Merge pull request #344 from Helene/overwork_8.0.7

Publish overworked 8.0.7 version

Author: Helene

docs/RELEASE_NOTES.md

@@ -1,4 +1,4 @@
-# Version 8.0.7 (08/14/2025)
+# Version 8.0.7 (09/01/2025)
 Published example dashboards for monitoring ESS Hardware metrics with Prometheus: \
 - ESS Hardware Performance overview \
 - HW Components Temperature \

docs/SUPPORT_MATRIX.md

@@ -1,5 +1,5 @@
 The following matrix gives a quick overview of the supported software for the IBM Storage Scale bridge for Grafana packages by version number:
-# Version 8.0.7 (08/14/2025)
+# Version 8.0.7 (09/01/2025)
 Classic Scale:
  - Python 3.9
  - CherryPy 18.10.0

source/collector.py

@@ -117,15 +117,12 @@ def __init__(self, name: str, desc: str, type: Optional[str] = None):
     def __format__(self, spec):
         return f'{self.mname}_mTS'
 
-    def str_descfmt(self, original_counters=False) -> [str]:
+    def str_descfmt(self) -> [str]:
         """Format MetricTimeSeries description rows
             Output format:
                 '''# HELP {name} {desc}'''
                 '''# TYPE {name} {mtype}'''
         """
-        metric_type = self.mtype
-        if not original_counters and metric_type == 'counter':
-            metric_type = 'gauge'
 
         myset = []
 
@@ -136,7 +133,7 @@ def str_descfmt(self, original_counters=False) -> [str]:
         myset.append(expfmt)
         expfmt1 = '''# TYPE {name} {mtype}'''.format(
             name=self.mname,
-            mtype=metric_type,
+            mtype=self.mtype,
         )
         myset.append(expfmt1)
 

source/prometheus.py

@@ -61,10 +61,10 @@ def TOPO(self):
     def format_response(self, data) -> [str]:
         resp = []
         for name, metric in data.items():
-            header = metric.str_descfmt(original_counters=self.raw_data)
+            header = metric.str_descfmt()
             resp.extend(header)
             for sts in metric.timeseries:
-                if self.raw_data:
+                if len(sts.dps) > 1:
                     sts.reduce_dps_to_first_not_none(reverse_order=True)
                 for _key, _value in sts.dps.items():
                     sts_resp = SingleTimeSeriesResponse(name, _key,