From 53de2458772af3e4447140af501174bee9c9c6f8 Mon Sep 17 00:00:00 2001
From: Alan Rominger <arominge@redhat.com>
Date: Sun, 4 Sep 2022 22:33:12 -0400
Subject: [PATCH] Fix LDAP volume conditional, better metrics interval

---
 .../ansible/roles/sources/templates/docker-compose.yml.j2  | 2 +-
 tools/grafana/dashboards/demo_dashboard.json               | 7 -------
 tools/grafana/datasources/prometheus_source.yml            | 2 ++
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 b/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2
index 390180788a..2f7fc3cf41 100644
--- a/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2
+++ b/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2
@@ -228,7 +228,7 @@ volumes:
   redis_socket_{{ container_postfix }}:
     name: tools_redis_socket_{{ container_postfix }}
 {% endfor -%}
-{% if enable_ldap %}
+{% if enable_ldap|bool %}
   openldap_data:
     name: tools_ldap_1
     driver: local
diff --git a/tools/grafana/dashboards/demo_dashboard.json b/tools/grafana/dashboards/demo_dashboard.json
index 23fc18e8b6..62570500f4 100644
--- a/tools/grafana/dashboards/demo_dashboard.json
+++ b/tools/grafana/dashboards/demo_dashboard.json
@@ -90,7 +90,6 @@
         "y": 0
       },
       "id": 8,
-      "interval": "5",
       "options": {
         "legend": {
           "calcs": [],
@@ -177,7 +176,6 @@
         "y": 8
       },
       "id": 12,
-      "interval": "5",
       "options": {
         "legend": {
           "calcs": [],
@@ -291,7 +289,6 @@
         "y": 8
       },
       "id": 10,
-      "interval": "5",
       "options": {
         "legend": {
           "calcs": [],
@@ -430,7 +427,6 @@
         "y": 16
       },
       "id": 16,
-      "interval": "5",
       "options": {
         "legend": {
           "calcs": [],
@@ -552,7 +548,6 @@
         "y": 16
       },
       "id": 18,
-      "interval": "5",
       "options": {
         "legend": {
           "calcs": [],
@@ -650,7 +645,6 @@
         "y": 24
       },
       "id": 14,
-      "interval": "5",
       "options": {
         "legend": {
           "calcs": [],
@@ -740,7 +734,6 @@
         "y": 24
       },
       "id": 20,
-      "interval": "5",
       "options": {
         "legend": {
           "calcs": [],
diff --git a/tools/grafana/datasources/prometheus_source.yml b/tools/grafana/datasources/prometheus_source.yml
index 99c11684c4..22619c637f 100644
--- a/tools/grafana/datasources/prometheus_source.yml
+++ b/tools/grafana/datasources/prometheus_source.yml
@@ -8,3 +8,5 @@ datasources:
     access: proxy
     url: http://prometheus:9090
     editable: true
+    jsonData:
+      timeInterval: 5s