Skip to content

Commit 20d6d7a

Browse files
robin-checkmkrobin-checkmk
authored
Merge pull request #667 from Checkmk/devel
Release 5.3.0
2 parents 1c9f628 + eb87803 commit 20d6d7a

File tree

105 files changed

+4670
-249
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+4670
-249
lines changed

‎.ansible-lint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ exclude_paths:
3232
# requirements, like avoiding python identifiers. To disable add `var-naming`
3333
# to skip_list.
3434
# var_naming_pattern: "^[a-z_][a-z0-9_]*$"
35-
var_naming_pattern: "^checkmk_(server|agent|var)_.*$"
35+
var_naming_pattern: "^(__)?checkmk_(server|agent|var)_.*$"
3636

3737
use_default_rules: true
3838
# Load custom rules from this specific folder

‎.github/workflows/ans-int-test-activation.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ on:
2929
push:
3030
paths:
3131
- 'plugins/modules/activation.py'
32+
- '.github/workflows/ans-int-test-activation.yaml'
3233

3334
jobs:
3435

‎.github/workflows/ans-int-test-bakery.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ on:
2828
push:
2929
paths:
3030
- 'plugins/modules/bakery.py'
31+
- '.github/workflows/ans-int-test-bakery.yaml'
3132

3233
jobs:
3334

‎.github/workflows/ans-int-test-contact_group.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ on:
2828
push:
2929
paths:
3030
- 'plugins/modules/contact_group.py'
31+
- '.github/workflows/ans-int-test-contact_group.yaml'
3132

3233
jobs:
3334

‎.github/workflows/ans-int-test-discovery.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ on:
2828
push:
2929
paths:
3030
- 'plugins/modules/discovery.py'
31+
- '.github/workflows/ans-int-test-discovery.yaml'
3132

3233
jobs:
3334

‎.github/workflows/ans-int-test-downtime.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ on:
2828
push:
2929
paths:
3030
- 'plugins/modules/downtime.py'
31+
- '.github/workflows/ans-int-test-downtime.yaml'
3132

3233
jobs:
3334

‎.github/workflows/ans-int-test-folder.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ on:
2828
push:
2929
paths:
3030
- 'plugins/modules/folder.py'
31+
- '.github/workflows/ans-int-test-folder.yaml'
3132

3233
jobs:
3334

‎.github/workflows/ans-int-test-host.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ on:
2828
push:
2929
paths:
3030
- 'plugins/modules/host.py'
31+
- '.github/workflows/ans-int-test-host.yaml'
3132

3233
jobs:
3334

‎.github/workflows/ans-int-test-host_group.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ on:
2828
push:
2929
paths:
3030
- 'plugins/modules/host_group.py'
31+
- '.github/workflows/ans-int-test-host_group.yaml'
3132

3233
jobs:
3334

‎.github/workflows/ans-int-test-lkp-bakery.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ on:
2828
push:
2929
paths:
3030
- 'plugins/lookup/bakery.py'
31+
- '.github/workflows/ans-int-test-lkp-bakery.yaml'
3132

3233
jobs:
3334

‎.github/workflows/ans-int-test-lkp-folder.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ on:
2626
push:
2727
paths:
2828
- 'plugins/lookup/folder.py'
29+
- '.github/workflows/ans-int-test-lkp-folder.yaml'
2930

3031
jobs:
3132

‎.github/workflows/ans-int-test-lkp-folders.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ on:
2626
push:
2727
paths:
2828
- 'plugins/lookup/folders.py'
29+
- '.github/workflows/ans-int-test-lkp-folders.yaml'
2930

3031
jobs:
3132

‎.github/workflows/ans-int-test-lkp-host.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ on:
2626
push:
2727
paths:
2828
- 'plugins/lookup/host.py'
29+
- '.github/workflows/ans-int-test-lkp-host.yaml'
2930

3031
jobs:
3132

‎.github/workflows/ans-int-test-lkp-hosts.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ on:
2626
push:
2727
paths:
2828
- 'plugins/lookup/hosts.py'
29+
- '.github/workflows/ans-int-test-lkp-hosts.yaml'
2930

3031
jobs:
3132

‎.github/workflows/ans-int-test-lkp-rules.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ on:
2828
paths:
2929
- 'plugins/lookup/rule.py'
3030
- 'plugins/lookup/rules.py'
31+
- '.github/workflows/ans-int-test-lkp-rules.yaml'
3132

