mirror of
				https://github.com/KevinMidboe/mktxp-no-cli.git
				synced 2025-10-29 17:50:23 +00:00 
			
		
		
		
	Merge pull request #103 from vgropp/phy-temp
CRS312-4C+8XG Phy temp and fan3/fan4
This commit is contained in:
		| @@ -21,7 +21,7 @@ class HealthCollector(BaseCollector): | ||||
|     '''     | ||||
|     @staticmethod | ||||
|     def collect(router_entry): | ||||
|         health_labels = ['voltage', '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: | ||||
| @@ -33,6 +33,9 @@ class HealthCollector(BaseCollector): | ||||
|                 if 'temperature' in record: | ||||
|                     temperature_metrics = BaseCollector.gauge_collector('system_routerboard_temperature', 'Routerboard current temperature', [record, ], 'temperature') | ||||
|                     yield temperature_metrics | ||||
|                 elif 'phy_temperature' in record: | ||||
|                     temperature_metrics = BaseCollector.gauge_collector('system_routerboard_temperature', 'Routerboard current temperature', [record, ], 'phy_temperature') | ||||
|                     yield temperature_metrics | ||||
|  | ||||
|                 if 'cpu_temperature' in record: | ||||
|                     cpu_temperature_metrics = BaseCollector.gauge_collector('system_cpu_temperature', 'CPU current temperature', [record, ], 'cpu_temperature') | ||||
| @@ -49,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 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user