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

fixes

Browse source
This commit is contained in:
Michael Kutý 2014-03-03 19:54:05 +01:00
parent 8af5295b9c
commit a52b0dbd8b
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
conf/config.js
View file

@ -22,11 +22,11 @@ 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
*/ */
{% if data in pillar.grafana.server.data.count == 1 %} {% if (pillar.grafana.server.data|length) == 1 %}
{% for data in pillar.grafana.server.data %} {% for data in pillar.grafana.server.data %}
{%- if data.type == "graphite" %} {%- if data.type == "graphite" %}
graphiteUrl: "http://"+{{ data.host }}+":{{ data.port }}", graphiteUrl: "http://{{ data.host }}:{{ data.port }}",
{%- endif %} {%- endif %}
{% endfor %} {% endfor %}
@ -38,7 +38,7 @@ function (Settings) {
* 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>' }
* } * }

12
server.sls Normal file → Executable file
View file

@ -26,12 +26,22 @@ grafana_install:
- names: - names:
- npm install - npm install
- npm install -g grunt-cli - npm install -g grunt-cli
- grunt build
- cwd: /srv/grafana/site - cwd: /srv/grafana/site
- unless: test -e /srv/grafana/site/node_modules - unless: test -e /srv/grafana/site/node_modules
- require: - require:
- git: grafana_repository - git: grafana_repository
grafana_grun_build:
cmd.run:
- names:
- grunt build --force
- cwd: /srv/grafana/site
- unless: test -e /srv/grafana/site/dist
- require:
- git: grafana_repository
{% endif %} {% endif %}
/srv/grafana/site/src/config.js: /srv/grafana/site/src/config.js: