From 2d62d71cd46d791294b3803e034c0995fef08b33 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 25 Jul 2019 17:12:51 -0500 Subject: [PATCH] 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 --- doc/mgr/telemetry.rst | 9 --------- qa/tasks/ceph.conf.template | 1 + src/mon/MgrMonitor.cc | 1 + src/vstart.sh | 4 ++++ 4 files changed, 6 insertions(+), 9 deletions(-) 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> 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 -- 2.47.3