From 16bb5b8076a6df30b1e6323b406fee0ba6cc2b39 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Fri, 23 Jul 2021 11:03:42 -0400 Subject: [PATCH] mgr/cephadm/grafana: check if dashboard is enabled 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 --- src/pybind/mgr/cephadm/services/monitoring.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pybind/mgr/cephadm/services/monitoring.py b/src/pybind/mgr/cephadm/services/monitoring.py index c32a1a1ee6bbd..8fe223aeaaa4e 100644 --- a/src/pybind/mgr/cephadm/services/monitoring.py +++ b/src/pybind/mgr/cephadm/services/monitoring.py @@ -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', { -- 2.39.5