Compare commits
No commits in common. "libertacasa" and "v5.6.4" have entirely different histories.
libertacas
...
v5.6.4
@ -134,7 +134,6 @@ rubocop:
|
||||
# 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'}
|
||||
@ -153,9 +152,6 @@ 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'}
|
||||
@ -168,12 +164,9 @@ centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
|
||||
# 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-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'}
|
||||
@ -204,36 +197,54 @@ 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-debian-11-3004-0-py3: {extends: '.test_instance'}
|
||||
# default-debian-10-3004-0-py3: {extends: '.test_instance'}
|
||||
# default-debian-9-3004-0-py3: {extends: '.test_instance'}
|
||||
# default-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
|
||||
# default-ubuntu-1804-3004-0-py3: {extends: '.test_instance'}
|
||||
# default-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'}
|
||||
# default-centos-7-3004-0-py3: {extends: '.test_instance'}
|
||||
# default-fedora-34-3004-0-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'}
|
||||
# default-amazonlinux-2-3004-0-py3: {extends: '.test_instance'}
|
||||
# default-oraclelinux-8-3004-0-py3: {extends: '.test_instance'}
|
||||
# default-oraclelinux-7-3004-0-py3: {extends: '.test_instance'}
|
||||
# default-arch-base-latest-3004-0-py3: {extends: '.test_instance'}
|
||||
# default-gentoo-stage3-latest-3004-0-py3: {extends: '.test_instance'}
|
||||
# default-gentoo-stage3-systemd-3004-0-py3: {extends: '.test_instance'}
|
||||
# default-almalinux-8-3004-0-py3: {extends: '.test_instance'}
|
||||
# default-rockylinux-8-3004-0-py3: {extends: '.test_instance'}
|
||||
# default-debian-10-3003-3-py3: {extends: '.test_instance'}
|
||||
# default-debian-9-3003-3-py3: {extends: '.test_instance'}
|
||||
# default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
|
||||
# default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
|
||||
# default-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'}
|
||||
# default-centos-7-3003-3-py3: {extends: '.test_instance'}
|
||||
# default-fedora-35-3003-3-py3: {extends: '.test_instance_failure_permitted'}
|
||||
# default-fedora-34-3003-3-py3: {extends: '.test_instance'}
|
||||
# default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
|
||||
# default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'}
|
||||
# default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
|
||||
# default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
|
||||
# default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
|
||||
# default-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'}
|
||||
# default-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'}
|
||||
# default-almalinux-8-3003-3-py3: {extends: '.test_instance'}
|
||||
# default-debian-10-3002-7-py3: {extends: '.test_instance'}
|
||||
# default-debian-9-3002-7-py3: {extends: '.test_instance'}
|
||||
# default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
|
||||
# default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
|
||||
# default-centos-7-3002-7-py3: {extends: '.test_instance'}
|
||||
# default-fedora-35-3002-7-py3: {extends: '.test_instance_failure_permitted'}
|
||||
# default-fedora-34-3002-7-py3: {extends: '.test_instance'}
|
||||
# default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
|
||||
# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'}
|
||||
# default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
|
||||
# default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
|
||||
# default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
|
||||
# default-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'}
|
||||
# default-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'}
|
||||
# yamllint enable rule:line-length
|
||||
|
||||
###############################################################################
|
||||
|
||||
@ -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.25.1
|
||||
hooks:
|
||||
- id: rubocop
|
||||
name: Check Ruby files with rubocop
|
||||
|
||||
87
.travis.yml
87
.travis.yml
@ -86,7 +86,6 @@ 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
|
||||
@ -105,9 +104,6 @@ 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
|
||||
@ -120,12 +116,9 @@ jobs:
|
||||
# - 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-opensuse-leap-153-master-py3
|
||||
# - env: INSTANCE=repo-opensuse-leap-153-master-py3
|
||||
# - env: INSTANCE=opensuse-leap-153-master-py3
|
||||
@ -156,36 +149,54 @@ 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-debian-11-3004-0-py3
|
||||
# - env: INSTANCE=default-debian-10-3004-0-py3
|
||||
# - env: INSTANCE=default-debian-9-3004-0-py3
|
||||
# - env: INSTANCE=default-ubuntu-2004-3004-0-py3
|
||||
# - env: INSTANCE=default-ubuntu-1804-3004-0-py3
|
||||
# - env: INSTANCE=default-centos-stream8-3004-0-py3
|
||||
# - env: INSTANCE=default-centos-7-3004-0-py3
|
||||
# - env: INSTANCE=default-fedora-34-3004-0-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-amazonlinux-2-3004-0-py3
|
||||
# - env: INSTANCE=default-oraclelinux-8-3004-0-py3
|
||||
# - env: INSTANCE=default-oraclelinux-7-3004-0-py3
|
||||
# - env: INSTANCE=default-arch-base-latest-3004-0-py3
|
||||
# - env: INSTANCE=default-gentoo-stage3-latest-3004-0-py3
|
||||
# - env: INSTANCE=default-gentoo-stage3-systemd-3004-0-py3
|
||||
# - env: INSTANCE=default-almalinux-8-3004-0-py3
|
||||
# - env: INSTANCE=default-rockylinux-8-3004-0-py3
|
||||
# - env: INSTANCE=default-debian-10-3003-3-py3
|
||||
# - env: INSTANCE=default-debian-9-3003-3-py3
|
||||
# - env: INSTANCE=default-ubuntu-2004-3003-3-py3
|
||||
# - env: INSTANCE=default-ubuntu-1804-3003-3-py3
|
||||
# - env: INSTANCE=default-centos-stream8-3003-3-py3
|
||||
# - env: INSTANCE=default-centos-7-3003-3-py3
|
||||
# - env: INSTANCE=default-fedora-35-3003-3-py3
|
||||
# - env: INSTANCE=default-fedora-34-3003-3-py3
|
||||
# - env: INSTANCE=default-opensuse-leap-153-3003-3-py3
|
||||
# - env: INSTANCE=default-opensuse-tmbl-latest-3003-3-py3
|
||||
# - env: INSTANCE=default-amazonlinux-2-3003-3-py3
|
||||
# - env: INSTANCE=default-oraclelinux-8-3003-3-py3
|
||||
# - env: INSTANCE=default-oraclelinux-7-3003-3-py3
|
||||
# - env: INSTANCE=default-gentoo-stage3-latest-3003-3-py3
|
||||
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-3-py3
|
||||
# - env: INSTANCE=default-almalinux-8-3003-3-py3
|
||||
# - env: INSTANCE=default-debian-10-3002-7-py3
|
||||
# - env: INSTANCE=default-debian-9-3002-7-py3
|
||||
# - env: INSTANCE=default-ubuntu-2004-3002-7-py3
|
||||
# - env: INSTANCE=default-ubuntu-1804-3002-7-py3
|
||||
# - env: INSTANCE=default-centos-7-3002-7-py3
|
||||
# - env: INSTANCE=default-fedora-35-3002-7-py3
|
||||
# - env: INSTANCE=default-fedora-34-3002-7-py3
|
||||
# - env: INSTANCE=default-opensuse-leap-153-3002-7-py3
|
||||
# - env: INSTANCE=default-opensuse-tmbl-latest-3002-7-py3
|
||||
# - env: INSTANCE=default-amazonlinux-2-3002-7-py3
|
||||
# - env: INSTANCE=default-oraclelinux-8-3002-7-py3
|
||||
# - env: INSTANCE=default-oraclelinux-7-3002-7-py3
|
||||
# - env: INSTANCE=default-gentoo-stage3-latest-3002-7-py3
|
||||
# - env: INSTANCE=default-gentoo-stage3-systemd-3002-7-py3
|
||||
|
||||
## Define the release stage that runs `semantic-release`
|
||||
- stage: 'release'
|
||||
|
||||
@ -4,13 +4,13 @@ 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/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|132
|
||||
<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/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)|14
|
||||
<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/83996323?v=4' width='36' height='36' alt='@mdschmitt'>|[@mdschmitt](https://github.com/mdschmitt)|7
|
||||
<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/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
|
||||
@ -19,4 +19,4 @@ Avatar|Contributor|Contributions
|
||||
|
||||
---
|
||||
|
||||
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 2022-02-26.
|
||||
|
||||
18
CHANGELOG.md
18
CHANGELOG.md
@ -1,23 +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)
|
||||
|
||||
|
||||
|
||||
2
FORMULA
2
FORMULA
@ -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.4
|
||||
release: 1
|
||||
minimum_version: 2019.2
|
||||
summary: prometheus formula
|
||||
|
||||
2
Gemfile
2
Gemfile
@ -1,6 +1,6 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
source ENV.fetch('PROXY_RUBYGEMSORG', 'https://rubygems.org')
|
||||
source ENV['PROXY_RUBYGEMSORG'] || '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.
|
||||
|
||||
331
Gemfile.lock
331
Gemfile.lock
@ -1,20 +1,19 @@
|
||||
GIT
|
||||
remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
|
||||
revision: aaef842906a5666f0fc0b4f186b4dd3498f5b28c
|
||||
revision: 1dd91ba6544d9e26c266b055f7648defc89ca9ce
|
||||
branch: ssf
|
||||
specs:
|
||||
inspec (5.18.15)
|
||||
inspec (5.0.4)
|
||||
cookstyle
|
||||
faraday_middleware (>= 0.12.2, < 1.1)
|
||||
inspec-core (= 5.18.15)
|
||||
inspec-core (= 5.0.4)
|
||||
mongo (= 2.13.2)
|
||||
progress_bar (~> 1.3.3)
|
||||
rake
|
||||
train (~> 3.10)
|
||||
train (~> 3.0)
|
||||
train-aws (~> 0.2)
|
||||
train-habitat (~> 0.1)
|
||||
train-winrm (~> 0.2)
|
||||
inspec-core (5.18.15)
|
||||
inspec-core (5.0.4)
|
||||
addressable (~> 2.4)
|
||||
chef-telemetry (~> 1.0, >= 1.0.8)
|
||||
faraday (>= 0.9.0, < 1.5)
|
||||
@ -27,20 +26,20 @@ 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: 4e03ca42d98624323c1c2d91ceb39c09a29bbfc8
|
||||
branch: ssf
|
||||
specs:
|
||||
kitchen-docker (2.12.0)
|
||||
@ -49,7 +48,7 @@ GIT
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
activesupport (7.0.3.1)
|
||||
activesupport (7.0.2.2)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
@ -58,24 +57,24 @@ GEM
|
||||
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-partitions (1.555.0)
|
||||
aws-sdk-alexaforbusiness (1.55.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.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-sdk-apigateway (1.74.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-apigatewayv2 (1.42.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-apigatewayv2 (1.41.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.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.49.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-autoscaling (1.63.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
@ -83,41 +82,41 @@ GEM
|
||||
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.48.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-cloudformation (1.70.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-cloudformation (1.67.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-cloudfront (1.65.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-cloudfront (1.62.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-cloudhsm (1.39.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-cloudhsm (1.38.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-cloudhsmv2 (1.42.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-cloudhsmv2 (1.41.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-cloudtrail (1.49.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-cloudtrail (1.46.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-cloudwatch (1.64.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-cloudwatch (1.61.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.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.51.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-codecommit (1.51.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-codecommit (1.50.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-codedeploy (1.49.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-codedeploy (1.48.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-codepipeline (1.53.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-codepipeline (1.52.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-cognitoidentity (1.31.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
@ -125,55 +124,55 @@ GEM
|
||||
aws-sdk-cognitoidentityprovider (1.53.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.73.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-core (3.131.2)
|
||||
aws-sdk-core (3.126.2)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.525.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.39.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.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.72.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-ec2 (1.322.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-ec2 (1.299.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-ecr (1.56.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-ecr (1.53.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-ecrpublic (1.12.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-ecrpublic (1.11.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-ecs (1.100.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-ecs (1.95.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-efs (1.54.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-efs (1.52.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-eks (1.75.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-eks (1.72.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-elasticache (1.78.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-elasticache (1.72.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-elasticbeanstalk (1.51.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-elasticbeanstalk (1.50.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-elasticloadbalancing (1.40.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-elasticloadbalancing (1.39.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-elasticloadbalancingv2 (1.78.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-elasticloadbalancingv2 (1.76.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-elasticsearchservice (1.65.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-elasticsearchservice (1.64.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-emr (1.53.0)
|
||||
aws-sdk-core (~> 3, >= 3.121.2)
|
||||
@ -181,38 +180,38 @@ GEM
|
||||
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.47.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-glue (1.88.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.55.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-iam (1.69.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-iam (1.67.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-kafka (1.50.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-kafka (1.48.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-kinesis (1.41.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-kinesis (1.40.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-kms (1.57.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-kms (1.54.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-lambda (1.84.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-lambda (1.78.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.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-sdk-networkfirewall (1.14.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-networkmanager (1.24.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-networkmanager (1.21.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-organizations (1.59.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
@ -220,23 +219,23 @@ GEM
|
||||
aws-sdk-ram (1.26.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.139.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-redshift (1.84.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-redshift (1.78.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-route53 (1.63.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-route53 (1.61.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-route53domains (1.40.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-route53domains (1.39.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-route53resolver (1.37.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-route53resolver (1.36.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-s3 (1.114.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-s3 (1.112.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.4)
|
||||
aws-sdk-s3control (1.43.0)
|
||||
@ -245,8 +244,8 @@ GEM
|
||||
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.61.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-servicecatalog (1.60.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
@ -254,8 +253,8 @@ GEM
|
||||
aws-sdk-ses (1.41.0)
|
||||
aws-sdk-core (~> 3, >= 3.120.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-shield (1.48.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-shield (1.47.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-signer (1.32.0)
|
||||
aws-sdk-core (~> 3, >= 3.120.0)
|
||||
@ -263,17 +262,17 @@ GEM
|
||||
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-sms (1.38.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-sns (1.53.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-sns (1.52.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-sqs (1.51.1)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-sqs (1.50.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-ssm (1.137.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-ssm (1.131.0)
|
||||
aws-sdk-core (~> 3, >= 3.126.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-states (1.39.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
@ -288,7 +287,7 @@ GEM
|
||||
aws-sdk-core (~> 3, >= 3.122.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sigv2 (1.1.0)
|
||||
aws-sigv4 (1.5.0)
|
||||
aws-sigv4 (1.4.0)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
azure_graph_rbac (0.17.2)
|
||||
ms_rest_azure (~> 0.12.0)
|
||||
@ -301,11 +300,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.14.1)
|
||||
builder (3.2.4)
|
||||
chef-config (17.10.0)
|
||||
chef-config (17.9.52)
|
||||
addressable
|
||||
chef-utils (= 17.10.0)
|
||||
chef-utils (= 17.9.52)
|
||||
fuzzyurl
|
||||
mixlib-config (>= 2.2.12, < 4.0)
|
||||
mixlib-shellout (>= 2.0, < 4.0)
|
||||
@ -313,11 +312,11 @@ GEM
|
||||
chef-telemetry (1.1.1)
|
||||
chef-config
|
||||
concurrent-ruby (~> 1.0)
|
||||
chef-utils (17.10.0)
|
||||
chef-utils (17.9.52)
|
||||
concurrent-ruby
|
||||
coderay (1.1.3)
|
||||
concurrent-ruby (1.1.10)
|
||||
cookstyle (7.32.1)
|
||||
concurrent-ruby (1.1.9)
|
||||
cookstyle (7.31.7)
|
||||
rubocop (= 1.25.1)
|
||||
declarative (0.0.20)
|
||||
diff-lcs (1.5.0)
|
||||
@ -328,7 +327,7 @@ GEM
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
ed25519 (1.3.0)
|
||||
erubi (1.10.0)
|
||||
excon (0.92.3)
|
||||
excon (0.91.0)
|
||||
faraday (1.4.3)
|
||||
faraday-em_http (~> 1.0)
|
||||
faraday-em_synchrony (~> 1.0)
|
||||
@ -367,23 +366,21 @@ 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.10.0)
|
||||
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.6.0)
|
||||
json (2.6.1)
|
||||
jwt (2.3.0)
|
||||
kitchen-inspec (2.5.2)
|
||||
hashie (>= 3.4, <= 5.0)
|
||||
inspec (>= 2.2.64, < 7.0)
|
||||
inspec (>= 2.2.64, < 6.0)
|
||||
test-kitchen (>= 2.7, < 4)
|
||||
kitchen-salt (0.7.2)
|
||||
hashie (>= 3.5)
|
||||
@ -394,21 +391,21 @@ 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)
|
||||
minitest (5.15.0)
|
||||
mixlib-config (3.0.9)
|
||||
tomlrb
|
||||
mixlib-install (3.12.19)
|
||||
mixlib-install (3.12.16)
|
||||
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)
|
||||
@ -423,53 +420,49 @@ 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)
|
||||
parallel (1.21.0)
|
||||
parser (3.1.0.0)
|
||||
ast (~> 2.4.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)
|
||||
public_suffix (4.0.6)
|
||||
rainbow (3.1.1)
|
||||
rake (13.0.6)
|
||||
regexp_parser (2.5.0)
|
||||
representable (3.2.0)
|
||||
regexp_parser (2.2.1)
|
||||
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.2)
|
||||
rspec-support (~> 3.10.0)
|
||||
rspec-expectations (3.10.2)
|
||||
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.3)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.11.0)
|
||||
rspec-support (3.11.0)
|
||||
rspec-support (~> 3.10.0)
|
||||
rspec-support (3.10.3)
|
||||
rubocop (1.25.1)
|
||||
parallel (~> 1.10)
|
||||
parser (>= 3.1.0.0)
|
||||
@ -479,16 +472,16 @@ GEM
|
||||
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)
|
||||
rubocop-ast (1.15.2)
|
||||
parser (>= 3.0.1.1)
|
||||
ruby-progressbar (1.11.0)
|
||||
ruby2_keywords (0.0.5)
|
||||
rubyntlm (0.6.3)
|
||||
rubyzip (2.3.2)
|
||||
semverse (3.0.2)
|
||||
signet (0.17.0)
|
||||
semverse (3.0.0)
|
||||
signet (0.16.0)
|
||||
addressable (~> 2.8)
|
||||
faraday (>= 0.17.5, < 3.a)
|
||||
faraday (>= 0.17.3, < 2.0)
|
||||
jwt (>= 1.5, < 3.0)
|
||||
multi_json (~> 1.10)
|
||||
sslshake (1.3.1)
|
||||
@ -497,7 +490,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.2.2)
|
||||
bcrypt_pbkdf (~> 1.0)
|
||||
chef-utils (>= 16.4.35)
|
||||
ed25519 (~> 1.2)
|
||||
@ -515,7 +508,7 @@ GEM
|
||||
timeliness (0.3.10)
|
||||
tomlrb (1.3.0)
|
||||
trailblazer-option (0.1.2)
|
||||
train (3.10.1)
|
||||
train (3.8.7)
|
||||
activesupport (>= 6.0.3.1)
|
||||
azure_graph_rbac (~> 0.16)
|
||||
azure_mgmt_key_vault (~> 0.17)
|
||||
@ -526,7 +519,7 @@ 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.7)
|
||||
train-winrm (~> 0.2)
|
||||
train-aws (0.2.24)
|
||||
aws-sdk-alexaforbusiness (~> 1.0)
|
||||
@ -604,7 +597,7 @@ GEM
|
||||
aws-sdk-synthetics (~> 1.19.0)
|
||||
aws-sdk-transfer (>= 1.26, < 1.35)
|
||||
aws-sdk-waf (~> 1.43.0)
|
||||
train-core (3.10.1)
|
||||
train-core (3.8.7)
|
||||
addressable (~> 2.5)
|
||||
ffi (!= 1.13.0)
|
||||
json (>= 1.8, < 3.0)
|
||||
@ -612,7 +605,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 +632,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.8)
|
||||
unicode-display_width (2.1.0)
|
||||
unicode_utils (1.4.0)
|
||||
winrm (2.3.6)
|
||||
builder (>= 2.1.2)
|
||||
|
||||
@ -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
|
||||
|
||||
258
kitchen.yml
258
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
|
||||
@ -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
|
||||
@ -97,12 +89,9 @@ platforms:
|
||||
- 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
|
||||
driver:
|
||||
image: saltimages/salt-master-py3:fedora-35
|
||||
image: saltimages/salt-master-py3:fedora-34
|
||||
- name: opensuse-leap-153-master-py3
|
||||
driver:
|
||||
image: saltimages/salt-master-py3:opensuse-leap-15.3
|
||||
@ -143,70 +132,36 @@ platforms:
|
||||
driver:
|
||||
image: saltimages/salt-master-py3:rockylinux-8
|
||||
|
||||
## SALT `3004.1`
|
||||
- name: debian-11-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.1-py3:debian-11
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: debian-10-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.1-py3:debian-10
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: debian-9-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.1-py3:debian-9
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: ubuntu-2204-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.1-py3:ubuntu-22.04
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: ubuntu-2004-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.1-py3:ubuntu-20.04
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: ubuntu-1804-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.1-py3:ubuntu-18.04
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: centos-stream8-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.1-py3:centos-stream8
|
||||
- name: centos-7-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.1-py3:centos-7
|
||||
- name: fedora-36-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.1-py3:fedora-36
|
||||
- name: fedora-35-3004-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: debian-11-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:debian-11
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: debian-10-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:debian-10
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: debian-9-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:debian-9
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: ubuntu-2004-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:ubuntu-20.04
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: ubuntu-1804-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:ubuntu-18.04
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: centos-stream8-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:centos-stream8
|
||||
- name: centos-7-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:centos-7
|
||||
- name: fedora-34-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:fedora-34
|
||||
- name: opensuse-leap-153-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:opensuse-leap-15.3
|
||||
@ -221,42 +176,151 @@ platforms:
|
||||
# => SCP did not finish successfully (255): (Net::SCP::Error)
|
||||
transport:
|
||||
max_ssh_sessions: 1
|
||||
- name: amazonlinux-2-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:amazonlinux-2
|
||||
- name: oraclelinux-8-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:oraclelinux-8
|
||||
- name: oraclelinux-7-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:oraclelinux-7
|
||||
- name: arch-base-latest-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:arch-base-latest
|
||||
- name: gentoo-stage3-latest-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:gentoo-stage3-latest
|
||||
run_command: /sbin/init
|
||||
- name: gentoo-stage3-systemd-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:gentoo-stage3-systemd
|
||||
- name: almalinux-8-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:almalinux-8
|
||||
- name: rockylinux-8-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.0-py3:rockylinux-8
|
||||
|
||||
## SALT `3003.4`
|
||||
- name: debian-10-3003-4-py3
|
||||
## SALT `3003.3`
|
||||
- name: debian-10-3003-3-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.4-py3:debian-10
|
||||
image: saltimages/salt-3003.3-py3:debian-10
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: debian-9-3003-4-py3
|
||||
- name: debian-9-3003-3-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.4-py3:debian-9
|
||||
image: saltimages/salt-3003.3-py3:debian-9
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: ubuntu-2004-3003-4-py3
|
||||
- name: ubuntu-2004-3003-3-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.4-py3:ubuntu-20.04
|
||||
image: saltimages/salt-3003.3-py3:ubuntu-20.04
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: ubuntu-1804-3003-4-py3
|
||||
- name: ubuntu-1804-3003-3-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.4-py3:ubuntu-18.04
|
||||
image: saltimages/salt-3003.3-py3:ubuntu-18.04
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: centos-stream8-3003-4-py3
|
||||
- name: centos-stream8-3003-3-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.4-py3:centos-stream8
|
||||
- name: centos-7-3003-4-py3
|
||||
image: saltimages/salt-3003.3-py3:centos-stream8
|
||||
- name: centos-7-3003-3-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.4-py3:centos-7
|
||||
- name: amazonlinux-2-3003-4-py3
|
||||
image: saltimages/salt-3003.3-py3:centos-7
|
||||
- name: fedora-35-3003-3-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.4-py3:amazonlinux-2
|
||||
- name: oraclelinux-8-3003-4-py3
|
||||
image: saltimages/salt-3003.3-py3:fedora-35
|
||||
- name: fedora-34-3003-3-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.4-py3:oraclelinux-8
|
||||
- name: oraclelinux-7-3003-4-py3
|
||||
image: saltimages/salt-3003.3-py3:fedora-34
|
||||
- name: opensuse-leap-153-3003-3-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.4-py3:oraclelinux-7
|
||||
- name: almalinux-8-3003-4-py3
|
||||
image: saltimages/salt-3003.3-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-3003-3-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.4-py3:almalinux-8
|
||||
image: saltimages/salt-3003.3-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-3-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.3-py3:amazonlinux-2
|
||||
- name: oraclelinux-8-3003-3-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.3-py3:oraclelinux-8
|
||||
- name: oraclelinux-7-3003-3-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.3-py3:oraclelinux-7
|
||||
- name: gentoo-stage3-latest-3003-3-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.3-py3:gentoo-stage3-latest
|
||||
run_command: /sbin/init
|
||||
- name: gentoo-stage3-systemd-3003-3-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.3-py3:gentoo-stage3-systemd
|
||||
- name: almalinux-8-3003-3-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.3-py3:almalinux-8
|
||||
|
||||
## SALT `3002.7`
|
||||
- name: debian-10-3002-7-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.7-py3:debian-10
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: debian-9-3002-7-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.7-py3:debian-9
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: ubuntu-2004-3002-7-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.7-py3:ubuntu-20.04
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: ubuntu-1804-3002-7-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.7-py3:ubuntu-18.04
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: centos-7-3002-7-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.7-py3:centos-7
|
||||
- name: fedora-35-3002-7-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.7-py3:fedora-35
|
||||
- name: fedora-34-3002-7-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.7-py3:fedora-34
|
||||
- name: opensuse-leap-153-3002-7-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.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-tmbl-latest-3002-7-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.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-3002-7-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.7-py3:amazonlinux-2
|
||||
- name: oraclelinux-8-3002-7-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.7-py3:oraclelinux-8
|
||||
- name: oraclelinux-7-3002-7-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.7-py3:oraclelinux-7
|
||||
- name: gentoo-stage3-latest-3002-7-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.7-py3:gentoo-stage3-latest
|
||||
run_command: /sbin/init
|
||||
- name: gentoo-stage3-systemd-3002-7-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.7-py3:gentoo-stage3-systemd
|
||||
|
||||
verifier:
|
||||
# https://www.inspec.io/
|
||||
|
||||
@ -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 }}
|
||||
|
||||
|
||||
@ -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 %}
|
||||
@ -4,7 +4,6 @@
|
||||
{%- set tplroot = tpldir.split('/')[0] %}
|
||||
{%- from tplroot ~ "/map.jinja" import prometheus as p with context %}
|
||||
|
||||
{%- if p.manage_user_group or p.pkg.use_upstream_archive %}
|
||||
{%- for name in p.wanted.component %}
|
||||
|
||||
prometheus-config-users-install-{{ name }}-group-present:
|
||||
@ -30,4 +29,3 @@ prometheus-config-users-install-{{ name }}-user-present:
|
||||
{%- endif %}
|
||||
|
||||
{%- endfor %}
|
||||
{%- endif %}
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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() %}
|
||||
|
||||
@ -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 }}"
|
||||
|
||||
|
||||
|
||||
@ -219,66 +219,7 @@ RedHat:
|
||||
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:
|
||||
|
||||
@ -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' %}
|
||||
|
||||
@ -24,5 +24,4 @@ supports:
|
||||
- platform-name: gentoo
|
||||
- platform-name: almalinux
|
||||
- platform-name: rocky
|
||||
- platform-name: mac_os_x
|
||||
- platform: windows
|
||||
|
||||
@ -24,5 +24,4 @@ supports:
|
||||
- platform-name: gentoo
|
||||
- platform-name: almalinux
|
||||
- platform-name: rocky
|
||||
- platform-name: mac_os_x
|
||||
- platform: windows
|
||||
|
||||
@ -21,5 +21,4 @@ supports:
|
||||
- platform-name: gentoo
|
||||
- platform-name: almalinux
|
||||
- platform-name: rocky
|
||||
- platform-name: mac_os_x
|
||||
- platform: windows
|
||||
|
||||
@ -57,8 +57,6 @@ 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]
|
||||
@ -97,8 +95,6 @@ class SystemResource < Inspec.resource(1)
|
||||
# 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'
|
||||
|
||||
@ -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:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user