3233
jobs:
3334

‎.github/workflows/ans-int-test-lkp-rulesets.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ on:
2828
paths:
2929
- 'plugins/lookup/ruleset.py'
3030
- 'plugins/lookup/rulesets.py'
31+
- '.github/workflows/ans-int-test-lkp-rulesets.yaml'
3132

3233
jobs:
3334

‎.github/workflows/ans-int-test-lkp-site.yaml

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# README:
2+
# - When changing the module name, it needs to be changed in 'env:MODULE_NAME' and in 'on:pull_requests:path'!
3+
#
4+
# Resources:
5+
# - Template for this file: https://github.com/ansible-collections/collection_template/blob/main/.github/workflows/ansible-test.yml
6+
# - About Ansible integration tests: https://docs.ansible.com/ansible/latest/dev_guide/testing_integration.html
7+
8+
env:
9+
NAMESPACE: checkmk
10+
COLLECTION_NAME: general
11+
MODULE_NAME: lookup_site
12+
13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.ref }}
15+
cancel-in-progress: true
16+
17+
name: Ansible Integration Tests for Site Lookup Module
18+
on:
19+
workflow_dispatch:
20+
pull_request:
21+
branches:
22+
- main
23+
- devel
24+
paths:
25+
- 'plugins/lookup/site.py'
26+
push:
27+
paths:
28+
- 'plugins/lookup/site.py'
29+
- '.github/workflows/ans-int-test-lkp-site.yaml'
30+
31+
jobs:
32+
33+
integration:
34+
runs-on: ubuntu-22.04
35+
name: Ⓐ${{ matrix.ansible }}+py${{ matrix.python }}
36+
strategy:
37+
fail-fast: false
38+
matrix:
39+
ansible:
40+
- stable-2.15
41+
- stable-2.16
42+
- stable-2.17
43+
- devel
44+
python:
45+
- '3.9'
46+
- '3.10'
47+
- '3.11'
48+
- '3.12'
49+
exclude:
50+
# Exclude unsupported sets.
51+
- ansible: stable-2.15
52+
python: '3.12'
53+
54+
steps:
55+
- name: Check out code
56+
uses: actions/checkout@v4
57+
with:
58+
path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
59+
60+
- name: Set up Python
61+
uses: actions/setup-python@v5
62+
with:
63+
python-version: '3.11'
64+
65+
- name: Install ansible-base (${{ matrix.ansible }})
66+
run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
67+
68+
- name: Provide secrets file
69+
run: echo "${{ secrets.CHECKMK_DOWNLOAD_PW }}" > ./tests/integration/files/.dl-secret
70+
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
71+
env:
72+
CHECKMK_DOWNLOAD_PW: ${{ secrets.CHECKMK_DOWNLOAD_PW }}
73+
74+
- name: Run integration test
75+
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker default
76+
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}

‎.github/workflows/ans-int-test-lkp-sites.yaml

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# README:
2+
# - When changing the module name, it needs to be changed in 'env:MODULE_NAME' and in 'on:pull_requests:path'!
3+
#
4+
# Resources:
5+
# - Template for this file: https://github.com/ansible-collections/collection_template/blob/main/.github/workflows/ansible-test.yml
6+
# - About Ansible integration tests: https://docs.ansible.com/ansible/latest/dev_guide/testing_integration.html
7+
8+
env:
9+
NAMESPACE: checkmk
10+
COLLECTION_NAME: general
11+
MODULE_NAME: lookup_sites
12+
13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.ref }}
15+
cancel-in-progress: true
16+
17+
name: Ansible Integration Tests for Sites Lookup Module
18+
on:
19+
workflow_dispatch:
20+
pull_request:
21+
branches:
22+
- main
23+
- devel
24+
paths:
25+
- 'plugins/lookup/sites.py'
26+
push:
27+
paths:
28+
- 'plugins/lookup/sites.py'
29+
- '.github/workflows/ans-int-test-lkp-sites.yaml'
30+
31+
jobs:
32+
33+
integration:
34+
runs-on: ubuntu-22.04
35+
name: Ⓐ${{ matrix.ansible }}+py${{ matrix.python }}
36+
strategy:
37+
fail-fast: false
38+
matrix:
39+
ansible:
40+
- stable-2.15
41+
- stable-2.16
42+
- stable-2.17
43+
- devel
44+
python:
45+
- '3.9'
46+
- '3.10'
47+
- '3.11'
48+
- '3.12'
49+
exclude:
50+
# Exclude unsupported sets.
51+
- ansible: stable-2.15
52+
python: '3.12'
53+
54+
steps:
55+
- name: Check out code
56+
uses: actions/checkout@v4
57+
with:
58+
path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
59+
60+
- name: Set up Python
61+
uses: actions/setup-python@v5
62+
with:
63+
python-version: '3.11'
64+
65+
- name: Install ansible-base (${{ matrix.ansible }})
66+
run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
67+
68+
- name: Provide secrets file
69+
run: echo "${{ secrets.CHECKMK_DOWNLOAD_PW }}" > ./tests/integration/files/.dl-secret
70+
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
71+
env:
72+
CHECKMK_DOWNLOAD_PW: ${{ secrets.CHECKMK_DOWNLOAD_PW }}
73+
74+
- name: Run integration test
75+
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker default
76+
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}

