Reduce logging and use the fix for boolean yaml options in all collectors

ibmmqmet · ibmmqmet · commit 5e8fda1f0d51 · 2021-09-14T09:19:53.000+01:00
diff --git a/cmd/mq_aws/config.go b/cmd/mq_aws/config.go
@@ -67,8 +67,6 @@ func initConfig() error {
 
 	if err == nil {
 		if config.cf.ConfigFile != "" {
-			// Set defaults
-			cfy.Global.UsePublications = true
 			err = cf.ReadConfigFile(config.cf.ConfigFile, &cfy)
 			if err == nil {
 				cf.CopyYamlConfig(&config.cf, cfy.Global, cfy.Connection, cfy.Objects)
diff --git a/cmd/mq_aws/exporter.go b/cmd/mq_aws/exporter.go
@@ -62,7 +62,7 @@ data
 func Collect() error {
 	var err error
 	var series string
-	log.Infof("IBM MQ AWS collection started")
+	log.Debugf("IBM MQ AWS collection started")
 	collectStartTime := time.Now()
 
 	if platformString == "" {
diff --git a/cmd/mq_coll/config.go b/cmd/mq_coll/config.go
@@ -60,8 +60,6 @@ func initConfig() error {
 
 	if err == nil {
 		if config.cf.ConfigFile != "" {
-			// Set defaults
-			cfy.Global.UsePublications = true
 			err = cf.ReadConfigFile(config.cf.ConfigFile, &cfy)
 			if err == nil {
 				cf.CopyYamlConfig(&config.cf, cfy.Global, cfy.Connection, cfy.Objects)
diff --git a/cmd/mq_coll/exporter.go b/cmd/mq_coll/exporter.go
@@ -51,7 +51,7 @@ data
 func Collect() error {
 	var err error
 	series := ""
-	log.Infof("IBM MQ stdout collector started")
+	log.Debugf("IBM MQ stdout collector started")
 	if platformString == "" {
 		platformString = strings.Replace(ibmmq.MQItoString("PL", int(mqmetric.GetPlatform())), "MQPL_", "", -1)
 	}
diff --git a/cmd/mq_influx/config.go b/cmd/mq_influx/config.go
@@ -78,8 +78,6 @@ func initConfig() error {
 
 	if err == nil {
 		if config.cf.ConfigFile != "" {
-			// Set defaults
-			cfy.Global.UsePublications = true
 			err = cf.ReadConfigFile(config.cf.ConfigFile, &cfy)
 			if err == nil {
 				cf.CopyYamlConfig(&config.cf, cfy.Global, cfy.Connection, cfy.Objects)
@@ -94,7 +92,6 @@ func initConfig() error {
 				config.ci.ApiToken = cf.CopyParmIfNotSetStr("influx", "apiToken", cfy.Influx.ApiToken)
 				config.ci.ApiTokenFile = cf.CopyParmIfNotSetStr("influx", "apiTokenFile", cfy.Influx.ApiTokenFile)
 				config.ci.Org = cf.CopyParmIfNotSetStr("influx", "org", cfy.Influx.Org)
-
 			}
 		}
 	}
diff --git a/cmd/mq_influx/exporter.go b/cmd/mq_influx/exporter.go
@@ -54,7 +54,7 @@ func Collect(c client.Client) error {
 	var err error
 	var series string
 
-	log.Infof("IBMMQ InfluxDB collection started")
+	log.Debugf("IBMMQ InfluxDB collection started")
 	collectStartTime := time.Now()
 	atomic.StoreInt64(&loopErrorCount, 0)
 	bp := c.WriteAPI(config.ci.Org, config.ci.BucketName)
diff --git a/cmd/mq_json/config.go b/cmd/mq_json/config.go
@@ -55,8 +55,6 @@ func initConfig() error {
 
 	if err == nil {
 		if config.cf.ConfigFile != "" {
-			// Set defaults
-			cfy.Global.UsePublications = true
 			err = cf.ReadConfigFile(config.cf.ConfigFile, &cfy)
 			if err == nil {
 				cf.CopyYamlConfig(&config.cf, cfy.Global, cfy.Connection, cfy.Objects)
diff --git a/cmd/mq_json/exporter.go b/cmd/mq_json/exporter.go
@@ -70,7 +70,7 @@ func Collect() error {
 	var err error
 	var j jsonReportStruct
 
-	log.Infof("IBM MQ JSON collector started")
+	log.Debugf("IBM MQ JSON collector started")
 	collectStartTime := time.Now()
 
 	if platformString == "" {
diff --git a/cmd/mq_opentsdb/config.go b/cmd/mq_opentsdb/config.go
@@ -67,8 +67,6 @@ func initConfig() error {
 
 	if err == nil {
 		if config.cf.ConfigFile != "" {
-			// Set defaults
-			cfy.Global.UsePublications = true
 			err = cf.ReadConfigFile(config.cf.ConfigFile, &cfy)
 			if err == nil {
 				cf.CopyYamlConfig(&config.cf, cfy.Global, cfy.Connection, cfy.Objects)
@@ -77,7 +75,6 @@ func initConfig() error {
 				config.ci.MaxErrors = cf.CopyParmIfNotSetInt("opentsdb", "maxErrors", cfy.OpenTSDB.MaxErrors)
 				config.ci.MaxPoints = cf.CopyParmIfNotSetInt("opentsdb", "maxPoints", cfy.OpenTSDB.MaxPoints)
 				config.ci.MetricPrefix = cf.CopyParmIfNotSetStr("opentsdb", "seriesPrefix", cfy.OpenTSDB.MetricPrefix)
-
 			}
 		}
 	}
diff --git a/cmd/mq_opentsdb/exporter.go b/cmd/mq_opentsdb/exporter.go
@@ -62,7 +62,7 @@ data
 func Collect() error {
 	var err error
 	var series string
-	log.Infof("IBM MQ OpenTSDB collection started")
+	log.Debugf("IBM MQ OpenTSDB collection started")
 
 	if platformString == "" {
 		platformString = strings.Replace(ibmmq.MQItoString("PL", int(mqmetric.GetPlatform())), "MQPL_", "", -1)
diff --git a/cmd/mq_prometheus/exporter.go b/cmd/mq_prometheus/exporter.go
@@ -152,7 +152,7 @@ func (e *exporter) Collect(ch chan<- prometheus.Metric) {
 	mutex.Lock() // To protect metrics from concurrent collects.
 	defer mutex.Unlock()
 
-	log.Infof("IBMMQ Collect started %o", ch)
+	log.Debugf("IBMMQ Collect started %o", ch)
 	collectStartTime := time.Now()
 
 	// If we're not connected, then continue to report a single metric about the qmgr status
@@ -534,8 +534,15 @@ func (e *exporter) Collect(ch chan<- prometheus.Metric) {
 
 		for _, attr := range e.clusterStatus.Attributes {
 			for key, value := range attr.Values {
-				clusterName := e.clusterStatus.Attributes[mqmetric.ATTR_CLUSTER_NAME].Values[key].ValueString
-				qmType := e.clusterStatus.Attributes[mqmetric.ATTR_CLUSTER_QMTYPE].Values[key].ValueInt64
+				clusterName := ""
+				if cN, ok := e.clusterStatus.Attributes[mqmetric.ATTR_CLUSTER_NAME].Values[key]; ok {
+					clusterName = cN.ValueString
+				}
+
+				qmType := int64(ibmmq.MQQMT_NORMAL)
+				if qT, ok := e.clusterStatus.Attributes[mqmetric.ATTR_CLUSTER_QMTYPE].Values[key]; ok {
+					qmType = qT.ValueInt64
+				}
 				qmTypeString := "PARTIAL"
 				if qmType == int64(ibmmq.MQQMT_REPOSITORY) {
 					qmTypeString = "FULL"
diff --git a/pkg/config/configyaml.go b/pkg/config/configyaml.go
@@ -63,7 +63,6 @@ func ReadConfigFile(f string, cmy interface{}) error {
 	data, e2 := ioutil.ReadFile(f)
 	if e2 == nil {
 		e2 = yaml.Unmarshal(data, cmy)
-		fmt.Printf("CMY: %+v\n", cmy)
 	}
 
 	return e2

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ data`
`51`	`51`	`func Collect() error {`
`52`	`52`	`var err error`
`53`	`53`	`series := ""`
`54`		`- log.Infof("IBM MQ stdout collector started")`
	`54`	`+ log.Debugf("IBM MQ stdout collector started")`
`55`	`55`	`if platformString == "" {`
`56`	`56`	`platformString = strings.Replace(ibmmq.MQItoString("PL", int(mqmetric.GetPlatform())), "MQPL_", "", -1)`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,6 @@ func initConfig() error {`
`78`	`78`
`79`	`79`	`if err == nil {`
`80`	`80`	`if config.cf.ConfigFile != "" {`
`81`		`- // Set defaults`
`82`		`- cfy.Global.UsePublications = true`
`83`	`81`	`err = cf.ReadConfigFile(config.cf.ConfigFile, &cfy)`
`84`	`82`	`if err == nil {`
`85`	`83`	`cf.CopyYamlConfig(&config.cf, cfy.Global, cfy.Connection, cfy.Objects)`
`@@ -94,7 +92,6 @@ func initConfig() error {`
`94`	`92`	`config.ci.ApiToken = cf.CopyParmIfNotSetStr("influx", "apiToken", cfy.Influx.ApiToken)`
`95`	`93`	`config.ci.ApiTokenFile = cf.CopyParmIfNotSetStr("influx", "apiTokenFile", cfy.Influx.ApiTokenFile)`
`96`	`94`	`config.ci.Org = cf.CopyParmIfNotSetStr("influx", "org", cfy.Influx.Org)`
`97`		`-`
`98`	`95`	`}`
`99`	`96`	`}`
`100`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,6 @@ func initConfig() error {`
`67`	`67`
`68`	`68`	`if err == nil {`
`69`	`69`	`if config.cf.ConfigFile != "" {`
`70`		`- // Set defaults`
`71`		`- cfy.Global.UsePublications = true`
`72`	`70`	`err = cf.ReadConfigFile(config.cf.ConfigFile, &cfy)`
`73`	`71`	`if err == nil {`
`74`	`72`	`cf.CopyYamlConfig(&config.cf, cfy.Global, cfy.Connection, cfy.Objects)`
`@@ -77,7 +75,6 @@ func initConfig() error {`
`77`	`75`	`config.ci.MaxErrors = cf.CopyParmIfNotSetInt("opentsdb", "maxErrors", cfy.OpenTSDB.MaxErrors)`
`78`	`76`	`config.ci.MaxPoints = cf.CopyParmIfNotSetInt("opentsdb", "maxPoints", cfy.OpenTSDB.MaxPoints)`
`79`	`77`	`config.ci.MetricPrefix = cf.CopyParmIfNotSetStr("opentsdb", "seriesPrefix", cfy.OpenTSDB.MetricPrefix)`
`80`		`-`
`81`	`78`	`}`
`82`	`79`	`}`
`83`	`80`	`}`