From 2ba4761033b4346722a4f3d42a450cc8b43ca3e7 Mon Sep 17 00:00:00 2001
From: abednarik <alejandro.bednarik@gmail.com>
Date: Fri, 17 Nov 2017 19:21:21 -0300
Subject: [PATCH] Revert external_image_storage settings

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

diff --git a/grafana/files/grafana.ini b/grafana/files/grafana.ini
index e7a4fe4..4ce5f94 100644
--- a/grafana/files/grafana.ini
+++ b/grafana/files/grafana.ini
@@ -288,17 +288,3 @@ 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 59a8faf..bf85245 100644
--- a/grafana/map.jinja
+++ b/grafana/map.jinja
@@ -48,14 +48,6 @@ 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')) %}