mgr/cephadm: grafana.ini: Set `cookie_secure = true`

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit e90433b8f9bb4d60b5a6da636d880ce0b7b8b243)

diff --git a/src/pybind/mgr/cephadm/templates/services/grafana/grafana.ini.j2 b/src/pybind/mgr/cephadm/templates/services/grafana/grafana.ini.j2
index 642d0647f3fcd7b1511a51841730f7b87a310001..cf23802d71b78d014773c4112843612aebe33f0d 100644 (file)
--- a/src/pybind/mgr/cephadm/templates/services/grafana/grafana.ini.j2
+++ b/src/pybind/mgr/cephadm/templates/services/grafana/grafana.ini.j2
@@ -19,4 +19,6 @@
   admin_user = admin
   admin_password = {{ initial_admin_password }}
 {% endif %}
+  cookie_secure = true
+  cookie_samesite = none
   allow_embedding = true

diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py
index c4f1e5b1c024bb3510887b01a4b1b53e4a9181a0..b244a9317826a5770845ed2e929b04c26760324a 100644 (file)
--- a/src/pybind/mgr/cephadm/tests/test_services.py
+++ b/src/pybind/mgr/cephadm/tests/test_services.py
@@ -354,6 +354,8 @@ class TestMonitoring:
                           http_addr = 
                         [security]
                           disable_initial_admin_creation = true
+                          cookie_secure = true
+                          cookie_samesite = none
                           allow_embedding = true""").lstrip(),  # noqa: W291
                     'provisioning/datasources/ceph-dashboard.yml': dedent("""
                         # This file is generated by cephadm.
@@ -421,6 +423,8 @@ class TestMonitoring:
                                     '[security]\n'
                                     '  admin_user = admin\n'
                                     '  admin_password = secure\n'
+                                    '  cookie_secure = true\n'
+                                    '  cookie_samesite = none\n'
                                     '  allow_embedding = true',
                                 'provisioning/datasources/ceph-dashboard.yml':
                                     '# This file is generated by cephadm.\n'