Merge pull request #104 from oGi4i/feature/fix_firmware

Fixed firmware collector for multiple devices with same packages
This commit is contained in:
Steve Brunton 2021-03-25 20:22:47 -04:00 committed by GitHub
commit b60ab4f8ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions

View File

@ -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