Merge pull request #75 from gblansteen/hmc-timeout

hmc timeout

Author: adejoux

docs/content/configuration/file.md

@@ -55,6 +55,7 @@ hmc_password="abc123"
 hmc_managed_system="mysystem"
 hmc_database="nmon2influxdbHMC"
 hmc_data_retention="40d"
+hmc_timeout="30"
 {{< /highlight >}}
 
 # Additional parameters

docs/content/usage/hmc_import.md

@@ -22,6 +22,7 @@ OPTIONS:
    --managed_system, -m 	only import this managed system
    --managed_system-only, --sys-only	skip partition metrics
    --samples "0"			import latest <value> samples
+   --timeout 30				set a connection timeout
 {{< /highlight >}}
 
 # Parameters
@@ -32,6 +33,7 @@ OPTIONS:
   * **managed_system**: fetch HMC PCM data only for this managed system
   * **--sys-only**: skip partition metrics
   * **--samples <value>**: fetch the latest <value> samples. Each sample is averaging 30 seconds.
+  * **--timeout <value>**: set a connection timeout
 
 # Environment variables
 
@@ -53,6 +55,7 @@ hmc_managed_system="mysystem"
 hmc_database="nmon2influxdbHMC"
 hmc_data_retention="40d"
 hmc_samples=10
+hmc_timeout=30
 {{< /highlight >}}
 
 It's possible to set all CLI parameters. It's also possible to change the InfluxDB database name with **hmc_database** and change the data retention with **hmc_data_retention**.

hmc/hmc.go

@@ -24,9 +24,6 @@ import (
 	"github.com/codegangsta/cli"
 )
 
-// hmc can be really slow to answer
-const timeout = 30
-
 // HMC contains the base struct used by all the hmc sub command
 type HMC struct {
 	Session             *Session
@@ -87,8 +84,9 @@ func NewHMC(c *cli.Context) *HMC {
 	}
 	hmcURL := fmt.Sprintf("https://"+"%s"+":12443", config.HMCServer)
 	//initialize new http session
-	hmc.Session = NewSession(config.HMCUser, config.HMCPassword, hmcURL)
+	hmc.Session = NewSession(config.HMCUser, config.HMCPassword, hmcURL, config.HMCTimeout)
 	hmc.Token = hmc.Session.doLogon()
+
 	return &hmc
 }
 
@@ -222,7 +220,7 @@ type Session struct {
 }
 
 // NewSession initialize a Session struct
-func NewSession(user string, password string, url string) *Session {
+func NewSession(user string, password string, url string, timeout int) *Session {
 	tr := &http.Transport{
 		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
 	}
@@ -232,7 +230,9 @@ func NewSession(user string, password string, url string) *Session {
 		log.Fatal(err)
 	}
 
-	return &Session{client: &http.Client{Transport: tr, Jar: jar, Timeout: time.Second * timeout}, User: user, Password: password, url: url}
+	log.Printf("Session Timeout %d\n", timeout)
+
+	return &Session{client: &http.Client{Transport: tr, Jar: jar, Timeout: time.Second * time.Duration(timeout)}, User: user, Password: password, url: url}
 }
 
 type Token struct {

main.go

@@ -73,7 +73,7 @@ func main() {
 	app := cli.NewApp()
 	app.Name = "nmon2influxdb"
 	app.Usage = "upload NMON stats to InfluxDB database"
-	app.Version = "2.1.5"
+	app.Version = "2.1.6"
 	app.Commands = []cli.Command{
 		{
 			Name:  "import",
@@ -254,6 +254,11 @@ func main() {
 							Usage: "import latest <value> samples",
 							Value: config.HMCSamples,
 						},
+						cli.IntFlag{
+							Name:  "timeout",
+							Usage: "HMC connection timeout",
+							Value: config.HMCTimeout,
+						},
 					},
 				},
 			},

nmon2influxdblib/config.go

@@ -46,6 +46,7 @@ type Config struct {
 	HMCManagedSystem      string `toml:"hmc_managed_system"`
 	HMCManagedSystemOnly  bool   `toml:"hmc_managed_system_only"`
 	HMCSamples            int    `toml:"hmc_samples"`
+	HMCTimeout            int    `toml:"hmc_timeout"`
 	ImportSkipDisks       bool
 	ImportAllCpus         bool
 	ImportBuildDashboard  bool
@@ -99,6 +100,7 @@ func InitConfig() Config {
 		HMCPassword:           "abc123",
 		HMCDatabase:           "nmon2influxdbHMC",
 		HMCSamples:            10,
+		HMCTimeout:            30,
 		GrafanaUser:           "admin",
 		GrafanaPassword:       "admin",
 		GrafanaURL:            "http://localhost:3000",
@@ -242,6 +244,7 @@ func ParseParameters(c *cli.Context) (config *Config) {
 	config.HMCManagedSystem = c.String("managed_system")
 	config.HMCManagedSystemOnly = c.Bool("managed_system-only")
 	config.HMCSamples = c.Int("samples")
+	config.HMCTimeout = c.Int("timeout")
 	config.InfluxdbServer = c.GlobalString("server")
 	config.InfluxdbUser = c.GlobalString("user")
 	config.InfluxdbPort = c.GlobalString("port")