‎.github/workflows/ans-int-test-lkp-version.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ on:
2828
push:
2929
paths:
3030
- 'plugins/lookup/version.py'
31+
- '.github/workflows/ans-int-test-lkp-version.yaml'
3132

3233
jobs:
3334

‎.github/workflows/ans-int-test-password.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ on:
2828
push:
2929
paths:
3030
- 'plugins/modules/password.py'
31+
- '.github/workflows/ans-int-test-password.yaml'
3132

3233
jobs:
3334

‎.github/workflows/ans-int-test-rule.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ on:
2828
push:
2929
paths:
3030
- 'plugins/modules/rule.py'
31+
- '.github/workflows/ans-int-test-rule.yaml'
3132

3233
jobs:
3334

‎.github/workflows/ans-int-test-service_group.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ on:
2828
push:
2929
paths:
3030
- 'plugins/modules/service_group.py'
31+
- '.github/workflows/ans-int-test-service_group.yaml'
3132

3233
jobs:
3334

‎.github/workflows/ans-int-test-site.yaml

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
# README:
2+
# - When changing the module name, it needs to be changed in 'env:MODULE_NAME' and in 'on:pull_requests:path'!
3+
#
4+
# Resources:
5+
# - Template for this file: https://github.com/ansible-collections/collection_template/blob/main/.github/workflows/ansible-test.yml
6+
# - About Ansible integration tests: https://docs.ansible.com/ansible/latest/dev_guide/testing_integration.html
7+
8+
env:
9+
NAMESPACE: checkmk
10+
COLLECTION_NAME: general
11+
MODULE_NAME: site
12+
13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.ref }}
15+
cancel-in-progress: true
16+
17+
name: Ansible Integration Tests for Site Management Module
18+
on:
19+
workflow_dispatch:
20+
schedule:
21+
- cron: '0 0 * * 0'
22+
pull_request:
23+
branches:
24+
- main
25+
- devel
26+
paths:
27+
- 'plugins/modules/site.py'
28+
push:
29+
paths:
30+
- 'plugins/modules/site.py'
31+
- '.github/workflows/ans-int-test-site.yaml'
32+
33+
jobs:
34+
35+
integration:
36+
runs-on: ubuntu-22.04
37+
name: Ⓐ${{ matrix.ansible }}+py${{ matrix.python }}
38+
strategy:
39+
fail-fast: false
40+
matrix:
41+
ansible:
42+
- stable-2.15
43+
- stable-2.16
44+
- stable-2.17
45+
- devel
46+
python:
47+
- '3.9'
48+
- '3.10'
49+
- '3.11'
50+
- '3.12'
51+
exclude:
52+
# Exclude unsupported sets.
53+
- ansible: stable-2.15
54+
python: '3.12'
55+
56+
steps:
57+
- name: Check out code
58+
uses: actions/checkout@v4
59+
with:
60+
path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
61+
62+
- name: Set up Python
63+
uses: actions/setup-python@v5
64+
with:
65+
python-version: '3.11'
66+
67+
- name: Install ansible-base (${{ matrix.ansible }})
68+
run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
69+
70+
- name: Provide secrets file
71+
run: echo "${{ secrets.CHECKMK_DOWNLOAD_PW }}" > ./tests/integration/files/.dl-secret
72+
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
73+
env:
74+
CHECKMK_DOWNLOAD_PW: ${{ secrets.CHECKMK_DOWNLOAD_PW }}
75+
76+
- name: Run integration test
77+
run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker default
78+
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}

0 commit comments

Comments
 (0)