Merge pull request #11381 from vkuznet/metrics-dashes

Replace dash in exporter name
dmwm · Dec 1, 2022 · a293975 · a293975
2 parents efd8db5 + 1e87cad
commit a293975
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/python/Utils/CPMetrics.py b/src/python/Utils/CPMetrics.py
@@ -195,6 +195,9 @@ def promMetrics(data, exporter):
     """
     Provide cherrypy stats prometheus metrics for given exporter name.
     """
+    # exporter name should not contain dashes, see
+    # https://its.cern.ch/jira/browse/CMSMONIT-514
+    exporter = exporter.replace("-", "_")
     metrics = flattenStats(data)
     if isinstance(metrics, str):
         metrics = json.loads(metrics)

diff --git a/test/python/Utils_t/CPMetrics_t.py b/test/python/Utils_t/CPMetrics_t.py
@@ -39,10 +39,10 @@ def testPromMetrics(self):
         """
         Test the flattenStats function
         """
-        data = promMetrics(self.testData, 'test')
+        data = promMetrics(self.testData, 'test-exporter')
         self.assertEqual("# HELP" in data, True)
         self.assertEqual("# TYPE" in data, True)
-        self.assertEqual("test_cherrypy_app_bytes_read_request" in data, True)
+        self.assertEqual("test_exporter_cherrypy_app_bytes_read_request" in data, True)
         self.assertEqual("bla-bla" in data, False)