Linux-Help/formula-grafana
1
0
Fork 0
mirror of synced 2024-11-22 08:55:35 -05:00
Code Issues Releases Wiki Activity

some config changes

Browse source
This commit is contained in:
Michael Kutý 2014-03-03 19:01:04 +01:00
parent 3f50dab285
commit 56bc4d111d
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
conf/config.js Normal file → Executable file
View file

@ -13,7 +13,7 @@ function (Settings) {
* elasticsearch url: * elasticsearch url:
* For Basic authentication use: http://username:password@domain.com:9200 * For Basic authentication use: http://username:password@domain.com:9200
*/ */
elasticsearch: "http://{{ pillar.grafana.server.elasticsearch.host }}:{{ pillar.grafana.server.elasticsearch.port }}", elasticsearch: "http://{{ salt['pillar.get']('grafana:server:elasticsearch:host', "") }}:{{ salt['pillar.get']('grafana:server:elasticsearch:port', 9200) }}",
/** /**
* graphite-web url: * graphite-web url:
@ -22,7 +22,15 @@ function (Settings) {
* in nginx or apache for cross origin domain sharing to work (CORS). * in nginx or apache for cross origin domain sharing to work (CORS).
* Check install documentation on github * Check install documentation on github
*/ */
graphiteUrl: "http://"+window.location.hostname+":8080", {% set data = pillar.grafana.server.data %}
{% if data.get("type", "") == "graphite" %}
{% if data.get("ssl", "false") %}
graphiteUrl: "https://"+{{ data.get("host", "") }}+":{{ data.get("port", 443) }}",
{% else %}
graphiteUrl: "http://"+{{ data.get("host", "") }}+":{{ data.get("port", 80) }}",
{% endif %}
{% endif %}
/** /**
* Multiple graphite servers? Comment out graphiteUrl and replace with * Multiple graphite servers? Comment out graphiteUrl and replace with