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 7c4f8668bb7df13ec02fb0531a9d831d3f0bac8e..2c3e612abd1ef00a069e08bb66f3beee8c4e0dcf 100644 (file)
--- 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 a4728b5f0706c3711652e0ab31d52cc2e66d960d..66c7e0f3f41e9e538324c98f32226f3fdae894ac 100644 (file)
--- 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 fb8fe4ea08ec0f8c2d9289b8901d428e3a0d1ee6..a867dbad0a7e2df43bda34f0280a37a2d8bdbbd7 100644 (file)
--- 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 b258cde9ac4706895034a897cdfe6c772eff257a..2d37cc7d9713bf20506c0f0d52fd92a4262be4c0 100755 (executable)
--- 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