From 5d9748ae5ef5afea70fde3cbe9ebcfc081bb70e3 Mon Sep 17 00:00:00 2001 From: Ben Kochie Date: Fri, 7 Jul 2023 11:37:44 +0200 Subject: [PATCH] Fixup hwmon chip include Use the correct include value to the device filter function. * Add new bogus hwmon fixture. * Update end-to-end test to use hwmon chip include flag. Signed-off-by: Ben Kochie --- README.md | 1 + collector/fixtures/sys.ttar | 42 +++++++++++++++++++++++++++++++++++++ collector/hwmon_linux.go | 3 ++- end-to-end-test.sh | 1 + 4 files changed, 46 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2fd3ff4657..de774e63a2 100644 --- a/README.md +++ b/README.md @@ -101,6 +101,7 @@ ethtool | device | --collector.ethtool.device-include | --collector.ethtool.devi ethtool | metrics | --collector.ethtool.metrics-include | N/A filesystem | fs-types | N/A | --collector.filesystem.fs-types-exclude filesystem | mount-points | N/A | --collector.filesystem.mount-points-exclude +hwmon | device | --collector.hwmon.chip-include | --collector.hwmon.chip-exclude netdev | device | --collector.netdev.device-include | --collector.netdev.device-exclude qdisk | device | --collector.qdisk.device-include | --collector.qdisk.device-exclude sysctl | all | --collector.sysctl.include | N/A diff --git a/collector/fixtures/sys.ttar b/collector/fixtures/sys.ttar index ee152dfa3c..213c8b3867 100644 --- a/collector/fixtures/sys.ttar +++ b/collector/fixtures/sys.ttar @@ -356,6 +356,9 @@ Lines: 1 100000 Mode: 644 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/class/hwmon/hwmon5 +SymlinkTo: ../../devices/platform/bogus.0/hwmon/hwmon5/ +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Directory: sys/class/infiniband Mode: 755 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2672,6 +2675,45 @@ Lines: 1 applesmc Mode: 644 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Directory: sys/devices/platform/bogus.0 +Mode: 775 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Directory: sys/devices/platform/bogus.0/hwmon +Mode: 775 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Directory: sys/devices/platform/bogus.0/hwmon/hwmon5 +Mode: 775 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/platform/bogus.0/hwmon/hwmon5/bogus1_crit +Lines: 1 +100000 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/platform/bogus.0/hwmon/hwmon5/bogus1_crit_alarm +Lines: 1 +0 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/platform/bogus.0/hwmon/hwmon5/bogus1_input +Lines: 1 +55000 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/platform/bogus.0/hwmon/hwmon5/bogus1_label +Lines: 1 +Physical id 0 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/platform/bogus.0/hwmon/hwmon5/bogus1_max +Lines: 1 +84000 +Mode: 644 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Path: sys/devices/platform/bogus.0/hwmon/hwmon5/name +Lines: 1 +bogus +Mode: 664 +# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Directory: sys/devices/platform/coretemp.0 Mode: 755 # ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/collector/hwmon_linux.go b/collector/hwmon_linux.go index 1d06e89107..3ad469a61a 100644 --- a/collector/hwmon_linux.go +++ b/collector/hwmon_linux.go @@ -61,7 +61,7 @@ func NewHwMonCollector(logger log.Logger) (Collector, error) { return &hwMonCollector{ logger: logger, - deviceFilter: newDeviceFilter(*collectorHWmonChipExclude, *collectorHWmonChipExclude), + deviceFilter: newDeviceFilter(*collectorHWmonChipExclude, *collectorHWmonChipInclude), }, nil } @@ -164,6 +164,7 @@ func (c *hwMonCollector) updateHwmon(ch chan<- prometheus.Metric, dir string) er } if c.deviceFilter.ignored(hwmonName) { + level.Debug(c.logger).Log("msg", "ignoring hwmon chip", "chip", hwmonName) return nil } diff --git a/end-to-end-test.sh b/end-to-end-test.sh index c8dadc91b9..9aa2b7bfc1 100755 --- a/end-to-end-test.sh +++ b/end-to-end-test.sh @@ -132,6 +132,7 @@ fi --collector.qdisc.fixtures="collector/fixtures/qdisc/" \ --collector.qdisk.device-include="(wlan0|eth0)" \ --collector.arp.device-exclude="nope" \ + --collector.hwmon.chip-include="(applesmc|coretemp|hwmon4|nct6779)" \ --collector.netclass.ignored-devices="(dmz|int)" \ --collector.netclass.ignore-invalid-speed \ --collector.netdev.device-include="lo" \