From: Sage Weil <sage@redhat.com>
Date: Thu, 25 Jul 2019 15:46:55 +0000 (-0500)
Subject: mgr/telemetry: move contact info to an 'ident' channel
X-Git-Tag: v15.1.0~2074^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=35c273c9c3ebd00fbac8e1a9fd281333a24c5fe7;p=ceph-ci.git

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

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

diff --git a/src/pybind/mgr/telemetry/module.py b/src/pybind/mgr/telemetry/module.py
index 2b9f419f3e9..495fd5d8c55 100644
--- 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', 'crash', 'device']
+ALL_CHANNELS = ['basic', 'ident', 'crash', 'device']
 
 class Module(MgrModule):
     config = dict()
@@ -80,6 +80,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',
+        },
         {
             'name': 'channel_crash',
             'type': 'bool',
@@ -229,11 +235,11 @@ class Module(MgrModule):
             'channels_available': ALL_CHANNELS,
         }
 
-        if self.leaderboard:
-            report['leaderboard'] = True
-
-        for option in ['description', 'contact', 'organization']:
-            report[option] = getattr(self, option)
+        if 'ident' in channels:
+            if self.leaderboard:
+                report['leaderboard'] = True
+            for option in ['description', 'contact', 'organization']:
+                report[option] = getattr(self, option)
 
         if 'basic' in channels:
             mon_map = self.get('mon_map')