32 changed files with 658 additions and 795 deletions
--- a/.gitignore
+++ b/.gitignore
@ -127,7 +127,6 @@ tmp/
 # `salt-formula` -- Vagrant Specific files
 .vagrant
 top.sls
-!test/salt/pillar/top.sls

 # `suricata-formula` -- Platform binaries
 *.rpm
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -102,7 +102,7 @@ rubocop:
 ###############################################################################
 # Define `test` template
 ###############################################################################
-.test_instance: &test_instance
+.test_instance:
  stage: *stage_test
  image: *image_dindruby
  services: *services_docker_dind
@ -117,27 +117,18 @@ rubocop:
    # Alternative value to consider: `${CI_JOB_NAME}`
    - 'bin/kitchen verify "${DOCKER_ENV_CI_JOB_NAME}"'

-###############################################################################
-# Define `test` template (`allow_failure: true`)
-###############################################################################
-.test_instance_failure_permitted:
-  <<: *test_instance
-  allow_failure: true
-
 ###############################################################################
 # `test` stage: each instance below uses the `test` template above
 ###############################################################################
 ## Define the rest of the matrix based on Kitchen testing
 # Make sure the instances listed below match up with
 # the `platforms` defined in `kitchen.yml`
-# yamllint disable rule:line-length
 # default-debian-11-tiamat-py3: {extends: '.test_instance'}
 # default-debian-10-tiamat-py3: {extends: '.test_instance'}
 # default-debian-9-tiamat-py3: {extends: '.test_instance'}
-# default-ubuntu-2204-tiamat-py3: {extends: '.test_instance_failure_permitted'}
 # default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
-# default-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
+# default-centos-8-tiamat-py3: {extends: '.test_instance'}
 # default-centos-7-tiamat-py3: {extends: '.test_instance'}
 # default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
@ -153,33 +144,33 @@ debian-10-master-py3: {extends: '.test_instance'}
 # default-debian-9-master-py3: {extends: '.test_instance'}
 # repo-debian-9-master-py3: {extends: '.test_instance'}
 debian-9-master-py3: {extends: '.test_instance'}
-# default-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
-# repo-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
 # default-ubuntu-2004-master-py3: {extends: '.test_instance'}
 # repo-ubuntu-2004-master-py3: {extends: '.test_instance'}
 ubuntu-2004-master-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-master-py3: {extends: '.test_instance'}
 # repo-ubuntu-1804-master-py3: {extends: '.test_instance'}
 ubuntu-1804-master-py3: {extends: '.test_instance'}
-# default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
-# repo-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
+# default-centos-8-master-py3: {extends: '.test_instance'}
+# repo-centos-8-master-py3: {extends: '.test_instance'}
+centos-8-master-py3: {extends: '.test_instance'}
 # default-centos-7-master-py3: {extends: '.test_instance'}
 # repo-centos-7-master-py3: {extends: '.test_instance'}
 centos-7-master-py3: {extends: '.test_instance'}
-default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
-# repo-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
-# fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
-default-fedora-35-master-py3: {extends: '.test_instance'}
-# repo-fedora-35-master-py3: {extends: '.test_instance'}
-# fedora-35-master-py3: {extends: '.test_instance'}
+default-fedora-34-master-py3: {extends: '.test_instance'}
+# repo-fedora-34-master-py3: {extends: '.test_instance'}
+# fedora-34-master-py3: {extends: '.test_instance'}
+default-fedora-33-master-py3: {extends: '.test_instance'}
+# repo-fedora-33-master-py3: {extends: '.test_instance'}
+# fedora-33-master-py3: {extends: '.test_instance'}
 default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
 # repo-opensuse-leap-153-master-py3: {extends: '.test_instance'}
 # opensuse-leap-153-master-py3: {extends: '.test_instance'}
-default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
-# repo-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
-# opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
+default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
+# repo-opensuse-leap-152-master-py3: {extends: '.test_instance'}
+# opensuse-leap-152-master-py3: {extends: '.test_instance'}
+default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
+# repo-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
+# opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
 # default-amazonlinux-2-master-py3: {extends: '.test_instance'}
 # repo-amazonlinux-2-master-py3: {extends: '.test_instance'}
 amazonlinux-2-master-py3: {extends: '.test_instance'}
@ -204,37 +195,73 @@ almalinux-8-master-py3: {extends: '.test_instance'}
 # default-rockylinux-8-master-py3: {extends: '.test_instance'}
 # repo-rockylinux-8-master-py3: {extends: '.test_instance'}
 rockylinux-8-master-py3: {extends: '.test_instance'}
-# default-debian-11-3004-1-py3: {extends: '.test_instance'}
-# default-debian-10-3004-1-py3: {extends: '.test_instance'}
-# default-debian-9-3004-1-py3: {extends: '.test_instance'}
-# default-ubuntu-2204-3004-1-py3: {extends: '.test_instance_failure_permitted'}
-# default-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
-# default-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'}
-# default-centos-7-3004-1-py3: {extends: '.test_instance'}
-# default-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'}
-# default-fedora-35-3004-1-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3004-1-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-latest-3004-1-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-systemd-3004-1-py3: {extends: '.test_instance'}
-# default-almalinux-8-3004-1-py3: {extends: '.test_instance'}
-# default-rockylinux-8-3004-1-py3: {extends: '.test_instance'}
-# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
-# default-debian-10-3003-4-py3: {extends: '.test_instance'}
-# default-debian-9-3003-4-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3003-4-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3003-4-py3: {extends: '.test_instance'}
-# default-centos-stream8-3003-4-py3: {extends: '.test_instance_failure_permitted'}
-# default-centos-7-3003-4-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3003-4-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
-# default-almalinux-8-3003-4-py3: {extends: '.test_instance'}
-# yamllint enable rule:line-length
+# default-debian-11-3003-1-py3: {extends: '.test_instance'}
+# default-debian-10-3003-1-py3: {extends: '.test_instance'}
+# default-debian-9-3003-1-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3003-1-py3: {extends: '.test_instance'}
+# default-centos-8-3003-1-py3: {extends: '.test_instance'}
+# default-centos-7-3003-1-py3: {extends: '.test_instance'}
+# default-fedora-34-3003-1-py3: {extends: '.test_instance'}
+# default-fedora-33-3003-1-py3: {extends: '.test_instance'}
+# default-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3003-1-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3003-1-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3003-1-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3003-1-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'}
+# default-debian-11-3002-6-py3: {extends: '.test_instance'}
+# default-debian-10-3002-6-py3: {extends: '.test_instance'}
+# default-debian-9-3002-6-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3002-6-py3: {extends: '.test_instance'}
+# default-centos-8-3002-6-py3: {extends: '.test_instance'}
+# default-centos-7-3002-6-py3: {extends: '.test_instance'}
+# default-fedora-34-3002-6-py3: {extends: '.test_instance'}
+# default-fedora-33-3002-6-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3002-6-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3002-6-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-3002-6-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-3002-6-py3: {extends: '.test_instance'}
+# default-opensuse-leap-153-3002-2-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
+# default-debian-10-3001-7-py3: {extends: '.test_instance'}
+# default-debian-9-3001-7-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3001-7-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3001-7-py3: {extends: '.test_instance'}
+# default-centos-8-3001-7-py3: {extends: '.test_instance'}
+# default-centos-7-3001-7-py3: {extends: '.test_instance'}
+# default-fedora-34-3001-7-py3: {extends: '.test_instance'}
+# default-fedora-33-3001-7-py3: {extends: '.test_instance'}
+# default-opensuse-leap-153-3001-7-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3001-7-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3001-7-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3001-7-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-3001-7-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-3001-7-py3: {extends: '.test_instance'}
+# default-debian-10-3000-9-py3: {extends: '.test_instance'}
+# default-debian-9-3000-9-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
+# default-centos-8-3000-9-py3: {extends: '.test_instance'}
+# default-centos-7-3000-9-py3: {extends: '.test_instance'}
+# default-opensuse-leap-153-3000-9-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3000-9-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3000-9-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-3000-9-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-3000-9-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
+# default-arch-base-latest-3000-9-py2: {extends: '.test_instance'}

 ###############################################################################
 # `release` stage: `semantic-release`
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -3,18 +3,6 @@
 ---
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
-ci:
-  autofix_commit_msg: |
-    ci(pre-commit.ci): apply auto fixes from pre-commit.com hooks
-
-    For more information, see https://pre-commit.ci
-  autofix_prs: true
-  autoupdate_branch: ''
-  autoupdate_commit_msg: |
-    ci(pre-commit.ci): perform `pre-commit` autoupdate
-  autoupdate_schedule: quarterly
-  skip: []
-  submodules: false
 default_stages: [commit]
 repos:
  - repo: https://github.com/dafyddj/commitlint-pre-commit-hook
@ -30,7 +18,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.9.1
    hooks:
      - id: rubocop
        name: Check Ruby files with rubocop
@ -38,14 +26,14 @@ repos:
        always_run: true
        pass_filenames: false
  - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.8.0.4
+    rev: v0.7.1.1
    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.23.0
    hooks:
      - id: yamllint
        name: Check YAML syntax with yamllint
@ -53,7 +41,7 @@ repos:
        always_run: true
        pass_filenames: false
  - repo: https://github.com/warpnet/salt-lint
-    rev: v0.8.0
+    rev: v0.3.0
    hooks:
      - id: salt-lint
        name: Check Salt files using salt-lint
--- a/.rubocop.yml
+++ b/.rubocop.yml
@ -16,8 +16,4 @@ Security/YAMLLoad:
  Exclude:
    - test/integration/**/_mapdata.rb

-# General settings across all cops in this formula
-AllCops:
-  NewCops: enable
-
 # Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config`
--- a/.travis.yml
+++ b/.travis.yml
@ -86,10 +86,9 @@ jobs:
    # - env: INSTANCE=default-debian-11-tiamat-py3
    # - env: INSTANCE=default-debian-10-tiamat-py3
    # - env: INSTANCE=default-debian-9-tiamat-py3
-    # - env: INSTANCE=default-ubuntu-2204-tiamat-py3
    # - env: INSTANCE=default-ubuntu-2004-tiamat-py3
    # - env: INSTANCE=default-ubuntu-1804-tiamat-py3
-    # - env: INSTANCE=default-centos-stream8-tiamat-py3
+    # - env: INSTANCE=default-centos-8-tiamat-py3
    # - env: INSTANCE=default-centos-7-tiamat-py3
    # - env: INSTANCE=default-amazonlinux-2-tiamat-py3
    # - env: INSTANCE=default-oraclelinux-8-tiamat-py3
