From a3309741d9e86b26287874accc2e451baff1c1b5 Mon Sep 17 00:00:00 2001 From: Volker Gropp Date: Tue, 26 Dec 2023 15:30:50 +0100 Subject: [PATCH] add fan3 and fan4 --- mktxp/collector/health_collector.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/mktxp/collector/health_collector.py b/mktxp/collector/health_collector.py index d26ff21..573178d 100644 --- a/mktxp/collector/health_collector.py +++ b/mktxp/collector/health_collector.py @@ -21,7 +21,7 @@ class HealthCollector(BaseCollector): ''' @staticmethod def collect(router_entry): - health_labels = ['voltage', 'temperature', 'phy_temperature', 'cpu_temperature', 'switch_temperature', 'fan1_speed', 'fan2_speed', 'power_consumption'] + health_labels = ['voltage', 'temperature', 'phy_temperature', 'cpu_temperature', 'switch_temperature', 'fan1_speed', 'fan2_speed', 'fan3_speed', 'fan4_speed', 'power_consumption'] health_records = HealthMetricsDataSource.metric_records(router_entry, metric_labels = health_labels) if health_records: for record in health_records: @@ -52,6 +52,14 @@ class HealthCollector(BaseCollector): fan_two_speed_metrics = BaseCollector.gauge_collector('system_fan_two_speed', 'System fan 2 current speed', [record, ], 'fan2_speed') yield fan_two_speed_metrics + if 'fan3_speed' in record: + fan_three_speed_metrics = BaseCollector.gauge_collector('system_fan_three_speed', 'System fan 3 current speed', [record, ], 'fan3_speed') + yield fan_three_speed_metrics + + if 'fan4_speed' in record: + fan_four_speed_metrics = BaseCollector.gauge_collector('system_fan_four_speed', 'System fan 4 current speed', [record, ], 'fan4_speed') + yield fan_four_speed_metrics + if 'power_consumption' in record: power_consumption_metrics = BaseCollector.gauge_collector('system_power_consumption', 'System Power Consumption', [record, ], 'power_consumption') yield power_consumption_metrics