fixes
This commit is contained in:
parent
8af5295b9c
commit
a52b0dbd8b
2 changed files with 14 additions and 4 deletions
|
@ -22,11 +22,11 @@ function (Settings) {
|
|||
* in nginx or apache for cross origin domain sharing to work (CORS).
|
||||
* 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 %}
|
||||
{%- if data.type == "graphite" %}
|
||||
graphiteUrl: "http://"+{{ data.host }}+":{{ data.port }}",
|
||||
graphiteUrl: "http://{{ data.host }}:{{ data.port }}",
|
||||
{%- endif %}
|
||||
{% endfor %}
|
||||
|
||||
|
|
12
server.sls
Normal file → Executable file
12
server.sls
Normal file → Executable file
|
@ -26,12 +26,22 @@ grafana_install:
|
|||
- names:
|
||||
- npm install
|
||||
- npm install -g grunt-cli
|
||||
- grunt build
|
||||
- cwd: /srv/grafana/site
|
||||
- unless: test -e /srv/grafana/site/node_modules
|
||||
- require:
|
||||
- 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 %}
|
||||
|
||||
/srv/grafana/site/src/config.js:
|
||||
|
|
Loading…
Reference in a new issue