From: Sage Weil <sage@redhat.com>
Date: Thu, 25 Jul 2019 22:12:51 +0000 (-0500)
Subject: mon: enable telemetry module by default
X-Git-Tag: v15.1.0~1958^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2d62d71cd46d791294b3803e034c0995fef08b33;p=ceph.git

mon: enable telemetry module by default

We already have a robust set of opt-in and opt-out procedures; no need to
require the user to enable the module.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/doc/mgr/telemetry.rst b/doc/mgr/telemetry.rst
index 7c4f8668bb7d..2c3e612abd1e 100644
--- a/doc/mgr/telemetry.rst
+++ b/doc/mgr/telemetry.rst
@@ -47,15 +47,6 @@ the way Ceph is used.
 
 Data is sent over HTTPS to *telemetry.ceph.com*.
 
-Enabling the module
--------------------
-
-The module must first be enabled.  Note that even if the module is
-enabled, telemetry is still "off" by default, so simply enabling the
-module will *NOT* result in any data being shared.::
-
-  ceph mgr module enable telemetry
-
 Sample report
 -------------
 
diff --git a/qa/tasks/ceph.conf.template b/qa/tasks/ceph.conf.template
index a4728b5f0706..66c7e0f3f41e 100644
--- a/qa/tasks/ceph.conf.template
+++ b/qa/tasks/ceph.conf.template
@@ -75,6 +75,7 @@
 	debug auth = 20
 	mon reweight min pgs per osd = 4
 	mon reweight min bytes per osd = 10
+	mgr/telemetry/nag = false
 
 [mon]
 	debug ms = 1
diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index fb8fe4ea08ec..a867dbad0a7e 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -63,6 +63,7 @@ const static std::map<uint32_t, std::set<std::string>> always_on_modules = {
       "rbd_support",
       "volumes",
       "pg_autoscaler",
+      "telemetry",
     }
   }
 };
diff --git a/src/vstart.sh b/src/vstart.sh
index b258cde9ac47..2d37cc7d9713 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -1104,6 +1104,10 @@ mds_debug_frag = true
 mds_debug_auth_pins = true
 mds_debug_subtrees = true
 
+[mgr]
+mgr/telemetry/nag = false
+mgr/telemetry/enable = false
+
 EOF
 
     if [ "$debug" -ne 0 ]; then