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

fix(usernames): truncating user/group names to 32 characters

Browse Source
This commit is contained in:
Corey Hammerton 2022-09-02 10:10:14 -04:00
parent d5cfeb0d80
commit 2cb8316edb
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
prometheus/archive/install.sls
View File

@ -99,8 +99,8 @@ prometheus-archive-install-{{ name }}-file-directory:
- name: {{ p.dir.var }}{{ p.div }}{{ name }} - name: {{ p.dir.var }}{{ p.div }}{{ name }}
- makedirs: True - makedirs: True
{%- if grains.os != 'Windows' %} {%- if grains.os != 'Windows' %}
- user: {{ name }} - user: {{ name|truncate(32) }}
- group: {{ name }} - group: {{ name|truncate(32) }}
- mode: '0755' - mode: '0755'
- require: - require:
- user: prometheus-config-users-install-{{ name }}-user-present - user: prometheus-config-users-install-{{ name }}-user-present
@ -124,8 +124,8 @@ prometheus-archive-install-{{ name }}-managed-service:
- context: - context:
desc: prometheus - {{ name }} service desc: prometheus - {{ name }} service
name: {{ name }} name: {{ name }}
user: {{ name }} user: {{ name|truncate(32) }}
group: {{ name }} group: {{ name|truncate(32) }}
env: {{ p.pkg.component[name]['service'].get('env', [])|tojson }} env: {{ p.pkg.component[name]['service'].get('env', [])|tojson }}
workdir: {{ p.dir.var }}/{{ name }} workdir: {{ p.dir.var }}/{{ name }}
stop: '' stop: ''

4
prometheus/config/clean.sls
View File

@ -19,12 +19,12 @@ prometheus-config-clean-{{ name }}:
- name: {{ name }}_environ - name: {{ name }}_environ
{%- endif %} {%- endif %}
user.absent: user.absent:
- name: {{ name }} - name: {{ name|truncate(32) }}
{%- if grains.os_family == 'MacOS' %} {%- if grains.os_family == 'MacOS' %}
- onlyif: /usr/bin/dscl . list /Users | grep {{ name }} >/dev/null 2>&1 - onlyif: /usr/bin/dscl . list /Users | grep {{ name }} >/dev/null 2>&1
{%- endif %} {%- endif %}
group.absent: group.absent:
- name: {{ name }} - name: {{ name|truncate(32) }}
- require: - require:
- {{ sls_config_clean }} - {{ sls_config_clean }}

6
prometheus/config/users.sls
View File

@ -8,16 +8,16 @@
prometheus-config-users-install-{{ name }}-group-present: prometheus-config-users-install-{{ name }}-group-present:
group.present: group.present:
- name: {{ name }} - name: {{ name|truncate(32) }}
- system: true - system: true
- require_in: - require_in:
- user: prometheus-config-users-install-{{ name }}-user-present - user: prometheus-config-users-install-{{ name }}-user-present
prometheus-config-users-install-{{ name }}-user-present: prometheus-config-users-install-{{ name }}-user-present:
user.present: user.present:
- name: {{ name }} - name: {{ name|truncate(32) }}
- groups: - groups:
- {{ name }} - {{ name|truncate(32) }}
{%- if grains.os != 'Windows' %} {%- if grains.os != 'Windows' %}
- shell: {{ p.shell }} - shell: {{ p.shell }}
{%- if grains.kernel|lower == 'linux' %} {%- if grains.kernel|lower == 'linux' %}

4
prometheus/exporters/node_exporter/textfile_collectors/init.sls
View File

@ -18,8 +18,8 @@ prometheus-exporters-{{ name }}-collector-textfile-dir:
- name: {{ p.pkg.component[name]['service']['args']['collector.textfile.directory'] }} - name: {{ p.pkg.component[name]['service']['args']['collector.textfile.directory'] }}
{%- if grains.os != 'Windows' %} {%- if grains.os != 'Windows' %}
- mode: 755 - mode: 755
- user: {{ name }} - user: {{ name|truncate(32) }}
- group: {{ name }} - group: {{ name|truncate(32) }}
{%- endif %} {%- endif %}
- makedirs: True - makedirs: True
- require: - require:

4
prometheus/service/args/install.sls
View File

@ -25,8 +25,8 @@ include:
prometheus-service-args-{{ name }}-data-dir: prometheus-service-args-{{ name }}-data-dir:
file.directory: file.directory:
- name: {{ args['storage.tsdb.path'] }} - name: {{ args['storage.tsdb.path'] }}
- user: {{ name }} - user: {{ name|truncate(32) }}
- group: {{ name }} - group: {{ name|truncate(32) }}
- makedirs: True - makedirs: True
- watch_in: - watch_in:
- service: prometheus-service-running-{{ name }} - service: prometheus-service-running-{{ name }}