chore(deps): bump activesupport from 7.0.3.1 to 7.0.4.1

Bumps [activesupport](https://github.com/rails/rails) from 7.0.3.1 to 7.0.4.1.
- [Release notes](https://github.com/rails/rails/releases)
- [Changelog](https://github.com/rails/rails/blob/v7.0.4.1/activesupport/CHANGELOG.md)
- [Commits](https://github.com/rails/rails/compare/v7.0.3.1...v7.0.4.1)

---
updated-dependencies:
- dependency-name: activesupport
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Gemfile.lock

@@ -49,7 +49,7 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.3.1)
+    activesupport (7.0.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -400,7 +400,7 @@ GEM
     memoist (0.16.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    minitest (5.16.2)
+    minitest (5.17.0)
     mixlib-config (3.0.27)
       tomlrb
     mixlib-install (3.12.19)
@@ -634,7 +634,7 @@ GEM
       pastel (~> 0.8)
       strings (~> 0.2.0)
       tty-screen (~> 0.8)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unf (0.1.4)

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: