raw counters for prometheus api

Signed-off-by: hwassman <[email protected]>

Author: Helene

.pydevproject

@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?eclipse-pydev version="1.0"?><pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python interpreter</pydev_property>
+    
+    <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+    
+    <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python interpreter</pydev_property>
+    
+    <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
+        <path>/${PROJECT_DIR_NAME}</path>
+    </pydev_pathproperty>
 </pydev_project>

source/collector.py

@@ -86,6 +86,20 @@ def parse_tags(self, filtersMap):
             else:
                 self.tags[_key] = _values.pop()
 
+    def reduce_dps_to_first_not_none(self, reverse_order=False):
+        """Reduce multiple data points(dps) of a single
+           TimeSeries to the first non null value in a sorted order.
+           Optionally the order of timestamps can be reversed.
+        """
+        if len(self.dps) > 1:
+            logger = getBridgeLogger()
+            timestamps = sorted(self.dps.keys(), reverse=reverse_order)
+            self.dps = next((
+                {timestmp: self.dps[timestmp]} for timestmp in timestamps if
+                self.dps[timestmp] is not None), {})
+            if len(self.dps) == 0:
+                logger.warning(f'Received null values in all data points for {self.metricname}')
+
 
 class MetricTimeSeries(object):
 
@@ -154,9 +168,17 @@ def _setup_static_metrics_data(self, metric_names: List[str]):
         mDict = {}
         md = MetadataHandler()
         spec = md.metricsDesc
-        type = 'histogram' if self.sensor == 'GPFSWaiters' else 'gauge'
+        metricsTypes = md.metaData.metricsType
+
+        mtype = 'gauge'
         for name in metric_names:
-            ts = MetricTimeSeries(name, spec.get(name, "Desc not found"), type)
+            if self.sensor == 'GPFSWaiters':
+                mtype = 'histogram'
+            elif metricsTypes.get(name, None) == "counter":
+                mtype = 'counter'
+            ts = MetricTimeSeries(name,
+                                  spec.get(name, "Desc not found"),
+                                  mtype)
             mDict[name] = ts
         self.metrics = mDict
 
@@ -310,6 +332,9 @@ def _collect(self):
 
         res = self.md.qh.runQuery(self.query)
         if res is None:
+            self.logger.error(MSG['NoData'])
+            # self.stop_collect()
+            # raise cherrypy.HTTPError(400, MSG['NoData'])
             return
         self.logger.details("res.rows length: {}".format(len(res.rows)))
         if self.removeNoData:

source/config.ini

@@ -14,9 +14,13 @@ protocol = http
 ##################### Prometheus Exporter API Connection Defaults #############
 # Port number the bridge listening on for Prometheus server https requests;
 # ssl cert and key configuration required
-
 # prometheus = 9250
 
+# Sensor counters deltas will be exported by default.
+# Set True if you want export original sensor counters.
+# rawCounters = False
+
+
 #################################### API SSL OAuth ############################
 [tls]
 # Directory path of tls key and cert file location

source/prometheus.py

@@ -32,10 +32,11 @@
 class PrometheusExporter(object):
     exposed = True
 
-    def __init__(self, logger, mdHandler, port):
+    def __init__(self, logger, mdHandler, port, raw_data=False):
         self.logger = logger
         self.__md = mdHandler
         self.port = port
+        self.raw_data = raw_data
         self.static_sensors_list = ['CPU', 'Memory', 'GPFSFileset']
         self.cache_strategy = False
         self.caching_collectors = []
@@ -60,6 +61,8 @@ def format_response(self, data) -> [str]:
             header = metric.str_descfmt()
             resp.extend(header)
             for sts in metric.timeseries:
+                if self.raw_data:
+                    sts.reduce_dps_to_first_not_none(reverse_order=True)
                 for _key, _value in sts.dps.items():
                     sts_resp = SingleTimeSeriesResponse(name, _key, _value, sts.tags, metric.mtype)
                     self.logger.trace(f'sts_resp.str_expfmt output: {sts_resp.str_expfmt()}')
@@ -121,8 +124,12 @@ def build_collector(self, sensor) -> SensorCollector:
 
         attrs = {}
 
