From: Sage Weil <sage@redhat.com>
Date: Tue, 29 Oct 2019 18:20:07 +0000 (-0500)
Subject: mgr/telemetry: note whether osd cluster_network is in use
X-Git-Tag: v15.1.0~1083^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=702175f49361f3875c5e356c812d45e34d01a021;p=ceph.git

mgr/telemetry: note whether osd cluster_network is in use

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

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index d98055e8dbf7..cff6a29e2278 100644
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -209,6 +209,7 @@
     - whether pools are replicated or erasure coded, and
       which erasure code profile plugin and parameters are in use
     - how many hosts are in the cluster, and how many hosts have each type of daemon
+    - whether a separate OSD cluster network is being used
 
   If you had telemetry enabled, you will need to re-opt-in with::
 
diff --git a/src/pybind/mgr/telemetry/module.py b/src/pybind/mgr/telemetry/module.py
index eaf41e0b2000..319fb9509191 100644
--- a/src/pybind/mgr/telemetry/module.py
+++ b/src/pybind/mgr/telemetry/module.py
@@ -52,6 +52,7 @@ REVISION = 3
 #   - remove crush_rule
 #   - added more pool metadata (rep vs ec, cache tiering mode, ec profile)
 #   - added host count, and counts for hosts with each of (mon, osd, mds, mgr)
+#   - whether an OSD cluster network is in use
 
 class Module(MgrModule):
     config = dict()
@@ -433,10 +434,18 @@ class Module(MgrModule):
                 )
 
             # osds
+            cluster_network = False
+            for osd in osd_map['osds']:
+                if osd['up'] and not cluster_network:
+                    front_ip = osd['public_addrs']['addrvec'][0]['addr'].split(':')[0]
+                    back_ip = osd['public_addrs']['addrvec'][0]['addr'].split(':')[0]
+                    if front_ip != back_ip:
+                        cluster_network = True
             report['osd'] = {
                 'count': len(osd_map['osds']),
                 'require_osd_release': osd_map['require_osd_release'],
-                'require_min_compat_client': osd_map['require_min_compat_client']
+                'require_min_compat_client': osd_map['require_min_compat_client'],
+                'cluster_network': cluster_network,
             }
 
             # cephfs