@ -105,30 +104,30 @@ jobs:
    # - env: INSTANCE=default-debian-9-master-py3
    # - env: INSTANCE=repo-debian-9-master-py3
    - env: INSTANCE=debian-9-master-py3
-    # - env: INSTANCE=default-ubuntu-2204-master-py3
-    # - env: INSTANCE=repo-ubuntu-2204-master-py3
-    - env: INSTANCE=ubuntu-2204-master-py3
    # - env: INSTANCE=default-ubuntu-2004-master-py3
    # - env: INSTANCE=repo-ubuntu-2004-master-py3
    - env: INSTANCE=ubuntu-2004-master-py3
    # - env: INSTANCE=default-ubuntu-1804-master-py3
    # - env: INSTANCE=repo-ubuntu-1804-master-py3
    - env: INSTANCE=ubuntu-1804-master-py3
-    # - env: INSTANCE=default-centos-stream8-master-py3
-    # - env: INSTANCE=repo-centos-stream8-master-py3
-    - env: INSTANCE=centos-stream8-master-py3
+    # - env: INSTANCE=default-centos-8-master-py3
+    # - env: INSTANCE=repo-centos-8-master-py3
+    - env: INSTANCE=centos-8-master-py3
    # - env: INSTANCE=default-centos-7-master-py3
    # - env: INSTANCE=repo-centos-7-master-py3
    - env: INSTANCE=centos-7-master-py3
-    - env: INSTANCE=default-fedora-36-master-py3
-    # - env: INSTANCE=repo-fedora-36-master-py3
-    # - env: INSTANCE=fedora-36-master-py3
-    - env: INSTANCE=default-fedora-35-master-py3
-    # - env: INSTANCE=repo-fedora-35-master-py3
-    # - env: INSTANCE=fedora-35-master-py3
+    - env: INSTANCE=default-fedora-34-master-py3
+    # - env: INSTANCE=repo-fedora-34-master-py3
+    # - env: INSTANCE=fedora-34-master-py3
+    - env: INSTANCE=default-fedora-33-master-py3
+    # - env: INSTANCE=repo-fedora-33-master-py3
+    # - env: INSTANCE=fedora-33-master-py3
    - env: INSTANCE=default-opensuse-leap-153-master-py3
    # - env: INSTANCE=repo-opensuse-leap-153-master-py3
    # - env: INSTANCE=opensuse-leap-153-master-py3
+    - env: INSTANCE=default-opensuse-leap-152-master-py3
+    # - env: INSTANCE=repo-opensuse-leap-152-master-py3
+    # - env: INSTANCE=opensuse-leap-152-master-py3
    - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
    # - env: INSTANCE=repo-opensuse-tmbl-latest-master-py3
    # - env: INSTANCE=opensuse-tmbl-latest-master-py3
@ -156,36 +155,73 @@ jobs:
    # - env: INSTANCE=default-rockylinux-8-master-py3
    # - env: INSTANCE=repo-rockylinux-8-master-py3
    - env: INSTANCE=rockylinux-8-master-py3
-    # - env: INSTANCE=default-debian-11-3004-1-py3
-    # - env: INSTANCE=default-debian-10-3004-1-py3
-    # - env: INSTANCE=default-debian-9-3004-1-py3
-    # - env: INSTANCE=default-ubuntu-2204-3004-1-py3
-    # - env: INSTANCE=default-ubuntu-2004-3004-1-py3
-    # - env: INSTANCE=default-ubuntu-1804-3004-1-py3
-    # - env: INSTANCE=default-centos-stream8-3004-1-py3
-    # - env: INSTANCE=default-centos-7-3004-1-py3
-    # - env: INSTANCE=default-fedora-36-3004-1-py3
-    # - env: INSTANCE=default-fedora-35-3004-1-py3
-    # - env: INSTANCE=default-amazonlinux-2-3004-1-py3
-    # - env: INSTANCE=default-oraclelinux-8-3004-1-py3
-    # - env: INSTANCE=default-oraclelinux-7-3004-1-py3
-    # - env: INSTANCE=default-arch-base-latest-3004-1-py3
-    # - env: INSTANCE=default-gentoo-stage3-latest-3004-1-py3
-    # - env: INSTANCE=default-gentoo-stage3-systemd-3004-1-py3
-    # - env: INSTANCE=default-almalinux-8-3004-1-py3
-    # - env: INSTANCE=default-rockylinux-8-3004-1-py3
-    # - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
-    # - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
-    # - env: INSTANCE=default-debian-10-3003-4-py3
-    # - env: INSTANCE=default-debian-9-3003-4-py3
-    # - env: INSTANCE=default-ubuntu-2004-3003-4-py3
-    # - env: INSTANCE=default-ubuntu-1804-3003-4-py3
-    # - env: INSTANCE=default-centos-stream8-3003-4-py3
-    # - env: INSTANCE=default-centos-7-3003-4-py3
-    # - env: INSTANCE=default-amazonlinux-2-3003-4-py3
-    # - env: INSTANCE=default-oraclelinux-8-3003-4-py3
-    # - env: INSTANCE=default-oraclelinux-7-3003-4-py3
-    # - env: INSTANCE=default-almalinux-8-3003-4-py3
+    # - env: INSTANCE=default-debian-11-3003-1-py3
+    # - env: INSTANCE=default-debian-10-3003-1-py3
+    # - env: INSTANCE=default-debian-9-3003-1-py3
+    # - env: INSTANCE=default-ubuntu-2004-3003-1-py3
+    # - env: INSTANCE=default-ubuntu-1804-3003-1-py3
+    # - env: INSTANCE=default-centos-8-3003-1-py3
+    # - env: INSTANCE=default-centos-7-3003-1-py3
+    # - env: INSTANCE=default-fedora-34-3003-1-py3
+    # - env: INSTANCE=default-fedora-33-3003-1-py3
+    # - env: INSTANCE=default-opensuse-leap-153-3003-1-py3
+    # - env: INSTANCE=default-opensuse-leap-152-3003-1-py3
+    # - env: INSTANCE=default-opensuse-tmbl-latest-3003-1-py3
+    # - env: INSTANCE=default-amazonlinux-2-3003-1-py3
+    # - env: INSTANCE=default-oraclelinux-8-3003-1-py3
+    # - env: INSTANCE=default-oraclelinux-7-3003-1-py3
+    # - env: INSTANCE=default-arch-base-latest-3003-1-py3
+    # - env: INSTANCE=default-gentoo-stage3-latest-3003-1-py3
+    # - env: INSTANCE=default-gentoo-stage3-systemd-3003-1-py3
+    # - env: INSTANCE=default-debian-11-3002-6-py3
+    # - env: INSTANCE=default-debian-10-3002-6-py3
+    # - env: INSTANCE=default-debian-9-3002-6-py3
+    # - env: INSTANCE=default-ubuntu-2004-3002-6-py3
+    # - env: INSTANCE=default-ubuntu-1804-3002-6-py3
+    # - env: INSTANCE=default-centos-8-3002-6-py3
+    # - env: INSTANCE=default-centos-7-3002-6-py3
+    # - env: INSTANCE=default-fedora-34-3002-6-py3
+    # - env: INSTANCE=default-fedora-33-3002-6-py3
+    # - env: INSTANCE=default-amazonlinux-2-3002-6-py3
+    # - env: INSTANCE=default-oraclelinux-8-3002-6-py3
+    # - env: INSTANCE=default-oraclelinux-7-3002-6-py3
+    # - env: INSTANCE=default-arch-base-latest-3002-6-py3
+    # - env: INSTANCE=default-gentoo-stage3-latest-3002-6-py3
+    # - env: INSTANCE=default-gentoo-stage3-systemd-3002-6-py3
+    # - env: INSTANCE=default-opensuse-leap-153-3002-2-py3
+    # - env: INSTANCE=default-opensuse-leap-152-3002-2-py3
+    # - env: INSTANCE=default-opensuse-tmbl-latest-3002-2-py3
+    # - env: INSTANCE=default-debian-10-3001-7-py3
+    # - env: INSTANCE=default-debian-9-3001-7-py3
+    # - env: INSTANCE=default-ubuntu-2004-3001-7-py3
+    # - env: INSTANCE=default-ubuntu-1804-3001-7-py3
+    # - env: INSTANCE=default-centos-8-3001-7-py3
+    # - env: INSTANCE=default-centos-7-3001-7-py3
+    # - env: INSTANCE=default-fedora-34-3001-7-py3
+    # - env: INSTANCE=default-fedora-33-3001-7-py3
+    # - env: INSTANCE=default-opensuse-leap-153-3001-7-py3
+    # - env: INSTANCE=default-opensuse-leap-152-3001-7-py3
+    # - env: INSTANCE=default-opensuse-tmbl-latest-3001-7-py3
+    # - env: INSTANCE=default-amazonlinux-2-3001-7-py3
+    # - env: INSTANCE=default-oraclelinux-8-3001-7-py3
+    # - env: INSTANCE=default-oraclelinux-7-3001-7-py3
+    # - env: INSTANCE=default-arch-base-latest-3001-7-py3
+    # - env: INSTANCE=default-gentoo-stage3-latest-3001-7-py3
+    # - env: INSTANCE=default-gentoo-stage3-systemd-3001-7-py3
+    # - env: INSTANCE=default-debian-10-3000-9-py3
+    # - env: INSTANCE=default-debian-9-3000-9-py3
+    # - env: INSTANCE=default-ubuntu-1804-3000-9-py3
+    # - env: INSTANCE=default-centos-8-3000-9-py3
+    # - env: INSTANCE=default-centos-7-3000-9-py3
+    # - env: INSTANCE=default-opensuse-leap-153-3000-9-py3
+    # - env: INSTANCE=default-opensuse-leap-152-3000-9-py3
+    # - env: INSTANCE=default-amazonlinux-2-3000-9-py3
+    # - env: INSTANCE=default-oraclelinux-8-3000-9-py3
+    # - env: INSTANCE=default-oraclelinux-7-3000-9-py3
+    # - env: INSTANCE=default-gentoo-stage3-latest-3000-9-py3
+    # - env: INSTANCE=default-gentoo-stage3-systemd-3000-9-py3
+    # - env: INSTANCE=default-ubuntu-1804-3000-9-py2
+    # - env: INSTANCE=default-arch-base-latest-3000-9-py2

    ## Define the release stage that runs `semantic-release`
    - stage: 'release'
