Merge pull request #147 from Helene/prometheus_histogram

Export histogram metrics

Author: Helene

source/collector.py

@@ -89,8 +89,8 @@ def parse_tags(self, filtersMap):
 
 class MetricTimeSeries(object):
 
-    def __init__(self, name: str, desc: str):
-        self.mtype = 'gauge'
+    def __init__(self, name: str, desc: str, type: Optional[str] = None):
+        self.mtype = type or 'gauge'
         self.mname = name
         self.desc = desc
         self.timeseries: list[TimeSeries] = []
@@ -154,8 +154,9 @@ def _setup_static_metrics_data(self, metric_names: List[str]):
         mDict = {}
         md = MetadataHandler()
         spec = md.metricsDesc
+        type = 'histogram' if self.sensor == 'GPFSWaiters' else 'gauge'
         for name in metric_names:
-            ts = MetricTimeSeries(name, spec.get(name, "Desc not found"))
+            ts = MetricTimeSeries(name, spec.get(name, "Desc not found"), type)
             mDict[name] = ts
         self.metrics = mDict
 

source/prometheus.py

@@ -61,7 +61,7 @@ def format_response(self, data) -> [str]:
             resp.extend(header)
             for sts in metric.timeseries:
                 for _key, _value in sts.dps.items():
-                    sts_resp = SingleTimeSeriesResponse(name, _key, _value, sts.tags)
+                    sts_resp = SingleTimeSeriesResponse(name, _key, _value, sts.tags, metric.mtype)
                     self.logger.trace(f'sts_resp.str_expfmt output: {sts_resp.str_expfmt()}')
                     resp.extend(sts_resp.str_expfmt())
         return resp
@@ -201,6 +201,13 @@ def GET(self, **params):
             resString = '\n'.join(resp) + '\n'
             return resString
 
+        # /metrics_gpfs_waiters
+        elif 'metrics_gpfs_waiters' in cherrypy.request.script_name:
+            resp = self.metrics(['GPFSWaiters'])
+            cherrypy.response.headers['Content-Type'] = 'text/plain'
+            resString = '\n'.join(resp) + '\n'
+            return resString
+
         # /metrics
         elif 'metrics' in cherrypy.request.script_name:
             resp = self.metrics()
@@ -238,14 +245,26 @@ def OPTIONS(self):
 
 class SingleTimeSeriesResponse():
 
-    def __init__(self, metricname, timestamp, value, tags):
+    def __init__(self, metricname, timestamp, value, tags, type):
         self.metric = metricname
         self.timestamp = timestamp * 1000
         self.value = value if value is not None else 0     # TODO check if we should return None or null
         self.tags = tags
+        self.type = type
 
-    def str_expfmt(self) -> str:
+    def str_expfmt(self) -> [str]:
         myset = []
+        mstring = ''
+
+        if self.type == 'histogram':
+            mstring = self._str_expfmt_histogram()
+        else:
+            mstring = self._str_expfmt_gauge()
+
+        myset.append(mstring)
+        return myset
+
+    def _str_expfmt_gauge(self) -> str:
 
         if self.tags:
             labels = ','.join('%s="%s"' % (k, v) for k, v in self.tags.items())
@@ -261,5 +280,30 @@ def str_expfmt(self) -> str:
                                 value=repr(float(self.value)),
                                 timestamp=int(self.timestamp)
                                 )
-        myset.append(mstring)
-        return myset
+        return mstring
+
+    def _str_expfmt_histogram(self) -> str:
+
+        labels = ''
+
+        if self.tags:
+            for k, v in self.tags.items():
+                if k == 'waiters_time_threshold':
+                    k = 'le'
+                elif v == 'all':
+                    v = '+Inf'
+                if labels == '':
+                    labels = labels + '%s="%s"' % (k, v)
+                else:
+                    labels = labels + ',%s="%s"' % (k, v)
+
+        if labels:
+            fmtstr = '{name}{{{labels}}} {value} {timestamp}'
+        else:
+            fmtstr = '{name} {value} {timestamp}'
+        mstring = fmtstr.format(name=self.metric + '_bucket',
+                                labels=labels,
+                                value=repr(float(self.value)),
+                                timestamp=int(self.timestamp)
+                                )
+        return mstring

source/zimonGrafanaIntf.py

@@ -321,6 +321,12 @@ def main(argv):
                              {'request.dispatch': cherrypy.dispatch.MethodDispatcher()}
                              }
                             )
+        # query for GPFSWaiters sensor metrics (PrometheusExporter)
+        cherrypy.tree.mount(exporter, '/metrics_gpfs_waiters',
+                            {'/':
+                             {'request.dispatch': cherrypy.dispatch.MethodDispatcher()}
+                             }
+                            )
 
     logger.info("%s", MSG['sysStart'].format(sys.version, cherrypy.__version__))