From: Igor Fedotov <ifedotov@suse.com>
Date: Mon, 22 Oct 2018 11:46:55 +0000 (+0300)
Subject: mgr: rename ceph df stat columns for both influx and prometheus.
X-Git-Tag: v14.1.0~692^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=71fe9149acf12331c1fd0e6b4accde126f02415b;p=ceph.git

mgr: rename ceph df stat columns for both influx and prometheus.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
---

diff --git a/doc/mgr/influx.rst b/doc/mgr/influx.rst
index 7434b4d8bcc0..62c643b885d5 100644
--- a/doc/mgr/influx.rst
+++ b/doc/mgr/influx.rst
@@ -87,7 +87,7 @@ Pools
 +---------------+-----------------------------------------------------+
 |Counter        | Description                                         |
 +===============+=====================================================+
-|bytes_used     | Bytes used in the pool not including copies         |
+|stored         | Bytes stored in the pool not including copies       |
 +---------------+-----------------------------------------------------+
 |max_avail      | Max available number of bytes in the pool           |
 +---------------+-----------------------------------------------------+
@@ -99,7 +99,7 @@ Pools
 +---------------+-----------------------------------------------------+
 |rd_bytes       | Number of bytes read in the pool                    |
 +---------------+-----------------------------------------------------+
-|raw_bytes_used | Bytes used in pool including copies made            |
+|stored_raw     | Bytes used in pool including copies made            |
 +---------------+-----------------------------------------------------+
 
 ^^^^
diff --git a/src/pybind/mgr/influx/module.py b/src/pybind/mgr/influx/module.py
index 761c53ece5c7..6937cc9fc8c1 100644
--- a/src/pybind/mgr/influx/module.py
+++ b/src/pybind/mgr/influx/module.py
@@ -178,12 +178,12 @@ class Module(MgrModule):
         pool_info = {}
 
         df_types = [
-            'bytes_used',
+            'stored',
             'kb_used',
             'dirty',
             'rd',
             'rd_bytes',
-            'raw_bytes_used',
+            'stored_raw',
             'wr',
             'wr_bytes',
             'objects',
diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py
index 662da96b72b9..71aebf9d5e2a 100644
--- a/src/pybind/mgr/prometheus/module.py
+++ b/src/pybind/mgr/prometheus/module.py
@@ -46,7 +46,7 @@ def health_status_to_number(status):
 
 DF_CLUSTER = ['total_bytes', 'total_used_bytes', 'total_objects']
 
-DF_POOL = ['max_avail', 'bytes_used', 'raw_bytes_used', 'objects', 'dirty',
+DF_POOL = ['max_avail', 'stored', 'stored_raw', 'objects', 'dirty',
            'quota_bytes', 'quota_objects', 'rd', 'rd_bytes', 'wr', 'wr_bytes']
 
 OSD_FLAGS = ('noup', 'nodown', 'noout', 'noin', 'nobackfill', 'norebalance',