import ceph quincy 17.2.1

[ceph.git] / ceph / src / pybind / mgr / cephadm / templates / services / grafana / grafana.ini.j2

diff --git a/ceph/src/pybind/mgr/cephadm/templates/services/grafana/grafana.ini.j2 b/ceph/src/pybind/mgr/cephadm/templates/services/grafana/grafana.ini.j2
index 51aff3f9fb5cb1b1eef79550f7e3e8f8aa33031a..e7e81d89a4b6f682a471e442a04dfee69e83d8ee 100644 (file)
--- a/ceph/src/pybind/mgr/cephadm/templates/services/grafana/grafana.ini.j2
+++ b/ceph/src/pybind/mgr/cephadm/templates/services/grafana/grafana.ini.j2
@@ -11,7 +11,16 @@
   cert_file = /etc/grafana/certs/cert_file
   cert_key = /etc/grafana/certs/cert_key
   http_port = {{ http_port }}
+  http_addr = {{ http_addr }}
+[snapshots]
+  external_enabled = false
 [security]
+{% if not initial_admin_password %}
+  disable_initial_admin_creation = true
+{% else %}
   admin_user = admin
-  admin_password = admin
+  admin_password = {{ initial_admin_password }}
+{% endif %}
+  cookie_secure = true
+  cookie_samesite = none
   allow_embedding = true