mgr/telemetry: move contact info to an 'ident' channel

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

Conflicts:
	src/pybind/mgr/telemetry/module.py
          Due to lack of 'crash' and 'devicehealth' modules, and a bit
          on how we keep options (self.config[] vs class attributes)

diff --git a/src/pybind/mgr/telemetry/module.py b/src/pybind/mgr/telemetry/module.py
index 35cf6a603fae917705f081220ff59b4dccb8f68c..5df9c6dc909790ed485b898d49b40a9783e2acd1 100644 (file)
--- a/src/pybind/mgr/telemetry/module.py
+++ b/src/pybind/mgr/telemetry/module.py
@@ -16,7 +16,7 @@ from collections import defaultdict
 
 from mgr_module import MgrModule
 
-ALL_CHANNELS = ['basic']
+ALL_CHANNELS = ['basic', 'ident']
 
 class Module(MgrModule):
     config = dict()
@@ -71,6 +71,12 @@ class Module(MgrModule):
             'default': True,
             'description': 'Share basic cluster information (size, version)',
         },
+        {
+            'name': 'channel_ident',
+            'type': 'bool',
+            'default': False,
+            'description': 'Share a user-provided description and/or contact email for the cluster',
+        }
     ]
 
     COMMANDS = [
@@ -241,11 +247,11 @@ class Module(MgrModule):
             'channels_available': ALL_CHANNELS,
         }
 
-        if self.str_to_bool(self.config['leaderboard']):
-            report['leaderboard'] = True
-
-        for option in ['description', 'contact', 'organization']:
-            report[option] = self.config.get(option, None)
+        if 'ident' in channels:
+            if self.config['leaderboard']:
+                report['leaderboard'] = True
+            for option in ['description', 'contact', 'organization']:
+                report[option] = self.config.get(option, None)
 
         if 'basic' in channels:
             mon_map = self.get('mon_map')