From: Jan Fajerski <jfajerski@suse.com>
Date: Fri, 4 Aug 2017 08:23:11 +0000 (+0200)
Subject: pybind/mgr/prometheus: prefix metrics with 'ceph'; replace :: with _
X-Git-Tag: v12.2.2~61^2~84
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5f0ef3a73a55a3f24997e415a848308afa0263ba;p=ceph.git

pybind/mgr/prometheus: prefix metrics with 'ceph'; replace :: with _

Both follow prometheus best practices. While : is a legal metric
character, "Exposed metrics should not contain colons, these are for
users to use when aggregating."

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 177afcc7886aa3898d092ebd1e101697bc6539fd)
---

diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py
index 82e6a077dab..95d7bff3277 100644
--- a/src/pybind/mgr/prometheus/module.py
+++ b/src/pybind/mgr/prometheus/module.py
@@ -76,7 +76,7 @@ class Metric(object):
 
         def promethize(path):
             ''' replace illegal metric name characters '''
-            result = path.replace('.', '_').replace('+', '_plus') 
+            result = path.replace('.', '_').replace('+', '_plus').replace('::', '_')
 
             # Hyphens usually turn into underscores, unless they are
             # trailing
@@ -85,7 +85,7 @@ class Metric(object):
             else:
                 result = result.replace("-", "_")
 
-            return result
+            return "ceph_{0}".format(result)
 
         def floatstr(value):
             ''' represent as Go-compatible float '''