Merge pull request #4 from treydock/fix-labels

Avoid duplicate label errors
treydock · Feb 17, 2020 · 48690be · 48690be
2 parents 745b93e + 37fb0bd
commit 48690be
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 11 deletions.
diff --git a/collectors/mmces.go b/collectors/mmces.go
@@ -82,12 +82,10 @@ func (c *MmcesCollector) collect(ch chan<- prometheus.Metric) error {
 	nodename := *configNodeName
 	mmces_state_out, err := mmces_state_show(nodename)
 	if err != nil {
-		ch <- prometheus.MustNewConstMetric(collectError, prometheus.GaugeValue, 1, "mmces")
 		return err
 	}
 	metrics, err := mmces_state_show_parse(mmces_state_out)
 	if err != nil {
-		ch <- prometheus.MustNewConstMetric(collectError, prometheus.GaugeValue, 1, "mmces")
 		return err
 	}
 	for _, m := range metrics {

diff --git a/collectors/mmhealth.go b/collectors/mmhealth.go
@@ -73,12 +73,10 @@ func (c *MmhealthCollector) collect(ch chan<- prometheus.Metric) error {
 	collectTime := time.Now()
 	mmhealth_out, err := mmhealth()
 	if err != nil {
-		ch <- prometheus.MustNewConstMetric(collectError, prometheus.GaugeValue, 1, "mmhealth")
 		return err
 	}
 	metrics, err := mmhealth_parse(mmhealth_out)
 	if err != nil {
-		ch <- prometheus.MustNewConstMetric(collectError, prometheus.GaugeValue, 1, "mmhealth")
 		return err
 	}
 	for _, m := range metrics {

diff --git a/collectors/mmpmon.go b/collectors/mmpmon.go
@@ -93,7 +93,6 @@ func (c *MmpmonCollector) collect(ch chan<- prometheus.Metric) error {
 	collectTime := time.Now()
 	mmpmon_out, err := mmpmon()
 	if err != nil {
-		ch <- prometheus.MustNewConstMetric(collectError, prometheus.GaugeValue, 1, "mmpmon")
 		return err
 	}
 	perfs, err := mmpmon_parse(mmpmon_out)

diff --git a/collectors/mount.go b/collectors/mount.go
@@ -64,13 +64,11 @@ func (c *MountCollector) collect(ch chan<- prometheus.Metric) error {
 	collectTime := time.Now()
 	gpfsMounts, err := getGPFSMounts()
 	if err != nil {
-		ch <- prometheus.MustNewConstMetric(collectError, prometheus.GaugeValue, 1, "mount")
-		return nil
+		return err
 	}
 	gpfsMountsFstab, err := getGPFSMountsFSTab()
 	if err != nil {
-		ch <- prometheus.MustNewConstMetric(collectError, prometheus.GaugeValue, 1, "mount")
-		return nil
+		return err
 	}
 	for _, m := range gpfsMountsFstab {
 		if !SliceContains(gpfsMounts, m) {

diff --git a/collectors/verbs.go b/collectors/verbs.go
@@ -59,12 +59,10 @@ func (c *VerbsCollector) collect(ch chan<- prometheus.Metric) error {
 	collectTime := time.Now()
 	out, err := verbs()
 	if err != nil {
-		ch <- prometheus.MustNewConstMetric(collectError, prometheus.GaugeValue, 1, "verbs")
 		return err
 	}
 	metric, err := verbs_parse(out)
 	if err != nil {
-		ch <- prometheus.MustNewConstMetric(collectError, prometheus.GaugeValue, 1, "verbs")
 		return err
 	}
 	if metric.Status == "started" {