From 970bcdf2399e5fa32920b0ed7eddd329b7377db2 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 29 Oct 2019 13:20:07 -0500 Subject: [PATCH] mgr/telemetry: note whether osd cluster_network is in use Signed-off-by: Sage Weil (cherry picked from commit 702175f49361f3875c5e356c812d45e34d01a021) --- PendingReleaseNotes | 1 + src/pybind/mgr/telemetry/module.py | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/PendingReleaseNotes b/PendingReleaseNotes index ee6cf2625e6a0..903add1c8f1f5 100644 --- a/PendingReleaseNotes +++ b/PendingReleaseNotes @@ -64,6 +64,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 114629d399520..5de53a3084542 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() @@ -446,10 +447,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 -- 2.39.5