From: Sage Weil <sage@redhat.com>
Date: Tue, 29 Oct 2019 16:29:46 +0000 (-0500)
Subject: mgr/telemetry: remove crush rule name
X-Git-Tag: v12.2.13~15^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=54758dfb9c889e15fc5ec2df5889741f14122455;p=ceph.git

mgr/telemetry: remove crush rule name

This is a user-specified string and could contain identifying info.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 26b427356d920682b61cdf98fc2745e324c28baa)

 Conflicts:
	src/pybind/mgr/telemetry/module.py
            Context issues
---

diff --git a/src/pybind/mgr/telemetry/module.py b/src/pybind/mgr/telemetry/module.py
index 31dbfb810592..a31a4e3d832c 100644
--- a/src/pybind/mgr/telemetry/module.py
+++ b/src/pybind/mgr/telemetry/module.py
@@ -46,6 +46,7 @@ REVISION = 2
 #
 # Version 3:
 #   - added CephFS metadata (how many MDSs, fs features, how many data pools)
+#   - remove crush_rule
 
 class Module(MgrModule):
     config = dict()
@@ -323,8 +324,7 @@ class Module(MgrModule):
                         'pg_num': pool['pg_num'],
                         'pgp_num': pool['pg_placement_num'],
                         'size': pool['size'],
-                        'min_size': pool['min_size'],
-                        'crush_rule': pool['crush_rule']
+                        'min_size': pool['min_size']
                     }
                 )