Support for namespace in graphite bridge prometheus#49

Vikas Kumar · Vikas Kumar · commit 9e2b3664c289 · 2015-10-03T11:51:51.000-07:00
1. An optional `prefix` parameter in `bridge.graphite.GraphiteBridge.push()`.
2. `prefix` is prepended to metrics name before sending to graphite server.
3. Unit test.
diff --git a/prometheus_client/bridge/graphite.py b/prometheus_client/bridge/graphite.py
@@ -49,9 +49,14 @@ def __init__(self, address, registry=core.REGISTRY, timeout_seconds=30, _time=ti
         self._timeout = timeout_seconds
         self._time = _time
 
-    def push(self):
+    def push(self, prefix=''):
         now = int(self._time.time())
         output = []
+
+        prefixstr = ''
+        if prefix:
+            prefixstr = prefix + '.'
+
         for metric in self._registry.collect():
             for name, labels, value in metric._samples:
                 if labels:
@@ -61,8 +66,8 @@ def push(self):
                          for k, v in sorted(labels.items())])
                 else:
                     labelstr = ''
-                output.append('{0}{1} {2} {3}\n'.format(
-                    _sanitize(name), labelstr, float(value), now))
+                output.append('{0}{1}{2} {3} {4}\n'.format(
+                    prefixstr, _sanitize(name), labelstr, float(value), now))
 
         conn = socket.create_connection(self._address, self._timeout)
         conn.sendall(''.join(output).encode('ascii'))
diff --git a/tests/graphite_bridge.py b/tests/graphite_bridge.py
@@ -50,6 +50,15 @@ def test_labels(self):
 
         self.assertEqual(b'labels.a.c.b.d 1.0 1434898897\n', self.data)
 
+    def test_prefix(self):
+        labels = Counter('labels', 'help', ['a', 'b'], registry=self.registry)
+        labels.labels('c', 'd').inc()
+
+        self.gb.push(prefix = 'pre.fix')
+        self.t.join()
+
+        self.assertEqual(b'pre.fix.labels.a.c.b.d 1.0 1434898897\n', self.data)
+
     def test_sanitizing(self):
         labels = Counter('labels', 'help', ['a'], registry=self.registry)
         labels.labels('c.:8').inc()
