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

fix(username): truncating all usernames to 16 characters

Browse Source
This commit is contained in:
Corey Hammerton 2022-09-07 15:39:39 -04:00
parent 1b7a5b04c0
commit a6b8cd87ab
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
prometheus/archive/install.sls
View File

@ -98,7 +98,7 @@ 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|truncate(32, False, "") }} - user: {{ name|truncate(16, False, "") }}
- group: {{ name|truncate(16, False, "") }} - group: {{ name|truncate(16, False, "") }}
- mode: '0755' - mode: '0755'
- require: - require:
@ -123,7 +123,7 @@ prometheus-archive-install-{{ name }}-managed-service:
- context: - context:
desc: prometheus - {{ name }} service desc: prometheus - {{ name }} service
name: {{ name }} name: {{ name }}
user: {{ name|truncate(32, False, "") }} user: {{ name|truncate(16, False, "") }}
group: {{ name|truncate(16, False, "") }} group: {{ name|truncate(16, False, "") }}
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 }}

2
prometheus/config/clean.sls
View File

@ -19,7 +19,7 @@ prometheus-config-clean-{{ name }}:
- name: {{ name }}_environ - name: {{ name }}_environ
{%- endif %} {%- endif %}
user.absent: user.absent:
- name: {{ name|truncate(32, False, "") }} - name: {{ name|truncate(16, False, "") }}
{%- 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 %}

2
prometheus/config/users.sls
View File

@ -15,7 +15,7 @@ prometheus-config-users-install-{{ name }}-group-present:
prometheus-config-users-install-{{ name }}-user-present: prometheus-config-users-install-{{ name }}-user-present:
user.present: user.present:
- name: {{ name|truncate(32, False, "") }} - name: {{ name|truncate(16, False, "") }}
- groups: - groups:
- {{ name|truncate(16, False, "") }} - {{ name|truncate(16, False, "") }}
{%- if grains.os != 'Windows' %} {%- if grains.os != 'Windows' %}

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

@ -18,7 +18,7 @@ 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|truncate(32, False, "") }} - user: {{ name|truncate(16, False, "") }}
- group: {{ name|truncate(16, False, "") }} - group: {{ name|truncate(16, False, "") }}
{%- endif %} {%- endif %}
- makedirs: True - makedirs: True

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

@ -25,7 +25,7 @@ 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|truncate(32, False, "") }} - user: {{ name|truncate(16, False, "") }}
- group: {{ name|truncate(16, False, "") }} - group: {{ name|truncate(16, False, "") }}
- makedirs: True - makedirs: True
- watch_in: - watch_in:

2
test/integration/default/controls/archive_spec.rb
View File

@ -56,7 +56,7 @@ control 'prometheus components' do
describe group('prometheus_bigqu') do describe group('prometheus_bigqu') do
it { should exist } it { should exist }
end end
describe user('prometheus_bigquery_remote_stora') do describe user('prometheus_bigqu') do
it { should exist } it { should exist }
end end
describe directory('/var/lib/prometheus') do describe directory('/var/lib/prometheus') do