From: Ilya Margolin <ilya@ulani.de>
Date: Thu, 14 Dec 2017 16:07:01 +0000 (+0100)
Subject: pybind/mgr/prometheus: fix metric type undef -> untyped
X-Git-Tag: v12.2.3~102^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b5892a13b9e10f1d5cc5e3c4e869bac06c3926ca;p=ceph.git

pybind/mgr/prometheus: fix metric type undef -> untyped

Fixes "Prometheus exporter can't get metrics after update to 12.2.2"

Fixes: http://tracker.ceph.com/issues/22313
Signed-off-by: Ilya Margolin <listen@ulani.de>
(cherry picked from commit 58669bedf530e1ccaf4d6c4bf018eeec43b78647)
---

diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py
index 842517f208f3..e03b4d900472 100644
--- a/src/pybind/mgr/prometheus/module.py
+++ b/src/pybind/mgr/prometheus/module.py
@@ -181,7 +181,7 @@ class Module(MgrModule):
         # so that we can stably use the same tag names that
         # the Prometheus node_exporter does
         metrics['disk_occupation'] = Metric(
-            'undef',
+            'untyped',
             'disk_occupation',
             'Associate Ceph daemon with disk used',
             DISK_OCCUPATION