fix bug #54

adejoux · adejoux · commit 9baaac428f46 · 2017-11-07T14:33:31.000+01:00
diff --git a/hmc/hmc.go b/hmc/hmc.go
@@ -103,12 +103,12 @@ func (hmc *HMC) WritePoints() (err error) {
 // AddPoint add a InfluxDB point. It's using the GlobalPoint parameter to fill some fields
 func (hmc *HMC) AddPoint(name string, metric string, values []float64) {
 
-  value := 0.0
+	value := 0.0
 	if len(values) > 0 {
 		value = values[0]
 	}
 
-	point := Point{ Name: name, Metric: metric, Value: value}
+	point := Point{Name: name, Metric: metric, Value: value}
 
 	tags := map[string]string{"system": hmc.GlobalPoint.System, "name": point.Metric}
 	if len(hmc.GlobalPoint.Pool) > 0 {
diff --git a/main.go b/main.go
@@ -272,13 +272,13 @@ func main() {
 			Value: config.InfluxdbPort,
 		},
 		cli.BoolFlag{
-			Name:  "secure",
-			Usage: "use ssl for InfluxDB",
+			Name:   "secure",
+			Usage:  "use ssl for InfluxDB",
 			EnvVar: "NMON2INFLUXDB_SECURE",
 		},
 		cli.BoolFlag{
-			Name:  "skip_cert_check",
-			Usage: "skip cert check for ssl connzction to InfluxDB",
+			Name:   "skip_cert_check",
+			Usage:  "skip cert check for ssl connzction to InfluxDB",
 			EnvVar: "NMON2INFLUXDB_SKIP_CERT_CHECK",
 		},
 		cli.StringFlag{
diff --git a/nmon/dashboard.go b/nmon/dashboard.go
@@ -8,10 +8,11 @@ import (
 	"bufio"
 	"encoding/json"
 	"fmt"
+	"log"
 	"os"
+	"path"
 	"regexp"
 	"sort"
-        "path"
 
 	"github.com/adejoux/grafanaclient"
 	"github.com/adejoux/nmon2influxdb/nmon2influxdblib"
@@ -116,7 +117,7 @@ func (nmon *Nmon) WriteDashboard() {
 	r.WriteTo(writer)
 	writer.Flush()
 
-	fmt.Printf("Writing GRAFANA dashboard: %s\n", filename)
+	log.Printf("Writing GRAFANA dashboard: %s\n", filename)
 
 }
 
@@ -826,13 +827,13 @@ func (nmon *Nmon) InitGrafanaSession() *grafanaclient.Session {
 			}
 
 			if status != "ok" {
-				fmt.Printf("No plugin for influxDB in Grafana !\n")
+				log.Printf("No plugin for influxDB in Grafana !\n")
 				os.Exit(1)
 			}
 		} else {
 			nmon2influxdblib.CheckError(err)
 			if _, present := plugins["influxdb"]; !present {
-				fmt.Printf("No plugin for influxDB in Grafana !\n")
+				log.Printf("No plugin for influxDB in Grafana !\n")
 				os.Exit(1)
 			}
 		}
@@ -848,7 +849,7 @@ func (nmon *Nmon) InitGrafanaSession() *grafanaclient.Session {
 		}
 		err = grafana.CreateDataSource(ds)
 		nmon2influxdblib.CheckError(err)
-		fmt.Printf("Grafana %s DataSource created.\n", nmon.Config.GrafanaDatasource)
+		log.Printf("Grafana %s DataSource created.\n", nmon.Config.GrafanaDatasource)
 	}
 
 	return grafana
@@ -860,10 +861,10 @@ func (nmon *Nmon) UploadDashboard(dashboard grafanaclient.Dashboard) (err error)
 
 	err = grafana.UploadDashboard(dashboard, true)
 	if err != nil {
-		fmt.Printf("Unable to upload Grafana dashboard: %s ! \n", err.Error())
+		log.Printf("Unable to upload Grafana dashboard: %s ! \n", err.Error())
 		return
 	}
 
-	fmt.Printf("Dashboard uploaded to grafana\n")
+	log.Printf("Dashboard uploaded to grafana\n")
 	return
 }
diff --git a/nmon/import.go b/nmon/import.go
@@ -7,13 +7,13 @@ package nmon
 import (
 	"fmt"
 	"log"
+	"math"
 	"os"
 	"path"
 	"regexp"
 	"strconv"
 	"strings"
 	"time"
-	"math"
 
 	"github.com/adejoux/influxdbclient"
 	"github.com/adejoux/nmon2influxdb/nmon2influxdblib"
@@ -63,7 +63,6 @@ func Import(c *cli.Context) {
 
 	for _, nmonFile := range nmonFiles.Valid() {
 
-
 		// store the list of metrics which was logged as skipped
 		LoggedSkippedMetrics := make(map[string]bool)
 		var count int64
@@ -75,18 +74,26 @@ func Import(c *cli.Context) {
 			nmon.TagParsers = tagParsers
 		}
 
+		if nmon.Debug {
+			log.Printf("Import file: %s", nmonFile.Name)
+		}
+
 		lines := nmonFile.Content()
 		log.Printf("NMON file separator: %s\n", nmonFile.Delimiter)
 		var last string
 		filters := new(influxdbclient.Filters)
 		filters.Add("file", path.Base(nmonFile.Name), "text")
 
-		result, err := influxdbLog.ReadLastPoint("value", filters, "timestamp")
+		timeStamp, err := influxdbLog.ReadLastPoint("value", filters, "timestamp")
 		nmon2influxdblib.CheckError(err)
 
+		if nmon.Debug {
+			log.Printf("influxdb stored timestamp: %v\n", timeStamp)
+		}
+
 		var lastTime time.Time
-		if !nmon.Config.ImportForce && len(result) > 0 {
-			lastTime, err = nmon.ConvertTimeStamp(result[1].(string))
+		if !nmon.Config.ImportForce && len(timeStamp) > 0 {
+			lastTime, err = nmon.ConvertTimeStamp(timeStamp)
 		} else {
 			lastTime, err = nmon.ConvertTimeStamp("00:00:00,01-JAN-1900")
 		}
@@ -95,10 +102,14 @@ func Import(c *cli.Context) {
 		origChecksum, err := influxdbLog.ReadLastPoint("value", filters, "checksum")
 		nmon2influxdblib.CheckError(err)
 
+		if nmon.Debug {
+			log.Printf("influxdb stored checksum: %v\n", origChecksum)
+		}
+
 		ckfield := map[string]interface{}{"value": nmonFile.Checksum()}
 		if !nmon.Config.ImportForce && len(origChecksum) > 0 {
 
-			if origChecksum[1].(string) == nmonFile.Checksum() {
+			if origChecksum == nmonFile.Checksum() {
 				fmt.Printf("file not changed since last import: %s\n", nmonFile.Name)
 				continue
 			}
@@ -159,7 +170,7 @@ func Import(c *cli.Context) {
 
 					// try to convert string to integer
 					converted, parseErr := strconv.ParseFloat(value, 64)
-					if (parseErr != nil || math.IsNaN(converted)) {
+					if parseErr != nil || math.IsNaN(converted) {
 						//if not working, skip to next value. We don't want text values in InfluxDB.
 						continue
 					}
diff --git a/nmon2influxdblib/config.go b/nmon2influxdblib/config.go
@@ -23,50 +23,50 @@ var secretPassword = "secret"
 
 // Config is the configuration structure used by nmon2influxdb
 type Config struct {
-	Debug                bool
-	DebugFile            string
-	Timezone             string
-	InfluxdbUser         string
-	InfluxdbPassword     string
-	InfluxdbServer       string
-	InfluxdbPort         string
-	InfluxdbSecure 			 bool
+	Debug                 bool
+	DebugFile             string
+	Timezone              string
+	InfluxdbUser          string
+	InfluxdbPassword      string
+	InfluxdbServer        string
+	InfluxdbPort          string
+	InfluxdbSecure        bool
 	InfluxdbSkipCertCheck bool
-	InfluxdbDatabase     string
-	GrafanaUser          string
-	GrafanaPassword      string
-	GrafanaURL           string `toml:"grafana_URL"`
-	GrafanaAccess        string
-	GrafanaDatasource    string
-	HMCServer            string `toml:"hmc_server"`
-	HMCUser              string `toml:"hmc_user"`
-	HMCPassword          string `toml:"hmc_password"`
-	HMCDatabase          string `toml:"hmc_database"`
-	HMCDataRetention     string `toml:"hmc_data_retention"`
-	HMCManagedSystem     string `toml:"hmc_managed_system"`
-	HMCManagedSystemOnly bool   `toml:"hmc_managed_system_only"`
-	HMCSamples           int    `toml:"hmc_samples"`
-	ImportSkipDisks      bool
-	ImportAllCpus        bool
-	ImportBuildDashboard bool
-	ImportForce          bool
-	ImportSkipMetrics    string
-	ImportLogDatabase    string
-	ImportLogRetention   string
-	ImportDataRetention  string
-	ImportSSHUser        string `toml:"import_ssh_user"`
-	ImportSSHKey         string `toml:"import_ssh_key"`
-	DashboardWriteFile   bool
-	StatsLimit           int
-	StatsSort            string
-	StatsFilter          string
-	StatsFrom            string
-	StatsTo              string
-	StatsHost            string
-	Metric               string `toml:"metric,omitempty"`
-	ListFilter           string `toml:",omitempty"`
-	ListHost             string `toml:",omitempty"`
-	Inputs               Inputs `toml:"input"`
+	InfluxdbDatabase      string
+	GrafanaUser           string
+	GrafanaPassword       string
+	GrafanaURL            string `toml:"grafana_URL"`
+	GrafanaAccess         string
+	GrafanaDatasource     string
+	HMCServer             string `toml:"hmc_server"`
+	HMCUser               string `toml:"hmc_user"`
+	HMCPassword           string `toml:"hmc_password"`
+	HMCDatabase           string `toml:"hmc_database"`
+	HMCDataRetention      string `toml:"hmc_data_retention"`
+	HMCManagedSystem      string `toml:"hmc_managed_system"`
+	HMCManagedSystemOnly  bool   `toml:"hmc_managed_system_only"`
+	HMCSamples            int    `toml:"hmc_samples"`
+	ImportSkipDisks       bool
+	ImportAllCpus         bool
+	ImportBuildDashboard  bool
+	ImportForce           bool
+	ImportSkipMetrics     string
+	ImportLogDatabase     string
+	ImportLogRetention    string
+	ImportDataRetention   string
+	ImportSSHUser         string `toml:"import_ssh_user"`
+	ImportSSHKey          string `toml:"import_ssh_key"`
+	DashboardWriteFile    bool
+	StatsLimit            int
+	StatsSort             string
+	StatsFilter           string
+	StatsFrom             string
+	StatsTo               string
+	StatsHost             string
+	Metric                string `toml:"metric,omitempty"`
+	ListFilter            string `toml:",omitempty"`
+	ListHost              string `toml:",omitempty"`
+	Inputs                Inputs `toml:"input"`
 }
 
 // Inputs allows to put multiple input in the configuration file
@@ -87,39 +87,39 @@ func InitConfig() Config {
 	sshKey := filepath.Join(home, "/.ssh/id_rsa")
 
 	return Config{Debug: false,
-		Timezone:             "Europe/Paris",
-		InfluxdbUser:         "root",
-		InfluxdbPassword:     "root",
-		InfluxdbServer:       "localhost",
-		InfluxdbPort:         "8086",
-		InfluxdbDatabase:     "nmon_reports",
-		InfluxdbSecure: 			false,
-		InfluxdbSkipCertCheck:  false,
-		HMCUser:              "hscroot",
-		HMCPassword:          "abc123",
-		HMCDatabase:          "nmon2influxdbHMC",
-		HMCSamples:           10,
-		GrafanaUser:          "admin",
-		GrafanaPassword:      "admin",
-		GrafanaURL:           "http://localhost:3000",
-		GrafanaAccess:        "direct",
-		GrafanaDatasource:    "nmon2influxdb",
-		ImportSkipDisks:      false,
-		ImportAllCpus:        false,
-		ImportBuildDashboard: false,
-		ImportForce:          false,
-		ImportLogDatabase:    "nmon2influxdb_log",
-		ImportLogRetention:   "2d",
-		ImportSSHUser:        currUser.Username,
-		ImportSSHKey:         sshKey,
-		DashboardWriteFile:   false,
-		ImportSkipMetrics:    "JFSINODE|TOP|PCPU",
-		StatsLimit:           20,
-		StatsSort:            "mean",
-		StatsFilter:          "",
-		StatsFrom:            "",
-		StatsTo:              "",
-		StatsHost:            "",
+		Timezone:              "Europe/Paris",
+		InfluxdbUser:          "root",
+		InfluxdbPassword:      "root",
+		InfluxdbServer:        "localhost",
+		InfluxdbPort:          "8086",
+		InfluxdbDatabase:      "nmon_reports",
+		InfluxdbSecure:        false,
+		InfluxdbSkipCertCheck: false,
+		HMCUser:               "hscroot",
+		HMCPassword:           "abc123",
+		HMCDatabase:           "nmon2influxdbHMC",
+		HMCSamples:            10,
+		GrafanaUser:           "admin",
+		GrafanaPassword:       "admin",
+		GrafanaURL:            "http://localhost:3000",
+		GrafanaAccess:         "direct",
+		GrafanaDatasource:     "nmon2influxdb",
+		ImportSkipDisks:       false,
+		ImportAllCpus:         false,
+		ImportBuildDashboard:  false,
+		ImportForce:           false,
+		ImportLogDatabase:     "nmon2influxdb_log",
+		ImportLogRetention:    "2d",
+		ImportSSHUser:         currUser.Username,
+		ImportSSHKey:          sshKey,
+		DashboardWriteFile:    false,
+		ImportSkipMetrics:     "JFSINODE|TOP|PCPU",
+		StatsLimit:            20,
+		StatsSort:             "mean",
+		StatsFilter:           "",
+		StatsFrom:             "",
+		StatsTo:               "",
+		StatsHost:             "",
 	}
 }
 
@@ -202,6 +202,7 @@ func (config *Config) AddDashboardParams() {
 	config.GrafanaDatasource = dfltConfig.GrafanaDatasource
 	config.GrafanaUser = dfltConfig.GrafanaUser
 	config.GrafanaPassword = dfltConfig.GrafanaPassword
+	config.DashboardWriteFile = dfltConfig.DashboardWriteFile
 }
 
 // ParseParameters parse parameter from command line in Config struct
@@ -277,13 +278,13 @@ func ParseParameters(c *cli.Context) (config *Config) {
 // ConnectDB connect to the specified influxdb database
 func (config *Config) ConnectDB(db string) *influxdbclient.InfluxDB {
 	influxdbConfig := influxdbclient.InfluxDBConfig{
-		Host:     config.InfluxdbServer,
-		Port:     config.InfluxdbPort,
-		Database: db,
-		User:     config.InfluxdbUser,
-		Pass:     config.InfluxdbPassword,
-		Debug:    config.Debug,
-		Secure:   config.InfluxdbSecure,
+		Host:          config.InfluxdbServer,
+		Port:          config.InfluxdbPort,
+		Database:      db,
+		User:          config.InfluxdbUser,
+		Pass:          config.InfluxdbPassword,
+		Debug:         config.Debug,
+		Secure:        config.InfluxdbSecure,
 		SkipCertCheck: config.InfluxdbSkipCertCheck,
 	}
 	influxdb, err := influxdbclient.NewInfluxDB(influxdbConfig)

Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,11 @@ import (`
`8`	`8`	`"bufio"`
`9`	`9`	`"encoding/json"`
`10`	`10`	`"fmt"`
	`11`	`+ "log"`
`11`	`12`	`"os"`
	`13`	`+ "path"`
`12`	`14`	`"regexp"`
`13`	`15`	`"sort"`
`14`		`- "path"`
`15`	`16`
`16`	`17`	`"github.com/adejoux/grafanaclient"`
`17`	`18`	`"github.com/adejoux/nmon2influxdb/nmon2influxdblib"`
`@@ -116,7 +117,7 @@ func (nmon *Nmon) WriteDashboard() {`
`116`	`117`	`r.WriteTo(writer)`
`117`	`118`	`writer.Flush()`
`118`	`119`
`119`		`- fmt.Printf("Writing GRAFANA dashboard: %s\n", filename)`
	`120`	`+ log.Printf("Writing GRAFANA dashboard: %s\n", filename)`
`120`	`121`
`121`	`122`	`}`
`122`	`123`
`@@ -826,13 +827,13 @@ func (nmon Nmon) InitGrafanaSession() grafanaclient.Session {`
`826`	`827`	`}`
`827`	`828`
`828`	`829`	`if status != "ok" {`
`829`		`- fmt.Printf("No plugin for influxDB in Grafana !\n")`
	`830`	`+ log.Printf("No plugin for influxDB in Grafana !\n")`
`830`	`831`	`os.Exit(1)`
`831`	`832`	`}`
`832`	`833`	`} else {`
`833`	`834`	`nmon2influxdblib.CheckError(err)`
`834`	`835`	`if _, present := plugins["influxdb"]; !present {`
`835`		`- fmt.Printf("No plugin for influxDB in Grafana !\n")`
	`836`	`+ log.Printf("No plugin for influxDB in Grafana !\n")`
`836`	`837`	`os.Exit(1)`
`837`	`838`	`}`
`838`	`839`	`}`
`@@ -848,7 +849,7 @@ func (nmon Nmon) InitGrafanaSession() grafanaclient.Session {`
`848`	`849`	`}`
`849`	`850`	`err = grafana.CreateDataSource(ds)`
`850`	`851`	`nmon2influxdblib.CheckError(err)`
`851`		`- fmt.Printf("Grafana %s DataSource created.\n", nmon.Config.GrafanaDatasource)`
	`852`	`+ log.Printf("Grafana %s DataSource created.\n", nmon.Config.GrafanaDatasource)`
`852`	`853`	`}`
`853`	`854`
`854`	`855`	`return grafana`
`@@ -860,10 +861,10 @@ func (nmon *Nmon) UploadDashboard(dashboard grafanaclient.Dashboard) (err error)`
`860`	`861`
`861`	`862`	`err = grafana.UploadDashboard(dashboard, true)`
`862`	`863`	`if err != nil {`
`863`		`- fmt.Printf("Unable to upload Grafana dashboard: %s ! \n", err.Error())`
	`864`	`+ log.Printf("Unable to upload Grafana dashboard: %s ! \n", err.Error())`
`864`	`865`	`return`
`865`	`866`	`}`
`866`	`867`
`867`		`- fmt.Printf("Dashboard uploaded to grafana\n")`
	`868`	`+ log.Printf("Dashboard uploaded to grafana\n")`
`868`	`869`	`return`
`869`	`870`	`}`