freifunk/ansible-ffibk
9
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

role service-grafana: check prometheus_components instead of setting facts

Browse source
This commit is contained in:
Julian Labus 2018-09-24 15:12:15 +02:00
parent 9521fac988
commit e79761e8d8
No known key found for this signature in database
GPG key ID: 8AF209F2C6B3572A
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/service-grafana/tasks/main.yml
View file

@ -60,7 +60,7 @@
database: "yanic" database: "yanic"
- name: add prometheus datasource - name: add prometheus datasource
when: prometheus_present is defined when: '"prometheus" in prometheus_components'
grafana_datasource: grafana_datasource:
name: "prometheus" name: "prometheus"
grafana_url: "http://localhost:3000" grafana_url: "http://localhost:3000"

1
roles/service-prometheus/tasks/prometheus.yml
View file

@ -5,7 +5,6 @@
- name: set internal variables for convenience - name: set internal variables for convenience
set_fact: set_fact:
prometheus_present: yes
prometheus_daemon_dir: "{{ prometheus_install_path }}/prometheus-{{ prometheus_version }}.linux-amd64" prometheus_daemon_dir: "{{ prometheus_install_path }}/prometheus-{{ prometheus_version }}.linux-amd64"
prometheus_tarball_url: "https://github.com/prometheus/prometheus/releases/download/v{{ prometheus_version }}/prometheus-{{ prometheus_version }}.linux-amd64.tar.gz" prometheus_tarball_url: "https://github.com/prometheus/prometheus/releases/download/v{{ prometheus_version }}/prometheus-{{ prometheus_version }}.linux-amd64.tar.gz"