-        # if self.cache_strategy:
-        attrs = {'sensor': sensor, 'period': period, 'nsamples': 1}
+        if self.raw_data:
+            attrs = {'sensor': sensor, 'period': period,
+                     'nsamples': period, 'rawData': True}
+        else:
+            attrs = {'sensor': sensor, 'period': period,
+                     'nsamples': 1}
         request = QueryPolicy(**attrs)
         collector = SensorCollector(sensor, period, self.logger, request)
 
@@ -146,7 +153,7 @@ def GET(self, **params):
             resp = self.md.update()
 
         # /metrics_gpfs_disk
-        elif 'metrics_gpfs_disk' in cherrypy.request.script_name:
+        elif '/metrics_gpfs_disk' == cherrypy.request.script_name:
             resp = self.metrics(['GPFSDisk'])
             cherrypy.response.headers['Content-Type'] = 'text/plain'
             resString = '\n'.join(resp) + '\n'
@@ -244,21 +251,21 @@ def GET(self, **params):
             return resString
 
         # /metrics_gpfs_afm
-        elif 'metrics_gpfs_afm' in cherrypy.request.script_name:
+        elif '/metrics_gpfs_afm' == cherrypy.request.script_name:
             resp = self.metrics(['GPFSAFM'])
             cherrypy.response.headers['Content-Type'] = 'text/plain'
             resString = '\n'.join(resp) + '\n'
             return resString
 
         # /metrics_gpfs_afmfs
-        elif 'metrics_gpfs_afmfs' in cherrypy.request.script_name:
+        elif '/metrics_gpfs_afmfs' == cherrypy.request.script_name:
             resp = self.metrics(['GPFSAFMFS'])
             cherrypy.response.headers['Content-Type'] = 'text/plain'
             resString = '\n'.join(resp) + '\n'
             return resString
 
         # /metrics_gpfs_afmfset
-        elif 'metrics_gpfs_afmfset' in cherrypy.request.script_name:
+        elif '/metrics_gpfs_afmfset' == cherrypy.request.script_name:
             resp = self.metrics(['GPFSAFMFSET'])
             cherrypy.response.headers['Content-Type'] = 'text/plain'
             resString = '\n'.join(resp) + '\n'
@@ -293,7 +300,7 @@ def GET(self, **params):
             return resString
 
         # /metrics_gpfs_diskcap
-        elif 'metrics_gpfs_diskcap' in cherrypy.request.script_name:
+        elif '/metrics_gpfs_diskcap' == cherrypy.request.script_name:
             resp = self.metrics(['GPFSDiskCap'])
             cherrypy.response.headers['Content-Type'] = 'text/plain'
             resString = '\n'.join(resp) + '\n'

source/queryHandler/QueryHandler.py

@@ -495,7 +495,7 @@ def runQuery(self, query):
         res = self.__do_RESTCall('perfmon/data', 'GET', params)
 
         if res is None:
-            self.logger.error('QueryHandler: query response has no data results')
+            self.logger.debug('QueryHandler: query response has no data results')
             return None
         try:
             result = json.loads(res, strict=False)
@@ -528,7 +528,7 @@ def __do_RESTCall(self, endpoint, requestType='GET', params=None):
                 raise PerfmonConnError("{} {}".format(_response.status_code, _response.reason))
             else:
                 msg = "Perfmon RESTcall error __ Server responded: {} {}".format(_response.status_code, _response.reason)
-                self.logger.warning(msg)
+                self.logger.debug(msg)
                 if _response.content:
                     contentMsg = _response.content.decode('utf-8', "strict")
                     self.logger.details(f'Response content:{contentMsg}')

source/zimonGrafanaIntf.py

@@ -261,7 +261,10 @@ def main(argv):
 
     if args.get('prometheus', None):
         bind_prometheus_server(args)
-        exporter = PrometheusExporter(logger, mdHandler, args.get('prometheus'))
+        exporter = PrometheusExporter(logger,
+                                      mdHandler,
+                                      args.get('prometheus'),
+                                      args.get('rawCounters', False))
         # query to force update of metadata (zimon feature)
         cherrypy.tree.mount(exporter, '/update',
                             {'/':