From 27856cc49959de0f7cfaef63f4a674fb3264a232 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 12 Jun 2019 08:01:06 +0200 Subject: [PATCH] dashboard: add allow_embedding support Add a variable to support the allow_embedding support. See ceph/ceph-ansible/issues/4084 for details. Fixes: #4084 Signed-off-by: Guillaume Abrioux --- group_vars/all.yml.sample | 1 + group_vars/rhcs.yml.sample | 1 + roles/ceph-defaults/defaults/main.yml | 1 + roles/ceph-grafana/templates/grafana.ini.j2 | 1 + 4 files changed, 4 insertions(+) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index e5933378a..305d14e2d 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -727,6 +727,7 @@ dummy: #grafana_plugins: # - vonage-status-panel # - grafana-piechart-panel +#grafana_allow_embedding: True #prometheus_container_image: prom/prometheus:latest #prometheus_container_cpu_period: 100000 #prometheus_container_cpu_cores: 2 diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index 91c074063..b67529cb2 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -727,6 +727,7 @@ ceph_docker_registry: "registry.access.redhat.com" #grafana_plugins: # - vonage-status-panel # - grafana-piechart-panel +#grafana_allow_embedding: True #prometheus_container_image: prom/prometheus:latest #prometheus_container_cpu_period: 100000 #prometheus_container_cpu_cores: 2 diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index 03cec9aa0..632ffde3d 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -719,6 +719,7 @@ grafana_dashboards_path: "/etc/grafana/dashboards/ceph-dashboard" grafana_plugins: - vonage-status-panel - grafana-piechart-panel +grafana_allow_embedding: True prometheus_container_image: prom/prometheus:latest prometheus_container_cpu_period: 100000 prometheus_container_cpu_cores: 2 diff --git a/roles/ceph-grafana/templates/grafana.ini.j2 b/roles/ceph-grafana/templates/grafana.ini.j2 index 0ea67e9fa..0afe023c3 100644 --- a/roles/ceph-grafana/templates/grafana.ini.j2 +++ b/roles/ceph-grafana/templates/grafana.ini.j2 @@ -24,3 +24,4 @@ protocol = {{ dashboard_protocol }} [security] admin_user = {{ grafana_admin_user }} admin_password = {{ grafana_admin_password }} +allow_embedding = {{ grafana_allow_embedding }}