]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: report grafana version
authorSage Weil <sage@redhat.com>
Sat, 7 Mar 2020 22:49:44 +0000 (16:49 -0600)
committerSage Weil <sage@redhat.com>
Sun, 8 Mar 2020 22:23:24 +0000 (17:23 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
src/cephadm/cephadm

index c38780a1c47b24a2b458d69b061e1f459c430ca4..2e87ee3e59a45481fa116eccc92a0a3ad2d159cb 100755 (executable)
@@ -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