--- a/AUTHORS.md
+++ b/AUTHORS.md
@ -4,19 +4,18 @@ This list is sorted by the number of commits per contributor in _descending_ ord

 Avatar|Contributor|Contributions
 :-:|---|:-:
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|151
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|57
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|100
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|53
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>|[@alxwr](https://github.com/alxwr)|17
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|15
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|13
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3433835?v=4' width='36' height='36' alt='@n-rodriguez'>|[@n-rodriguez](https://github.com/n-rodriguez)|11
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/36701846?v=4' width='36' height='36' alt='@lagooj'>|[@lagooj](https://github.com/lagooj)|9
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/83996323?v=4' width='36' height='36' alt='@mdschmitt'>|[@mdschmitt](https://github.com/mdschmitt)|8
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|6
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/83996323?v=4' width='36' height='36' alt='@mdschmitt'>|[@mdschmitt](https://github.com/mdschmitt)|4
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4195158?v=4' width='36' height='36' alt='@dafyddj'>|[@dafyddj](https://github.com/dafyddj)|3
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/6086064?v=4' width='36' height='36' alt='@mgomersbach'>|[@mgomersbach](https://github.com/mgomersbach)|2
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1233212?v=4' width='36' height='36' alt='@baby-gnu'>|[@baby-gnu](https://github.com/baby-gnu)|2
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/38883924?v=4' width='36' height='36' alt='@Ahummeling'>|[@Ahummeling](https://github.com/Ahummeling)|1

 ---

-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2022-07-11.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-08-06.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,74 +1,5 @@
 # Changelog

-## [5.6.5](https://github.com/saltstack-formulas/prometheus-formula/compare/v5.6.4...v5.6.5) (2022-07-11)
-
-
-### Bug Fixes
-
-* **storage/install:** correct "owner" param to "user" ([8294f4f](https://github.com/saltstack-formulas/prometheus-formula/commit/8294f4fd30d696e0ed52954608cea2a3938603e6))
-
-
-### Continuous Integration
-
-* update `pre-commit` configuration inc. for pre-commit.ci [skip ci] ([7e63074](https://github.com/saltstack-formulas/prometheus-formula/commit/7e6307429582ede529f5d0a0947836d192113754))
-* **kitchen+gitlab:** update for new pre-salted images [skip ci] ([f870697](https://github.com/saltstack-formulas/prometheus-formula/commit/f8706975574416d3783c5089dc11698bf9c1ef0c))
-
-
-### Tests
-
-* **system.rb:** add support for `mac_os_x` [skip ci] ([5c7c22e](https://github.com/saltstack-formulas/prometheus-formula/commit/5c7c22e4380b6bcf7fe10540873f69dd62d4ffd3))
-
-## [5.6.4](https://github.com/saltstack-formulas/prometheus-formula/compare/v5.6.3...v5.6.4) (2022-02-26)
-
-
-### Bug Fixes
-
-* **pkgrepo:** remove gpgkey2 file.replace for idempotency ([e96c953](https://github.com/saltstack-formulas/prometheus-formula/commit/e96c9531f90148a703f0df1262149bb4b1c08caa))
-
-
-### Continuous Integration
-
-* update linters to latest versions [skip ci] ([7d5df46](https://github.com/saltstack-formulas/prometheus-formula/commit/7d5df46905c24d7695a4a1a7c8a5716102e5423d))
-
-
-### Tests
-
-* **system:** add `build_platform_codename` [skip ci] ([2396a13](https://github.com/saltstack-formulas/prometheus-formula/commit/2396a135b3aa5f2a288c018ac06e630443bb3dab))
-
-## [5.6.3](https://github.com/saltstack-formulas/prometheus-formula/compare/v5.6.2...v5.6.3) (2022-02-06)
-
-
-### Bug Fixes
-
-* **archive:** make sure special commandline flags are accepted ([9529d5f](https://github.com/saltstack-formulas/prometheus-formula/commit/9529d5fcfe3bea44aa683bb3312fcb0eff41e192))
-
-
-### Continuous Integration
-
-* **gemfile:** allow rubygems proxy to be provided as an env var [skip ci] ([d1b7d8c](https://github.com/saltstack-formulas/prometheus-formula/commit/d1b7d8c2de74eed0d257a466aa78dc3f5da09af4))
-* **kitchen+gitlab:** update for new pre-salted images [skip ci] ([5d39408](https://github.com/saltstack-formulas/prometheus-formula/commit/5d39408744dadcc331d1041e7bcb894bdfc35206))
-
-## [5.6.2](https://github.com/saltstack-formulas/prometheus-formula/compare/v5.6.1...v5.6.2) (2021-12-13)
-
-
-### Bug Fixes
-
-* **groups:** groups should always be created as system groups ([711ebf7](https://github.com/saltstack-formulas/prometheus-formula/commit/711ebf7c1b153096dab3031bc9ea46d162d83bbf))
-
-## [5.6.1](https://github.com/saltstack-formulas/prometheus-formula/compare/v5.6.0...v5.6.1) (2021-12-09)
-
-
-### Bug Fixes
-
-* **users:** users should always be created as system users ([ee20f82](https://github.com/saltstack-formulas/prometheus-formula/commit/ee20f821d663ea1b2b1da444e3b4e01a08349eb1))
-
-
-### Continuous Integration
-
-* **kitchen+ci:** update with `3004` pre-salted images/boxes [skip ci] ([4628d74](https://github.com/saltstack-formulas/prometheus-formula/commit/4628d741b82cc4a732bcbf6f4460cbf241bb50bb))
-* **kitchen+ci:** update with latest `3003.2` pre-salted images [skip ci] ([cfb0949](https://github.com/saltstack-formulas/prometheus-formula/commit/cfb0949e82f769152b4dbbd64cf5ee5ef575d253))
-* **kitchen+ci:** update with latest CVE pre-salted images [skip ci] ([9fda233](https://github.com/saltstack-formulas/prometheus-formula/commit/9fda2330ab4b72978ec9064091bc43e54020049b))
-
 # [5.6.0](https://github.com/saltstack-formulas/prometheus-formula/compare/v5.5.2...v5.6.0) (2021-08-06)


--- a/1
+++ b/1
@ -22,7 +22,6 @@
 /test/integration/**/libraries/system.rb    @saltstack-formulas/ssf
 /test/integration/**/inspec.yml             @saltstack-formulas/ssf
 /test/integration/**/README.md              @saltstack-formulas/ssf
-/test/salt/pillar/top.sls                   @saltstack-formulas/ssf
 /.gitignore                                 @saltstack-formulas/ssf
 /.cirrus.yml                                @saltstack-formulas/ssf
 /.gitlab-ci.yml                             @saltstack-formulas/ssf
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 name: prometheus
 os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Amazon, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS
 os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS
-version: 5.6.5
+version: 5.6.0
 release: 1
 minimum_version: 2019.2
 summary: prometheus formula
--- a/4
+++ b/4
@ -1,6 +1,6 @@
 # frozen_string_literal: true

-source ENV.fetch('PROXY_RUBYGEMSORG', 'https://rubygems.org')
+source 'https://rubygems.org'

 # Install the `inspec` gem using `git` because versions after `4.22.22`
 # suppress diff output; this version fixes this for our uses.
@ -16,4 +16,4 @@ gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure
 # rubocop:enable Layout/LineLength

 gem 'kitchen-inspec', '>= 2.5.0'
-gem 'kitchen-salt', '>= 0.7.2'
+gem 'kitchen-salt', '>= 0.6.3'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -1,20 +1,17 @@
 GIT
  remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
-  revision: aaef842906a5666f0fc0b4f186b4dd3498f5b28c
+  revision: 1dfd086de2d2ba87fd755b0c9063b43ab682519d
  branch: ssf
  specs:
-    inspec (5.18.15)
-      cookstyle
+    inspec (4.41.0)
      faraday_middleware (>= 0.12.2, < 1.1)
-      inspec-core (= 5.18.15)
-      mongo (= 2.13.2)
-      progress_bar (~> 1.3.3)
-      rake
-      train (~> 3.10)
-      train-aws (~> 0.2)
+      inspec-core (= 4.41.0)
+      mongo
+      train (~> 3.0)
+      train-aws (~> 0.1)
      train-habitat (~> 0.1)
      train-winrm (~> 0.2)
-    inspec-core (5.18.15)
+    inspec-core (4.41.0)
      addressable (~> 2.4)
      chef-telemetry (~> 1.0, >= 1.0.8)
      faraday (>= 0.9.0, < 1.5)
@ -27,268 +24,234 @@ GIT
      parallel (~> 1.9)
      parslet (>= 1.5, < 2.0)
      pry (~> 0.13)
-      rspec (>= 3.9, <= 3.11)
+      rspec (>= 3.9, < 3.11)
      rspec-its (~> 1.2)
      rubyzip (>= 1.2.2, < 3.0)
      semverse (~> 3.0)
      sslshake (~> 1.2)
      thor (>= 0.20, < 2.0)
      tomlrb (>= 1.2, < 2.1)
-      train-core (~> 3.10)
+      train-core (~> 3.0)
      tty-prompt (~> 0.17)
      tty-table (~> 0.10)

 GIT
  remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
-  revision: 9a09bc1e571e25f3ccabf4725ca2048d970fff82
+  revision: 428c89fc250b3790abad5ecb0afe0c3d4956084c
  branch: ssf
  specs:
-    kitchen-docker (2.12.0)
+    kitchen-docker (2.11.0)
      test-kitchen (>= 1.0.0)

 GEM
  remote: https://rubygems.org/
  specs:
-    activesupport (7.0.3.1)
+    activesupport (6.1.4)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 1.6, < 2)
      minitest (>= 5.1)
      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
    addressable (2.8.0)
      public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.2)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.607.0)
-    aws-sdk-alexaforbusiness (1.56.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-eventstream (1.1.1)
+    aws-partitions (1.482.0)
+    aws-sdk-apigateway (1.64.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-amplify (1.32.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-apigateway (1.78.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-apigatewayv2 (1.42.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-apigatewayv2 (1.34.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-applicationautoscaling (1.51.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-athena (1.55.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-athena (1.39.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-autoscaling (1.63.0)
+    aws-sdk-autoscaling (1.61.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-batch (1.47.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-budgets (1.50.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-budgets (1.40.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudformation (1.70.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-cloudformation (1.55.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudfront (1.65.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-cloudfront (1.55.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudhsm (1.39.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-cloudhsm (1.32.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudhsmv2 (1.42.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-cloudhsmv2 (1.35.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudtrail (1.49.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-cloudtrail (1.37.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.64.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-cloudwatch (1.54.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-cloudwatchevents (1.46.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatchlogs (1.53.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-cloudwatchlogs (1.43.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-codecommit (1.51.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-codecommit (1.44.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-codedeploy (1.49.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-codedeploy (1.42.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-codepipeline (1.53.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-codepipeline (1.46.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-cognitoidentity (1.31.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cognitoidentityprovider (1.53.0)
+    aws-sdk-cognitoidentityprovider (1.51.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-configservice (1.79.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-configservice (1.64.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.131.2)
+    aws-sdk-core (3.119.0)
      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
+      aws-partitions (~> 1, >= 1.239.0)
      aws-sigv4 (~> 1.1)
-      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-costandusagereportservice (1.40.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+      jmespath (~> 1.0)
+    aws-sdk-costandusagereportservice (1.33.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-databasemigrationservice (1.53.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-dynamodb (1.75.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-dynamodb (1.62.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ec2 (1.322.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-ec2 (1.254.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ecr (1.56.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-ecr (1.44.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ecrpublic (1.12.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-ecrpublic (1.5.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ecs (1.100.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-ecs (1.83.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-efs (1.54.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-efs (1.42.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-eks (1.75.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-eks (1.60.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.78.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-elasticache (1.59.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticbeanstalk (1.51.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-elasticbeanstalk (1.44.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticloadbalancing (1.40.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-elasticloadbalancing (1.33.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticloadbalancingv2 (1.78.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-elasticloadbalancingv2 (1.66.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticsearchservice (1.65.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-emr (1.53.0)
-      aws-sdk-core (~> 3, >= 3.121.2)
+    aws-sdk-elasticsearchservice (1.54.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-eventbridge (1.24.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-firehose (1.48.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-firehose (1.39.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-glue (1.88.0)
+    aws-sdk-glue (1.87.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-guardduty (1.58.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-guardduty (1.47.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-iam (1.69.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-iam (1.59.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-kafka (1.50.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-kafka (1.38.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-kinesis (1.41.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-kinesis (1.34.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.57.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-kms (1.46.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-lambda (1.84.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-mq (1.40.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-networkfirewall (1.17.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-networkmanager (1.24.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-lambda (1.66.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-organizations (1.59.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ram (1.26.0)
+    aws-sdk-ram (1.25.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.148.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-rds (1.124.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-redshift (1.84.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-redshift (1.68.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.63.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-route53 (1.52.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-route53domains (1.40.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-route53domains (1.32.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-route53resolver (1.37.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-route53resolver (1.28.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.114.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-s3 (1.98.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sdk-s3control (1.43.0)
-      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-secretsmanager (1.46.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-securityhub (1.67.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-securityhub (1.50.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-servicecatalog (1.60.0)
+    aws-sdk-servicecatalog (1.59.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ses (1.41.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-ses (1.40.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-shield (1.48.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-shield (1.40.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-signer (1.32.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-sms (1.31.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-simpledb (1.29.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
-      aws-sigv2 (~> 1.0)
-    aws-sdk-sms (1.40.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-sns (1.44.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.53.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-sqs (1.42.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-sqs (1.51.1)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.137.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-ssm (1.114.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-states (1.39.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-synthetics (1.19.0)
-      aws-sdk-core (~> 3, >= 3.121.2)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-transfer (1.34.0)
+    aws-sdk-transfer (1.32.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-waf (1.43.0)
-      aws-sdk-core (~> 3, >= 3.122.0)
-      aws-sigv4 (~> 1.1)
-    aws-sigv2 (1.1.0)
-    aws-sigv4 (1.5.0)
+    aws-sigv4 (1.2.4)
      aws-eventstream (~> 1, >= 1.0.2)
    azure_graph_rbac (0.17.2)
      ms_rest_azure (~> 0.12.0)
@ -301,11 +264,11 @@ GEM
    azure_mgmt_storage (0.23.0)
      ms_rest_azure (~> 0.12.0)
    bcrypt_pbkdf (1.1.0)
-    bson (4.15.0)
+    bson (4.12.1)
    builder (3.2.4)
-    chef-config (17.10.0)
+    chef-config (17.3.48)
      addressable
-      chef-utils (= 17.10.0)
+      chef-utils (= 17.3.48)
      fuzzyurl
      mixlib-config (>= 2.2.12, < 4.0)
      mixlib-shellout (>= 2.0, < 4.0)
@ -313,22 +276,20 @@ GEM
    chef-telemetry (1.1.1)
      chef-config
      concurrent-ruby (~> 1.0)
-    chef-utils (17.10.0)
+    chef-utils (17.3.48)
      concurrent-ruby
    coderay (1.1.3)
-    concurrent-ruby (1.1.10)
-    cookstyle (7.32.1)
-      rubocop (= 1.25.1)
+    concurrent-ruby (1.1.9)
    declarative (0.0.20)
-    diff-lcs (1.5.0)
+    diff-lcs (1.4.4)
    docker-api (2.2.0)
      excon (>= 0.47.0)
      multi_json
    domain_name (0.5.20190701)
      unf (>= 0.0.5, < 1.0.0)
-    ed25519 (1.3.0)
+    ed25519 (1.2.4)
    erubi (1.10.0)
-    excon (0.92.3)
+    excon (0.85.0)
    faraday (1.4.3)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
@ -347,7 +308,7 @@ GEM
    faraday-net_http_persistent (1.2.0)
    faraday_middleware (1.0.0)
      faraday (~> 1.0)
-    ffi (1.15.5)
+    ffi (1.15.3)
    fuzzyurl (0.9.0)
    google-api-client (0.52.0)
      addressable (~> 2.5, >= 2.5.1)
@ -367,25 +328,23 @@ GEM
      signet (~> 0.14)
    gssapi (1.3.1)
      ffi (>= 1.0.1)
-    gyoku (1.4.0)
+    gyoku (1.3.1)
      builder (>= 2.1.2)
-      rexml (~> 3.0)
    hashie (4.1.0)
-    highline (2.0.3)
-    http-cookie (1.0.5)
+    http-cookie (1.0.4)
      domain_name (~> 0.5)
    httpclient (2.8.3)
-    i18n (1.12.0)
+    i18n (1.8.10)
      concurrent-ruby (~> 1.0)
    inifile (3.0.0)
-    jmespath (1.6.1)
-    json (2.6.2)
-    jwt (2.4.1)
-    kitchen-inspec (2.6.1)
+    jmespath (1.4.0)
+    json (2.5.1)
+    jwt (2.2.3)
+    kitchen-inspec (2.5.0)
      hashie (>= 3.4, <= 5.0)
-      inspec (>= 2.2.64, < 7.0)
+      inspec (>= 2.2.64, < 5.0)
      test-kitchen (>= 2.7, < 4)
-    kitchen-salt (0.7.2)
+    kitchen-salt (0.6.3)
      hashie (>= 3.5)
      test-kitchen (>= 1.4)
    license-acceptance (2.1.13)
@ -394,24 +353,24 @@ GEM
      tty-box (~> 0.6)
      tty-prompt (~> 0.20)
    little-plugger (1.1.4)
-    logging (2.3.1)
+    logging (2.3.0)
      little-plugger (~> 1.1)
      multi_json (~> 1.14)
    memoist (0.16.2)
    method_source (1.0.0)
-    mini_mime (1.1.2)
-    minitest (5.16.2)
-    mixlib-config (3.0.27)
+    mini_mime (1.1.0)
+    minitest (5.14.4)
+    mixlib-config (3.0.9)
      tomlrb
-    mixlib-install (3.12.19)
+    mixlib-install (3.12.11)
      mixlib-shellout
      mixlib-versioning
      thor
    mixlib-log (3.0.9)
-    mixlib-shellout (3.2.7)
+    mixlib-shellout (3.2.5)
      chef-utils
    mixlib-versioning (1.2.12)
-    mongo (2.13.2)
+    mongo (2.15.0)
      bson (>= 4.8.2, < 5.0.0)
    ms_rest (0.7.6)
      concurrent-ruby (~> 1.0)
@ -423,72 +382,51 @@ GEM
      faraday-cookie_jar (~> 0.0.6)
      ms_rest (~> 0.7.6)
    multi_json (1.15.0)
-    multipart-post (2.2.3)
+    multipart-post (2.1.1)
    net-scp (3.0.0)
      net-ssh (>= 2.6.5, < 7.0.0)
    net-ssh (6.1.0)
    net-ssh-gateway (2.0.0)
      net-ssh (>= 4.0.0)
    nori (2.6.0)
-    options (2.3.2)
-    os (1.1.4)
-    parallel (1.22.1)
-    parser (3.1.2.0)
-      ast (~> 2.4.1)
+    os (1.1.1)
+    parallel (1.20.1)
    parslet (1.8.2)
    pastel (0.8.0)
      tty-color (~> 0.5)
-    progress_bar (1.3.3)
-      highline (>= 1.6, < 3)
-      options (~> 2.3.0)
    pry (0.14.1)
      coderay (~> 1.1)
      method_source (~> 1.0)
-    public_suffix (4.0.7)
-    rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.5.0)
-    representable (3.2.0)
+    public_suffix (4.0.6)
+    representable (3.1.1)
      declarative (< 0.1.0)
      trailblazer-option (>= 0.1.1, < 0.2.0)
      uber (< 0.2.0)
    retriable (3.1.2)
    rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
+      rspec-support (~> 3.10.0)
    rspec-its (1.3.0)
      rspec-core (>= 3.0.0)
      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.11.1)
+    rspec-mocks (3.10.2)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.25.1)
-      parallel (~> 1.10)
-      parser (>= 3.1.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.19.1)
-      parser (>= 3.1.1.0)
-    ruby-progressbar (1.11.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
    ruby2_keywords (0.0.5)
    rubyntlm (0.6.3)
    rubyzip (2.3.2)
-    semverse (3.0.2)
-    signet (0.17.0)
-      addressable (~> 2.8)
-      faraday (>= 0.17.5, < 3.a)
+    semverse (3.0.0)
+    signet (0.15.0)
+      addressable (~> 2.3)
+      faraday (>= 0.17.3, < 2.0)
      jwt (>= 1.5, < 3.0)
      multi_json (~> 1.10)
    sslshake (1.3.1)
@ -497,7 +435,7 @@ GEM
      unicode-display_width (>= 1.5, < 3.0)
      unicode_utils (~> 1.4)
    strings-ansi (0.2.0)
-    test-kitchen (3.3.1)
+    test-kitchen (3.0.0)
      bcrypt_pbkdf (~> 1.0)
      chef-utils (>= 16.4.35)
      ed25519 (~> 1.2)
@ -511,11 +449,11 @@ GEM
      winrm (~> 2.0)
      winrm-elevated (~> 1.0)
      winrm-fs (~> 1.1)
-    thor (1.2.1)
+    thor (1.1.0)
    timeliness (0.3.10)
    tomlrb (1.3.0)
-    trailblazer-option (0.1.2)
-    train (3.10.1)
+    trailblazer-option (0.1.1)
+    train (3.8.1)
      activesupport (>= 6.0.3.1)
      azure_graph_rbac (~> 0.16)
      azure_mgmt_key_vault (~> 0.17)
@ -526,16 +464,14 @@ GEM
      google-api-client (>= 0.23.9, <= 0.52.0)
      googleauth (>= 0.6.6, <= 0.14.0)
      inifile (~> 3.0)
-      train-core (= 3.10.1)
+      train-core (= 3.8.1)
      train-winrm (~> 0.2)
-    train-aws (0.2.24)
-      aws-sdk-alexaforbusiness (~> 1.0)
-      aws-sdk-amplify (~> 1.32.0)
+    train-aws (0.2.8)
      aws-sdk-apigateway (~> 1.0)
      aws-sdk-apigatewayv2 (~> 1.0)
      aws-sdk-applicationautoscaling (>= 1.46, < 1.52)
      aws-sdk-athena (~> 1.0)
-      aws-sdk-autoscaling (>= 1.22, < 1.64)
+      aws-sdk-autoscaling (>= 1.22, < 1.62)
      aws-sdk-batch (>= 1.36, < 1.48)
      aws-sdk-budgets (~> 1.0)
      aws-sdk-cloudformation (~> 1.0)
@ -550,7 +486,7 @@ GEM
      aws-sdk-codedeploy (~> 1.0)
      aws-sdk-codepipeline (~> 1.0)
      aws-sdk-cognitoidentity (>= 1.26, < 1.32)
-      aws-sdk-cognitoidentityprovider (>= 1.46, < 1.54)
+      aws-sdk-cognitoidentityprovider (>= 1.46, < 1.52)
      aws-sdk-configservice (~> 1.21)
      aws-sdk-core (~> 3.0)
      aws-sdk-costandusagereportservice (~> 1.6)
@ -567,44 +503,35 @@ GEM
      aws-sdk-elasticloadbalancing (~> 1.8)
      aws-sdk-elasticloadbalancingv2 (~> 1.0)
      aws-sdk-elasticsearchservice (~> 1.0)
-      aws-sdk-emr (~> 1.53.0)
      aws-sdk-eventbridge (~> 1.24.0)
      aws-sdk-firehose (~> 1.0)
-      aws-sdk-glue (>= 1.71, < 1.89)
+      aws-sdk-glue (>= 1.71, < 1.88)
      aws-sdk-guardduty (~> 1.31)
      aws-sdk-iam (~> 1.13)
      aws-sdk-kafka (~> 1.0)
      aws-sdk-kinesis (~> 1.0)
      aws-sdk-kms (~> 1.13)
      aws-sdk-lambda (~> 1.0)
-      aws-sdk-mq (~> 1.40.0)
-      aws-sdk-networkfirewall (>= 1.6.0)
-      aws-sdk-networkmanager (>= 1.13.0)
      aws-sdk-organizations (>= 1.17, < 1.60)
-      aws-sdk-ram (>= 1.21, < 1.27)
+      aws-sdk-ram (>= 1.21, < 1.26)
      aws-sdk-rds (~> 1.43)
      aws-sdk-redshift (~> 1.0)
      aws-sdk-route53 (~> 1.0)
      aws-sdk-route53domains (~> 1.0)
      aws-sdk-route53resolver (~> 1.0)
      aws-sdk-s3 (~> 1.30)
-      aws-sdk-s3control (~> 1.43.0)
      aws-sdk-secretsmanager (>= 1.42, < 1.47)
      aws-sdk-securityhub (~> 1.0)
-      aws-sdk-servicecatalog (>= 1.48, < 1.61)
-      aws-sdk-ses (~> 1.41.0)
+      aws-sdk-servicecatalog (>= 1.48, < 1.60)
+      aws-sdk-ses (~> 1.0)
      aws-sdk-shield (~> 1.30)
-      aws-sdk-signer (~> 1.32.0)
-      aws-sdk-simpledb (~> 1.29.0)
      aws-sdk-sms (~> 1.0)
      aws-sdk-sns (~> 1.9)
      aws-sdk-sqs (~> 1.10)
      aws-sdk-ssm (~> 1.0)
      aws-sdk-states (>= 1.35, < 1.40)
-      aws-sdk-synthetics (~> 1.19.0)
-      aws-sdk-transfer (>= 1.26, < 1.35)
-      aws-sdk-waf (~> 1.43.0)
-    train-core (3.10.1)
+      aws-sdk-transfer (>= 1.26, < 1.33)
+    train-core (3.8.1)
      addressable (~> 2.5)
      ffi (!= 1.13.0)
      json (>= 1.8, < 3.0)
@ -612,7 +539,7 @@ GEM
      net-scp (>= 1.2, < 4.0)
      net-ssh (>= 2.9, < 7.0)
    train-habitat (0.2.22)
-    train-winrm (0.2.13)
+    train-winrm (0.2.12)
      winrm (>= 2.3.6, < 3.0)
      winrm-elevated (~> 1.2.2)
      winrm-fs (~> 1.0)
@ -639,8 +566,8 @@ GEM
    uber (0.1.0)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (2.2.0)
+    unf_ext (0.0.7.7)
+    unicode-display_width (2.0.0)
    unicode_utils (1.4.0)
    winrm (2.3.6)
      builder (>= 2.1.2)
@ -661,6 +588,7 @@ GEM
      rubyzip (~> 2.0)
      winrm (~> 2.0)
    wisper (2.0.1)
+    zeitwerk (2.4.2)

 PLATFORMS
  ruby
@ -669,7 +597,7 @@ DEPENDENCIES
  inspec!
  kitchen-docker!
  kitchen-inspec (>= 2.5.0)
-  kitchen-salt (>= 0.7.2)
+  kitchen-salt (>= 0.6.3)

 BUNDLED WITH
   2.1.2
--- a/bin/kitchen
+++ b/bin/kitchen
@ -19,8 +19,8 @@ if File.file?(bundle_binstub)
    load(bundle_binstub)
  else
    abort(
-      'Your `bin/bundle` was not generated by Bundler, ' \
-      'so this binstub cannot run.  Replace `bin/bundle` by running ' \
+      'Your `bin/bundle` was not generated by Bundler, '\
+      'so this binstub cannot run.  Replace `bin/bundle` by running '\
      '`bundle binstubs bundler --force`, then run this command again.'
    )
  end
--- a/docs/AUTHORS.rst
+++ b/docs/AUTHORS.rst
@ -15,28 +15,28 @@ This list is sorted by the number of commits per contributor in *descending* ord
     - Contributions
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
     - `@myii <https://github.com/myii>`_
-     - 132
+     - 100
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>`
     - `@noelmcloughlin <https://github.com/noelmcloughlin>`_
-     - 57
+     - 53
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>`
     - `@alxwr <https://github.com/alxwr>`_
     - 17
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>`
     - `@javierbertoli <https://github.com/javierbertoli>`_
-     - 14
+     - 13
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3433835?v=4' width='36' height='36' alt='@n-rodriguez'>`
     - `@n-rodriguez <https://github.com/n-rodriguez>`_
     - 11
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/36701846?v=4' width='36' height='36' alt='@lagooj'>`
     - `@lagooj <https://github.com/lagooj>`_
     - 9
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/83996323?v=4' width='36' height='36' alt='@mdschmitt'>`
-     - `@mdschmitt <https://github.com/mdschmitt>`_
-     - 7
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>`
     - `@aboe76 <https://github.com/aboe76>`_
     - 6
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/83996323?v=4' width='36' height='36' alt='@mdschmitt'>`
+     - `@mdschmitt <https://github.com/mdschmitt>`_
+     - 4
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4195158?v=4' width='36' height='36' alt='@dafyddj'>`
     - `@dafyddj <https://github.com/dafyddj>`_
     - 3
@ -46,11 +46,8 @@ This list is sorted by the number of commits per contributor in *descending* ord
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1233212?v=4' width='36' height='36' alt='@baby-gnu'>`
     - `@baby-gnu <https://github.com/baby-gnu>`_
     - 2
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/38883924?v=4' width='36' height='36' alt='@Ahummeling'>`
-     - `@Ahummeling <https://github.com/Ahummeling>`_
-     - 1


 ----

-Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2022-02-26.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2021-08-06.
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@ -2,69 +2,6 @@
 Changelog
 =========

-`5.6.4 <https://github.com/saltstack-formulas/prometheus-formula/compare/v5.6.3...v5.6.4>`_ (2022-02-26)
------------------------------------------------------------------------------------------------------------
-
-Bug Fixes
-^^^^^^^^^
-
-
-* **pkgrepo:** remove gpgkey2 file.replace for idempotency (\ `e96c953 <https://github.com/saltstack-formulas/prometheus-formula/commit/e96c9531f90148a703f0df1262149bb4b1c08caa>`_\ )
-
-Continuous Integration
-^^^^^^^^^^^^^^^^^^^^^^
-
-
-* update linters to latest versions [skip ci] (\ `7d5df46 <https://github.com/saltstack-formulas/prometheus-formula/commit/7d5df46905c24d7695a4a1a7c8a5716102e5423d>`_\ )
-
-Tests
-^^^^^
-
-
-* **system:** add ``build_platform_codename`` [skip ci] (\ `2396a13 <https://github.com/saltstack-formulas/prometheus-formula/commit/2396a135b3aa5f2a288c018ac06e630443bb3dab>`_\ )
-
-`5.6.3 <https://github.com/saltstack-formulas/prometheus-formula/compare/v5.6.2...v5.6.3>`_ (2022-02-06)
------------------------------------------------------------------------------------------------------------
-
-Bug Fixes
-^^^^^^^^^
-
-
-* **archive:** make sure special commandline flags are accepted (\ `9529d5f <https://github.com/saltstack-formulas/prometheus-formula/commit/9529d5fcfe3bea44aa683bb3312fcb0eff41e192>`_\ )
-
-Continuous Integration
-^^^^^^^^^^^^^^^^^^^^^^
-
-
-* **gemfile:** allow rubygems proxy to be provided as an env var [skip ci] (\ `d1b7d8c <https://github.com/saltstack-formulas/prometheus-formula/commit/d1b7d8c2de74eed0d257a466aa78dc3f5da09af4>`_\ )
-* **kitchen+gitlab:** update for new pre-salted images [skip ci] (\ `5d39408 <https://github.com/saltstack-formulas/prometheus-formula/commit/5d39408744dadcc331d1041e7bcb894bdfc35206>`_\ )
-
-`5.6.2 <https://github.com/saltstack-formulas/prometheus-formula/compare/v5.6.1...v5.6.2>`_ (2021-12-13)
------------------------------------------------------------------------------------------------------------
-
-Bug Fixes
-^^^^^^^^^
-
-
-* **groups:** groups should always be created as system groups (\ `711ebf7 <https://github.com/saltstack-formulas/prometheus-formula/commit/711ebf7c1b153096dab3031bc9ea46d162d83bbf>`_\ )
-
-`5.6.1 <https://github.com/saltstack-formulas/prometheus-formula/compare/v5.6.0...v5.6.1>`_ (2021-12-09)
------------------------------------------------------------------------------------------------------------
-
-Bug Fixes
-^^^^^^^^^
-
-
-* **users:** users should always be created as system users (\ `ee20f82 <https://github.com/saltstack-formulas/prometheus-formula/commit/ee20f821d663ea1b2b1da444e3b4e01a08349eb1>`_\ )
-
-Continuous Integration
-^^^^^^^^^^^^^^^^^^^^^^
-
-
-* **kitchen+ci:** update with ``3004`` pre-salted images/boxes [skip ci] (\ `4628d74 <https://github.com/saltstack-formulas/prometheus-formula/commit/4628d741b82cc4a732bcbf6f4460cbf241bb50bb>`_\ )
-* **kitchen+ci:** update with latest ``3003.2`` pre-salted images [skip ci] (\ `cfb0949 <https://github.com/saltstack-formulas/prometheus-formula/commit/cfb0949e82f769152b4dbbd64cf5ee5ef575d253>`_\ )
-* **kitchen+ci:** update with latest CVE pre-salted images [skip ci] (\ `9fda233 <https://github.com/saltstack-formulas/prometheus-formula/commit/9fda2330ab4b72978ec9064091bc43e54020049b>`_\ )
-
 `5.6.0 <https://github.com/saltstack-formulas/prometheus-formula/compare/v5.5.2...v5.6.0>`_ (2021-08-06)
 ------------------------------------------------------------------------------------------------------------

--- a/kitchen.yml
+++ b/kitchen.yml
@ -32,10 +32,6 @@ platforms:
    driver:
      image: saltimages/salt-tiamat-py3:debian-9
      run_command: /lib/systemd/systemd
-  - name: ubuntu-2204-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:ubuntu-22.04
-      run_command: /lib/systemd/systemd
  - name: ubuntu-2004-tiamat-py3
    driver:
      image: saltimages/salt-tiamat-py3:ubuntu-20.04
@ -44,9 +40,9 @@ platforms:
    driver:
      image: saltimages/salt-tiamat-py3:ubuntu-18.04
      run_command: /lib/systemd/systemd
-  - name: centos-stream8-tiamat-py3
+  - name: centos-8-tiamat-py3
    driver:
-      image: saltimages/salt-tiamat-py3:centos-stream8
+      image: saltimages/salt-tiamat-py3:centos-8
  - name: centos-7-tiamat-py3
    driver:
      image: saltimages/salt-tiamat-py3:centos-7
@ -79,10 +75,6 @@ platforms:
    driver:
      image: saltimages/salt-master-py3:debian-9
      run_command: /lib/systemd/systemd
-  - name: ubuntu-2204-master-py3
-    driver:
-      image: saltimages/salt-master-py3:ubuntu-22.04
-      run_command: /lib/systemd/systemd
  - name: ubuntu-2004-master-py3
    driver:
      image: saltimages/salt-master-py3:ubuntu-20.04
@ -91,18 +83,18 @@ platforms:
    driver:
      image: saltimages/salt-master-py3:ubuntu-18.04
      run_command: /lib/systemd/systemd
-  - name: centos-stream8-master-py3
+  - name: centos-8-master-py3
    driver:
-      image: saltimages/salt-master-py3:centos-stream8
+      image: saltimages/salt-master-py3:centos-8
  - name: centos-7-master-py3
    driver:
      image: saltimages/salt-master-py3:centos-7
-  - name: fedora-36-master-py3
+  - name: fedora-34-master-py3
    driver:
-      image: saltimages/salt-master-py3:fedora-36
-  - name: fedora-35-master-py3
+      image: saltimages/salt-master-py3:fedora-34
+  - name: fedora-33-master-py3
    driver:
-      image: saltimages/salt-master-py3:fedora-35
+      image: saltimages/salt-master-py3:fedora-33
  - name: opensuse-leap-153-master-py3
    driver:
      image: saltimages/salt-master-py3:opensuse-leap-15.3
@ -110,6 +102,13 @@ platforms:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
      max_ssh_sessions: 1
+  - name: opensuse-leap-152-master-py3
+    driver:
+      image: saltimages/salt-master-py3:opensuse-leap-15.2
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
  - name: opensuse-tmbl-latest-master-py3
    driver:
      image: saltimages/salt-master-py3:opensuse-tumbleweed-latest
@ -143,120 +142,282 @@ platforms:
    driver:
      image: saltimages/salt-master-py3:rockylinux-8

-  ## SALT `3004.1`
-  - name: debian-11-3004-1-py3
+  ## SALT `3003.1`
+  - name: debian-11-3003-1-py3
    driver:
-      image: saltimages/salt-3004.1-py3:debian-11
+      image: saltimages/salt-3003.1-py3:debian-11
      run_command: /lib/systemd/systemd
-  - name: debian-10-3004-1-py3
+  - name: debian-10-3003-1-py3
    driver:
-      image: saltimages/salt-3004.1-py3:debian-10
+      image: saltimages/salt-3003.1-py3:debian-10
      run_command: /lib/systemd/systemd
-  - name: debian-9-3004-1-py3
+  - name: debian-9-3003-1-py3
    driver:
-      image: saltimages/salt-3004.1-py3:debian-9
+      image: saltimages/salt-3003.1-py3:debian-9
      run_command: /lib/systemd/systemd
-  - name: ubuntu-2204-3004-1-py3
+  - name: ubuntu-2004-3003-1-py3
    driver:
-      image: saltimages/salt-3004.1-py3:ubuntu-22.04
+      image: saltimages/salt-3003.1-py3:ubuntu-20.04
      run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3004-1-py3
+  - name: ubuntu-1804-3003-1-py3
    driver:
-      image: saltimages/salt-3004.1-py3:ubuntu-20.04
+      image: saltimages/salt-3003.1-py3:ubuntu-18.04
      run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3004-1-py3
+  - name: centos-8-3003-1-py3
    driver:
-      image: saltimages/salt-3004.1-py3:ubuntu-18.04
-      run_command: /lib/systemd/systemd
-  - name: centos-stream8-3004-1-py3
+      image: saltimages/salt-3003.1-py3:centos-8
+  - name: centos-7-3003-1-py3
    driver:
-      image: saltimages/salt-3004.1-py3:centos-stream8
-  - name: centos-7-3004-1-py3
+      image: saltimages/salt-3003.1-py3:centos-7
+  - name: fedora-34-3003-1-py3
    driver:
-      image: saltimages/salt-3004.1-py3:centos-7
-  - name: fedora-36-3004-1-py3
+      image: saltimages/salt-3003.1-py3:fedora-34
+  - name: fedora-33-3003-1-py3
    driver:
-      image: saltimages/salt-3004.1-py3:fedora-36
-  - name: fedora-35-3004-1-py3
+      image: saltimages/salt-3003.1-py3:fedora-33
+  - name: opensuse-leap-153-3003-1-py3
    driver:
-      image: saltimages/salt-3004.1-py3:fedora-35
-  - name: amazonlinux-2-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:amazonlinux-2
-  - name: oraclelinux-8-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:oraclelinux-8
-  - name: oraclelinux-7-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:oraclelinux-7
-  - name: arch-base-latest-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:arch-base-latest
-  - name: gentoo-stage3-latest-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:gentoo-stage3-systemd
-  - name: almalinux-8-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:almalinux-8
-  - name: rockylinux-8-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:rockylinux-8
-
-  ## SALT `3004.0`
-  - name: opensuse-leap-153-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:opensuse-leap-15.3
+      image: saltimages/salt-3003.1-py3:opensuse-leap-15.3
    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
      max_ssh_sessions: 1
-  - name: opensuse-tmbl-latest-3004-0-py3
+  - name: opensuse-leap-152-3003-1-py3
    driver:
-      image: saltimages/salt-3004.0-py3:opensuse-tumbleweed-latest
+      image: saltimages/salt-3003.1-py3:opensuse-leap-15.2
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: opensuse-tmbl-latest-3003-1-py3
+    driver:
+      image: saltimages/salt-3003.1-py3:opensuse-tumbleweed-latest
+    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: amazonlinux-2-3003-1-py3
+    driver:
+      image: saltimages/salt-3003.1-py3:amazonlinux-2
+  - name: oraclelinux-8-3003-1-py3
+    driver:
+      image: saltimages/salt-3003.1-py3:oraclelinux-8
+  - name: oraclelinux-7-3003-1-py3
+    driver:
+      image: saltimages/salt-3003.1-py3:oraclelinux-7
+  - name: arch-base-latest-3003-1-py3
+    driver:
+      image: saltimages/salt-3003.1-py3:arch-base-latest
+  - name: gentoo-stage3-latest-3003-1-py3
+    driver:
+      image: saltimages/salt-3003.1-py3:gentoo-stage3-latest
+      run_command: /sbin/init
+  - name: gentoo-stage3-systemd-3003-1-py3
+    driver:
+      image: saltimages/salt-3003.1-py3:gentoo-stage3-systemd
+
+  ## SALT `3002.6`
+  - name: debian-11-3002-6-py3
+    driver:
+      image: saltimages/salt-3002.6-py3:debian-11
+      run_command: /lib/systemd/systemd
+  - name: debian-10-3002-6-py3
+    driver:
+      image: saltimages/salt-3002.6-py3:debian-10
+      run_command: /lib/systemd/systemd
+  - name: debian-9-3002-6-py3
+    driver:
+      image: saltimages/salt-3002.6-py3:debian-9
+      run_command: /lib/systemd/systemd
+  - name: ubuntu-2004-3002-6-py3
+    driver:
+      image: saltimages/salt-3002.6-py3:ubuntu-20.04
+      run_command: /lib/systemd/systemd
+  - name: ubuntu-1804-3002-6-py3
+    driver:
+      image: saltimages/salt-3002.6-py3:ubuntu-18.04
+      run_command: /lib/systemd/systemd
+  - name: centos-8-3002-6-py3
+    driver:
+      image: saltimages/salt-3002.6-py3:centos-8
+  - name: centos-7-3002-6-py3
+    driver:
+      image: saltimages/salt-3002.6-py3:centos-7
+  - name: fedora-34-3002-6-py3
+    driver:
+      image: saltimages/salt-3002.6-py3:fedora-34
+  - name: fedora-33-3002-6-py3
+    driver:
+      image: saltimages/salt-3002.6-py3:fedora-33
+  - name: amazonlinux-2-3002-6-py3
+    driver:
+      image: saltimages/salt-3002.6-py3:amazonlinux-2
+  - name: oraclelinux-8-3002-6-py3
+    driver:
+      image: saltimages/salt-3002.6-py3:oraclelinux-8
+  - name: oraclelinux-7-3002-6-py3
+    driver:
+      image: saltimages/salt-3002.6-py3:oraclelinux-7
+  - name: arch-base-latest-3002-6-py3
+    driver:
+      image: saltimages/salt-3002.6-py3:arch-base-latest
+  - name: gentoo-stage3-latest-3002-6-py3
+    driver:
+      image: saltimages/salt-3002.6-py3:gentoo-stage3-latest
+      run_command: /sbin/init
+  - name: gentoo-stage3-systemd-3002-6-py3
+    driver:
+      image: saltimages/salt-3002.6-py3:gentoo-stage3-systemd
+
+  ## SALT `3002.2`
+  - name: opensuse-leap-153-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:opensuse-leap-15.3
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: opensuse-leap-152-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:opensuse-leap-15.2
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: opensuse-tmbl-latest-3002-2-py3
+    driver:
+      image: saltimages/salt-3002.2-py3:opensuse-tumbleweed-latest
    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
      max_ssh_sessions: 1

-  ## SALT `3003.4`
-  - name: debian-10-3003-4-py3
+  ## SALT `3001.7`
+  - name: debian-10-3001-7-py3
    driver:
-      image: saltimages/salt-3003.4-py3:debian-10
+      image: saltimages/salt-3001.7-py3:debian-10
      run_command: /lib/systemd/systemd
-  - name: debian-9-3003-4-py3
+  - name: debian-9-3001-7-py3
    driver:
-      image: saltimages/salt-3003.4-py3:debian-9
+      image: saltimages/salt-3001.7-py3:debian-9
      run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3003-4-py3
+  - name: ubuntu-2004-3001-7-py3
    driver:
-      image: saltimages/salt-3003.4-py3:ubuntu-20.04
+      image: saltimages/salt-3001.7-py3:ubuntu-20.04
      run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3003-4-py3
+  - name: ubuntu-1804-3001-7-py3
    driver:
-      image: saltimages/salt-3003.4-py3:ubuntu-18.04
+      image: saltimages/salt-3001.7-py3:ubuntu-18.04
      run_command: /lib/systemd/systemd
-  - name: centos-stream8-3003-4-py3
+  - name: centos-8-3001-7-py3
    driver:
-      image: saltimages/salt-3003.4-py3:centos-stream8
-  - name: centos-7-3003-4-py3
+      image: saltimages/salt-3001.7-py3:centos-8
+  - name: centos-7-3001-7-py3
    driver:
-      image: saltimages/salt-3003.4-py3:centos-7
-  - name: amazonlinux-2-3003-4-py3
+      image: saltimages/salt-3001.7-py3:centos-7
+  - name: fedora-34-3001-7-py3
    driver:
-      image: saltimages/salt-3003.4-py3:amazonlinux-2
-  - name: oraclelinux-8-3003-4-py3
+      image: saltimages/salt-3001.7-py3:fedora-34
+  - name: fedora-33-3001-7-py3
    driver:
-      image: saltimages/salt-3003.4-py3:oraclelinux-8
-  - name: oraclelinux-7-3003-4-py3
+      image: saltimages/salt-3001.7-py3:fedora-33
+  - name: opensuse-leap-153-3001-7-py3
    driver:
-      image: saltimages/salt-3003.4-py3:oraclelinux-7
-  - name: almalinux-8-3003-4-py3
+      image: saltimages/salt-3001.7-py3:opensuse-leap-15.3
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: opensuse-leap-152-3001-7-py3
    driver:
-      image: saltimages/salt-3003.4-py3:almalinux-8
+      image: saltimages/salt-3001.7-py3:opensuse-leap-15.2
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: opensuse-tmbl-latest-3001-7-py3
+    driver:
+      image: saltimages/salt-3001.7-py3:opensuse-tumbleweed-latest
+    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: amazonlinux-2-3001-7-py3
+    driver:
+      image: saltimages/salt-3001.7-py3:amazonlinux-2
+  - name: oraclelinux-8-3001-7-py3
+    driver:
+      image: saltimages/salt-3001.7-py3:oraclelinux-8
+  - name: oraclelinux-7-3001-7-py3
+    driver:
+      image: saltimages/salt-3001.7-py3:oraclelinux-7
+  - name: arch-base-latest-3001-7-py3
+    driver:
+      image: saltimages/salt-3001.7-py3:arch-base-latest
+  - name: gentoo-stage3-latest-3001-7-py3
+    driver:
+      image: saltimages/salt-3001.7-py3:gentoo-stage3-latest
+      run_command: /sbin/init
+  - name: gentoo-stage3-systemd-3001-7-py3
+    driver:
+      image: saltimages/salt-3001.7-py3:gentoo-stage3-systemd
+
+  ## SALT `3000.9`
+  - name: debian-10-3000-9-py3
+    driver:
+      image: saltimages/salt-3000.9-py3:debian-10
+      run_command: /lib/systemd/systemd
+  - name: debian-9-3000-9-py3
+    driver:
+      image: saltimages/salt-3000.9-py3:debian-9
+      run_command: /lib/systemd/systemd
+  - name: ubuntu-1804-3000-9-py3
+    driver:
+      image: saltimages/salt-3000.9-py3:ubuntu-18.04
+      run_command: /lib/systemd/systemd
+  - name: centos-8-3000-9-py3
+    driver:
+      image: saltimages/salt-3000.9-py3:centos-8
+  - name: centos-7-3000-9-py3
+    driver:
+      image: saltimages/salt-3000.9-py3:centos-7
+  - name: opensuse-leap-153-3000-9-py3
+    driver:
+      image: saltimages/salt-3000.9-py3:opensuse-leap-15.3
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: opensuse-leap-152-3000-9-py3
+    driver:
+      image: saltimages/salt-3000.9-py3:opensuse-leap-15.2
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: amazonlinux-2-3000-9-py3
+    driver:
+      image: saltimages/salt-3000.9-py3:amazonlinux-2
+  - name: oraclelinux-8-3000-9-py3
+    driver:
+      image: saltimages/salt-3000.9-py3:oraclelinux-8
+  - name: oraclelinux-7-3000-9-py3
+    driver:
+      image: saltimages/salt-3000.9-py3:oraclelinux-7
+  - name: gentoo-stage3-latest-3000-9-py3
+    driver:
+      image: saltimages/salt-3000.9-py3:gentoo-stage3-latest
+      run_command: /sbin/init
+  - name: gentoo-stage3-systemd-3000-9-py3
+    driver:
+      image: saltimages/salt-3000.9-py3:gentoo-stage3-systemd
+  - name: ubuntu-1804-3000-9-py2
+    driver:
+      image: saltimages/salt-3000.9-py2:ubuntu-18.04
+      run_command: /lib/systemd/systemd
+  - name: arch-base-latest-3000-9-py2
+    driver:
+      image: saltimages/salt-3000.9-py2:arch-base-latest

 verifier:
  # https://www.inspec.io/
--- a/pre-commit_semantic-release.sh
+++ b/pre-commit_semantic-release.sh
@ -7,16 +7,16 @@ sed -i -e "s_^\(version:\).*_\1 ${1}_" FORMULA


 ###############################################################################
-# (B) Use `m2r2` to convert automatically produced `.md` docs to `.rst`
+# (B) Use `m2r` to convert automatically produced `.md` docs to `.rst`
 ###############################################################################

-# Install `m2r2`
-pip3 install m2r2
+# Install `m2r`
+pip3 install m2r

 # Copy and then convert the `.md` docs
 cp ./*.md docs/
 cd docs/ || exit
-m2r2 --overwrite ./*.md
+m2r --overwrite ./*.md

 # Change excess `H1` headings to `H2` in converted `CHANGELOG.rst`
 sed -i -e '/^=.*$/s/=/-/g' CHANGELOG.rst
--- a/prometheus/archive/install.sls
+++ b/prometheus/archive/install.sls
@ -129,28 +129,19 @@ prometheus-archive-install-{{ name }}-managed-service:
        env: {{ p.pkg.component[name]['service'].get('env', [])|tojson }}
        workdir: {{ p.dir.var }}/{{ name }}
        stop: ''
-             {%- set all_args = p.pkg.component.get(name).get('service').get('args', {}) %}
-             {%- set commandline_only_args = ["storage.tsdb.retention.time"] %}
-             {%- if name in ('node_exporter', 'consul_exporter') or 'config_file' not in p.pkg.component[name] %}
-               {%- set args = all_args %}
-             {%- else %}
-               {%- set args = {'config.file': p.pkg.component[name]['config_file']} %}
-             {%- endif %}
-             {%- for arg in commandline_only_args %}
-               {%- set value = all_args.get(arg) %}
-               {%- if value is not none %}
-                 {%- do args.update({arg: value}) %}
+               {%- if name in ('node_exporter', 'consul_exporter') or 'config_file' not in p.pkg.component[name] %}
+                 {%- set args = [] %}
+                 {%- for param, value in p.pkg.component.get(name).get('service').get('args', {}).items() %}
+                    {%- if value is not none %}
+                      {% do args.append("--" ~ param ~ "=" ~ value ) %}
+                    {%- else %}
+                      {% do args.append("--" ~ param ) %}
+                    {%- endif %}
+                 {%- endfor %}
+        start: {{ p.pkg.component[name]['path'] }}/{{ name }} {{ args|join(' ') }}
+               {%- else %}
+        start: {{ p.pkg.component[name]['path'] }}/{{ name }} --config.file {{ p.pkg.component[name]['config_file'] }}  # noqa 204
               {%- endif %}
-             {%- endfor %}
-             {%- set flags = [] %}
-             {%- for param, value in args.items() %}
-                {%- if value is not none %}
-                  {% do flags.append("--" ~ param ~ "=" ~ value ) %}
-                {%- else %}
-                  {% do flags.append("--" ~ param ) %}
-                {%- endif %}
-             {%- endfor %}
-        start: {{ p.pkg.component[name]['path'] }}/{{ name }} {{ flags|join(' ') }}
    - require:
      - file: prometheus-archive-install-{{ name }}-file-directory
              {%- if p.pkg.component.get(name).get('archive').get('tar', true) %}
--- a/prometheus/config/file.sls
+++ b/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 }}

--- a/prometheus/config/storage.sls
+++ b/prometheus/config/storage.sls
@ -19,17 +19,15 @@ include:
 prometheus-service-args-{{ name }}-data-dir:
  file.directory:
    - name: {{ args['storage.tsdb.path'] }}
-    - user: {{ name }}
+    - owner: {{ name }}
    - group: {{ name }}
    - 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 %}
-    {% endfor %}
+    {% endfor %}
--- a/prometheus/config/users.sls
+++ b/prometheus/config/users.sls
@ -4,13 +4,11 @@
 {%- 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:
  group.present:
    - name: {{ name }}
-    - system: true
    - require_in:
      - user: prometheus-config-users-install-{{ name }}-user-present

@ -23,11 +21,12 @@ prometheus-config-users-install-{{ name }}-user-present:
    - shell: {{ p.shell }}
                  {%- if grains.kernel|lower == 'linux' %}
    - createhome: false
+                    {%- if grains.get('osfinger', '') in ['Debian-11'] %}
    - system: true
+                    {%- endif %}
                  {%- elif grains.os_family == 'MacOS' %}
    - unless: /usr/bin/dscl . list /Users | grep {{ name }} >/dev/null 2>&1
                  {%- endif %}
              {%- endif %}

  {%- endfor %}
-  {%- endif %}
--- a/prometheus/defaults.yaml
+++ b/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
--- a/prometheus/exporters/node_exporter/textfile_collectors/init.sls
+++ b/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() %}
--- a/prometheus/files/default/environ.sh.jinja
+++ b/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 }}"


--- a/prometheus/osfamilymap.yaml
+++ b/prometheus/osfamilymap.yaml
@ -163,7 +163,7 @@ Debian:
      xmpp_alerts:
        name: prometheus-xmpp-alerts
        args_file: /etc/default/prometheus-xmpp-alerts
-
+        
  exporters:
    node_exporter:
      textfile_collectors_dependencies:
@ -188,7 +188,7 @@ RedHat:
        environ_file: /etc/default/alertmanager
        environ:
          environ_arg_name: ALERTMANAGER_OPTS
-          args:
+          args: 
            config.file: /etc/prometheus/alertmanager.yml
            storage.path: /var/lib/prometheus/alertmanager
      node_exporter:
@ -211,74 +211,16 @@ RedHat:
        {% else %}
          {%- set releasever = "$releasever" %}
        {%- endif %}
+      # https://akai-tsuki.hatenablog.com/entry/2017/12/03/000000
      # yamllint disable rule:line-length
      baseurl: "https://packagecloud.io/prometheus-rpm/release/el/{{ releasever }}/$basearch"
-      gpgkey: 'https://packagecloud.io/prometheus-rpm/release/gpgkey https://raw.githubusercontent.com/lest/prometheus-rpm/master/RPM-GPG-KEY-prometheus-rpm'
+      gpgkey: 'https://packagecloud.io/prometheus-rpm/release/gpgkey gpgkey2=https://raw.githubusercontent.com/lest/prometheus-rpm/master/RPM-GPG-KEY-prometheus-rpm'
      # yamllint enable rule:line-length
      sslverify: 1
      sslcacert: /etc/pki/tls/certs/ca-bundle.crt
      metadata_expire: 300

-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
+Suse: {}

 Gentoo:
  pkg:
@ -506,3 +448,4 @@ MacOS:
      statsd_exporter:
        archive:
          source_hash: 15132494523c2b6a89e09b2da63452c8fe587fb82fcc3fd21cc75a4aa2766644
+
--- a/prometheus/package/repo/install.sls
+++ b/prometheus/package/repo/install.sls
@ -11,6 +11,12 @@
 prometheus-package-repo-install-pkgrepo-managed:
  pkgrepo.managed:
    {{- format_kwargs(p.pkg.repo) }}
+  file.replace:
+    # redhat workaround for salt issue #51494
+    - name: /etc/yum.repos.d/prometheus.repo
+    - pattern: ' gpgkey2='
+    - repl: '\n       '
+    - ignore_if_missing: True

    {%- endif %}
 {%- else %}
--- a/prometheus/service/args/install.sls
+++ b/prometheus/service/args/install.sls
@ -25,16 +25,14 @@ include:
 prometheus-service-args-{{ name }}-data-dir:
  file.directory:
    - name: {{ args['storage.tsdb.path'] }}
-    - user: {{ name }}
+    - owner: {{ name }}
    - group: {{ name }}
    - 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' %}
--- a/test/integration/default/inspec.yml
+++ b/test/integration/default/inspec.yml
@ -24,5 +24,4 @@ supports:
  - platform-name: gentoo
  - platform-name: almalinux
  - platform-name: rocky
-  - platform-name: mac_os_x
  - platform: windows
--- a/test/integration/repo/inspec.yml
+++ b/test/integration/repo/inspec.yml
@ -24,5 +24,4 @@ supports:
  - platform-name: gentoo
  - platform-name: almalinux
  - platform-name: rocky
-  - platform-name: mac_os_x
  - platform: windows
--- a/test/integration/share/inspec.yml
+++ b/test/integration/share/inspec.yml
@ -21,5 +21,4 @@ supports:
  - platform-name: gentoo
  - platform-name: almalinux
  - platform-name: rocky
-  - platform-name: mac_os_x
  - platform: windows
--- a/test/integration/share/libraries/system.rb
+++ b/test/integration/share/libraries/system.rb
@ -4,7 +4,6 @@
 # Author: Daniel Dehennin <daniel.dehennin@ac-dijon.fr>
 # Copyright (C) 2020 Daniel Dehennin <daniel.dehennin@ac-dijon.fr>

-# rubocop:disable Metrics/ClassLength
 class SystemResource < Inspec.resource(1)
  name 'system'

@ -22,8 +21,7 @@ class SystemResource < Inspec.resource(1)
      family: build_platform_family,
      name: build_platform_name,
      release: build_platform_release,
-      finger: build_platform_finger,
-      codename: build_platform_codename
+      finger: build_platform_finger
    }
  end

@ -57,16 +55,12 @@ class SystemResource < Inspec.resource(1)
      'base-latest'
    when 'gentoo'
      "#{inspec.platform[:release].split('.')[0]}-#{derive_gentoo_init_system}"
-    when 'mac_os_x'
-      inspec.command('sw_vers -productVersion').stdout.to_s
    when 'opensuse'
      # rubocop:disable Style/NumericLiterals,Layout/LineLength
      inspec.platform[:release].to_i > 20210101 ? 'tumbleweed' : inspec.platform[:release]
      # rubocop:enable Style/NumericLiterals,Layout/LineLength
    when 'windows_8.1_pro'
      '8.1'
-    when 'windows_server_2022_datacenter'
-      '2022-server'
    when 'windows_server_2019_datacenter'
      '2019-server'
    when 'windows_server_2016_datacenter'
@ -93,46 +87,4 @@ class SystemResource < Inspec.resource(1)
      build_platform_release.split('.')[0]
    end
  end
-
-  # rubocop:disable Metrics/MethodLength,Metrics/CyclomaticComplexity
-  def build_platform_codename
-    case build_platform_finger
-    when 'ubuntu-22.04'
-      'jammy'
-    when 'ubuntu-20.04'
-      'focal'
-    when 'ubuntu-18.04'
-      'bionic'
-    when 'debian-11'
-      'bullseye'
-    when 'debian-10'
-      'buster'
-    when 'debian-9'
-      'stretch'
-    when 'almalinux-8'
-      "AlmaLinux #{build_platform_release} (Arctic Sphynx)"
-    when 'amazonlinux-2'
-      'Amazon Linux 2'
-    when 'arch-base-latest'
-      'Arch Linux'
-    when 'centos-7'
-      'CentOS Linux 7 (Core)'
-    when 'centos-8'
-      'CentOS Stream 8'
-    when 'opensuse-tumbleweed'
-      'openSUSE Tumbleweed'
-    when 'opensuse-15'
-      "openSUSE Leap #{build_platform_release}"
-    when 'oraclelinux-8', 'oraclelinux-7'
-      "Oracle Linux Server #{build_platform_release}"
-    when 'gentoo-2-sysd', 'gentoo-2-sysv'
-      'Gentoo/Linux'
-    when 'rockylinux-8'
-      "Rocky Linux #{build_platform_release} (Green Obsidian)"
-    else
-      ''
-    end
-  end
-  # rubocop:enable Metrics/MethodLength,Metrics/CyclomaticComplexity
 end
-# rubocop:enable Metrics/ClassLength
--- a/test/salt/pillar/default.sls
+++ b/test/salt/pillar/default.sls
@ -118,7 +118,6 @@ prometheus:
        service:
          args:
            web.listen-address: 0.0.0.0:9090
-            storage.tsdb.retention.time: 150d
        environ:
          args:
            web.listen-address: 0.0.0.0:9090
--- a/test/salt/pillar/repo.sls
+++ b/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: