add grafana_datasource_es_version

Wizcorp · Aug 28, 2019 · a7d7af3 · a7d7af3
1 parent 05d4700
commit a7d7af3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/docker-image/ansible/roles/grafana/defaults/main.yml b/docker-image/ansible/roles/grafana/defaults/main.yml
@@ -20,6 +20,8 @@ grafana_use_smtp: true
 grafana_stmp_host: "{{ smtp_hostname }}:{{ smtp_port }}"
 grafana_smtp_username: "{{ smtp_username }}"
 grafana_smtp_password: "{{ smtp_password }}"
+# Elasticsearch version as a number (2/5/56/60/70)
+grafana_datasource_es_version: 56
 
 ldap_server: "{{ group_ipv4.control[0] }}"
 ldap_server_port: 389

diff --git a/docker-image/ansible/roles/grafana/tasks/main.yml b/docker-image/ansible/roles/grafana/tasks/main.yml
@@ -87,7 +87,7 @@
       basicAuth: false
       database: "[elasticsearch_metrics-]YYYY.MM.DD"
       jsonData:
-        esVersion: 56
+        esVersion: "{{ grafana_datasource_es_version }}"
         interval: "Daily"
         keepCookies: []
         maxConcurrentShardRequests: 256