saltstack-formulas/prometheus-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(node_exporter): allow standalone use of node_exporter

Browse Source
This commit is contained in:
Alexander Weidinger 2019-10-04 01:10:32 +02:00 committed by alxwr
parent 07d6209664
commit a0d8ad4c35
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
prometheus/config/file/install.sls
View File

@ -16,8 +16,8 @@ include:
prometheus-config-file-etc-file-directory: prometheus-config-file-etc-file-directory:
file.directory: file.directory:
- name: {{ prometheus.dir.etc }} - name: {{ prometheus.dir.etc }}
- user: prometheus - user: root
- group: prometheus - group: {{ prometheus.rootgroup }}
- mode: 755 - mode: 755
- makedirs: True - makedirs: True
- require: - require:

6
prometheus/service/running.sls
View File

@ -11,6 +11,7 @@ include:
- {{ sls_config_args }} - {{ sls_config_args }}
- {{ sls_config_file }} - {{ sls_config_file }}
{%- if 'prometheus' in prometheus.wanted %}
prometheus-config-file-var-file-directory: prometheus-config-file-var-file-directory:
file.directory: file.directory:
- name: {{ prometheus.dir.var }} - name: {{ prometheus.dir.var }}
@ -20,6 +21,7 @@ prometheus-config-file-var-file-directory:
- makedirs: True - makedirs: True
- require: - require:
- file: prometheus-config-file-etc-file-directory - file: prometheus-config-file-etc-file-directory
{%- endif %}
{%- for name in prometheus.wanted %} {%- for name in prometheus.wanted %}
{%- if name in prometheus.service %} {%- if name in prometheus.service %}
@ -34,8 +36,10 @@ prometheus-config-file-var-file-directory:
prometheus-service-running-{{ name }}-service-unmasked: prometheus-service-running-{{ name }}-service-unmasked:
service.unmasked: service.unmasked:
- name: {{ service_name }} - name: {{ service_name }}
{%- if 'prometheus' in prometheus.wanted %}
- require: - require:
- file: prometheus-config-file-var-file-directory - file: prometheus-config-file-var-file-directory
{%- endif %}
- onlyif: - onlyif:
- systemctl list-units | grep {{ service_name }} >/dev/null 2>&1 - systemctl list-units | grep {{ service_name }} >/dev/null 2>&1
{%- endif %} {%- endif %}
@ -48,8 +52,10 @@ prometheus-service-running-{{ name }}-service-running:
- watch: - watch:
- file: prometheus-config-file-{{ name }}-file-managed - file: prometheus-config-file-{{ name }}-file-managed
{%- endif %} {%- endif %}
{%- if 'prometheus' in prometheus.wanted %}
- require: - require:
- file: prometheus-config-file-var-file-directory - file: prometheus-config-file-var-file-directory
{%- endif %}
{%- if grains.kernel|lower == 'linux' %} {%- if grains.kernel|lower == 'linux' %}
- service: prometheus-service-running-{{ name }}-service-unmasked - service: prometheus-service-running-{{ name }}-service-unmasked
- onlyif: systemctl list-units | grep {{ service_name }} >/dev/null 2>&1 - onlyif: systemctl list-units | grep {{ service_name }} >/dev/null 2>&1