expose_metadata_endpoints

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

Author: Helene

source/metadata.py

@@ -35,6 +35,7 @@
 
 
 class MetadataHandler(metaclass=Singleton):
+    exposed = True
 
     def __init__(self, **kwargs):
         self.__qh = None
@@ -146,6 +147,33 @@ def __initializeTables(self):
                 return
         raise ValueError(MSG['NoData'])
 
+    @cherrypy.tools.json_out()  # @UndefinedVariable
+    def GET(self, **params):
+        """ Forward GET REST HTTP/s API incoming requests to Metadata Handler
+            available endpoints:
+                            /metadata/update
+                            /metadata/sensorsconfig
+        """
+        resp = []
+
+        # /metadata/update
+        if '/metadata/update' == cherrypy.request.script_name:
+            # cherrypy.response.headers['Content-Type'] = 'application/json'
+            resp = self.update()
+            # resp = json.dumps(resp)
+
+        # /metadata/sensorsconfig
+        elif '/metadata/sensorsconfig' == cherrypy.request.script_name:
+            # cherrypy.response.headers['Content-Type'] = 'application/json'
+            resp = self.SensorsConfig
+            # resp = json.dumps(resp)
+
+        del cherrypy.response.headers['Allow']
+        cherrypy.response.headers['Access-Control-Allow-Origin'] = '*'
+        # cherrypy.response.headers['Content-Type'] = 'application/json'
+        # resp = json.dumps(resp)
+        return resp
+
     @execution_time()
     def update(self, refresh_all=False):
         '''Read the topology from ZIMon and update

source/opentsdb.py

@@ -293,18 +293,6 @@ def GET(self, **params):
         elif 'lookup' in cherrypy.request.script_name:
             resp = self.lookup(params)
 
-        # /api/update
-        elif 'update' in cherrypy.request.script_name:
-            # cherrypy.response.headers['Content-Type'] = 'application/json'
-            resp = self.md.update()
-            # resp = json.dumps(resp)
-
-        # /sensorsconfig
-        elif '/sensorsconfig' == cherrypy.request.script_name:
-            # cherrypy.response.headers['Content-Type'] = 'application/json'
-            resp = self.md.SensorsConfig
-            # resp = json.dumps(resp)
-
         elif 'aggregators' in cherrypy.request.script_name:
             resp = ["noop", "sum", "avg", "max", "min", "rate"]
 

source/prometheus.py

@@ -153,17 +153,7 @@ def GET(self, **params):
         if int(conn[1]) != int(self.port):
             raise cherrypy.HTTPError(400, MSG[400])
 
-        # /update
-        if '/update' == cherrypy.request.script_name:
-            # cherrypy.response.headers['Content-Type'] = 'application/json'
-            resp = self.md.update()
-
-        # /sensorsconfig
-        elif '/sensorsconfig' == cherrypy.request.script_name:
-            # cherrypy.response.headers['Content-Type'] = 'application/json'
-            resp = self.md.SensorsConfig
-
-        elif self.endpoints and self.endpoints.get(cherrypy.request.script_name,
+        if self.endpoints and self.endpoints.get(cherrypy.request.script_name,
                                                    None):
             sensor = self.endpoints[cherrypy.request.script_name]
             resp = self.metrics([sensor])

source/zimonGrafanaIntf.py

@@ -258,6 +258,19 @@ def main(argv):
         logger.error("ZiMon sensor configuration file not found")
         return
 
+    # query to force update of metadata (zimon)
+    cherrypy.tree.mount(mdHandler, '/metadata/update',
+                        {'/':
+                         {'request.dispatch': cherrypy.dispatch.MethodDispatcher()}
+                         }
+                        )
+    # query for list configured zimon sensors
+    cherrypy.tree.mount(mdHandler, '/metadata/sensorsconfig',
+                        {'/':
+                         {'request.dispatch': cherrypy.dispatch.MethodDispatcher()}
+                         }
+                        )
+
     if args.get('port', None):
         bind_opentsdb_server(args)
         api = OpenTsdbApi(logger, mdHandler, args.get('port'))
@@ -281,18 +294,6 @@ def main(argv):
                              {'request.dispatch': cherrypy.dispatch.MethodDispatcher()}
                              }
                             )
-        # query to force update of metadata (zimon feature)
-        cherrypy.tree.mount(api, '/api/update',
-                            {'/':
-                             {'request.dispatch': cherrypy.dispatch.MethodDispatcher()}
-                             }
-                            )
-        # query for list configured zimon sensors
-        cherrypy.tree.mount(api, '/sensorsconfig',
-                            {'/':
-                             {'request.dispatch': cherrypy.dispatch.MethodDispatcher()}
-                             }
-                            )
         # query for list of aggregators (openTSDB)
         cherrypy.tree.mount(api, '/api/aggregators',
                             {'/':
@@ -316,19 +317,6 @@ def main(argv):
                                       args.get('rawCounters', False))
         exporter.endpoints.update(ENDPOINTS.get('prometheus',
                                                 {}))
-
-        # query to force update of metadata (zimon feature)
-        cherrypy.tree.mount(exporter, '/update',
-                            {'/':
-                             {'request.dispatch': cherrypy.dispatch.MethodDispatcher()}
-                             }
-                            )
-        # query for list configured zimon sensors
-        cherrypy.tree.mount(exporter, '/sensorsconfig',
-                            {'/':
-                             {'request.dispatch': cherrypy.dispatch.MethodDispatcher()}
-                             }
-                            )
         # query for all metrics (PrometheusExporter)
         cherrypy.tree.mount(exporter, '/metrics',
                             {'/':
@@ -343,8 +331,9 @@ def main(argv):
                                      }
                                     )
         registered_apps.append("Prometheus Exporter Api listening on Prometheus requests")
+
     profiler = Profiler(args.get('logPath'))
-    # query for list configured zimon sensors
+    # query for print out profiling report
     cherrypy.tree.mount(profiler, '/profiling',
                         {'/':
                          {'request.dispatch': cherrypy.dispatch.MethodDispatcher()}