Merge pull request ceph#65981 from rhcs-dashboard/disconnected-grafana

mgr/cephadm: update grafana conf for disconnected environment

Reviewed-by: Ankush Behl <[email protected]>

Author: nizamial09

src/pybind/mgr/cephadm/templates/services/grafana/grafana.ini.j2

@@ -44,3 +44,9 @@
   enable_login_token = false
   headers = Role:X-WEBAUTH-ROLE
 {% endif %}
+[analytics]
+  check_for_updates = false
+  reporting_enabled = false
+[plugins]
+  check_for_plugin_updates = false
+  public_key_retrieval_disabled = true

src/pybind/mgr/cephadm/tests/test_services.py

@@ -1907,7 +1907,13 @@ def inline_certificate(multi_line_cert):
                           whitelist = 1::4
                           headers_encoded = false
                           enable_login_token = false
-                          headers = Role:X-WEBAUTH-ROLE\n""").lstrip(),  # noqa: W291
+                          headers = Role:X-WEBAUTH-ROLE
+                        [analytics]
+                          check_for_updates = false
+                          reporting_enabled = false
+                        [plugins]
+                          check_for_plugin_updates = false
+                          public_key_retrieval_disabled = true""").lstrip(),  # noqa: W291
                     "provisioning/datasources/ceph-dashboard.yml": y,
                     'certs/cert_file': dedent(f"""
                         # generated by cephadm\n{ceph_generated_cert}""").lstrip(),
@@ -2050,7 +2056,13 @@ def inline_certificate(multi_line_cert):
                           disable_initial_admin_creation = true
                           cookie_secure = true
                           cookie_samesite = none
-                          allow_embedding = true\n""").lstrip(),  # noqa: W291
+                          allow_embedding = true
+                        [analytics]
+                          check_for_updates = false
+                          reporting_enabled = false
+                        [plugins]
+                          check_for_plugin_updates = false
+                          public_key_retrieval_disabled = true""").lstrip(),  # noqa: W291
                     "provisioning/datasources/ceph-dashboard.yml": y,
                     'certs/cert_file': dedent(f"""
                         # generated by cephadm\n{ceph_generated_cert}""").lstrip(),
@@ -2142,7 +2154,13 @@ def test_grafana_config(self, _run_cephadm, cephadm_module: CephadmOrchestrator)
                           disable_initial_admin_creation = true
                           cookie_secure = true
                           cookie_samesite = none
-                          allow_embedding = true\n""").lstrip(),  # noqa: W291
+                          allow_embedding = true
+                        [analytics]
+                          check_for_updates = false
+                          reporting_enabled = false
+                        [plugins]
+                          check_for_plugin_updates = false
+                          public_key_retrieval_disabled = true""").lstrip(),  # noqa: W291
                     'provisioning/datasources/ceph-dashboard.yml': dedent("""
                         # This file is generated by cephadm.
                         apiVersion: 1
@@ -2252,7 +2270,13 @@ def test_grafana_initial_admin_pw(self, cephadm_module: CephadmOrchestrator):
                                     '  admin_password = secure\n'
                                     '  cookie_secure = true\n'
                                     '  cookie_samesite = none\n'
-                                    '  allow_embedding = true\n',
+                                    '  allow_embedding = true\n'
+                                    '[analytics]\n'
+                                    '  check_for_updates = false\n'
+                                    '  reporting_enabled = false\n'
+                                    '[plugins]\n'
+                                    '  check_for_plugin_updates = false\n'
+                                    '  public_key_retrieval_disabled = true',
                                 'provisioning/datasources/ceph-dashboard.yml':
                                     "# This file is generated by cephadm.\n"
                                     "apiVersion: 1\n\n"
@@ -2315,7 +2339,13 @@ def test_grafana_no_anon_access(self, cephadm_module: CephadmOrchestrator):
                                     '  admin_password = secure\n'
                                     '  cookie_secure = true\n'
                                     '  cookie_samesite = none\n'
-                                    '  allow_embedding = true\n',
+                                    '  allow_embedding = true\n'
+                                    '[analytics]\n'
+                                    '  check_for_updates = false\n'
+                                    '  reporting_enabled = false\n'
+                                    '[plugins]\n'
+                                    '  check_for_plugin_updates = false\n'
+                                    '  public_key_retrieval_disabled = true',
                                 'provisioning/datasources/ceph-dashboard.yml':
                                     "# This file is generated by cephadm.\n"
                                     "apiVersion: 1\n\n"