From: Sage Weil <sage@redhat.com>
Date: Fri, 1 Mar 2019 20:27:02 +0000 (-0600)
Subject: mgr/telemetry: add 'telemetry on' and 'telemetry off' commands
X-Git-Tag: v12.2.13~15^2~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5555553c292e9e42f7ab365e6c27db03bcee3b45;p=ceph.git

mgr/telemetry: add 'telemetry on' and 'telemetry off' commands

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

Conflicts:
	src/pybind/mgr/telemetry/module.py
          master no longer has 'telemetry selftest' due to some other
          major changes that we did not backport, as they would require
          too many changes that were not, in an obvious manner, relevant
          for us.
---

diff --git a/src/pybind/mgr/telemetry/module.py b/src/pybind/mgr/telemetry/module.py
index 38745ff321aa..fe1203411cf6 100644
--- a/src/pybind/mgr/telemetry/module.py
+++ b/src/pybind/mgr/telemetry/module.py
@@ -92,6 +92,16 @@ class Module(MgrModule):
             "cmd": "telemetry self-test",
             "desc": "Perform a self-test",
             "perm": "r"
+        },
+        {
+            "cmd": "telemetry on",
+            "desc": "Enable telemetry reports from this cluster",
+            "perm": "rw",
+        },
+        {
+            "cmd": "telemetry off",
+            "desc": "Disable telemetry reports from this cluster",
+            "perm": "rw",
         }
     ]
 
@@ -299,6 +309,12 @@ class Module(MgrModule):
             self.set_config_option(key, value)
             self.set_config(key, value)
             return 0, 'Configuration option {0} updated'.format(key), ''
+        elif command['prefix'] == 'telemetry on':
+            self.set_config('active', True)
+            return 0, '', ''
+        elif command['prefix'] == 'telemetry off':
+            self.set_config('active', False)
+            return 0, '', ''
         elif command['prefix'] == 'telemetry send':
             self.last_report = self.compile_report()
             self.send(self.last_report)