Linux-Help/formula-grafana
1
0
Fork 0
mirror of synced 2025-04-03 11:02:03 -04:00
Code Issues Releases Wiki Activity

Merge pull request from Perceptyx/external_image_storage_revert

Browse source 
Revert external_image_storage settings
This commit is contained in:
Alejandro Bednarik 2017-11-17 19:21:52 -03:00 • committed by GitHub
commit c04fd6984e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 22 deletions

14
grafana/files/grafana.ini
View file

@ -288,17 +288,3 @@ path = {{ server.dashboards.path }}
;enabled = false ;enabled = false
;path = /var/lib/grafana/dashboards ;path = /var/lib/grafana/dashboards
{%- endif %} {%- 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 }}

8
grafana/map.jinja
View file

@ -48,14 +48,6 @@ Debian:
static: /usr/share/grafana/public static: /usr/share/grafana/public
dashboards: dashboards:
enabled: false enabled: false
external_image_storage:
provider: ""
bucket_url: ""
bucket: ""
region: ""
path: ""
access_key: ""
secret_key: ""
{%- endload %} {%- endload %}
{%- set server = salt['grains.filter_by'](server_defaults, merge=salt['pillar.get']('grafana:server')) %} {%- set server = salt['grains.filter_by'](server_defaults, merge=salt['pillar.get']('grafana:server')) %}