From: Boris Ranto <branto@redhat.com>
Date: Tue, 22 May 2018 10:04:20 +0000 (+0200)
Subject: prometheus: Fix order of occupation values
X-Git-Tag: v14.0.0~56^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b5f16367eae097cb5994edb6f700a44a9c55504d;p=ceph.git

prometheus: Fix order of occupation values

When we merged the PR to unify the metadata labels, we forgot to switch
the order of hostname and disk in ceph_disk_occupation metric.

Signed-off-by: Boris Ranto <branto@redhat.com>
---

diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py
index aac656e407ee..86a9f8f458c5 100644
--- a/src/pybind/mgr/prometheus/module.py
+++ b/src/pybind/mgr/prometheus/module.py
@@ -530,8 +530,8 @@ class Module(MgrModule):
                     id_, osd_hostname, osd_dev_node))
                 self.metrics.set('disk_occupation', 1, (
                     "osd.{0}".format(id_),
-                    osd_hostname,
-                    osd_dev_node
+                    osd_dev_node,
+                    osd_hostname
                 ))
             else:
                 self.log.info("Missing dev node metadata for osd {0}, skipping "