From: Sage Weil <sage@redhat.com>
Date: Sat, 7 Mar 2020 22:49:44 +0000 (-0600)
Subject: cephadm: report grafana version
X-Git-Tag: v15.1.1~66^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=02f2ddf3dcd09e1bf08426de394eee5ad8926244;p=ceph-ci.git

cephadm: report grafana version

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

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index c38780a1c47..2e87ee3e59a 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -2438,6 +2438,14 @@ def list_daemons(detail=True, legacy_dir=None):
                                        out.startswith('ceph version '):
                                         version = out.split(' ')[2]
                                         seen_versions[image_id] = version
+                                elif daemon_type == 'grafana':
+                                    out, err, code = call(
+                                        [container_path, 'exec', container_id,
+                                         'grafana-server', '-v'])
+                                    if not code and \
+                                       out.startswith('Version '):
+                                        version = out.split(' ')[1]
+                                        seen_versions[image_id] = version
                                 elif daemon_type in ['prometheus',
                                                      'alertmanager',
                                                      'node-exporter']:
@@ -2450,7 +2458,6 @@ def list_daemons(detail=True, legacy_dir=None):
                                         version = err.split(' ')[2]
                                         seen_versions[image_id] = version
                                 else:
-                                    # FIXME: monitoring component version?
                                     pass
                         else:
                             vfile = os.path.join(data_dir, fsid, j, 'unit.image') # type: ignore