]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm/grafana: check if dashboard is enabled 42467/head
authorDimitri Savineau <dsavinea@redhat.com>
Fri, 23 Jul 2021 15:03:42 +0000 (11:03 -0400)
committerDimitri Savineau <dsavinea@redhat.com>
Fri, 23 Jul 2021 15:03:42 +0000 (11:03 -0400)
When deploying the grafana service but the mgr dashboard isn't enabled then
dashboard set-grafana-api-ssl-verify command fails.

Closes: https://tracker.ceph.com/issues/51796
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
src/pybind/mgr/cephadm/services/monitoring.py

index c32a1a1ee6bbd366d7b3217e481ea549b515e1a0..8fe223aeaaa4e76bf1d75b2fa7135b49367e3231 100644 (file)
@@ -49,10 +49,11 @@ class GrafanaService(CephadmService):
             cert, pkey = create_self_signed_cert('Ceph', 'cephadm')
             self.mgr.set_store('grafana_crt', cert)
             self.mgr.set_store('grafana_key', pkey)
-            self.mgr.check_mon_command({
-                'prefix': 'dashboard set-grafana-api-ssl-verify',
-                'value': 'false',
-            })
+            if 'dashboard' in self.mgr.get('mgr_map')['modules']:
+                self.mgr.check_mon_command({
+                    'prefix': 'dashboard set-grafana-api-ssl-verify',
+                    'value': 'false',
+                })
 
         grafana_ini = self.mgr.template.render(
             'services/grafana/grafana.ini.j2', {