Compare commits
106 Commits
v5.5.0
...
libertacas
| Author | SHA1 | Date | |
|---|---|---|---|
2d5e549872
|
|||
|
b9b2e42ad2
|
|||
|
d5cfeb0d80 | ||
|
|
e03e7c9b20 | ||
|
|
ed678bd5fa | ||
|
|
8294f4fd30 | ||
|
|
9c0812c5ae | ||
|
|
4b8babbf95 | ||
|
|
7e63074295 | ||
|
|
6f29fc3fec | ||
|
|
2dbf9219c5 | ||
|
|
e20d8486b5 | ||
|
|
5c7c22e438 | ||
|
|
272b3b7579 | ||
|
|
301451f79d | ||
|
|
307d78665c | ||
|
|
fbe4f805bd | ||
|
|
7676679e17 | ||
|
|
7f9d0d2a80 | ||
|
|
f870697557 | ||
|
|
cc29f2e82e | ||
|
|
7292237179 | ||
|
|
b5dd015dda | ||
|
|
ccbad10301 | ||
|
|
b4de755eef | ||
|
|
8d0a9364c3 | ||
|
|
4027ae5845 | ||
|
|
e96c9531f9 | ||
|
|
24c075693c | ||
|
|
54b37f6777 | ||
|
|
2396a135b3 | ||
|
|
7d5df46905 | ||
|
|
92ab8cdf33 | ||
|
|
4c1564cb61 | ||
|
|
5f5967952b | ||
|
|
9529d5fcfe | ||
|
|
5d39408744 | ||
|
|
b67c038421 | ||
|
|
d1b7d8c2de | ||
|
|
67ad9cc597 | ||
|
|
84c7e9fcc6 | ||
|
|
3bacb65a66 | ||
|
|
a9bd9be2eb | ||
|
|
e3596ecc40 | ||
|
|
9e82000b4e | ||
|
|
b205649356 | ||
|
|
54193c7e00 | ||
|
|
c93300cddd | ||
|
|
1f84e4c6e0 | ||
|
|
711ebf7c1b | ||
|
|
cad14ac07e | ||
|
|
11513c4d9c | ||
|
|
ee20f821d6 | ||
|
|
4aa4777b03 | ||
|
|
5938fe5eab | ||
|
|
4628d741b8 | ||
|
|
70cd33ef19 | ||
|
|
2575aa2c06 | ||
|
|
d4094f708b | ||
|
|
4d8a0c694c | ||
|
|
9fda2330ab | ||
|
|
b2a86e6c09 | ||
|
|
5db9fe534d | ||
|
|
a16397efda | ||
|
|
5cf6488b41 | ||
|
|
2332c7d2f1 | ||
|
|
cec7a6e3f1 | ||
|
|
cfb0949e82 | ||
|
|
74c8358191 | ||
|
|
0179638ba6 | ||
|
|
1c0ce65e12 | ||
|
|
bc5713d29e | ||
|
|
6951f9f482 | ||
|
|
1af0deb087 | ||
|
|
3fafc2172e | ||
|
|
bd213f2ddf | ||
|
|
1b94b086c1 | ||
|
|
33fbb956cd | ||
|
|
802970c47d | ||
|
|
0e65cc345b | ||
|
|
32039539bb | ||
|
|
7ddcd607f6 | ||
|
|
4bd140d71b | ||
|
|
f9c4e46282 | ||
|
|
7140ccf8a8 | ||
|
|
6745bf23d4 | ||
|
|
338ab4ddb6 | ||
|
|
9166498fd8 | ||
|
|
2c572d0019 | ||
|
|
8e9616208c | ||
|
|
f51d24563d | ||
|
|
55503974e4 | ||
|
|
d9b2af894a | ||
|
|
ef8a3a9ad7 | ||
|
|
076869a8cd | ||
|
|
5c1d8b6870 | ||
|
|
0ca247a37e | ||
|
|
f2261f9dc9 | ||
|
|
e52f804bf4 | ||
|
|
52845bb534 | ||
|
|
4de3ebd241 | ||
|
|
4635ca7070 | ||
|
|
a4dfb87554 | ||
|
|
696bee0522 | ||
|
|
eea5b407fa | ||
|
|
fa96aabba7 |
1
.gitignore
vendored
1
.gitignore
vendored
@ -127,6 +127,7 @@ tmp/
|
||||
# `salt-formula` -- Vagrant Specific files
|
||||
.vagrant
|
||||
top.sls
|
||||
!test/salt/pillar/top.sls
|
||||
|
||||
# `suricata-formula` -- Platform binaries
|
||||
*.rpm
|
||||
|
||||
166
.gitlab-ci.yml
166
.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,61 +117,72 @@ 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-ubuntu-1604-tiamat-py3: {extends: '.test_instance'}
|
||||
# default-centos-8-tiamat-py3: {extends: '.test_instance'}
|
||||
# default-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
|
||||
# default-centos-7-tiamat-py3: {extends: '.test_instance'}
|
||||
# default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
|
||||
# default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
|
||||
# default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
|
||||
# default-almalinux-8-tiamat-py3: {extends: '.test_instance'}
|
||||
# default-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
|
||||
# default-debian-11-master-py3: {extends: '.test_instance'}
|
||||
# repo-debian-11-master-py3: {extends: '.test_instance'}
|
||||
debian-11-master-py3: {extends: '.test_instance'}
|
||||
# default-debian-10-master-py3: {extends: '.test_instance'}
|
||||
# repo-debian-10-master-py3: {extends: '.test_instance'}
|
||||
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-ubuntu-1604-master-py3: {extends: '.test_instance'}
|
||||
# repo-ubuntu-1604-master-py3: {extends: '.test_instance'}
|
||||
# ubuntu-1604-master-py3: {extends: '.test_instance'}
|
||||
# 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-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-7-master-py3: {extends: '.test_instance'}
|
||||
# repo-centos-7-master-py3: {extends: '.test_instance'}
|
||||
centos-7-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-fedora-32-master-py3: {extends: '.test_instance'}
|
||||
# repo-fedora-32-master-py3: {extends: '.test_instance'}
|
||||
# fedora-32-master-py3: {extends: '.test_instance'}
|
||||
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'}
|
||||
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-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-amazonlinux-2-master-py3: {extends: '.test_instance'}
|
||||
# repo-amazonlinux-2-master-py3: {extends: '.test_instance'}
|
||||
# amazonlinux-2-master-py3: {extends: '.test_instance'}
|
||||
amazonlinux-2-master-py3: {extends: '.test_instance'}
|
||||
# default-oraclelinux-8-master-py3: {extends: '.test_instance'}
|
||||
# repo-oraclelinux-8-master-py3: {extends: '.test_instance'}
|
||||
oraclelinux-8-master-py3: {extends: '.test_instance'}
|
||||
@ -187,72 +198,43 @@ default-arch-base-latest-master-py3: {extends: '.test_instance'}
|
||||
# default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
|
||||
# repo-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
|
||||
# gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
|
||||
# default-debian-10-3003-0-py3: {extends: '.test_instance'}
|
||||
# default-debian-9-3003-0-py3: {extends: '.test_instance'}
|
||||
# default-ubuntu-2004-3003-0-py3: {extends: '.test_instance'}
|
||||
# default-ubuntu-1804-3003-0-py3: {extends: '.test_instance'}
|
||||
# default-centos-8-3003-0-py3: {extends: '.test_instance'}
|
||||
# default-centos-7-3003-0-py3: {extends: '.test_instance'}
|
||||
# default-fedora-34-3003-0-py3: {extends: '.test_instance'}
|
||||
# default-fedora-33-3003-0-py3: {extends: '.test_instance'}
|
||||
# default-fedora-32-3003-0-py3: {extends: '.test_instance'}
|
||||
# default-amazonlinux-2-3003-0-py3: {extends: '.test_instance'}
|
||||
# default-oraclelinux-8-3003-0-py3: {extends: '.test_instance'}
|
||||
# default-oraclelinux-7-3003-0-py3: {extends: '.test_instance'}
|
||||
# default-arch-base-latest-3003-0-py3: {extends: '.test_instance'}
|
||||
# default-gentoo-stage3-latest-3003-0-py3: {extends: '.test_instance'}
|
||||
# default-gentoo-stage3-systemd-3003-0-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-ubuntu-1604-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-fedora-32-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-5-py3: {extends: '.test_instance'}
|
||||
# default-gentoo-stage3-systemd-3002-5-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-ubuntu-1604-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-fedora-32-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-6-py3: {extends: '.test_instance'}
|
||||
# default-gentoo-stage3-systemd-3001-6-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-ubuntu-1604-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-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-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
|
||||
# default-ubuntu-1604-3000-9-py2: {extends: '.test_instance'}
|
||||
# default-arch-base-latest-3000-9-py2: {extends: '.test_instance'}
|
||||
# default-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'}
|
||||
# default-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'}
|
||||
# default-almalinux-8-master-py3: {extends: '.test_instance'}
|
||||
# repo-almalinux-8-master-py3: {extends: '.test_instance'}
|
||||
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
|
||||
|
||||
###############################################################################
|
||||
# `release` stage: `semantic-release`
|
||||
|
||||
@ -3,6 +3,18 @@
|
||||
---
|
||||
# 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
|
||||
@ -18,7 +30,7 @@ repos:
|
||||
additional_dependencies: ['@commitlint/config-conventional@8.3.4']
|
||||
always_run: true
|
||||
- repo: https://github.com/rubocop-hq/rubocop
|
||||
rev: v1.9.1
|
||||
rev: v1.30.1
|
||||
hooks:
|
||||
- id: rubocop
|
||||
name: Check Ruby files with rubocop
|
||||
@ -26,14 +38,14 @@ repos:
|
||||
always_run: true
|
||||
pass_filenames: false
|
||||
- repo: https://github.com/shellcheck-py/shellcheck-py
|
||||
rev: v0.7.1.1
|
||||
rev: v0.8.0.4
|
||||
hooks:
|
||||
- id: shellcheck
|
||||
name: Check shell scripts with shellcheck
|
||||
files: ^.*\.(sh|bash|ksh)$
|
||||
types: []
|
||||
- repo: https://github.com/adrienverge/yamllint
|
||||
rev: v1.23.0
|
||||
rev: v1.26.3
|
||||
hooks:
|
||||
- id: yamllint
|
||||
name: Check YAML syntax with yamllint
|
||||
@ -41,7 +53,7 @@ repos:
|
||||
always_run: true
|
||||
pass_filenames: false
|
||||
- repo: https://github.com/warpnet/salt-lint
|
||||
rev: v0.3.0
|
||||
rev: v0.8.0
|
||||
hooks:
|
||||
- id: salt-lint
|
||||
name: Check Salt files using salt-lint
|
||||
@ -52,3 +64,14 @@ repos:
|
||||
- id: rstcheck
|
||||
name: Check reST files using rstcheck
|
||||
exclude: 'docs/CHANGELOG.rst'
|
||||
- repo: https://github.com/saltstack-formulas/mirrors-rst-lint
|
||||
rev: v1.3.2
|
||||
hooks:
|
||||
- id: rst-lint
|
||||
name: Check reST files using rst-lint
|
||||
exclude: |
|
||||
(?x)^(
|
||||
docs/CHANGELOG.rst|
|
||||
docs/TOFS_pattern.rst|
|
||||
)$
|
||||
additional_dependencies: [pygments==2.9.0]
|
||||
|
||||
@ -16,4 +16,8 @@ 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`
|
||||
|
||||
149
.travis.yml
149
.travis.yml
@ -83,55 +83,58 @@ jobs:
|
||||
## 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`
|
||||
# - 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-ubuntu-1604-tiamat-py3
|
||||
# - env: INSTANCE=default-centos-8-tiamat-py3
|
||||
# - env: INSTANCE=default-centos-stream8-tiamat-py3
|
||||
# - env: INSTANCE=default-centos-7-tiamat-py3
|
||||
# - env: INSTANCE=default-amazonlinux-2-tiamat-py3
|
||||
# - env: INSTANCE=default-oraclelinux-8-tiamat-py3
|
||||
# - env: INSTANCE=default-oraclelinux-7-tiamat-py3
|
||||
# - env: INSTANCE=default-almalinux-8-tiamat-py3
|
||||
# - env: INSTANCE=default-rockylinux-8-tiamat-py3
|
||||
# - env: INSTANCE=default-debian-11-master-py3
|
||||
# - env: INSTANCE=repo-debian-11-master-py3
|
||||
- env: INSTANCE=debian-11-master-py3
|
||||
# - env: INSTANCE=default-debian-10-master-py3
|
||||
# - env: INSTANCE=repo-debian-10-master-py3
|
||||
- env: INSTANCE=debian-10-master-py3
|
||||
# - 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-ubuntu-1604-master-py3
|
||||
# - env: INSTANCE=repo-ubuntu-1604-master-py3
|
||||
# - env: INSTANCE=ubuntu-1604-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-stream8-master-py3
|
||||
# - env: INSTANCE=repo-centos-stream8-master-py3
|
||||
- env: INSTANCE=centos-stream8-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-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-fedora-32-master-py3
|
||||
# - env: INSTANCE=repo-fedora-32-master-py3
|
||||
# - env: INSTANCE=fedora-32-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-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-opensuse-leap-153-master-py3
|
||||
# - env: INSTANCE=repo-opensuse-leap-153-master-py3
|
||||
# - env: INSTANCE=opensuse-leap-153-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
|
||||
- env: INSTANCE=default-amazonlinux-2-master-py3
|
||||
# - env: INSTANCE=default-amazonlinux-2-master-py3
|
||||
# - env: INSTANCE=repo-amazonlinux-2-master-py3
|
||||
# - env: INSTANCE=amazonlinux-2-master-py3
|
||||
- env: INSTANCE=amazonlinux-2-master-py3
|
||||
# - env: INSTANCE=default-oraclelinux-8-master-py3
|
||||
# - env: INSTANCE=repo-oraclelinux-8-master-py3
|
||||
- env: INSTANCE=oraclelinux-8-master-py3
|
||||
@ -147,72 +150,42 @@ jobs:
|
||||
# - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
|
||||
# - env: INSTANCE=repo-gentoo-stage3-systemd-master-py3
|
||||
# - env: INSTANCE=gentoo-stage3-systemd-master-py3
|
||||
# - env: INSTANCE=default-debian-10-3003-0-py3
|
||||
# - env: INSTANCE=default-debian-9-3003-0-py3
|
||||
# - env: INSTANCE=default-ubuntu-2004-3003-0-py3
|
||||
# - env: INSTANCE=default-ubuntu-1804-3003-0-py3
|
||||
# - env: INSTANCE=default-centos-8-3003-0-py3
|
||||
# - env: INSTANCE=default-centos-7-3003-0-py3
|
||||
# - env: INSTANCE=default-fedora-34-3003-0-py3
|
||||
# - env: INSTANCE=default-fedora-33-3003-0-py3
|
||||
# - env: INSTANCE=default-fedora-32-3003-0-py3
|
||||
# - env: INSTANCE=default-amazonlinux-2-3003-0-py3
|
||||
# - env: INSTANCE=default-oraclelinux-8-3003-0-py3
|
||||
# - env: INSTANCE=default-oraclelinux-7-3003-0-py3
|
||||
# - env: INSTANCE=default-arch-base-latest-3003-0-py3
|
||||
# - env: INSTANCE=default-gentoo-stage3-latest-3003-0-py3
|
||||
# - env: INSTANCE=default-gentoo-stage3-systemd-3003-0-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-ubuntu-1604-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-fedora-32-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-5-py3
|
||||
# - env: INSTANCE=default-gentoo-stage3-systemd-3002-5-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-ubuntu-1604-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-fedora-32-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-6-py3
|
||||
# - env: INSTANCE=default-gentoo-stage3-systemd-3001-6-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-ubuntu-1604-3000-9-py3
|
||||
# - env: INSTANCE=default-centos-8-3000-9-py3
|
||||
# - env: INSTANCE=default-centos-7-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-ubuntu-1804-3000-9-py2
|
||||
# - env: INSTANCE=default-ubuntu-1604-3000-9-py2
|
||||
# - env: INSTANCE=default-arch-base-latest-3000-9-py2
|
||||
# - env: INSTANCE=default-gentoo-stage3-latest-3000-8-py3
|
||||
# - env: INSTANCE=default-gentoo-stage3-systemd-3000-8-py3
|
||||
# - env: INSTANCE=default-almalinux-8-master-py3
|
||||
# - env: INSTANCE=repo-almalinux-8-master-py3
|
||||
- env: INSTANCE=almalinux-8-master-py3
|
||||
# - 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
|
||||
|
||||
## Define the release stage that runs `semantic-release`
|
||||
- stage: 'release'
|
||||
|
||||
14
.yamllint
14
.yamllint
@ -5,13 +5,15 @@
|
||||
extends: 'default'
|
||||
|
||||
# Files to ignore completely
|
||||
# 1. All YAML files under directory `.cache/`, introduced during the GitLab CI run
|
||||
# 2. All YAML files under directory `.git/`
|
||||
# 3. All YAML files under directory `node_modules/`, introduced during the Travis run
|
||||
# 4. Any SLS files under directory `test/`, which are actually state files
|
||||
# 5. Any YAML files under directory `.kitchen/`, introduced during local testing
|
||||
# 6. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax
|
||||
# 1. All YAML files under directory `.bundle/`, introduced if gems are installed locally
|
||||
# 2. All YAML files under directory `.cache/`, introduced during the CI run
|
||||
# 3. All YAML files under directory `.git/`
|
||||
# 4. All YAML files under directory `node_modules/`, introduced during the CI run
|
||||
# 5. Any SLS files under directory `test/`, which are actually state files
|
||||
# 6. Any YAML files under directory `.kitchen/`, introduced during local testing
|
||||
# 7. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax
|
||||
ignore: |
|
||||
.bundle/
|
||||
.cache/
|
||||
.git/
|
||||
node_modules/
|
||||
|
||||
10
AUTHORS.md
10
AUTHORS.md
@ -4,17 +4,19 @@ 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)|88
|
||||
<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)|49
|
||||
<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/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)|13
|
||||
<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/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/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 2021-05-28.
|
||||
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2022-07-11.
|
||||
|
||||
122
CHANGELOG.md
122
CHANGELOG.md
@ -1,5 +1,127 @@
|
||||
# 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)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **defaults:** use nologin instead of /bin/false ([1af0deb](https://github.com/saltstack-formulas/prometheus-formula/commit/1af0deb087b1d6b1109a838871933da97cb38474))
|
||||
* **indempotency:** run reload onchanges only ([9166498](https://github.com/saltstack-formulas/prometheus-formula/commit/9166498fd8fe046c24220f95b7876a50f3a99d3a))
|
||||
|
||||
|
||||
### Continuous Integration
|
||||
|
||||
* **gemfile+lock:** use `ssf` customised `inspec` repo [skip ci] ([3fafc21](https://github.com/saltstack-formulas/prometheus-formula/commit/3fafc2172e8ed77ee537a7935de988a0bc4c99de))
|
||||
* add Debian 11 Bullseye & update `yamllint` configuration [skip ci] ([802970c](https://github.com/saltstack-formulas/prometheus-formula/commit/802970c47d95241acbf69338db24cd74959f3fd9))
|
||||
* **kitchen:** move `provisioner` block & update `run_command` [skip ci] ([3203953](https://github.com/saltstack-formulas/prometheus-formula/commit/32039539bbe345314a1b65133dbadc0cccc40940))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **config/users:** add support for `debian-11` [skip ci] ([0e65cc3](https://github.com/saltstack-formulas/prometheus-formula/commit/0e65cc345b316412fad4ce9966f99d86c9fa829c))
|
||||
|
||||
## [5.5.2](https://github.com/saltstack-formulas/prometheus-formula/compare/v5.5.1...v5.5.2) (2021-07-16)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **clientlibs/install:** ensure tar is available for Amazon Linux 2 ([7140ccf](https://github.com/saltstack-formulas/prometheus-formula/commit/7140ccf8a8150d3776c2dc241f67ad93fa1f5787))
|
||||
* check for Amazon in osfamilymap for pkg repo ([338ab4d](https://github.com/saltstack-formulas/prometheus-formula/commit/338ab4ddb6d895e085a47b335f54451d9d406bc8)), closes [#65](https://github.com/saltstack-formulas/prometheus-formula/issues/65)
|
||||
* update Gitlab CI -test amazonlinux correctly ([6745bf2](https://github.com/saltstack-formulas/prometheus-formula/commit/6745bf23d43f583c0e73d66776c68a669eb9d688)), closes [#65](https://github.com/saltstack-formulas/prometheus-formula/issues/65)
|
||||
|
||||
## [5.5.1](https://github.com/saltstack-formulas/prometheus-formula/compare/v5.5.0...v5.5.1) (2021-07-09)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* added guidance and reverted incorrected changes from prior commits ([0ca247a](https://github.com/saltstack-formulas/prometheus-formula/commit/0ca247a37edd6dceb62d5524ce755c87c31ab599)), closes [#59](https://github.com/saltstack-formulas/prometheus-formula/issues/59)
|
||||
* added guidance and reverted incorrected changes from prior commits ([a4dfb87](https://github.com/saltstack-formulas/prometheus-formula/commit/a4dfb87554b9a5d35fe5654698940380cc5fadee)), closes [#59](https://github.com/saltstack-formulas/prometheus-formula/issues/59)
|
||||
* added handle for alternative argument opts header ([076869a](https://github.com/saltstack-formulas/prometheus-formula/commit/076869a8cdbde4ed1034d98f16cdeaa17906554e)), closes [#59](https://github.com/saltstack-formulas/prometheus-formula/issues/59)
|
||||
* added handle for alternative argument opts header ([4de3ebd](https://github.com/saltstack-formulas/prometheus-formula/commit/4de3ebd24196c347ae1ebba88d754c9dd535cf74)), closes [#59](https://github.com/saltstack-formulas/prometheus-formula/issues/59)
|
||||
* removed erroneus dash (-) ([ef8a3a9](https://github.com/saltstack-formulas/prometheus-formula/commit/ef8a3a9ad781bee86686465a13e27e301f0c5ea5)), closes [#59](https://github.com/saltstack-formulas/prometheus-formula/issues/59)
|
||||
* removed erroneus dash (-) ([52845bb](https://github.com/saltstack-formulas/prometheus-formula/commit/52845bb534ba98947ee161e7fb745489b2ad57da)), closes [#59](https://github.com/saltstack-formulas/prometheus-formula/issues/59)
|
||||
* revert to use of macro.jinja for arg handling ([f2261f9](https://github.com/saltstack-formulas/prometheus-formula/commit/f2261f9dc958792a16c13a6380386a1f7239f386))
|
||||
* revert to use of macro.jinja for arg handling ([696bee0](https://github.com/saltstack-formulas/prometheus-formula/commit/696bee0522b9e37befbe76728c2d3211f25b8a68))
|
||||
* rework to implement environment variables handling ([e52f804](https://github.com/saltstack-formulas/prometheus-formula/commit/e52f804bf454f8c57d8ed51e6566f60befd4d7c7)), closes [#59](https://github.com/saltstack-formulas/prometheus-formula/issues/59)
|
||||
* rework to implement environment variables handling ([eea5b40](https://github.com/saltstack-formulas/prometheus-formula/commit/eea5b407fa6dee5cdcb7bd951b752beb1833176c)), closes [#59](https://github.com/saltstack-formulas/prometheus-formula/issues/59) [#59](https://github.com/saltstack-formulas/prometheus-formula/issues/59)
|
||||
* switched test config entry that wasnt available for deb9 ([5c1d8b6](https://github.com/saltstack-formulas/prometheus-formula/commit/5c1d8b68707ebfbe948cf8f0c21c98504c751d5b))
|
||||
* switched test config entry that wasnt available for deb9 ([4635ca7](https://github.com/saltstack-formulas/prometheus-formula/commit/4635ca70702a05bf5db24df54956c175d0cd3e18))
|
||||
|
||||
|
||||
### Continuous Integration
|
||||
|
||||
* **3003.1:** update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] ([5550397](https://github.com/saltstack-formulas/prometheus-formula/commit/55503974e4cc338590750b02ed964f0afdd44f11))
|
||||
* **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] ([fa96aab](https://github.com/saltstack-formulas/prometheus-formula/commit/fa96aabba76128ebca85b76631bf04ec8daaeb90))
|
||||
|
||||
# [5.5.0](https://github.com/saltstack-formulas/prometheus-formula/compare/v5.4.0...v5.5.0) (2021-05-28)
|
||||
|
||||
|
||||
|
||||
@ -22,6 +22,7 @@
|
||||
/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
|
||||
|
||||
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.5.0
|
||||
version: 5.6.5
|
||||
release: 1
|
||||
minimum_version: 2019.2
|
||||
summary: prometheus formula
|
||||
|
||||
21
Gemfile
21
Gemfile
@ -1,14 +1,19 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
source 'https://rubygems.org'
|
||||
source ENV.fetch('PROXY_RUBYGEMSORG', 'https://rubygems.org')
|
||||
|
||||
# Use the latest version of `inspec` prior to `4.23.4`, which introduces a
|
||||
# regression where the diff isn't displayed when comparing using `eq`.
|
||||
gem 'inspec', '~> 4.22.22'
|
||||
# Install the `kitchen-docker` gem using `git` because the latest version
|
||||
# currently available (`2.10.0`) doesn't include a recent fix for Gentoo.
|
||||
# Install the `inspec` gem using `git` because versions after `4.22.22`
|
||||
# suppress diff output; this version fixes this for our uses.
|
||||
# rubocop:disable Layout/LineLength
|
||||
gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec', branch: 'ssf'
|
||||
# rubocop:enable Layout/LineLength
|
||||
|
||||
# Install the `kitchen-docker` gem using `git` in order to gain a performance
|
||||
# improvement: avoid package installations which are already covered by the
|
||||
# `salt-image-builder` (i.e. the pre-salted images that we're using)
|
||||
# rubocop:disable Layout/LineLength
|
||||
gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf'
|
||||
# rubocop:enable Layout/LineLength
|
||||
gem 'kitchen-inspec', '>= 2.2.1'
|
||||
gem 'kitchen-salt', '>= 0.6.3'
|
||||
|
||||
gem 'kitchen-inspec', '>= 2.5.0'
|
||||
gem 'kitchen-salt', '>= 0.7.2'
|
||||
|
||||
663
Gemfile.lock
663
Gemfile.lock
@ -1,321 +1,418 @@
|
||||
GIT
|
||||
remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
|
||||
revision: 042e6921940a28d2502258b6a5ff3be17dd2fd37
|
||||
remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
|
||||
revision: aaef842906a5666f0fc0b4f186b4dd3498f5b28c
|
||||
branch: ssf
|
||||
specs:
|
||||
kitchen-docker (2.10.0)
|
||||
inspec (5.18.15)
|
||||
cookstyle
|
||||
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)
|
||||
train-habitat (~> 0.1)
|
||||
train-winrm (~> 0.2)
|
||||
inspec-core (5.18.15)
|
||||
addressable (~> 2.4)
|
||||
chef-telemetry (~> 1.0, >= 1.0.8)
|
||||
faraday (>= 0.9.0, < 1.5)
|
||||
faraday_middleware (~> 1.0)
|
||||
hashie (>= 3.4, < 5.0)
|
||||
license-acceptance (>= 0.2.13, < 3.0)
|
||||
method_source (>= 0.8, < 2.0)
|
||||
mixlib-log (~> 3.0)
|
||||
multipart-post (~> 2.0)
|
||||
parallel (~> 1.9)
|
||||
parslet (>= 1.5, < 2.0)
|
||||
pry (~> 0.13)
|
||||
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)
|
||||
tty-prompt (~> 0.17)
|
||||
tty-table (~> 0.10)
|
||||
|
||||
GIT
|
||||
remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
|
||||
revision: 9a09bc1e571e25f3ccabf4725ca2048d970fff82
|
||||
branch: ssf
|
||||
specs:
|
||||
kitchen-docker (2.12.0)
|
||||
test-kitchen (>= 1.0.0)
|
||||
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
activesupport (5.2.4.4)
|
||||
activesupport (7.0.3.1)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 0.7, < 2)
|
||||
minitest (~> 5.1)
|
||||
tzinfo (~> 1.1)
|
||||
addressable (2.7.0)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
tzinfo (~> 2.0)
|
||||
addressable (2.8.0)
|
||||
public_suffix (>= 2.0.2, < 5.0)
|
||||
aws-eventstream (1.1.0)
|
||||
aws-partitions (1.386.0)
|
||||
aws-sdk-apigateway (1.55.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.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-sigv4 (~> 1.1)
|
||||
aws-sdk-apigatewayv2 (1.29.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-amplify (1.32.0)
|
||||
aws-sdk-core (~> 3, >= 3.120.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-athena (1.33.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-apigateway (1.78.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-autoscaling (1.22.0)
|
||||
aws-sdk-core (~> 3, >= 3.52.1)
|
||||
aws-sdk-apigatewayv2 (1.42.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-budgets (1.36.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-applicationautoscaling (1.51.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-cloudformation (1.44.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-athena (1.55.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-cloudfront (1.46.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-autoscaling (1.63.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-cloudhsm (1.27.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-batch (1.47.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-cloudhsmv2 (1.30.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-budgets (1.50.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-cloudtrail (1.29.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-cloudformation (1.70.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-cloudwatch (1.45.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-cloudfront (1.65.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-cloudwatchlogs (1.38.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-cloudhsm (1.39.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-codecommit (1.40.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-cloudhsmv2 (1.42.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-codedeploy (1.37.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-cloudtrail (1.49.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-codepipeline (1.37.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-cloudwatch (1.64.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-configservice (1.53.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-cloudwatchevents (1.46.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-core (3.109.1)
|
||||
aws-sdk-cloudwatchlogs (1.53.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-codecommit (1.51.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-codedeploy (1.49.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-codepipeline (1.53.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.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-core (~> 3, >= 3.112.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-configservice (1.79.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-core (3.131.2)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.239.0)
|
||||
aws-partitions (~> 1, >= 1.525.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
jmespath (~> 1.0)
|
||||
aws-sdk-costandusagereportservice (1.28.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
jmespath (~> 1, >= 1.6.1)
|
||||
aws-sdk-costandusagereportservice (1.40.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-dynamodb (1.55.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-databasemigrationservice (1.53.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-ec2 (1.202.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-dynamodb (1.75.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-ecr (1.39.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-ec2 (1.322.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-ecs (1.70.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-ecr (1.56.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-efs (1.36.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-ecrpublic (1.12.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-eks (1.45.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-ecs (1.100.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-elasticache (1.44.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-efs (1.54.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-elasticbeanstalk (1.39.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-eks (1.75.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-elasticloadbalancing (1.29.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-elasticache (1.78.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-elasticloadbalancingv2 (1.53.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-elasticbeanstalk (1.51.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-elasticsearchservice (1.43.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-elasticloadbalancing (1.40.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-firehose (1.35.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-elasticloadbalancingv2 (1.78.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-guardduty (1.42.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-elasticsearchservice (1.65.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-iam (1.46.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-emr (1.53.0)
|
||||
aws-sdk-core (~> 3, >= 3.121.2)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-kafka (1.29.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-eventbridge (1.24.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-kinesis (1.30.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-firehose (1.48.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-kms (1.39.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-glue (1.88.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-lambda (1.51.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-guardduty (1.58.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-organizations (1.17.0)
|
||||
aws-sdk-core (~> 3, >= 3.39.0)
|
||||
aws-sigv4 (~> 1.0)
|
||||
aws-sdk-rds (1.104.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-iam (1.69.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-redshift (1.50.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-kafka (1.50.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-route53 (1.44.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-kinesis (1.41.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-route53domains (1.28.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-kms (1.57.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-route53resolver (1.21.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-lambda (1.84.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-s3 (1.83.1)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
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-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-core (~> 3, >= 3.112.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-rds (1.148.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-redshift (1.84.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-route53 (1.63.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-route53domains (1.40.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-route53resolver (1.37.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-s3 (1.114.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.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-securityhub (1.35.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-secretsmanager (1.46.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-ses (1.36.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-securityhub (1.67.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-sms (1.27.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-servicecatalog (1.60.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-sns (1.34.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-ses (1.41.0)
|
||||
aws-sdk-core (~> 3, >= 3.120.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-sqs (1.34.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-shield (1.48.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-ssm (1.95.0)
|
||||
aws-sdk-core (~> 3, >= 3.109.0)
|
||||
aws-sdk-signer (1.32.0)
|
||||
aws-sdk-core (~> 3, >= 3.120.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sigv4 (1.2.2)
|
||||
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-sigv4 (~> 1.1)
|
||||
aws-sdk-sns (1.53.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.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-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-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-eventstream (~> 1, >= 1.0.2)
|
||||
azure_graph_rbac (0.17.2)
|
||||
ms_rest_azure (~> 0.12.0)
|
||||
azure_mgmt_key_vault (0.17.6)
|
||||
azure_mgmt_key_vault (0.17.7)
|
||||
ms_rest_azure (~> 0.12.0)
|
||||
azure_mgmt_resources (0.18.0)
|
||||
azure_mgmt_resources (0.18.2)
|
||||
ms_rest_azure (~> 0.12.0)
|
||||
azure_mgmt_security (0.18.2)
|
||||
azure_mgmt_security (0.19.0)
|
||||
ms_rest_azure (~> 0.12.0)
|
||||
azure_mgmt_storage (0.22.0)
|
||||
azure_mgmt_storage (0.23.0)
|
||||
ms_rest_azure (~> 0.12.0)
|
||||
bcrypt_pbkdf (1.0.1)
|
||||
bcrypt_pbkdf (1.1.0)
|
||||
bson (4.15.0)
|
||||
builder (3.2.4)
|
||||
chef-config (16.6.14)
|
||||
chef-config (17.10.0)
|
||||
addressable
|
||||
chef-utils (= 16.6.14)
|
||||
chef-utils (= 17.10.0)
|
||||
fuzzyurl
|
||||
mixlib-config (>= 2.2.12, < 4.0)
|
||||
mixlib-shellout (>= 2.0, < 4.0)
|
||||
tomlrb (~> 1.2)
|
||||
chef-telemetry (1.0.14)
|
||||
chef-telemetry (1.1.1)
|
||||
chef-config
|
||||
concurrent-ruby (~> 1.0)
|
||||
ffi-yajl (~> 2.2)
|
||||
chef-utils (16.6.14)
|
||||
chef-utils (17.10.0)
|
||||
concurrent-ruby
|
||||
coderay (1.1.3)
|
||||
concurrent-ruby (1.1.7)
|
||||
concurrent-ruby (1.1.10)
|
||||
cookstyle (7.32.1)
|
||||
rubocop (= 1.25.1)
|
||||
declarative (0.0.20)
|
||||
declarative-option (0.1.0)
|
||||
diff-lcs (1.4.4)
|
||||
docker-api (2.0.0)
|
||||
diff-lcs (1.5.0)
|
||||
docker-api (2.2.0)
|
||||
excon (>= 0.47.0)
|
||||
multi_json
|
||||
domain_name (0.5.20190701)
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
ecma-re-validator (0.2.1)
|
||||
regexp_parser (~> 1.2)
|
||||
ed25519 (1.2.4)
|
||||
erubi (1.9.0)
|
||||
excon (0.78.0)
|
||||
faraday (0.17.3)
|
||||
ed25519 (1.3.0)
|
||||
erubi (1.10.0)
|
||||
excon (0.92.3)
|
||||
faraday (1.4.3)
|
||||
faraday-em_http (~> 1.0)
|
||||
faraday-em_synchrony (~> 1.0)
|
||||
faraday-excon (~> 1.1)
|
||||
faraday-net_http (~> 1.0)
|
||||
faraday-net_http_persistent (~> 1.1)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
ruby2_keywords (>= 0.0.4)
|
||||
faraday-cookie_jar (0.0.7)
|
||||
faraday (>= 0.8.0)
|
||||
http-cookie (~> 1.0.0)
|
||||
faraday_middleware (0.12.2)
|
||||
faraday (>= 0.7.4, < 1.0)
|
||||
ffi (1.13.1)
|
||||
ffi-yajl (2.3.4)
|
||||
libyajl2 (~> 1.2)
|
||||
faraday-em_http (1.0.0)
|
||||
faraday-em_synchrony (1.0.0)
|
||||
faraday-excon (1.1.0)
|
||||
faraday-net_http (1.0.1)
|
||||
faraday-net_http_persistent (1.2.0)
|
||||
faraday_middleware (1.0.0)
|
||||
faraday (~> 1.0)
|
||||
ffi (1.15.5)
|
||||
fuzzyurl (0.9.0)
|
||||
google-api-client (0.44.0)
|
||||
google-api-client (0.52.0)
|
||||
addressable (~> 2.5, >= 2.5.1)
|
||||
googleauth (~> 0.9)
|
||||
httpclient (>= 2.8.1, < 3.0)
|
||||
mini_mime (~> 1.0)
|
||||
representable (~> 3.0)
|
||||
retriable (>= 2.0, < 4.0)
|
||||
rexml
|
||||
signet (~> 0.12)
|
||||
googleauth (0.13.0)
|
||||
googleauth (0.14.0)
|
||||
faraday (>= 0.17.3, < 2.0)
|
||||
jwt (>= 1.4, < 3.0)
|
||||
memoist (~> 0.16)
|
||||
multi_json (~> 1.11)
|
||||
os (>= 0.9, < 2.0)
|
||||
signet (~> 0.14)
|
||||
gssapi (1.3.0)
|
||||
gssapi (1.3.1)
|
||||
ffi (>= 1.0.1)
|
||||
gyoku (1.3.1)
|
||||
gyoku (1.4.0)
|
||||
builder (>= 2.1.2)
|
||||
hana (1.3.6)
|
||||
hashie (3.6.0)
|
||||
http-cookie (1.0.3)
|
||||
rexml (~> 3.0)
|
||||
hashie (4.1.0)
|
||||
highline (2.0.3)
|
||||
http-cookie (1.0.5)
|
||||
domain_name (~> 0.5)
|
||||
httpclient (2.8.3)
|
||||
i18n (1.8.5)
|
||||
i18n (1.12.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
inifile (3.0.0)
|
||||
inspec (4.22.22)
|
||||
faraday_middleware (~> 0.12.2)
|
||||
inspec-core (= 4.22.22)
|
||||
train (~> 3.0)
|
||||
train-aws (~> 0.1)
|
||||
train-habitat (~> 0.1)
|
||||
train-winrm (~> 0.2)
|
||||
inspec-core (4.22.22)
|
||||
addressable (~> 2.4)
|
||||
chef-telemetry (~> 1.0)
|
||||
faraday (>= 0.9.0)
|
||||
hashie (~> 3.4)
|
||||
json_schemer (>= 0.2.1, < 0.2.12)
|
||||
license-acceptance (>= 0.2.13, < 2.0)
|
||||
method_source (>= 0.8, < 2.0)
|
||||
mixlib-log (~> 3.0)
|
||||
multipart-post (~> 2.0)
|
||||
parallel (~> 1.9)
|
||||
parslet (~> 1.5)
|
||||
pry (~> 0.13)
|
||||
rspec (~> 3.9)
|
||||
rspec-its (~> 1.2)
|
||||
rubyzip (~> 1.2, >= 1.2.2)
|
||||
semverse (~> 3.0)
|
||||
sslshake (~> 1.2)
|
||||
thor (>= 0.20, < 2.0)
|
||||
tomlrb (~> 1.2.0)
|
||||
train-core (~> 3.0)
|
||||
tty-prompt (~> 0.17)
|
||||
tty-table (~> 0.10)
|
||||
jmespath (1.4.0)
|
||||
json (2.3.1)
|
||||
json_schemer (0.2.11)
|
||||
ecma-re-validator (~> 0.2)
|
||||
hana (~> 1.3)
|
||||
regexp_parser (~> 1.5)
|
||||
uri_template (~> 0.7)
|
||||
jwt (2.2.2)
|
||||
kitchen-inspec (2.2.1)
|
||||
hashie (~> 3.4)
|
||||
inspec (>= 2.2.64, < 5.0)
|
||||
test-kitchen (>= 2.7, < 3)
|
||||
kitchen-salt (0.6.3)
|
||||
jmespath (1.6.1)
|
||||
json (2.6.2)
|
||||
jwt (2.4.1)
|
||||
kitchen-inspec (2.6.1)
|
||||
hashie (>= 3.4, <= 5.0)
|
||||
inspec (>= 2.2.64, < 7.0)
|
||||
test-kitchen (>= 2.7, < 4)
|
||||
kitchen-salt (0.7.2)
|
||||
hashie (>= 3.5)
|
||||
test-kitchen (>= 1.4)
|
||||
libyajl2 (1.2.0)
|
||||
license-acceptance (1.0.19)
|
||||
license-acceptance (2.1.13)
|
||||
pastel (~> 0.7)
|
||||
tomlrb (~> 1.2)
|
||||
tty-box (~> 0.3)
|
||||
tty-prompt (~> 0.18)
|
||||
tomlrb (>= 1.2, < 3.0)
|
||||
tty-box (~> 0.6)
|
||||
tty-prompt (~> 0.20)
|
||||
little-plugger (1.1.4)
|
||||
logging (2.3.0)
|
||||
logging (2.3.1)
|
||||
little-plugger (~> 1.1)
|
||||
multi_json (~> 1.14)
|
||||
memoist (0.16.2)
|
||||
method_source (1.0.0)
|
||||
mini_mime (1.0.2)
|
||||
minitest (5.14.2)
|
||||
mixlib-config (3.0.9)
|
||||
mini_mime (1.1.2)
|
||||
minitest (5.16.2)
|
||||
mixlib-config (3.0.27)
|
||||
tomlrb
|
||||
mixlib-install (3.12.3)
|
||||
mixlib-install (3.12.19)
|
||||
mixlib-shellout
|
||||
mixlib-versioning
|
||||
thor
|
||||
mixlib-log (3.0.9)
|
||||
mixlib-shellout (3.1.6)
|
||||
mixlib-shellout (3.2.7)
|
||||
chef-utils
|
||||
mixlib-versioning (1.2.12)
|
||||
mongo (2.13.2)
|
||||
bson (>= 4.8.2, < 5.0.0)
|
||||
ms_rest (0.7.6)
|
||||
concurrent-ruby (~> 1.0)
|
||||
faraday (>= 0.9, < 2.0.0)
|
||||
@ -326,60 +423,83 @@ GEM
|
||||
faraday-cookie_jar (~> 0.0.6)
|
||||
ms_rest (~> 0.7.6)
|
||||
multi_json (1.15.0)
|
||||
multipart-post (2.1.1)
|
||||
multipart-post (2.2.3)
|
||||
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)
|
||||
os (1.1.1)
|
||||
parallel (1.19.2)
|
||||
options (2.3.2)
|
||||
os (1.1.4)
|
||||
parallel (1.22.1)
|
||||
parser (3.1.2.0)
|
||||
ast (~> 2.4.1)
|
||||
parslet (1.8.2)
|
||||
pastel (0.8.0)
|
||||
tty-color (~> 0.5)
|
||||
pry (0.13.1)
|
||||
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.6)
|
||||
regexp_parser (1.8.2)
|
||||
representable (3.0.4)
|
||||
public_suffix (4.0.7)
|
||||
rainbow (3.1.1)
|
||||
rake (13.0.6)
|
||||
regexp_parser (2.5.0)
|
||||
representable (3.2.0)
|
||||
declarative (< 0.1.0)
|
||||
declarative-option (< 0.2.0)
|
||||
trailblazer-option (>= 0.1.1, < 0.2.0)
|
||||
uber (< 0.2.0)
|
||||
retriable (3.1.2)
|
||||
rspec (3.9.0)
|
||||
rspec-core (~> 3.9.0)
|
||||
rspec-expectations (~> 3.9.0)
|
||||
rspec-mocks (~> 3.9.0)
|
||||
rspec-core (3.9.3)
|
||||
rspec-support (~> 3.9.3)
|
||||
rspec-expectations (3.9.3)
|
||||
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)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.9.0)
|
||||
rspec-support (~> 3.11.0)
|
||||
rspec-its (1.3.0)
|
||||
rspec-core (>= 3.0.0)
|
||||
rspec-expectations (>= 3.0.0)
|
||||
rspec-mocks (3.9.1)
|
||||
rspec-mocks (3.11.1)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.9.0)
|
||||
rspec-support (3.9.4)
|
||||
rubyntlm (0.6.2)
|
||||
rubyzip (1.3.0)
|
||||
semverse (3.0.0)
|
||||
signet (0.14.0)
|
||||
addressable (~> 2.3)
|
||||
faraday (>= 0.17.3, < 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)
|
||||
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)
|
||||
jwt (>= 1.5, < 3.0)
|
||||
multi_json (~> 1.10)
|
||||
sslshake (1.3.1)
|
||||
strings (0.2.0)
|
||||
strings (0.2.1)
|
||||
strings-ansi (~> 0.2)
|
||||
unicode-display_width (~> 1.5)
|
||||
unicode-display_width (>= 1.5, < 3.0)
|
||||
unicode_utils (~> 1.4)
|
||||
strings-ansi (0.2.0)
|
||||
test-kitchen (2.7.2)
|
||||
test-kitchen (3.3.1)
|
||||
bcrypt_pbkdf (~> 1.0)
|
||||
chef-utils (>= 16.4.35)
|
||||
ed25519 (~> 1.2)
|
||||
license-acceptance (>= 1.0.11, < 3.0)
|
||||
mixlib-install (~> 3.6)
|
||||
@ -391,28 +511,32 @@ GEM
|
||||
winrm (~> 2.0)
|
||||
winrm-elevated (~> 1.0)
|
||||
winrm-fs (~> 1.1)
|
||||
thor (1.0.1)
|
||||
thread_safe (0.3.6)
|
||||
thor (1.2.1)
|
||||
timeliness (0.3.10)
|
||||
tomlrb (1.2.9)
|
||||
train (3.3.27)
|
||||
activesupport (>= 5.2.4.3, < 6.0.0)
|
||||
tomlrb (1.3.0)
|
||||
trailblazer-option (0.1.2)
|
||||
train (3.10.1)
|
||||
activesupport (>= 6.0.3.1)
|
||||
azure_graph_rbac (~> 0.16)
|
||||
azure_mgmt_key_vault (~> 0.17)
|
||||
azure_mgmt_resources (~> 0.15)
|
||||
azure_mgmt_security (~> 0.18)
|
||||
azure_mgmt_storage (~> 0.18)
|
||||
docker-api (>= 1.26, < 3.0)
|
||||
google-api-client (>= 0.23.9, < 0.44.1)
|
||||
googleauth (>= 0.6.6, < 0.13.1)
|
||||
google-api-client (>= 0.23.9, <= 0.52.0)
|
||||
googleauth (>= 0.6.6, <= 0.14.0)
|
||||
inifile (~> 3.0)
|
||||
train-core (= 3.3.27)
|
||||
train-core (= 3.10.1)
|
||||
train-winrm (~> 0.2)
|
||||
train-aws (0.1.18)
|
||||
train-aws (0.2.24)
|
||||
aws-sdk-alexaforbusiness (~> 1.0)
|
||||
aws-sdk-amplify (~> 1.32.0)
|
||||
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.0)
|
||||
aws-sdk-autoscaling (>= 1.22, < 1.64)
|
||||
aws-sdk-batch (>= 1.36, < 1.48)
|
||||
aws-sdk-budgets (~> 1.0)
|
||||
aws-sdk-cloudformation (~> 1.0)
|
||||
aws-sdk-cloudfront (~> 1.0)
|
||||
@ -420,16 +544,21 @@ GEM
|
||||
aws-sdk-cloudhsmv2 (~> 1.0)
|
||||
aws-sdk-cloudtrail (~> 1.8)
|
||||
aws-sdk-cloudwatch (~> 1.13)
|
||||
aws-sdk-cloudwatchevents (>= 1.36, < 1.47)
|
||||
aws-sdk-cloudwatchlogs (~> 1.13)
|
||||
aws-sdk-codecommit (~> 1.0)
|
||||
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-configservice (~> 1.21)
|
||||
aws-sdk-core (~> 3.0)
|
||||
aws-sdk-costandusagereportservice (~> 1.6)
|
||||
aws-sdk-databasemigrationservice (>= 1.42, < 1.54)
|
||||
aws-sdk-dynamodb (~> 1.31)
|
||||
aws-sdk-ec2 (~> 1.70)
|
||||
aws-sdk-ecr (~> 1.18)
|
||||
aws-sdk-ecrpublic (~> 1.3)
|
||||
aws-sdk-ecs (~> 1.30)
|
||||
aws-sdk-efs (~> 1.0)
|
||||
aws-sdk-eks (~> 1.9)
|
||||
@ -438,48 +567,65 @@ 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-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-organizations (~> 1.17.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-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-ses (~> 1.0)
|
||||
aws-sdk-servicecatalog (>= 1.48, < 1.61)
|
||||
aws-sdk-ses (~> 1.41.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)
|
||||
train-core (3.3.27)
|
||||
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)
|
||||
addressable (~> 2.5)
|
||||
ffi (!= 1.13.0)
|
||||
json (>= 1.8, < 3.0)
|
||||
mixlib-shellout (>= 2.0, < 4.0)
|
||||
net-scp (>= 1.2, < 4.0)
|
||||
net-ssh (>= 2.9, < 7.0)
|
||||
train-habitat (0.2.13)
|
||||
train-winrm (0.2.11)
|
||||
winrm (~> 2.0)
|
||||
train-habitat (0.2.22)
|
||||
train-winrm (0.2.13)
|
||||
winrm (>= 2.3.6, < 3.0)
|
||||
winrm-elevated (~> 1.2.2)
|
||||
winrm-fs (~> 1.0)
|
||||
tty-box (0.6.0)
|
||||
tty-box (0.7.0)
|
||||
pastel (~> 0.8)
|
||||
strings (~> 0.2.0)
|
||||
tty-cursor (~> 0.7)
|
||||
tty-color (0.5.2)
|
||||
tty-color (0.6.0)
|
||||
tty-cursor (0.7.1)
|
||||
tty-prompt (0.22.0)
|
||||
tty-prompt (0.23.1)
|
||||
pastel (~> 0.8)
|
||||
tty-reader (~> 0.8)
|
||||
tty-reader (0.8.0)
|
||||
tty-reader (0.9.0)
|
||||
tty-cursor (~> 0.7)
|
||||
tty-screen (~> 0.8)
|
||||
wisper (~> 2.0)
|
||||
@ -488,16 +634,15 @@ GEM
|
||||
pastel (~> 0.8)
|
||||
strings (~> 0.2.0)
|
||||
tty-screen (~> 0.8)
|
||||
tzinfo (1.2.7)
|
||||
thread_safe (~> 0.1)
|
||||
tzinfo (2.0.4)
|
||||
concurrent-ruby (~> 1.0)
|
||||
uber (0.1.0)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.7.7)
|
||||
unicode-display_width (1.7.0)
|
||||
unf_ext (0.0.8.2)
|
||||
unicode-display_width (2.2.0)
|
||||
unicode_utils (1.4.0)
|
||||
uri_template (0.7.0)
|
||||
winrm (2.3.5)
|
||||
winrm (2.3.6)
|
||||
builder (>= 2.1.2)
|
||||
erubi (~> 1.8)
|
||||
gssapi (~> 1.2)
|
||||
@ -505,15 +650,15 @@ GEM
|
||||
httpclient (~> 2.2, >= 2.2.0.2)
|
||||
logging (>= 1.6.1, < 3.0)
|
||||
nori (~> 2.0)
|
||||
rubyntlm (~> 0.6.0, >= 0.6.1)
|
||||
winrm-elevated (1.2.2)
|
||||
rubyntlm (~> 0.6.0, >= 0.6.3)
|
||||
winrm-elevated (1.2.3)
|
||||
erubi (~> 1.8)
|
||||
winrm (~> 2.0)
|
||||
winrm-fs (~> 1.0)
|
||||
winrm-fs (1.3.3)
|
||||
winrm-fs (1.3.5)
|
||||
erubi (~> 1.8)
|
||||
logging (>= 1.6.1, < 3.0)
|
||||
rubyzip (~> 1.1)
|
||||
rubyzip (~> 2.0)
|
||||
winrm (~> 2.0)
|
||||
wisper (2.0.1)
|
||||
|
||||
@ -521,10 +666,10 @@ PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
inspec (~> 4.22.22)
|
||||
inspec!
|
||||
kitchen-docker!
|
||||
kitchen-inspec (>= 2.2.1)
|
||||
kitchen-salt (>= 0.6.3)
|
||||
kitchen-inspec (>= 2.5.0)
|
||||
kitchen-salt (>= 0.7.2)
|
||||
|
||||
BUNDLED WITH
|
||||
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
|
||||
|
||||
@ -15,22 +15,25 @@ 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>`_
|
||||
- 88
|
||||
- 132
|
||||
* - :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>`_
|
||||
- 49
|
||||
- 57
|
||||
* - :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>`_
|
||||
- 13
|
||||
- 14
|
||||
* - :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
|
||||
@ -43,8 +46,11 @@ 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 2021-05-28.
|
||||
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2022-02-26.
|
||||
|
||||
@ -2,6 +2,131 @@
|
||||
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)
|
||||
------------------------------------------------------------------------------------------------------------
|
||||
|
||||
Bug Fixes
|
||||
^^^^^^^^^
|
||||
|
||||
|
||||
* **defaults:** use nologin instead of /bin/false (\ `1af0deb <https://github.com/saltstack-formulas/prometheus-formula/commit/1af0deb087b1d6b1109a838871933da97cb38474>`_\ )
|
||||
* **indempotency:** run reload onchanges only (\ `9166498 <https://github.com/saltstack-formulas/prometheus-formula/commit/9166498fd8fe046c24220f95b7876a50f3a99d3a>`_\ )
|
||||
|
||||
Continuous Integration
|
||||
^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
|
||||
* **gemfile+lock:** use ``ssf`` customised ``inspec`` repo [skip ci] (\ `3fafc21 <https://github.com/saltstack-formulas/prometheus-formula/commit/3fafc2172e8ed77ee537a7935de988a0bc4c99de>`_\ )
|
||||
* add Debian 11 Bullseye & update ``yamllint`` configuration [skip ci] (\ `802970c <https://github.com/saltstack-formulas/prometheus-formula/commit/802970c47d95241acbf69338db24cd74959f3fd9>`_\ )
|
||||
* **kitchen:** move ``provisioner`` block & update ``run_command`` [skip ci] (\ `3203953 <https://github.com/saltstack-formulas/prometheus-formula/commit/32039539bbe345314a1b65133dbadc0cccc40940>`_\ )
|
||||
|
||||
Features
|
||||
^^^^^^^^
|
||||
|
||||
|
||||
* **config/users:** add support for ``debian-11`` [skip ci] (\ `0e65cc3 <https://github.com/saltstack-formulas/prometheus-formula/commit/0e65cc345b316412fad4ce9966f99d86c9fa829c>`_\ )
|
||||
|
||||
`5.5.2 <https://github.com/saltstack-formulas/prometheus-formula/compare/v5.5.1...v5.5.2>`_ (2021-07-16)
|
||||
------------------------------------------------------------------------------------------------------------
|
||||
|
||||
Bug Fixes
|
||||
^^^^^^^^^
|
||||
|
||||
|
||||
* **clientlibs/install:** ensure tar is available for Amazon Linux 2 (\ `7140ccf <https://github.com/saltstack-formulas/prometheus-formula/commit/7140ccf8a8150d3776c2dc241f67ad93fa1f5787>`_\ )
|
||||
* check for Amazon in osfamilymap for pkg repo (\ `338ab4d <https://github.com/saltstack-formulas/prometheus-formula/commit/338ab4ddb6d895e085a47b335f54451d9d406bc8>`_\ ), closes `#65 <https://github.com/saltstack-formulas/prometheus-formula/issues/65>`_
|
||||
* update Gitlab CI -test amazonlinux correctly (\ `6745bf2 <https://github.com/saltstack-formulas/prometheus-formula/commit/6745bf23d43f583c0e73d66776c68a669eb9d688>`_\ ), closes `#65 <https://github.com/saltstack-formulas/prometheus-formula/issues/65>`_
|
||||
|
||||
`5.5.1 <https://github.com/saltstack-formulas/prometheus-formula/compare/v5.5.0...v5.5.1>`_ (2021-07-09)
|
||||
------------------------------------------------------------------------------------------------------------
|
||||
|
||||
Bug Fixes
|
||||
^^^^^^^^^
|
||||
|
||||
|
||||
* added guidance and reverted incorrected changes from prior commits (\ `0ca247a <https://github.com/saltstack-formulas/prometheus-formula/commit/0ca247a37edd6dceb62d5524ce755c87c31ab599>`_\ ), closes `#59 <https://github.com/saltstack-formulas/prometheus-formula/issues/59>`_
|
||||
* added guidance and reverted incorrected changes from prior commits (\ `a4dfb87 <https://github.com/saltstack-formulas/prometheus-formula/commit/a4dfb87554b9a5d35fe5654698940380cc5fadee>`_\ ), closes `#59 <https://github.com/saltstack-formulas/prometheus-formula/issues/59>`_
|
||||
* added handle for alternative argument opts header (\ `076869a <https://github.com/saltstack-formulas/prometheus-formula/commit/076869a8cdbde4ed1034d98f16cdeaa17906554e>`_\ ), closes `#59 <https://github.com/saltstack-formulas/prometheus-formula/issues/59>`_
|
||||
* added handle for alternative argument opts header (\ `4de3ebd <https://github.com/saltstack-formulas/prometheus-formula/commit/4de3ebd24196c347ae1ebba88d754c9dd535cf74>`_\ ), closes `#59 <https://github.com/saltstack-formulas/prometheus-formula/issues/59>`_
|
||||
* removed erroneus dash (-) (\ `ef8a3a9 <https://github.com/saltstack-formulas/prometheus-formula/commit/ef8a3a9ad781bee86686465a13e27e301f0c5ea5>`_\ ), closes `#59 <https://github.com/saltstack-formulas/prometheus-formula/issues/59>`_
|
||||
* removed erroneus dash (-) (\ `52845bb <https://github.com/saltstack-formulas/prometheus-formula/commit/52845bb534ba98947ee161e7fb745489b2ad57da>`_\ ), closes `#59 <https://github.com/saltstack-formulas/prometheus-formula/issues/59>`_
|
||||
* revert to use of macro.jinja for arg handling (\ `f2261f9 <https://github.com/saltstack-formulas/prometheus-formula/commit/f2261f9dc958792a16c13a6380386a1f7239f386>`_\ )
|
||||
* revert to use of macro.jinja for arg handling (\ `696bee0 <https://github.com/saltstack-formulas/prometheus-formula/commit/696bee0522b9e37befbe76728c2d3211f25b8a68>`_\ )
|
||||
* rework to implement environment variables handling (\ `e52f804 <https://github.com/saltstack-formulas/prometheus-formula/commit/e52f804bf454f8c57d8ed51e6566f60befd4d7c7>`_\ ), closes `#59 <https://github.com/saltstack-formulas/prometheus-formula/issues/59>`_
|
||||
* rework to implement environment variables handling (\ `eea5b40 <https://github.com/saltstack-formulas/prometheus-formula/commit/eea5b407fa6dee5cdcb7bd951b752beb1833176c>`_\ ), closes `#59 <https://github.com/saltstack-formulas/prometheus-formula/issues/59>`_ `#59 <https://github.com/saltstack-formulas/prometheus-formula/issues/59>`_
|
||||
* switched test config entry that wasnt available for deb9 (\ `5c1d8b6 <https://github.com/saltstack-formulas/prometheus-formula/commit/5c1d8b68707ebfbe948cf8f0c21c98504c751d5b>`_\ )
|
||||
* switched test config entry that wasnt available for deb9 (\ `4635ca7 <https://github.com/saltstack-formulas/prometheus-formula/commit/4635ca70702a05bf5db24df54956c175d0cd3e18>`_\ )
|
||||
|
||||
Continuous Integration
|
||||
^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
|
||||
* **3003.1:** update inc. AlmaLinux, Rocky & ``rst-lint`` [skip ci] (\ `5550397 <https://github.com/saltstack-formulas/prometheus-formula/commit/55503974e4cc338590750b02ed964f0afdd44f11>`_\ )
|
||||
* **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] (\ `fa96aab <https://github.com/saltstack-formulas/prometheus-formula/commit/fa96aabba76128ebca85b76631bf04ec8daaeb90>`_\ )
|
||||
|
||||
`5.5.0 <https://github.com/saltstack-formulas/prometheus-formula/compare/v5.4.0...v5.5.0>`_ (2021-05-28)
|
||||
------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
380
kitchen.yml
380
kitchen.yml
@ -6,28 +6,47 @@ driver:
|
||||
name: docker
|
||||
use_sudo: false
|
||||
privileged: true
|
||||
run_command: /lib/systemd/systemd
|
||||
run_command: /usr/lib/systemd/systemd
|
||||
|
||||
provisioner:
|
||||
name: salt_solo
|
||||
log_level: debug
|
||||
salt_install: none
|
||||
require_chef: false
|
||||
formula: prometheus
|
||||
salt_copy_filter:
|
||||
- .kitchen
|
||||
- .git
|
||||
|
||||
platforms:
|
||||
## SALT `tiamat`
|
||||
- name: debian-11-tiamat-py3
|
||||
driver:
|
||||
image: saltimages/salt-tiamat-py3:debian-11
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: debian-10-tiamat-py3
|
||||
driver:
|
||||
image: saltimages/salt-tiamat-py3:debian-10
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: debian-9-tiamat-py3
|
||||
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
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: ubuntu-1804-tiamat-py3
|
||||
driver:
|
||||
image: saltimages/salt-tiamat-py3:ubuntu-18.04
|
||||
- name: ubuntu-1604-tiamat-py3
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: centos-stream8-tiamat-py3
|
||||
driver:
|
||||
image: saltimages/salt-tiamat-py3:ubuntu-16.04
|
||||
- name: centos-8-tiamat-py3
|
||||
driver:
|
||||
image: saltimages/salt-tiamat-py3:centos-8
|
||||
image: saltimages/salt-tiamat-py3:centos-stream8
|
||||
- name: centos-7-tiamat-py3
|
||||
driver:
|
||||
image: saltimages/salt-tiamat-py3:centos-7
|
||||
@ -40,50 +59,60 @@ platforms:
|
||||
- name: oraclelinux-7-tiamat-py3
|
||||
driver:
|
||||
image: saltimages/salt-tiamat-py3:oraclelinux-7
|
||||
- name: almalinux-8-tiamat-py3
|
||||
driver:
|
||||
image: saltimages/salt-tiamat-py3:almalinux-8
|
||||
- name: rockylinux-8-tiamat-py3
|
||||
driver:
|
||||
image: saltimages/salt-tiamat-py3:rockylinux-8
|
||||
|
||||
## SALT `master`
|
||||
- name: debian-11-master-py3
|
||||
driver:
|
||||
image: saltimages/salt-master-py3:debian-11
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: debian-10-master-py3
|
||||
driver:
|
||||
image: saltimages/salt-master-py3:debian-10
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: debian-9-master-py3
|
||||
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
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: ubuntu-1804-master-py3
|
||||
driver:
|
||||
image: saltimages/salt-master-py3:ubuntu-18.04
|
||||
- name: ubuntu-1604-master-py3
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: centos-stream8-master-py3
|
||||
driver:
|
||||
image: saltimages/salt-master-py3:ubuntu-16.04
|
||||
- name: centos-8-master-py3
|
||||
driver:
|
||||
image: saltimages/salt-master-py3:centos-8
|
||||
image: saltimages/salt-master-py3:centos-stream8
|
||||
- name: centos-7-master-py3
|
||||
driver:
|
||||
image: saltimages/salt-master-py3:centos-7
|
||||
- name: fedora-34-master-py3
|
||||
- name: fedora-36-master-py3
|
||||
driver:
|
||||
image: saltimages/salt-master-py3:fedora-34
|
||||
- name: fedora-33-master-py3
|
||||
image: saltimages/salt-master-py3:fedora-36
|
||||
- name: fedora-35-master-py3
|
||||
driver:
|
||||
image: saltimages/salt-master-py3:fedora-33
|
||||
- name: fedora-32-master-py3
|
||||
image: saltimages/salt-master-py3:fedora-35
|
||||
- name: opensuse-leap-153-master-py3
|
||||
driver:
|
||||
image: saltimages/salt-master-py3:fedora-32
|
||||
- name: opensuse-leap-152-master-py3
|
||||
driver:
|
||||
image: saltimages/salt-master-py3:opensuse-leap-15.2
|
||||
run_command: /usr/lib/systemd/systemd
|
||||
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
|
||||
image: saltimages/salt-master-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-master-py3
|
||||
driver:
|
||||
image: saltimages/salt-master-py3:opensuse-tumbleweed-latest
|
||||
run_command: /usr/lib/systemd/systemd
|
||||
# Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
|
||||
# => SCP did not finish successfully (255): (Net::SCP::Error)
|
||||
transport:
|
||||
@ -100,7 +129,6 @@ platforms:
|
||||
- name: arch-base-latest-master-py3
|
||||
driver:
|
||||
image: saltimages/salt-master-py3:arch-base-latest
|
||||
run_command: /usr/lib/systemd/systemd
|
||||
- name: gentoo-stage3-latest-master-py3
|
||||
driver:
|
||||
image: saltimages/salt-master-py3:gentoo-stage3-latest
|
||||
@ -108,270 +136,134 @@ platforms:
|
||||
- name: gentoo-stage3-systemd-master-py3
|
||||
driver:
|
||||
image: saltimages/salt-master-py3:gentoo-stage3-systemd
|
||||
- name: almalinux-8-master-py3
|
||||
driver:
|
||||
image: saltimages/salt-master-py3:almalinux-8
|
||||
- name: rockylinux-8-master-py3
|
||||
driver:
|
||||
image: saltimages/salt-master-py3:rockylinux-8
|
||||
|
||||
## SALT `3003.0`
|
||||
- name: debian-10-3003-0-py3
|
||||
## SALT `3004.1`
|
||||
- name: debian-11-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.0-py3:debian-10
|
||||
- name: debian-9-3003-0-py3
|
||||
image: saltimages/salt-3004.1-py3:debian-11
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: debian-10-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.0-py3:debian-9
|
||||
- name: ubuntu-2004-3003-0-py3
|
||||
image: saltimages/salt-3004.1-py3:debian-10
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: debian-9-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.0-py3:ubuntu-20.04
|
||||
- name: ubuntu-1804-3003-0-py3
|
||||
image: saltimages/salt-3004.1-py3:debian-9
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: ubuntu-2204-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.0-py3:ubuntu-18.04
|
||||
- name: centos-8-3003-0-py3
|
||||
image: saltimages/salt-3004.1-py3:ubuntu-22.04
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: ubuntu-2004-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.0-py3:centos-8
|
||||
- name: centos-7-3003-0-py3
|
||||
image: saltimages/salt-3004.1-py3:ubuntu-20.04
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: ubuntu-1804-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.0-py3:centos-7
|
||||
- name: fedora-34-3003-0-py3
|
||||
image: saltimages/salt-3004.1-py3:ubuntu-18.04
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: centos-stream8-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.0-py3:fedora-34
|
||||
- name: fedora-33-3003-0-py3
|
||||
image: saltimages/salt-3004.1-py3:centos-stream8
|
||||
- name: centos-7-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.0-py3:fedora-33
|
||||
- name: fedora-32-3003-0-py3
|
||||
image: saltimages/salt-3004.1-py3:centos-7
|
||||
- name: fedora-36-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.0-py3:fedora-32
|
||||
- name: amazonlinux-2-3003-0-py3
|
||||
image: saltimages/salt-3004.1-py3:fedora-36
|
||||
- name: fedora-35-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.0-py3:amazonlinux-2
|
||||
- name: oraclelinux-8-3003-0-py3
|
||||
image: saltimages/salt-3004.1-py3:fedora-35
|
||||
- name: amazonlinux-2-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.0-py3:oraclelinux-8
|
||||
- name: oraclelinux-7-3003-0-py3
|
||||
image: saltimages/salt-3004.1-py3:amazonlinux-2
|
||||
- name: oraclelinux-8-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.0-py3:oraclelinux-7
|
||||
- name: arch-base-latest-3003-0-py3
|
||||
image: saltimages/salt-3004.1-py3:oraclelinux-8
|
||||
- name: oraclelinux-7-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.0-py3:arch-base-latest
|
||||
run_command: /usr/lib/systemd/systemd
|
||||
- name: gentoo-stage3-latest-3003-0-py3
|
||||
image: saltimages/salt-3004.1-py3:oraclelinux-7
|
||||
- name: arch-base-latest-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.0-py3:gentoo-stage3-latest
|
||||
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-3003-0-py3
|
||||
- name: gentoo-stage3-systemd-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3003.0-py3:gentoo-stage3-systemd
|
||||
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 `3002.6`
|
||||
- name: debian-10-3002-6-py3
|
||||
## SALT `3004.0`
|
||||
- name: opensuse-leap-153-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.6-py3:debian-10
|
||||
- name: debian-9-3002-6-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.6-py3:debian-9
|
||||
- name: ubuntu-2004-3002-6-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.6-py3:ubuntu-20.04
|
||||
- name: ubuntu-1804-3002-6-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.6-py3:ubuntu-18.04
|
||||
- name: ubuntu-1604-3002-6-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.6-py3:ubuntu-16.04
|
||||
- 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: fedora-32-3002-6-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.6-py3:fedora-32
|
||||
- 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
|
||||
run_command: /usr/lib/systemd/systemd
|
||||
|
||||
## SALT `3002.5`
|
||||
- name: gentoo-stage3-latest-3002-5-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.5-py3:gentoo-stage3-latest
|
||||
run_command: /sbin/init
|
||||
- name: gentoo-stage3-systemd-3002-5-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.5-py3:gentoo-stage3-systemd
|
||||
|
||||
## SALT `3002.2`
|
||||
- name: opensuse-leap-152-3002-2-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.2-py3:opensuse-leap-15.2
|
||||
run_command: /usr/lib/systemd/systemd
|
||||
# Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
|
||||
image: saltimages/salt-3004.0-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-2-py3
|
||||
- name: opensuse-tmbl-latest-3004-0-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.2-py3:opensuse-tumbleweed-latest
|
||||
run_command: /usr/lib/systemd/systemd
|
||||
image: saltimages/salt-3004.0-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 `3001.7`
|
||||
- name: debian-10-3001-7-py3
|
||||
## SALT `3003.4`
|
||||
- name: debian-10-3003-4-py3
|
||||
driver:
|
||||
image: saltimages/salt-3001.7-py3:debian-10
|
||||
- name: debian-9-3001-7-py3
|
||||
image: saltimages/salt-3003.4-py3:debian-10
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: debian-9-3003-4-py3
|
||||
driver:
|
||||
image: saltimages/salt-3001.7-py3:debian-9
|
||||
- name: ubuntu-2004-3001-7-py3
|
||||
image: saltimages/salt-3003.4-py3:debian-9
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: ubuntu-2004-3003-4-py3
|
||||
driver:
|
||||
image: saltimages/salt-3001.7-py3:ubuntu-20.04
|
||||
- name: ubuntu-1804-3001-7-py3
|
||||
image: saltimages/salt-3003.4-py3:ubuntu-20.04
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: ubuntu-1804-3003-4-py3
|
||||
driver:
|
||||
image: saltimages/salt-3001.7-py3:ubuntu-18.04
|
||||
- name: ubuntu-1604-3001-7-py3
|
||||
image: saltimages/salt-3003.4-py3:ubuntu-18.04
|
||||
run_command: /lib/systemd/systemd
|
||||
- name: centos-stream8-3003-4-py3
|
||||
driver:
|
||||
image: saltimages/salt-3001.7-py3:ubuntu-16.04
|
||||
- name: centos-8-3001-7-py3
|
||||
image: saltimages/salt-3003.4-py3:centos-stream8
|
||||
- name: centos-7-3003-4-py3
|
||||
driver:
|
||||
image: saltimages/salt-3001.7-py3:centos-8
|
||||
- name: centos-7-3001-7-py3
|
||||
image: saltimages/salt-3003.4-py3:centos-7
|
||||
- name: amazonlinux-2-3003-4-py3
|
||||
driver:
|
||||
image: saltimages/salt-3001.7-py3:centos-7
|
||||
- name: fedora-34-3001-7-py3
|
||||
image: saltimages/salt-3003.4-py3:amazonlinux-2
|
||||
- name: oraclelinux-8-3003-4-py3
|
||||
driver:
|
||||
image: saltimages/salt-3001.7-py3:fedora-34
|
||||
- name: fedora-33-3001-7-py3
|
||||
image: saltimages/salt-3003.4-py3:oraclelinux-8
|
||||
- name: oraclelinux-7-3003-4-py3
|
||||
driver:
|
||||
image: saltimages/salt-3001.7-py3:fedora-33
|
||||
- name: fedora-32-3001-7-py3
|
||||
image: saltimages/salt-3003.4-py3:oraclelinux-7
|
||||
- name: almalinux-8-3003-4-py3
|
||||
driver:
|
||||
image: saltimages/salt-3001.7-py3:fedora-32
|
||||
- name: opensuse-leap-152-3001-7-py3
|
||||
driver:
|
||||
image: saltimages/salt-3001.7-py3:opensuse-leap-15.2
|
||||
run_command: /usr/lib/systemd/systemd
|
||||
# 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
|
||||
run_command: /usr/lib/systemd/systemd
|
||||
# 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
|
||||
run_command: /usr/lib/systemd/systemd
|
||||
|
||||
## SALT `3001.6`
|
||||
- name: gentoo-stage3-latest-3001-6-py3
|
||||
driver:
|
||||
image: saltimages/salt-3001.6-py3:gentoo-stage3-latest
|
||||
run_command: /sbin/init
|
||||
- name: gentoo-stage3-systemd-3001-6-py3
|
||||
driver:
|
||||
image: saltimages/salt-3001.6-py3:gentoo-stage3-systemd
|
||||
|
||||
## SALT `3000.9`
|
||||
- name: debian-10-3000-9-py3
|
||||
driver:
|
||||
image: saltimages/salt-3000.9-py3:debian-10
|
||||
- name: debian-9-3000-9-py3
|
||||
driver:
|
||||
image: saltimages/salt-3000.9-py3:debian-9
|
||||
- name: ubuntu-1804-3000-9-py3
|
||||
driver:
|
||||
image: saltimages/salt-3000.9-py3:ubuntu-18.04
|
||||
- name: ubuntu-1604-3000-9-py3
|
||||
driver:
|
||||
image: saltimages/salt-3000.9-py3:ubuntu-16.04
|
||||
- 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-152-3000-9-py3
|
||||
driver:
|
||||
image: saltimages/salt-3000.9-py3:opensuse-leap-15.2
|
||||
run_command: /usr/lib/systemd/systemd
|
||||
# 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: ubuntu-1804-3000-9-py2
|
||||
driver:
|
||||
image: saltimages/salt-3000.9-py2:ubuntu-18.04
|
||||
- name: ubuntu-1604-3000-9-py2
|
||||
driver:
|
||||
image: saltimages/salt-3000.9-py2:ubuntu-16.04
|
||||
- name: arch-base-latest-3000-9-py2
|
||||
driver:
|
||||
image: saltimages/salt-3000.9-py2:arch-base-latest
|
||||
run_command: /usr/lib/systemd/systemd
|
||||
|
||||
## SALT `3000.8`
|
||||
- name: gentoo-stage3-latest-3000-8-py3
|
||||
driver:
|
||||
image: saltimages/salt-3000.8-py3:gentoo-stage3-latest
|
||||
run_command: /sbin/init
|
||||
- name: gentoo-stage3-systemd-3000-8-py3
|
||||
driver:
|
||||
image: saltimages/salt-3000.8-py3:gentoo-stage3-systemd
|
||||
|
||||
provisioner:
|
||||
name: salt_solo
|
||||
log_level: debug
|
||||
salt_install: none
|
||||
require_chef: false
|
||||
formula: prometheus
|
||||
salt_copy_filter:
|
||||
- .kitchen
|
||||
- .git
|
||||
image: saltimages/salt-3003.4-py3:almalinux-8
|
||||
|
||||
verifier:
|
||||
# https://www.inspec.io/
|
||||
name: inspec
|
||||
sudo: true
|
||||
# cli, documentation, html, progress, json, json-min, json-rspec, junit
|
||||
reporter:
|
||||
# cli, documentation, html, progress, json, json-min, json-rspec, junit
|
||||
- cli
|
||||
|
||||
suites:
|
||||
|
||||
@ -1,6 +1,17 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=yaml
|
||||
---
|
||||
# Prometheus has two approaches to handling config arguments, through an environment
|
||||
# file or directly adding to the service file.
|
||||
# This formular takes both approaches in seperate circumstances, with the archive
|
||||
# install approach implementing a custom service file, and the repo (default) approach
|
||||
# using an environ file with the standard package provided service file.
|
||||
# As a result, depending on the install method used, the environ:args or service:args
|
||||
# pillars need to be set appropriately.
|
||||
# The default options given under service in the default.yaml may not therefore apply
|
||||
# depending on the install method, and in some cases they are no longer consistent
|
||||
# with the default configuration in the latest package.
|
||||
# This applies to all components with an example provided for node_exporter.
|
||||
prometheus:
|
||||
wanted:
|
||||
clientlibs:
|
||||
@ -33,6 +44,12 @@ prometheus:
|
||||
smartctl: /usr/sbin/smartctl
|
||||
pkg:
|
||||
use_upstream_repo: false
|
||||
# Uses the archive install method with true or repo method with false. Default is
|
||||
# false.
|
||||
# The archive and repo methods use completely different approaches to
|
||||
# / service arguments handling, with different required pillar values.
|
||||
# The repo method uses the package service config, the archive method uses a custom
|
||||
# service config.
|
||||
use_upstream_archive: true
|
||||
|
||||
clientlibs:
|
||||
@ -94,6 +111,10 @@ prometheus:
|
||||
version: v0.18.1
|
||||
archive:
|
||||
source_hash: b2503fd932f85f4e5baf161268854bf5d22001869b84f00fd2d1f57b51b72424
|
||||
environ:
|
||||
args:
|
||||
collector.systemd: null
|
||||
web.listen-address: ":9110"
|
||||
service:
|
||||
name: prometheus-node-exporter
|
||||
args:
|
||||
|
||||
@ -7,16 +7,16 @@ sed -i -e "s_^\(version:\).*_\1 ${1}_" FORMULA
|
||||
|
||||
|
||||
###############################################################################
|
||||
# (B) Use `m2r` to convert automatically produced `.md` docs to `.rst`
|
||||
# (B) Use `m2r2` to convert automatically produced `.md` docs to `.rst`
|
||||
###############################################################################
|
||||
|
||||
# Install `m2r`
|
||||
pip3 install m2r
|
||||
# Install `m2r2`
|
||||
pip3 install m2r2
|
||||
|
||||
# Copy and then convert the `.md` docs
|
||||
cp ./*.md docs/
|
||||
cd docs/ || exit
|
||||
m2r --overwrite ./*.md
|
||||
m2r2 --overwrite ./*.md
|
||||
|
||||
# Change excess `H1` headings to `H2` in converted `CHANGELOG.rst`
|
||||
sed -i -e '/^=.*$/s/=/-/g' CHANGELOG.rst
|
||||
|
||||
@ -129,19 +129,28 @@ prometheus-archive-install-{{ name }}-managed-service:
|
||||
env: {{ p.pkg.component[name]['service'].get('env', [])|tojson }}
|
||||
workdir: {{ p.dir.var }}/{{ name }}
|
||||
stop: ''
|
||||
{%- 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
|
||||
{%- 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}) %}
|
||||
{%- 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) %}
|
||||
@ -153,7 +162,7 @@ prometheus-archive-install-{{ name }}-managed-service:
|
||||
- group: prometheus-config-users-install-{{ name }}-group-present
|
||||
cmd.run:
|
||||
- name: systemctl daemon-reload
|
||||
- require:
|
||||
- onchanges:
|
||||
{%- if p.pkg.component.get(name).get('archive').get('tar', true) %}
|
||||
- archive: prometheus-archive-install-{{ name }}
|
||||
{% else %}
|
||||
|
||||
@ -28,7 +28,7 @@ prometheus-clientlibs-install-{{ name }}:
|
||||
- group
|
||||
- mode
|
||||
{%- endif %}
|
||||
{%- if grains.get('osfinger', '') in ['Oracle Linux Server-8'] %}
|
||||
{%- if grains.get('osfinger', '') in ['Oracle Linux Server-8', 'Amazon Linux-2'] %}
|
||||
pkg.installed:
|
||||
- name: tar
|
||||
- require_in:
|
||||
|
||||
@ -4,15 +4,19 @@
|
||||
{%- set tplroot = tpldir.split('/')[0] %}
|
||||
{%- from tplroot ~ "/map.jinja" import prometheus as p with context %}
|
||||
{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
|
||||
{%- from tplroot ~ "/files/macros.jinja" import concat_environ %}
|
||||
{%- from tplroot ~ "/files/macros.jinja" import concat_args %}
|
||||
{%- set sls_archive_install = tplroot ~ '.archive.install' %}
|
||||
{%- set sls_package_install = tplroot ~ '.package.install' %}
|
||||
{%- set sls_service_running = tplroot ~ '.service.running' %}
|
||||
|
||||
include:
|
||||
- {{ sls_archive_install if p.pkg.use_upstream_archive else sls_package_install }}
|
||||
- {{ sls_service_running }}
|
||||
|
||||
{%- for name in p.wanted.component %}
|
||||
{%- if 'environ' in p.pkg.component[name] and p.pkg.component[name]['environ'] %}
|
||||
{%- if 'environ' in p.pkg.component[name] and 'args' in p.pkg.component[name]['environ'] %}
|
||||
{%- set args = p.pkg.component[name]['environ']['args'] %}
|
||||
{%- set arg_name = p.pkg.component[name]['environ']['environ_arg_name'] %}
|
||||
{%- if 'environ_file' in p.pkg.component[name] and p.pkg.component[name]['environ_file'] %}
|
||||
|
||||
prometheus-config-install-{{ name }}-environ_file:
|
||||
@ -29,8 +33,9 @@ prometheus-config-install-{{ name }}-environ_file:
|
||||
- user: {{ p.identity.rootuser }}
|
||||
- group: {{ p.identity.rootgroup }}
|
||||
{%- endif %}
|
||||
- contents: |
|
||||
command_args="{{ concat_environ(environ) }}"
|
||||
- context:
|
||||
args: {{ concat_args(args) }}
|
||||
arg_name: {{ arg_name }}
|
||||
- watch_in:
|
||||
- service: prometheus-service-running-{{ name }}
|
||||
- require:
|
||||
@ -43,7 +48,7 @@ prometheus-config-environ-{{ name }}-all:
|
||||
- name: {{ name }}_environ
|
||||
# service prometheus restart tends to hang on FreeBSD
|
||||
# https://github.com/saltstack/salt/issues/44848#issuecomment-487016414
|
||||
- value: "{{ concat_environ(p.pkg.component[name]['environ']) }} >/dev/null 2>&1"
|
||||
- value: "{{ concat_args(p.pkg.component[name]['environ']) }} >/dev/null 2>&1"
|
||||
- watch_in:
|
||||
- service: prometheus-service-running-{{ name }}
|
||||
|
||||
|
||||
@ -40,15 +40,19 @@ 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 }}
|
||||
|
||||
@ -71,15 +75,19 @@ 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 }}
|
||||
|
||||
|
||||
@ -4,3 +4,4 @@
|
||||
include:
|
||||
- .file
|
||||
- .environ
|
||||
- .storage
|
||||
|
||||
35
prometheus/config/storage.sls
Normal file
35
prometheus/config/storage.sls
Normal file
@ -0,0 +1,35 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=sls
|
||||
|
||||
{%- set tplroot = tpldir.split('/')[0] %}
|
||||
{%- from tplroot ~ "/map.jinja" import prometheus as p with context %}
|
||||
{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
|
||||
{%- from tplroot ~ "/files/macros.jinja" import concat_args %}
|
||||
{%- set sls_archive_install = tplroot ~ '.archive.install' %}
|
||||
{%- set sls_package_install = tplroot ~ '.package.install' %}
|
||||
|
||||
include:
|
||||
- {{ sls_archive_install if p.pkg.use_upstream_archive else sls_package_install }}
|
||||
|
||||
{%- for name in p.wanted.component %}
|
||||
{%- if 'environ' in p.pkg.component[name] and 'args' in p.pkg.component[name]['environ'] %}
|
||||
{%- set args = p.pkg.component[name]['environ']['args'] %}
|
||||
{%- if 'storage.tsdb.path' in args.keys() %}
|
||||
|
||||
prometheus-service-args-{{ name }}-data-dir:
|
||||
file.directory:
|
||||
- name: {{ args['storage.tsdb.path'] }}
|
||||
- user: {{ 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 %}
|
||||
@ -4,11 +4,13 @@
|
||||
{%- 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
|
||||
|
||||
@ -18,12 +20,14 @@ prometheus-config-users-install-{{ name }}-user-present:
|
||||
- groups:
|
||||
- {{ name }}
|
||||
{%- if grains.os != 'Windows' %}
|
||||
- shell: /bin/false
|
||||
- shell: {{ p.shell }}
|
||||
{%- if grains.kernel|lower == 'linux' %}
|
||||
- createhome: false
|
||||
- system: true
|
||||
{%- elif grains.os_family == 'MacOS' %}
|
||||
- unless: /usr/bin/dscl . list /Users | grep {{ name }} >/dev/null 2>&1
|
||||
{%- endif %}
|
||||
{%- endif %}
|
||||
|
||||
{%- endfor %}
|
||||
{%- endif %}
|
||||
|
||||
@ -23,6 +23,8 @@ prometheus:
|
||||
tmp: /tmp/prometheus
|
||||
var: /var/lib/prometheus
|
||||
|
||||
manage_user_group: true
|
||||
|
||||
pkg:
|
||||
uri: https://github.com/prometheus
|
||||
use_upstream_repo: false
|
||||
@ -44,8 +46,11 @@ prometheus:
|
||||
version: v0.21.0
|
||||
config_file: /etc/prometheus/alertmanager.yml
|
||||
config: {}
|
||||
environ_file: /etc/default/prometheus-alertmanager.sh
|
||||
environ: {}
|
||||
environ_file: /etc/default/prometheus-alertmanager
|
||||
environ:
|
||||
environ_arg_name: ARGS
|
||||
# These service args will not impact installs using the non archive method and
|
||||
# instead should be added as environ args in such a case
|
||||
service:
|
||||
args:
|
||||
config.file: /etc/prometheus/alertmanager.yml
|
||||
@ -65,6 +70,9 @@ prometheus:
|
||||
version: v0.18.0
|
||||
config_file: /etc/prometheus/blackbox_exporter.yml
|
||||
config: {}
|
||||
environ_file: /etc/default/prometheus-blackbox-exporter
|
||||
environ:
|
||||
environ_arg_name: ARGS
|
||||
archive:
|
||||
source_hash: a87f9530e31e2b20d03a6d941f6f051c57ee724f24b38f2615b8580ca63966dc
|
||||
commands:
|
||||
@ -131,10 +139,13 @@ prometheus:
|
||||
- tcp/9207
|
||||
node_exporter:
|
||||
version: v1.0.1
|
||||
environ_file: /etc/default/prometheus-node-exporter.sh
|
||||
environ: {}
|
||||
environ_file: /etc/default/prometheus-node-exporter
|
||||
environ:
|
||||
environ_arg_name: ARGS
|
||||
config_file: /etc/prometheus/node_exporter.yml
|
||||
config: {}
|
||||
# These service args will not impact installs using the non archive method and
|
||||
# instead should be added as environ args in such a case
|
||||
service:
|
||||
args:
|
||||
collector.textfile.directory: /var/tmp/node_exporter
|
||||
@ -152,8 +163,11 @@ prometheus:
|
||||
version: v2.22.1
|
||||
config_file: /etc/prometheus/prometheus.yml
|
||||
config: {}
|
||||
environ_file: /etc/default/prometheus.sh
|
||||
environ: {}
|
||||
environ_file: /etc/default/prometheus
|
||||
environ:
|
||||
environ_arg_name: ARGS
|
||||
# These service args will not impact installs using the non archive method and
|
||||
# instead should be added as environ args in such a case
|
||||
service:
|
||||
args:
|
||||
config.file: /etc/prometheus/prometheus.yml
|
||||
@ -170,8 +184,9 @@ prometheus:
|
||||
- tcp/9090
|
||||
pushgateway:
|
||||
version: v1.3.0
|
||||
environ_file: /etc/default/prometheus-pushgateway.sh
|
||||
environ: {}
|
||||
environ_file: /etc/default/prometheus-pushgateway
|
||||
environ:
|
||||
environ_arg_name: ARGS
|
||||
config_file: /etc/prometheus/pushgateway.yml
|
||||
config: {}
|
||||
service: {}
|
||||
@ -195,7 +210,6 @@ prometheus:
|
||||
- tcp/4505
|
||||
- tcp/4506
|
||||
- tcp/9102
|
||||
|
||||
clientlibs:
|
||||
# https://prometheus.io/docs/instrumenting/clientlibs
|
||||
# no bash & perl client tarballs are available
|
||||
@ -298,6 +312,8 @@ prometheus:
|
||||
rootuser: root
|
||||
rootgroup: root
|
||||
|
||||
shell: /usr/sbin/nologin
|
||||
|
||||
retry_option:
|
||||
# https://docs.saltstack.com/en/latest/ref/states/requisites.html#retrying-states
|
||||
attempts: 3
|
||||
|
||||
@ -22,9 +22,11 @@ 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,5 +2,8 @@
|
||||
# File managed by Salt at <{{ source }}>.
|
||||
# Your changes may be overwritten.
|
||||
########################################################################
|
||||
# Set the command-line arguments to pass to the server."
|
||||
{{ arg_name }}="{{ args }}"
|
||||
|
||||
|
||||
|
||||
{{ config|yaml(False) }}
|
||||
|
||||
@ -15,7 +15,22 @@
|
||||
{%- set macos_rootgroup = salt['cmd.run']("stat -f '%Sg' /dev/console") %}
|
||||
{%- endif %}
|
||||
|
||||
Arch: {}
|
||||
Arch:
|
||||
pkg:
|
||||
component:
|
||||
alertmanager:
|
||||
name: alertmanager
|
||||
blackbox_exporter:
|
||||
name: prometheus-blackbox-exporter
|
||||
prometheus:
|
||||
environ_file: /etc/conf.d/prometheus
|
||||
environ:
|
||||
environ_arg_name: PROMETHEUS_ARGS
|
||||
node_exporter:
|
||||
name: prometheus-node-exporter
|
||||
environ_file: /etc/conf.d/prometheus-node-exporter
|
||||
environ:
|
||||
environ_arg_name: NODE_EXPORTER_ARGS
|
||||
|
||||
Alpine: {}
|
||||
|
||||
@ -29,8 +44,6 @@ Debian:
|
||||
use_upstream_package: false
|
||||
use_upstream_archive: false
|
||||
component:
|
||||
prometheus:
|
||||
name: prometheus
|
||||
alertmanager:
|
||||
name: prometheus-alertmanager
|
||||
service:
|
||||
@ -47,11 +60,20 @@ Debian:
|
||||
bird_exporter:
|
||||
name: prometheus-bird-exporter
|
||||
args_file: /etc/default/prometheus-bird-exporter
|
||||
prometheus:
|
||||
name: prometheus
|
||||
blackbox_exporter:
|
||||
name: prometheus-blackbox-exporter
|
||||
config_file: /etc/prometheus/blackbox.yml
|
||||
environ_file: /etc/default/prometheus-blackbox-exporter
|
||||
environ:
|
||||
environ_arg_name: ARGS
|
||||
service:
|
||||
name: prometheus-blackbox-exporter
|
||||
config_file: /etc/prometheus/blackbox.yml
|
||||
consul_exporter:
|
||||
name: prometheus-consul-exporter
|
||||
graphite_exporter:
|
||||
name: prometheus-graphite-exporter
|
||||
hacluster_exporter:
|
||||
name: prometheus-hacluster-exporter
|
||||
args_file: /etc/default/prometheus-hacluster-exporter
|
||||
@ -70,6 +92,8 @@ Debian:
|
||||
mailexporter:
|
||||
name: prometheus-mailexporter
|
||||
args_file: /etc/default/prometheus-mailexporter
|
||||
memcached_exporter:
|
||||
name: prometheus-memcached-exporter
|
||||
mongodb_exporter:
|
||||
name: prometheus-mongodb-exporter
|
||||
args_file: /etc/default/prometheus-mongodb-exporter
|
||||
@ -85,7 +109,7 @@ Debian:
|
||||
args_file: /etc/default/prometheus-nginx-exporter
|
||||
nginx_vts_exporter:
|
||||
name: prometheus-nginx-vts-exporter
|
||||
args_file: /etc/default/prometheus-nginx-vts-exporter
|
||||
args_file: /etc/default/prometheus-nginx-vts-export
|
||||
node_exporter:
|
||||
name: prometheus-node-exporter
|
||||
service:
|
||||
@ -113,7 +137,11 @@ Debian:
|
||||
args_file: /etc/default/prometheus-process-exporter
|
||||
pushgateway:
|
||||
name: prometheus-pushgateway
|
||||
service:
|
||||
name: prometheus-pushgateway
|
||||
args_file: /etc/default/prometheus-pushgateway
|
||||
statsd_exporter:
|
||||
name: prometheus-statsd-exporter
|
||||
snmp_exporter:
|
||||
name: prometheus-snmp-exporter
|
||||
args_file: /etc/default/prometheus-snmp-exporter
|
||||
@ -122,7 +150,7 @@ Debian:
|
||||
args_file: /etc/default/prometheus-sql-exporter
|
||||
squid_exporter:
|
||||
name: prometheus-squid-exporter
|
||||
args_file: /etc/default/prometheus-squid-exporter
|
||||
args_file: /etc/default/prometheus-squid
|
||||
tplink_plug_exporter:
|
||||
name: prometheus-tplink-plug-exporter
|
||||
args_file: /etc/default/prometheus-tplink-plug-exporter
|
||||
@ -148,17 +176,109 @@ RedHat:
|
||||
component:
|
||||
prometheus:
|
||||
name: prometheus2
|
||||
environ_file: /etc/default/prometheus
|
||||
environ:
|
||||
environ_arg_name: PROMETHEUS_OPTS
|
||||
args:
|
||||
config.file: /etc/prometheus/prometheus.yml
|
||||
storage.tsdb.path: /var/lib/prometheus/data
|
||||
web.console.libraries: /usr/share/prometheus/console_libraries
|
||||
web.console.templates: /usr/share/prometheus/consoles
|
||||
alertmanager:
|
||||
environ_file: /etc/default/alertmanager
|
||||
environ:
|
||||
environ_arg_name: ALERTMANAGER_OPTS
|
||||
args:
|
||||
config.file: /etc/prometheus/alertmanager.yml
|
||||
storage.path: /var/lib/prometheus/alertmanager
|
||||
node_exporter:
|
||||
environ_file: /etc/default/node_exporter
|
||||
environ:
|
||||
environ_arg_name: NODE_EXPORTER_OPTS
|
||||
pushgateway:
|
||||
environ_file: /etc/default/pushgateway
|
||||
environ:
|
||||
environ_arg_name: PUSHGATEWAY_OPTS
|
||||
blackbox_exporter:
|
||||
environ_file: /etc/default/blackbox_exporter
|
||||
environ:
|
||||
environ_arg_name: BLACKBOX_EXPORTER_OPTS
|
||||
args:
|
||||
config.file: /etc/prometheus/blackbox.yml
|
||||
repo:
|
||||
# https://akai-tsuki.hatenablog.com/entry/2017/12/03/000000
|
||||
{%- if grains.os == 'Amazon' %}
|
||||
{%- set releasever = salt['cmd.run']("rpm -E '%{rhel}'") %}
|
||||
{% else %}
|
||||
{%- set releasever = "$releasever" %}
|
||||
{%- endif %}
|
||||
# yamllint disable rule:line-length
|
||||
baseurl: 'https://packagecloud.io/prometheus-rpm/release/el/$releasever/$basearch'
|
||||
gpgkey: 'https://packagecloud.io/prometheus-rpm/release/gpgkey gpgkey2=https://raw.githubusercontent.com/lest/prometheus-rpm/master/RPM-GPG-KEY-prometheus-rpm'
|
||||
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'
|
||||
# yamllint enable rule:line-length
|
||||
sslverify: 1
|
||||
sslcacert: /etc/pki/tls/certs/ca-bundle.crt
|
||||
metadata_expire: 300
|
||||
|
||||
Suse: {}
|
||||
Suse:
|
||||
manage_user_group: false
|
||||
pkg:
|
||||
use_upstream_repo: false
|
||||
use_upstream_package: false
|
||||
use_upstream_archive: false
|
||||
component:
|
||||
alertmanager:
|
||||
name: golang-github-prometheus-alertmanager
|
||||
service:
|
||||
name: prometheus-alertmanager
|
||||
environ_file: /etc/sysconfig/prometheus-alertmanager
|
||||
args:
|
||||
config.file: /etc/prometheus/alertmanager.yml
|
||||
config_file: /etc/prometheus/alertmanager.yml
|
||||
prometheus:
|
||||
name: golang-github-prometheus-prometheus
|
||||
service:
|
||||
name: prometheus
|
||||
environ_file: /etc/sysconfig/prometheus
|
||||
environ:
|
||||
environ_arg_name: ARGS
|
||||
config_file: /etc/prometheus/prometheus.yml
|
||||
blackbox_exporter:
|
||||
name: prometheus-blackbox_exporter
|
||||
config_file: /etc/prometheus/blackbox.yml
|
||||
service:
|
||||
name: prometheus-blackbox_exporter
|
||||
hacluster_exporter:
|
||||
name: prometheus-ha_cluster_exporter
|
||||
environ_file: /etc/sysconfig/prometheus-ha_cluster_exporter
|
||||
environ:
|
||||
environ_arg_name: ARGS
|
||||
service:
|
||||
name: prometheus-ha_cluster_exporter
|
||||
node_exporter:
|
||||
name: golang-github-prometheus-node_exporter
|
||||
service:
|
||||
name: prometheus-node_exporter
|
||||
environ_file: /etc/sysconfig/prometheus-node_exporter
|
||||
environ:
|
||||
environ_arg_name: ARGS
|
||||
postgres_exporter:
|
||||
name: prometheus-postgres_exporter
|
||||
service:
|
||||
name: prometheus-postgres_exporter
|
||||
environ_file: /etc/sysconfig/prometheus-postgres_exporter
|
||||
environ:
|
||||
environ_arg_name: POSTGRES_EXPORTER_PARAMS
|
||||
saptune_exporter:
|
||||
name: prometheus-saptune_exporter
|
||||
service:
|
||||
name: prometheus-saptune_exporter
|
||||
webhook_snmp:
|
||||
name: prometheus-webhook-snmp
|
||||
service:
|
||||
name: prometheus-webhook-snmp
|
||||
environ_file: /etc/default/prometheus-webhook-snmp
|
||||
environ:
|
||||
environ_arg_name: PROMETHEUS_WEBHOOK_SNMP_OPTIONS
|
||||
|
||||
Gentoo:
|
||||
pkg:
|
||||
@ -344,6 +464,7 @@ Windows:
|
||||
|
||||
MacOS:
|
||||
div: '/'
|
||||
shell: /sbin/nologin
|
||||
dir:
|
||||
default: /etc/defaults
|
||||
identity:
|
||||
|
||||
@ -11,12 +11,6 @@
|
||||
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 %}
|
||||
|
||||
@ -25,14 +25,16 @@ include:
|
||||
prometheus-service-args-{{ name }}-data-dir:
|
||||
file.directory:
|
||||
- name: {{ args['storage.tsdb.path'] }}
|
||||
- owner: {{ name }}
|
||||
- user: {{ 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' %}
|
||||
|
||||
@ -22,4 +22,7 @@ supports:
|
||||
- platform-name: oracle
|
||||
- platform-name: arch
|
||||
- platform-name: gentoo
|
||||
- platform-name: almalinux
|
||||
- platform-name: rocky
|
||||
- platform-name: mac_os_x
|
||||
- platform: windows
|
||||
|
||||
@ -11,7 +11,16 @@ control 'prometheus packages' do
|
||||
alertmanager
|
||||
node_exporter
|
||||
]
|
||||
when 'debian'
|
||||
when 'linux'
|
||||
case platform[:name]
|
||||
when 'arch'
|
||||
%w[
|
||||
prometheus
|
||||
alertmanager
|
||||
prometheus-node-exporter
|
||||
]
|
||||
end
|
||||
else
|
||||
%w[
|
||||
prometheus
|
||||
prometheus-alertmanager
|
||||
|
||||
@ -21,15 +21,37 @@ control 'prometheus services' do
|
||||
]
|
||||
end
|
||||
|
||||
node_exporter =
|
||||
case platform[:family]
|
||||
when 'redhat'
|
||||
'node_exporter'
|
||||
else
|
||||
'prometheus-node-exporter'
|
||||
end
|
||||
|
||||
services.each do |service|
|
||||
describe service(service) do
|
||||
it { should be_enabled }
|
||||
it { should be_running }
|
||||
end
|
||||
|
||||
describe file("/etc/default/#{service}") do
|
||||
it { should exist }
|
||||
end
|
||||
end
|
||||
|
||||
# prometheus-node-exporter port
|
||||
describe port(9100) do
|
||||
describe port(9110) do
|
||||
it { should be_listening }
|
||||
end
|
||||
|
||||
# environ args check
|
||||
describe file('/etc/default/prometheus') do
|
||||
its('content') { should include '--log.level=debug' }
|
||||
end
|
||||
|
||||
describe file("/etc/default/#{node_exporter}") do
|
||||
its('content') { should include '--web.listen-address=:9110' }
|
||||
its('content') { should include '--log.level=debug' }
|
||||
end
|
||||
end
|
||||
|
||||
@ -22,4 +22,7 @@ supports:
|
||||
- platform-name: oracle
|
||||
- platform-name: arch
|
||||
- platform-name: gentoo
|
||||
- platform-name: almalinux
|
||||
- platform-name: rocky
|
||||
- platform-name: mac_os_x
|
||||
- platform: windows
|
||||
|
||||
@ -19,4 +19,7 @@ supports:
|
||||
- platform-name: oracle
|
||||
- platform-name: arch
|
||||
- platform-name: gentoo
|
||||
- platform-name: almalinux
|
||||
- platform-name: rocky
|
||||
- platform-name: mac_os_x
|
||||
- platform: windows
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
# 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'
|
||||
|
||||
@ -21,7 +22,8 @@ class SystemResource < Inspec.resource(1)
|
||||
family: build_platform_family,
|
||||
name: build_platform_name,
|
||||
release: build_platform_release,
|
||||
finger: build_platform_finger
|
||||
finger: build_platform_finger,
|
||||
codename: build_platform_codename
|
||||
}
|
||||
end
|
||||
|
||||
@ -36,7 +38,7 @@ class SystemResource < Inspec.resource(1)
|
||||
|
||||
def build_platform_name
|
||||
case inspec.platform[:name]
|
||||
when 'amazon', 'oracle'
|
||||
when 'amazon', 'oracle', 'rocky'
|
||||
"#{inspec.platform[:name]}linux"
|
||||
when /^windows_/
|
||||
inspec.platform[:family]
|
||||
@ -49,18 +51,22 @@ class SystemResource < Inspec.resource(1)
|
||||
def build_platform_release
|
||||
case inspec.platform[:name]
|
||||
when 'amazon'
|
||||
# `2018` relase is named `1` in kitchen.yaml
|
||||
# `2018` relase is named `1` in `kitchen.yml`
|
||||
inspec.platform[:release].gsub(/2018.*/, '1')
|
||||
when 'arch'
|
||||
'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'
|
||||
@ -87,4 +93,46 @@ 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
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=yaml
|
||||
---
|
||||
# Uses the archive install method identified by 'use_upstream_archive: true'
|
||||
prometheus:
|
||||
wanted:
|
||||
clientlibs:
|
||||
@ -18,7 +19,7 @@ prometheus:
|
||||
- php-fpm_exporter
|
||||
- postgres_exporter
|
||||
- mysqld_exporter
|
||||
# - memcached_exporter # not in upstream repo, only archive
|
||||
- memcached_exporter # not in upstream repo, only archive
|
||||
|
||||
exporters:
|
||||
node_exporter:
|
||||
@ -85,6 +86,10 @@ prometheus:
|
||||
- to: 'team-X+alerts@example.org'
|
||||
|
||||
node_exporter:
|
||||
environ:
|
||||
args:
|
||||
collector.systemd: true
|
||||
web.listen-address: ":9110"
|
||||
service:
|
||||
args:
|
||||
collector.systemd: null
|
||||
@ -113,6 +118,11 @@ 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
|
||||
log.level: debug
|
||||
config:
|
||||
# yamllint disable-line rule:line-length
|
||||
# ref https://raw.githubusercontent.com/prometheus/prometheus/release-2.10/config/testdata/conf.good.yml
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=yaml
|
||||
---
|
||||
# Uses the standard install method from package repo
|
||||
prometheus:
|
||||
wanted:
|
||||
clientlibs:
|
||||
@ -12,6 +13,12 @@ prometheus:
|
||||
- alertmanager
|
||||
- node_exporter
|
||||
- blackbox_exporter
|
||||
{%- if grains.os == 'SUSE' %}
|
||||
- hacluster_exporter
|
||||
- postgres_exporter
|
||||
- saptune_exporter
|
||||
- webhook_snmp
|
||||
{%- endif %}
|
||||
|
||||
exporters:
|
||||
node_exporter:
|
||||
@ -30,7 +37,7 @@ prometheus:
|
||||
|
||||
pkg:
|
||||
# yamllint disable-line rule:braces rule:commas
|
||||
use_upstream_repo: {{ false if grains.os_family|lower in ('debian',) else true }}
|
||||
use_upstream_repo: {{ false if grains.os_family|lower in ('debian','suse',) else true }}
|
||||
use_upstream_archive: false
|
||||
|
||||
clientlibs:
|
||||
@ -78,6 +85,10 @@ prometheus:
|
||||
version: v0.18.1
|
||||
archive:
|
||||
source_hash: b2503fd932f85f4e5baf161268854bf5d22001869b84f00fd2d1f57b51b72424
|
||||
environ:
|
||||
args:
|
||||
log.level: debug
|
||||
web.listen-address: ":9110"
|
||||
service:
|
||||
args:
|
||||
web.listen-address: ":9110"
|
||||
@ -92,6 +103,10 @@ prometheus:
|
||||
service:
|
||||
args:
|
||||
web.listen-address: 0.0.0.0:9090
|
||||
environ:
|
||||
args:
|
||||
web.listen-address: 0.0.0.0:9090
|
||||
log.level: debug
|
||||
config:
|
||||
# yamllint disable-line rule:line-length
|
||||
# ref https://raw.githubusercontent.com/prometheus/prometheus/release-2.10/config/testdata/conf.good.yml
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user