From c831457f60aef6603cc4ff5b27f9f387c4bd738b Mon Sep 17 00:00:00 2001
From: abednarik <alejandro.bednarik@gmail.com>
Date: Fri, 17 Nov 2017 17:21:36 -0300
Subject: [PATCH] Add external_image_storage S3 in grafana config

---
 grafana/files/grafana.ini | 14 ++++++++++++++
 grafana/map.jinja         |  8 ++++++++
 2 files changed, 22 insertions(+)

diff --git a/grafana/files/grafana.ini b/grafana/files/grafana.ini
index 4ce5f94..e7a4fe4 100644
--- a/grafana/files/grafana.ini
+++ b/grafana/files/grafana.ini
@@ -288,3 +288,17 @@ path = {{ server.dashboards.path }}
 ;enabled = false
 ;path = /var/lib/grafana/dashboards
 {%- endif %}
+
+
+#################################### External Image Storage ##############
+[external_image_storage]
+# You can choose between (s3, webdav, gcs)
+provider = {{ server.external_image_storage.provider }}
+
+[external_image_storage.s3]
+bucket_url = {{ server.external_image_storage.provider.bucket_url }}
+bucket = {{ server.external_image_storage.provider.bucket }}
+region = {{ server.external_image_storage.provider.region }}
+path = {{ server.external_image_storage.provider.path }}
+access_key = {{ server.external_image_storage.provider.access_key }}
+secret_key = {{ server.external_image_storage.provider.secret_key }}
diff --git a/grafana/map.jinja b/grafana/map.jinja
index bf85245..59a8faf 100644
--- a/grafana/map.jinja
+++ b/grafana/map.jinja
@@ -48,6 +48,14 @@ Debian:
     static: /usr/share/grafana/public
   dashboards:
     enabled: false
+  external_image_storage:
+    provider: ""
+    bucket_url: ""
+    bucket: ""
+    region: ""
+    path: ""
+    access_key: ""
+    secret_key: ""
 {%- endload %}
 
 {%- set server = salt['grains.filter_by'](server_defaults, merge=salt['pillar.get']('grafana:server')) %}