From 25dc6b22ecef9477a2d538190c7c9207588e68f5 Mon Sep 17 00:00:00 2001 From: oGi4i Date: Tue, 8 Dec 2020 21:31:12 +0300 Subject: [PATCH] fixed firmware collector for multiple devices with same packages --- collector/firmware_collector.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/collector/firmware_collector.go b/collector/firmware_collector.go index e283b36..af7b741 100644 --- a/collector/firmware_collector.go +++ b/collector/firmware_collector.go @@ -19,7 +19,7 @@ func newFirmwareCollector() routerOSCollector { } func (c *firmwareCollector) init() { - labelNames := []string{"name", "disabled", "version", "build_time"} + labelNames := []string{"devicename", "name", "disabled", "version", "build_time"} c.description = description("system", "package", "system packages version", labelNames) } @@ -41,10 +41,10 @@ func (c *firmwareCollector) collect(ctx *collectorContext) error { for _, pkg := range pkgs { v := 1.0 - if strings.Compare(pkg.Map["disabled"], "true") == 0 { + if strings.EqualFold(pkg.Map["disabled"], "true") { v = 0.0 } - ctx.ch <- prometheus.MustNewConstMetric(c.description, prometheus.GaugeValue, v, pkg.Map["name"], pkg.Map["disabled"], pkg.Map["version"], pkg.Map["build-time"]) + ctx.ch <- prometheus.MustNewConstMetric(c.description, prometheus.GaugeValue, v, ctx.device.Name, pkg.Map["name"], pkg.Map["disabled"], pkg.Map["version"], pkg.Map["build-time"]) } return nil