Merge pull request #253 from Helene/metadata_time

Add endpoint to query the timestamp of the metadata cache latest update

Author: Helene

source/metadata.py

@@ -28,7 +28,8 @@
 from utils import execution_time
 from messages import ERR, MSG
 from metaclasses import Singleton
-from time import sleep
+from time import time, sleep
+from datetime import datetime
 
 
 local_cache = []
@@ -42,6 +43,7 @@ def __init__(self, **kwargs):
         self.__sensorsConf = None
         self.__metaData = None
         self.__metricsDesc = {}
+        self.__updateTime = None
         self.logger = kwargs['logger']
         self.server = kwargs['server']
         self.port = kwargs['port']
@@ -76,6 +78,10 @@ def metaData(self):
     def metricsDesc(self):
         return self.__metricsDesc
 
+    @property
+    def getUpdateTime(self):
+        return self.__updateTime
+
     def getSensorPeriodForMetric(self, metric):
         sensor = self.metaData.getSensorForMetric(metric)
         if not sensor:
@@ -139,6 +145,7 @@ def __initializeTables(self):
                 sleep(self.sleepTime)
             else:
                 self.__metaData = Topo(topoStr)
+                self.__updateTime = time()
                 foundItems = len(self.metaData.allParents) - 1
                 sensors = self.metaData.sensorsSpec.keys()
                 self.logger.info(MSG['MetaSuccess'])
@@ -163,6 +170,12 @@ def GET(self, **params):
             resp = self.update()
             # resp = json.dumps(resp)
 
+        # /metadata/time
+        elif '/metadata/time' == cherrypy.request.script_name:
+            # cherrypy.response.headers['Content-Type'] = 'application/json'
+            ts = int(self.getUpdateTime)
+            resp = [datetime.utcfromtimestamp(ts).strftime('%Y-%m-%d %H:%M:%S')]
+
         # /metadata/sensorsconfig
         elif '/metadata/sensorsconfig' == cherrypy.request.script_name:
             # cherrypy.response.headers['Content-Type'] = 'application/json'
@@ -189,6 +202,7 @@ def update(self, refresh_all=False):
             self.logger.error(MSG['NoData'])  # Please check the pmcollector is properly configured and running.
             raise cherrypy.HTTPError(404, ERR[404])
         self.__metaData = Topo(topoStr)
+        self.__updateTime = time()
         self.logger.details(MSG['MetaSuccess'])
         self.logger.debug(MSG['ReceivAttrValues'].format('parents', ", ".join(self.metaData.allParents)))
         return ({'msg': MSG['MetaSuccess']})

source/zimonGrafanaIntf.py

@@ -277,6 +277,12 @@ def main(argv):
                          {'request.dispatch': cherrypy.dispatch.MethodDispatcher()}
                          }
                         )
+    # query for metadata (zimon) last update time
+    cherrypy.tree.mount(mdHandler, '/metadata/time',
+                        {'/':
+                         {'request.dispatch': cherrypy.dispatch.MethodDispatcher()}
+                         }
+                        )
     # query for list configured zimon sensors
     cherrypy.tree.mount(mdHandler, '/metadata/sensorsconfig',
                         {'/':