Merge pull request #971 from dhellmann/enable-hwmon

enable hwmon for sensor collection for bare metal clusters

Author: openshift-merge-robot

CHANGELOG.md

@@ -9,6 +9,7 @@
 - [#959](https://github.com/openshift/cluster-monitoring-operator/pull/959) Remove memory limits from prometheus-config-reloader in user workload monitoring
 - [#969](https://github.com/openshift/cluster-monitoring-operator/pull/969) Bump Thanos v0.16.0
 - [#970](https://github.com/openshift/cluster-monitoring-operator/pull/970) Bump prometheus-operator v0.43.0.
+- [#971](https://github.com/openshift/cluster-monitoring-operator/pull/971) Enable `hwmon` in node-exporter for hardware sensor data collection
 
 ## 4.6
 

assets/node-exporter/daemonset.yaml

@@ -23,7 +23,6 @@ spec:
         - --path.sysfs=/host/sys
         - --path.rootfs=/host/root
         - --no-collector.wifi
-        - --no-collector.hwmon
         - --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/pods/.+)($|/)
         - --collector.mountstats
         - --collector.cpu.info

jsonnet/node-exporter.jsonnet

@@ -123,7 +123,10 @@ local tlsVolumeName = 'node-exporter-tls';
                       }
                     else
                       c {
-                        args+: ['--collector.mountstats', '--collector.cpu.info', '--collector.textfile.directory=' + textfileDir],
+		        // Remove the flag to disable hwmon that is set upstream so we
+			// gather that data (especially for bare metal clusters), and
+			// add flags to collect data not included by default.
+                        args: [a for a in c.args if a != '--no-collector.hwmon'] + ['--collector.mountstats', '--collector.cpu.info', '--collector.textfile.directory=' + textfileDir],
                         terminationMessagePolicy: 'FallbackToLogsOnError',
                         volumeMounts+: [
                           containerVolumeMount.new(textfileVolumeName, textfileDir, true),