Merge pull request #164 from Helene/sensorsconfig

Add sensorsconfig endpoint

Author: Helene

source/opentsdb.py

@@ -294,6 +294,12 @@ def GET(self, **params):
             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,6 +153,11 @@ def GET(self, **params):
             # 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,
                                                    None):
             sensor = self.endpoints[cherrypy.request.script_name]

source/zimonGrafanaIntf.py

@@ -258,6 +258,12 @@ def main(argv):
                              {'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',
                             {'/':
@@ -287,6 +293,12 @@ def main(argv):
                              {'request.dispatch': cherrypy.dispatch.MethodDispatcher()}
                              }
                             )
+        # query for list configured zimon sensors
+        cherrypy.tree.mount(api, '/sensorsconfig',
+                            {'/':
+                             {'request.dispatch': cherrypy.dispatch.MethodDispatcher()}
+                             }
+                            )
         # query for all metrics (PrometheusExporter)
         cherrypy.tree.mount(exporter, '/metrics',
                             {'/':