From 2cb8316edb094ae182e25af129ba6e9a23ac80bb Mon Sep 17 00:00:00 2001 From: Corey Hammerton Date: Fri, 2 Sep 2022 10:10:14 -0400 Subject: [PATCH] fix(usernames): truncating user/group names to 32 characters --- prometheus/archive/install.sls | 8 ++++---- prometheus/config/clean.sls | 4 ++-- prometheus/config/users.sls | 6 +++--- .../exporters/node_exporter/textfile_collectors/init.sls | 4 ++-- prometheus/service/args/install.sls | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/prometheus/archive/install.sls b/prometheus/archive/install.sls index 439b9a3..c68c02e 100644 --- a/prometheus/archive/install.sls +++ b/prometheus/archive/install.sls @@ -99,8 +99,8 @@ prometheus-archive-install-{{ name }}-file-directory: - name: {{ p.dir.var }}{{ p.div }}{{ name }} - makedirs: True {%- if grains.os != 'Windows' %} - - user: {{ name }} - - group: {{ name }} + - user: {{ name|truncate(32) }} + - group: {{ name|truncate(32) }} - mode: '0755' - require: - user: prometheus-config-users-install-{{ name }}-user-present @@ -124,8 +124,8 @@ prometheus-archive-install-{{ name }}-managed-service: - context: desc: prometheus - {{ name }} service name: {{ name }} - user: {{ name }} - group: {{ name }} + user: {{ name|truncate(32) }} + group: {{ name|truncate(32) }} env: {{ p.pkg.component[name]['service'].get('env', [])|tojson }} workdir: {{ p.dir.var }}/{{ name }} stop: '' diff --git a/prometheus/config/clean.sls b/prometheus/config/clean.sls index 4208f0d..4e94d5f 100644 --- a/prometheus/config/clean.sls +++ b/prometheus/config/clean.sls @@ -19,12 +19,12 @@ prometheus-config-clean-{{ name }}: - name: {{ name }}_environ {%- endif %} user.absent: - - name: {{ name }} + - name: {{ name|truncate(32) }} {%- if grains.os_family == 'MacOS' %} - onlyif: /usr/bin/dscl . list /Users | grep {{ name }} >/dev/null 2>&1 {%- endif %} group.absent: - - name: {{ name }} + - name: {{ name|truncate(32) }} - require: - {{ sls_config_clean }} diff --git a/prometheus/config/users.sls b/prometheus/config/users.sls index 2938adb..cd1b4d5 100644 --- a/prometheus/config/users.sls +++ b/prometheus/config/users.sls @@ -8,16 +8,16 @@ prometheus-config-users-install-{{ name }}-group-present: group.present: - - name: {{ name }} + - name: {{ name|truncate(32) }} - system: true - require_in: - user: prometheus-config-users-install-{{ name }}-user-present prometheus-config-users-install-{{ name }}-user-present: user.present: - - name: {{ name }} + - name: {{ name|truncate(32) }} - groups: - - {{ name }} + - {{ name|truncate(32) }} {%- if grains.os != 'Windows' %} - shell: {{ p.shell }} {%- if grains.kernel|lower == 'linux' %} diff --git a/prometheus/exporters/node_exporter/textfile_collectors/init.sls b/prometheus/exporters/node_exporter/textfile_collectors/init.sls index 4ea4f71..b2519a5 100644 --- a/prometheus/exporters/node_exporter/textfile_collectors/init.sls +++ b/prometheus/exporters/node_exporter/textfile_collectors/init.sls @@ -18,8 +18,8 @@ prometheus-exporters-{{ name }}-collector-textfile-dir: - name: {{ p.pkg.component[name]['service']['args']['collector.textfile.directory'] }} {%- if grains.os != 'Windows' %} - mode: 755 - - user: {{ name }} - - group: {{ name }} + - user: {{ name|truncate(32) }} + - group: {{ name|truncate(32) }} {%- endif %} - makedirs: True - require: diff --git a/prometheus/service/args/install.sls b/prometheus/service/args/install.sls index 71e364e..c0a34e2 100644 --- a/prometheus/service/args/install.sls +++ b/prometheus/service/args/install.sls @@ -25,8 +25,8 @@ include: prometheus-service-args-{{ name }}-data-dir: file.directory: - name: {{ args['storage.tsdb.path'] }} - - user: {{ name }} - - group: {{ name }} + - user: {{ name|truncate(32) }} + - group: {{ name|truncate(32) }} - makedirs: True - watch_in: - service: prometheus-service-running-{{ name }}