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

service-prometheus: fix variables

Browse source
This commit is contained in:
Julian Labus 2018-09-11 13:49:57 +02:00
parent a6faeb0ff6
commit ec039343df
No known key found for this signature in database
GPG key ID: 8AF209F2C6B3572A
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/service-prometheus/defaults/main.yml
View file

@ -28,4 +28,4 @@ prometheus_goroot: "{{ prometheus_workdir }}/go"
prometheus_gopath: "{{ prometheus_workdir }}/gopath" prometheus_gopath: "{{ prometheus_workdir }}/gopath"
prometheus_default_opts: "--config.file={{ prometheus_config_path }}/prometheus.yml --storage.tsdb.path={{ prometheus_db_path }}" prometheus_default_opts: "--config.file={{ prometheus_config_path }}/prometheus.yml --storage.tsdb.path={{ prometheus_db_path }}"
alertmanager_default_opts: "-config.file={{ prometheus_config_path }}/alertmanager.yml -storage.path={{ alertmanager_db_path }}" alertmanager_default_opts: "--config.file={{ prometheus_config_path }}/alertmanager.yml --storage.path={{ alertmanager_db_path }}"

2
roles/service-prometheus/templates/alertmanager.service.j2
View file

@ -8,7 +8,7 @@ Type=simple
User={{ prometheus_user }} User={{ prometheus_user }}
Group={{ prometheus_group }} Group={{ prometheus_group }}
{% if prometheus_opts is defined %} {% if alertmanager_opts is defined %}
ExecStart={{ alertmanager_daemon_dir }}/alertmanager {{ alertmanager_default_opts }} {{ alertmanager_opts }} ExecStart={{ alertmanager_daemon_dir }}/alertmanager {{ alertmanager_default_opts }} {{ alertmanager_opts }}
{% else %} {% else %}
ExecStart={{ alertmanager_daemon_dir }}/alertmanager {{ alertmanager_default_opts }} ExecStart={{ alertmanager_daemon_dir }}/alertmanager {{ alertmanager_default_opts }}

2
roles/service-prometheus/templates/prometheus.service.j2
View file

@ -9,7 +9,7 @@ User={{ prometheus_user }}
Group={{ prometheus_group }} Group={{ prometheus_group }}
{% if prometheus_opts is defined %} {% if prometheus_opts is defined %}
ExecStart={{ prometheus_daemon_dir }}/prometheus {{ prometheus_default_opts }} {{ prometheus_node_exporter_opts }} ExecStart={{ prometheus_daemon_dir }}/prometheus {{ prometheus_default_opts }} {{ prometheus_opts }}
{% else %} {% else %}
ExecStart={{ prometheus_daemon_dir }}/prometheus {{ prometheus_default_opts }} ExecStart={{ prometheus_daemon_dir }}/prometheus {{ prometheus_default_opts }}
{% endif %} {% endif %}