Compare commits

..

2 Commits

Author SHA1 Message Date
325567eeff
fix(environ): remove stray control characters
Remove useless "%}" from comment in file.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-02-15 03:09:10 +01:00
2b2c316b76
feat(suse): support packaged installations
- add all components available in the default openSUSE Leap (OSS)
  repository to osfamilymap
- introduce global manage_user_group toggle to prevent the formula from
  changing users and groups managed by system packages

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
2023-02-15 03:09:10 +01:00
6 changed files with 12 additions and 10 deletions

View File

@ -18,8 +18,10 @@ prometheus-archive-install-prerequisites:
file.directory: file.directory:
- name: {{ p.dir.var }} - name: {{ p.dir.var }}
- makedirs: True - makedirs: True
{%- if p.manage_user_group %}
- require: - require:
- sls: {{ sls_config_users }} - sls: {{ sls_config_users }}
{%- endif %}
{%- if grains.os != 'Windows' %} {%- if grains.os != 'Windows' %}
- mode: 755 - mode: 755
- user: {{ p.identity.rootuser }} - user: {{ p.identity.rootuser }}
@ -100,7 +102,7 @@ prometheus-archive-install-{{ name }}-file-directory:
- makedirs: True - makedirs: True
{%- if grains.os != 'Windows' %} {%- if grains.os != 'Windows' %}
- mode: '0755' - mode: '0755'
{%- if p.manage_user_group != false %} {%- if p.manage_user_group %}
- user: {{ name }} - user: {{ name }}
- group: {{ name }} - group: {{ name }}
- require: - require:
@ -126,7 +128,7 @@ prometheus-archive-install-{{ name }}-managed-service:
- context: - context:
desc: prometheus - {{ name }} service desc: prometheus - {{ name }} service
name: {{ name }} name: {{ name }}
{%- if p.manage_user_group != false %} {%- if p.manage_user_group %}
user: {{ name }} user: {{ name }}
group: {{ name }} group: {{ name }}
{%- endif %} {%- endif %}
@ -162,7 +164,7 @@ prometheus-archive-install-{{ name }}-managed-service:
{% else %} {% else %}
- file: prometheus-archive-install-{{ name }} - file: prometheus-archive-install-{{ name }}
{% endif %} {% endif %}
{%- if p.manage_user_group != false %} {%- if p.manage_user_group %}
- user: prometheus-config-users-install-{{ name }}-user-present - user: prometheus-config-users-install-{{ name }}-user-present
- group: prometheus-config-users-install-{{ name }}-group-present - group: prometheus-config-users-install-{{ name }}-group-present
{%- endif %} {%- endif %}

View File

@ -40,7 +40,7 @@ prometheus-config-file-{{ name }}-file-managed:
- template: jinja - template: jinja
{%- if grains.os != 'Windows' %} {%- if grains.os != 'Windows' %}
- mode: 644 - mode: 644
{%- if p.manage_user_group != false %} {%- if p.manage_user_group %}
- user: {{ name }} - user: {{ name }}
- group: {{ name }} - group: {{ name }}
{%- endif %} {%- endif %}
@ -49,7 +49,7 @@ prometheus-config-file-{{ name }}-file-managed:
config: {{ p.pkg.component[name]['config']|json }} config: {{ p.pkg.component[name]['config']|json }}
- require: - require:
- file: prometheus-config-file-etc-file-directory - file: prometheus-config-file-etc-file-directory
{%- if p.manage_user_group != false %} {%- if p.manage_user_group %}
- user: prometheus-config-users-install-{{ name }}-user-present - user: prometheus-config-users-install-{{ name }}-user-present
- group: prometheus-config-users-install-{{ name }}-group-present - group: prometheus-config-users-install-{{ name }}-group-present
{%- endif %} {%- endif %}
@ -82,7 +82,7 @@ prometheus-config-file-{{ ef }}-file-managed:
config: {{ p.extra_files[ef]['config'] }} config: {{ p.extra_files[ef]['config'] }}
- require: - require:
- file: prometheus-config-file-etc-file-directory - file: prometheus-config-file-etc-file-directory
{%- if p.manage_user_group != false %} {%- if p.manage_user_group %}
- user: prometheus-config-users-install-{{ component }}-user-present - user: prometheus-config-users-install-{{ component }}-user-present
- group: prometheus-config-users-install-{{ component }}-group-present - group: prometheus-config-users-install-{{ component }}-group-present
{%- endif %} {%- endif %}

View File

@ -24,7 +24,7 @@ prometheus-service-args-{{ name }}-data-dir:
- makedirs: True - makedirs: True
- watch_in: - watch_in:
- service: prometheus-service-running-{{ name }} - service: prometheus-service-running-{{ name }}
{%- if p.manage_user_group != false %} {%- if p.manage_user_group %}
- require: - require:
- user: prometheus-config-users-install-{{ name }}-user-present - user: prometheus-config-users-install-{{ name }}-user-present
- group: prometheus-config-users-install-{{ name }}-group-present - group: prometheus-config-users-install-{{ name }}-group-present

View File

@ -4,7 +4,7 @@
{%- set tplroot = tpldir.split('/')[0] %} {%- set tplroot = tpldir.split('/')[0] %}
{%- from tplroot ~ "/map.jinja" import prometheus as p with context %} {%- from tplroot ~ "/map.jinja" import prometheus as p with context %}
{%- if p.manage_user_group != false %} {%- if p.manage_user_group %}
{%- for name in p.wanted.component %} {%- for name in p.wanted.component %}
prometheus-config-users-install-{{ name }}-group-present: prometheus-config-users-install-{{ name }}-group-present:

View File

@ -22,7 +22,7 @@ prometheus-exporters-{{ name }}-collector-textfile-dir:
- group: {{ name }} - group: {{ name }}
{%- endif %} {%- endif %}
- makedirs: True - makedirs: True
{%- if p.manage_user_group != false %} {%- if p.manage_user_group %}
- require: - require:
- user: prometheus-config-users-install-{{ name }}-user-present - user: prometheus-config-users-install-{{ name }}-user-present
- group: prometheus-config-users-install-{{ name }}-group-present - group: prometheus-config-users-install-{{ name }}-group-present

View File

@ -30,7 +30,7 @@ prometheus-service-args-{{ name }}-data-dir:
- makedirs: True - makedirs: True
- watch_in: - watch_in:
- service: prometheus-service-running-{{ name }} - service: prometheus-service-running-{{ name }}
{%- if p.manage_user_group != false %} {%- if p.manage_user_group %}
- require: - require:
- user: prometheus-config-users-install-{{ name }}-user-present - user: prometheus-config-users-install-{{ name }}-user-present
- group: prometheus-config-users-install-{{ name }}-group-present - group: prometheus-config-users-install-{{ name }}-group-present