ci(pre-commit.ci): perform pre-commit autoupdate

updates:
- [github.com/rubocop-hq/rubocop: v1.30.1 → v1.42.0](https://github.com/rubocop-hq/rubocop/compare/v1.30.1...v1.42.0)
- [github.com/shellcheck-py/shellcheck-py: v0.8.0.4 → v0.9.0.2](https://github.com/shellcheck-py/shellcheck-py/compare/v0.8.0.4...v0.9.0.2)
- [github.com/adrienverge/yamllint: v1.26.3 → v1.28.0](https://github.com/adrienverge/yamllint/compare/v1.26.3...v1.28.0)
- https://github.com/myint/rstcheck → https://github.com/rstcheck/rstcheck
- [github.com/rstcheck/rstcheck: 3f929574 → v6.1.1](https://github.com/rstcheck/rstcheck/compare/3f929574...v6.1.1)

.pre-commit-config.yaml

@@ -30,7 +30,7 @@ repos:
         additional_dependencies: ['@commitlint/config-conventional@8.3.4']
         always_run: true
   - repo: https://github.com/rubocop-hq/rubocop
-    rev: v1.30.1
+    rev: v1.42.0
     hooks:
       - id: rubocop
         name: Check Ruby files with rubocop
@@ -38,14 +38,14 @@ repos:
         always_run: true
         pass_filenames: false
   - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.8.0.4
+    rev: v0.9.0.2
     hooks:
       - id: shellcheck
         name: Check shell scripts with shellcheck
         files: ^.*\.(sh|bash|ksh)$
         types: []
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.26.3
+    rev: v1.28.0
     hooks:
       - id: yamllint
         name: Check YAML syntax with yamllint
@@ -58,8 +58,8 @@ repos:
       - id: salt-lint
         name: Check Salt files using salt-lint
         files: ^.*\.(sls|jinja|j2|tmpl|tst)$
-  - repo: https://github.com/myint/rstcheck
+  - repo: https://github.com/rstcheck/rstcheck
-    rev: 3f929574
+    rev: v6.1.1
     hooks:
       - id: rstcheck
         name: Check reST files using rstcheck

prometheus/config/file.sls

@@ -40,19 +40,15 @@ prometheus-config-file-{{ name }}-file-managed:
     - template: jinja
             {%- if grains.os != 'Windows' %}
     - mode: 644
-            {%- if p.manage_user_group %}
     - user: {{ name }}
     - group: {{ name }}
             {%- endif %}
-            {%- endif %}
     - context:
         config: {{ p.pkg.component[name]['config']|json }}
     - require:
       - file: prometheus-config-file-etc-file-directory
-            {%- if p.manage_user_group %}
       - user: prometheus-config-users-install-{{ name }}-user-present
       - group: prometheus-config-users-install-{{ name }}-group-present
-            {%- endif %}
     - watch_in:
       - service: prometheus-service-running-{{ name }}
 
@@ -75,19 +71,15 @@ prometheus-config-file-{{ ef }}-file-managed:
     - template: jinja
             {%- if grains.os != 'Windows' %}
     - mode: 644
-            {%- if p.manage_user_group %}
     - user: {{ component }}
     - group: {{ component }}
             {%- endif %}
-            {%- endif %}
     - context:
         config: {{ p.extra_files[ef]['config'] }}
     - require:
       - file: prometheus-config-file-etc-file-directory
-            {%- if p.manage_user_group %}
       - user: prometheus-config-users-install-{{ component }}-user-present
       - group: prometheus-config-users-install-{{ component }}-group-present
-            {%- endif %}
     - watch_in:
       - service: prometheus-service-running-{{ component }}
 

prometheus/config/storage.sls

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

prometheus/config/users.sls

@@ -4,7 +4,6 @@
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import prometheus as p with context %}
 
-  {%- if p.manage_user_group or p.pkg.use_upstream_archive %}
   {%- for name in p.wanted.component %}
 
 prometheus-config-users-install-{{ name }}-group-present:
@@ -30,4 +29,3 @@ prometheus-config-users-install-{{ name }}-user-present:
               {%- endif %}
 
   {%- endfor %}
-  {%- endif %}

prometheus/defaults.yaml

@@ -23,8 +23,6 @@ prometheus:
     tmp: /tmp/prometheus
     var: /var/lib/prometheus
 
-  manage_user_group: true
-
   pkg:
     uri: https://github.com/prometheus
     use_upstream_repo: false

prometheus/exporters/node_exporter/textfile_collectors/init.sls

@@ -22,11 +22,9 @@ prometheus-exporters-{{ name }}-collector-textfile-dir:
     - group: {{ name }}
         {%- endif %}
     - makedirs: True
-            {%- if p.manage_user_group %}
     - require:
       - user: prometheus-config-users-install-{{ name }}-user-present
       - group: prometheus-config-users-install-{{ name }}-group-present
-            {%- endif %}
     {%- endif %}
 
 {%- for k, v in p.get('exporters', {}).get(name, {}).get('textfile_collectors', {}).items() %}

prometheus/files/default/environ.sh.jinja

@@ -2,7 +2,7 @@
 # File managed by Salt at <{{ source }}>.
 # Your changes may be overwritten.
 ########################################################################
-# Set the command-line arguments to pass to the server."
+# Set the command-line arguments to pass to the server.%}"
 {{ arg_name }}="{{ args }}"
 
 

prometheus/osfamilymap.yaml

@@ -219,66 +219,7 @@ RedHat:
       sslcacert: /etc/pki/tls/certs/ca-bundle.crt
       metadata_expire: 300
 
-Suse:
+Suse: {}
-  manage_user_group: false
-  pkg:
-    use_upstream_repo: false
-    use_upstream_package: false
-    use_upstream_archive: false
-    component:
-      alertmanager:
-        name: golang-github-prometheus-alertmanager
-        service:
-          name: prometheus-alertmanager
-        environ_file: /etc/sysconfig/prometheus-alertmanager
-        args:
-            config.file: /etc/prometheus/alertmanager.yml
-        config_file: /etc/prometheus/alertmanager.yml
-      prometheus:
-        name: golang-github-prometheus-prometheus
-        service:
-          name: prometheus
-        environ_file: /etc/sysconfig/prometheus
-        environ:
-          environ_arg_name: ARGS
-        config_file: /etc/prometheus/prometheus.yml
-      blackbox_exporter:
-        name: prometheus-blackbox_exporter
-        config_file: /etc/prometheus/blackbox.yml
-        service:
-          name: prometheus-blackbox_exporter
-      hacluster_exporter:
-        name: prometheus-ha_cluster_exporter
-        environ_file: /etc/sysconfig/prometheus-ha_cluster_exporter
-        environ:
-          environ_arg_name: ARGS
-        service:
-          name: prometheus-ha_cluster_exporter
-      node_exporter:
-        name: golang-github-prometheus-node_exporter
-        service:
-          name: prometheus-node_exporter
-        environ_file: /etc/sysconfig/prometheus-node_exporter
-        environ:
-          environ_arg_name: ARGS
-      postgres_exporter:
-        name: prometheus-postgres_exporter
-        service:
-          name: prometheus-postgres_exporter
-        environ_file: /etc/sysconfig/prometheus-postgres_exporter
-        environ:
-          environ_arg_name: POSTGRES_EXPORTER_PARAMS
-      saptune_exporter:
-        name: prometheus-saptune_exporter
-        service:
-          name: prometheus-saptune_exporter
-      webhook_snmp:
-        name: prometheus-webhook-snmp
-        service:
-          name: prometheus-webhook-snmp
-        environ_file: /etc/default/prometheus-webhook-snmp
-        environ:
-          environ_arg_name: PROMETHEUS_WEBHOOK_SNMP_OPTIONS
 
 Gentoo:
   pkg:

prometheus/service/args/install.sls

@@ -30,11 +30,9 @@ prometheus-service-args-{{ name }}-data-dir:
     - makedirs: True
     - watch_in:
       - service: prometheus-service-running-{{ name }}
-            {%- if p.manage_user_group %}
     - require:
       - user: prometheus-config-users-install-{{ name }}-user-present
       - group: prometheus-config-users-install-{{ name }}-group-present
-            {%- endif %}
 
             {%- endif %}
             {%- if grains.os_family == 'FreeBSD' %}

test/salt/pillar/repo.sls

@@ -13,12 +13,6 @@ prometheus:
       - alertmanager
       - node_exporter
       - blackbox_exporter
-      {%- if grains.os == 'SUSE' %}
-      - hacluster_exporter
-      - postgres_exporter
-      - saptune_exporter
-      - webhook_snmp
-      {%- endif %}
 
   exporters:
     node_exporter:
@@ -37,7 +31,7 @@ prometheus:
 
   pkg:
     # yamllint disable-line rule:braces rule:commas
-    use_upstream_repo: {{ false if grains.os_family|lower in ('debian','suse',) else true }}
+    use_upstream_repo: {{ false if grains.os_family|lower in ('debian',) else true }}
     use_upstream_archive: false
 
     clientlibs: