Merge pull request 'Refactored Temperature - created single metric with labels' (#5) from dev into main

Reviewed-on: #5

README.md

@@ -203,13 +203,12 @@ From version 2.0 there are following metric names used
 - `das_rest_value` - Remote REST API Value; Labels **name, url, method, server**
 - `das_shell_value` - Shell Value; Labels: **name, command, server**
 - `das_host_available` - Host availability; Labels **name, ip, server**
-- `das_net_interface_bytes` - Network Interface bytes; Labels: **name, server, metric**=(sent|receive)
+- `das_net_interface_bytes` - Network Interface bytes; Labels: **name, server, metric=(sent|receive)**
 - `das_exporter` - Exporter Uptime for **server** in seconds
 - `das_uptime_seconds` - System uptime on **server**
 - `das_cpu_percent` - CPU used percent on **server**
 - `das_memory_percent` - Memory used percent on **server**
-- `das_ChassisTemperature_current` - Current Chassis Temperature overall on **server** 
+- `das_temperature` - Temperature overall; Labels **server**, **metric=(CPU|Chassis)**;
-- `das_CpuTemperature_current` - Current CPU Temperature overall on **server**
 **Note:** there are no doubles in metrics names supported by Prometheus. If so the exception occurs ant the application will be stopped.
 
 ### 🚀 Launching the application

app_config.py

@@ -1,6 +1,6 @@
 import os
 
-APP_VERSION="2.0"
+APP_VERSION="2.1"
 SCRIPT_PATH = os.path.dirname(__file__)
 CONFIGS_DIR = SCRIPT_PATH + "/configs"
 CONFIG_FILE_NAME = CONFIGS_DIR + "/config.json"

metrics/DataStructures.py

@@ -270,7 +270,7 @@ class SystemData(AbstractData):
     c_uptime: Counter
     g_cpu: Gauge
     g_memory: Gauge
-    g_chassis_temp: Gauge
+    g_tempr: Gauge
     g_cpu_temp: Gauge
     def __init__(self, interval, prefix=''):
         super().__init__('system', interval, prefix)
@@ -285,10 +285,9 @@ class SystemData(AbstractData):
         self.g_cpu.labels(server=self.instance_prefix)
         self.g_memory = get_gauge_metric('das_memory_percent', 'Memory used percent on [server]', ['server'])
         self.g_memory.labels(server=self.instance_prefix)
-        self.g_chassis_temp = get_gauge_metric('das_ChassisTemperature_current', 'Current Chassis Temperature overall on [server]', ['server'])
+        self.g_tempr = get_gauge_metric('das_temperature', 'Temperature of [type] overall on [server]', ['metric', 'server'])
-        self.g_chassis_temp.labels(server=self.instance_prefix)
+        self.g_tempr.labels(server=self.instance_prefix, metric='CPU')
-        self.g_cpu_temp = get_gauge_metric('das_CpuTemperature_current', 'Current CPU Temperature overall on [server]', ['server'])
+        self.g_tempr.labels(server=self.instance_prefix, metric='Chassis')
-        self.g_cpu_temp.labels(server=self.instance_prefix)
 
     def set_data(self):
         time_ms = get_time_millis()
@@ -320,13 +319,13 @@ class SystemData(AbstractData):
             else:
                 self.ch_temp = self.cpu_temp
 
-            self.g_chassis_temp.labels(server=self.instance_prefix).set(self.ch_temp)
+            self.g_tempr.labels(server=self.instance_prefix, metric='Chassis').set(self.ch_temp)
-            self.g_cpu_temp.labels(server=self.instance_prefix).set(self.cpu_temp)
+            self.g_tempr.labels(server=self.instance_prefix, metric='CPU').set(self.cpu_temp)
         except:
             self.ch_temp = -500
             self.cpu_temp = -500
-            self.g_chassis_temp.labels(server=self.instance_prefix).set(self.ch_temp)
+            self.g_tempr.labels(server=self.instance_prefix, metric='Chassis').set(self.ch_temp)
-            self.g_cpu_temp.labels(server=self.instance_prefix).set(self.cpu_temp)
+            self.g_tempr.labels(server=self.instance_prefix, metric='CPU').set(self.cpu_temp)
 
         self.set_collect_time(get_time_millis() - time_ms)
         self.set_update_time()