1
0
Fork 0

config changes

This commit is contained in:
Michael Kutý 2014-03-03 19:38:47 +01:00
parent 56bc4d111d
commit 8af5295b9c
2 changed files with 13 additions and 9 deletions

View File

@ -11,7 +11,7 @@ A beautiful, easy to use and feature rich Graphite dashboard replacement and gra
source: source:
type: 'git' type: 'git'
address: https://github.com/torkelo/grafana.git address: https://github.com/torkelo/grafana.git
rev: v1.4.0 rev: master
elasticsearch: elasticsearch:
host: localhost host: localhost
port: 9200 port: 9200

View File

@ -22,24 +22,28 @@ 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
*/ */
{% set data = pillar.grafana.server.data %} {% if data in pillar.grafana.server.data.count == 1 %}
{% if data.get("type", "") == "graphite" %} {% for data in pillar.grafana.server.data %}
{% if data.get("ssl", "false") %} {%- if data.type == "graphite" %}
graphiteUrl: "https://"+{{ data.get("host", "") }}+":{{ data.get("port", 443) }}", graphiteUrl: "http://"+{{ data.host }}+":{{ data.port }}",
{% else %} {%- endif %}
graphiteUrl: "http://"+{{ data.get("host", "") }}+":{{ data.get("port", 80) }}", {% endfor %}
{% endif %}
{% endif %} {%- else %}
/*graphiteUrl: "http://"+{{ salt['pillar.get']('grafana:server:data:host', "")}}+":{{ salt['pillar.get']('grafana:server:data:port', 80)}}",
*/
/** /**
* Multiple graphite servers? Comment out graphiteUrl and replace with * Multiple graphite servers? Comment out graphiteUrl and replace with
* *
* datasources: { * datasources: {
* data_center_us: { type: 'graphite', url: 'http://<graphite_url>', default: true }, * data_center_us: { type: 'graphite', url: 'http://<graphite_url>', default: true },
* data_center_eu: { type: 'graphite', url: 'http://<graphite_url>' } * data_center_eu: { type: 'graphite', url: 'http://<graphite_url>' }
* } * }
*/ */
{%- endif %}
default_route: '/dashboard/file/default.json', default_route: '/dashboard/file/default.json',