Merge pull request #46925 from rkachach/fix_issue_44461

mgr/cephadm: add a simple mechanism to check grafana cert/key

Reviewed-by: Adam King <adking@redhat.com>

diff --cc src/pybind/mgr/cephadm/serve.py
Simple merge

diff --cc src/pybind/mgr/cephadm/services/monitoring.py
Simple merge

diff --cc src/pybind/mgr/cephadm/tests/test_services.py
index cc1d4575517b31a292fb1049b7f063b2b92ed66f,98b5b58ce298dce0e39c3df87f41ba39b83ab2a0..5c1a42d3ea37ff063b26aa085daa23db3ded69aa
--- 1/src/pybind/mgr/cephadm/tests/test_services.py
--- 2/src/pybind/mgr/cephadm/tests/test_services.py
+++ b/src/pybind/mgr/cephadm/tests/test_services.py
@@@ -540,10 -537,10 +544,10 @@@ class TestMonitoring
          _run_cephadm.side_effect = async_side_effect(("{}", "", 0))
  
          with with_host(cephadm_module, "test"):
-             cephadm_module.set_store("test/grafana_crt", "c")
-             cephadm_module.set_store("test/grafana_key", "k")
+             cephadm_module.set_store("test/grafana_crt", grafana_cert)
+             cephadm_module.set_store("test/grafana_key", grafana_key)
              with with_service(
 -                cephadm_module, MonitoringSpec("prometheus")
 +                cephadm_module, PrometheusSpec("prometheus")
              ) as _, with_service(cephadm_module, ServiceSpec("mgr")) as _, with_service(
                  cephadm_module, GrafanaSpec("grafana")
              ) as _: