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

fix(archive): service name needs to use pillar values

Browse Source 
in archive mode, the service file name was ignoring the value set in
pillar (`pgk:component:service:name`).
This commit is contained in:
Javier Bértoli 2020-08-25 11:28:28 -03:00
parent 7c1cdb8fdf
commit 219250a215
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
prometheus/archive/install.sls
View File

@ -82,11 +82,9 @@ prometheus-archive-install-{{ name }}-file-directory:
- user: prometheus-config-user-install-{{ name }}-user-present - user: prometheus-config-user-install-{{ name }}-user-present
- group: prometheus-config-user-install-{{ name }}-user-present - group: prometheus-config-user-install-{{ name }}-user-present
{%- if grains.kernel|lower == 'linux' and 'config_file' in p.pkg.component[name] %}
prometheus-archive-install-{{ name }}-managed-service: prometheus-archive-install-{{ name }}-managed-service:
file.managed: file.managed:
- name: {{ p.dir.service }}/{{ name }}.service - name: {{ p.dir.service }}/{{ p.pkg.component[name]['service'].get('name', name) }}.service
- source: {{ files_switch(['systemd.ini.jinja'], - source: {{ files_switch(['systemd.ini.jinja'],
lookup='prometheus-archive-install-' ~ name ~ '-managed-service' lookup='prometheus-archive-install-' ~ name ~ '-managed-service'
) )
@ -103,7 +101,7 @@ prometheus-archive-install-{{ name }}-managed-service:
group: {{ name }} group: {{ name }}
workdir: {{ p.dir.var }}/{{ name }} workdir: {{ p.dir.var }}/{{ name }}
stop: '' stop: ''
{%- if name in ('node_exporter',) %} {%- if name in ('node_exporter', 'consul_exporter') %}
start: {{ p.pkg.component[name]['path'] }}/{{ name }} start: {{ p.pkg.component[name]['path'] }}/{{ name }}
{%- else %} {%- else %}
start: {{ p.pkg.component[name]['path'] }}/{{ name }} --config.file {{ p.pkg.component[name]['config_file'] }} # noqa 204 start: {{ p.pkg.component[name]['path'] }}/{{ name }} --config.file {{ p.pkg.component[name]['config_file'] }} # noqa 204
@ -119,5 +117,4 @@ prometheus-archive-install-{{ name }}-managed-service:
- archive: prometheus-archive-install-{{ name }} - archive: prometheus-archive-install-{{ name }}
{%- endif %} {%- endif %}
{%- endif %}
{%- endfor %} {%- endfor %}