Skip to content

Commit 01897ed

Browse files
Merge pull request #918 from Checkmk/devel
Release 6.3.0
2 parents b9fe309 + 26fefbc commit 01897ed

File tree

111 files changed

+1749
-1150
lines changed

Some content is hidden

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

111 files changed

+1749
-1150
lines changed

.github/labels-issues.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ module:bakery:
2323
module:contact_group:
2424
- 'Component Name: contact_group'
2525

26+
module:dcd:
27+
- 'Component Name: dcd'
28+
2629
module:discovery:
2730
- 'Component Name: discovery'
2831

.github/labels-prs.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ module:contact_group:
3434
- changed-files:
3535
- any-glob-to-any-file: 'plugins/modules/contact_group.py'
3636

37+
module:dcd:
38+
- any:
39+
- changed-files:
40+
- any-glob-to-any-file: 'plugins/modules/dcd.py'
41+
3742
module:discovery:
3843
- any:
3944
- changed-files:

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,35 +55,35 @@ jobs:
5555

5656
services:
5757
ancient_cre:
58-
image: checkmk/check-mk-raw:2.2.0p46
58+
image: checkmk/check-mk-raw:2.2.0p47
5959
ports:
6060
- 5022:5000
6161
env:
6262
CMK_SITE_ID: "ancient_cre"
6363
CMK_PASSWORD: "Sup3rSec4et!"
6464
old_cre:
65-
image: checkmk/check-mk-raw:2.3.0p38
65+
image: checkmk/check-mk-raw:2.3.0p40
6666
ports:
6767
- 5023:5000
6868
env:
6969
CMK_SITE_ID: "old_cre"
7070
CMK_PASSWORD: "Sup3rSec4et!"
7171
old_cme:
72-
image: checkmk/check-mk-managed:2.3.0p38
72+
image: checkmk/check-mk-managed:2.3.0p40
7373
ports:
7474
- 5323:5000
7575
env:
7676
CMK_SITE_ID: "old_cme"
7777
CMK_PASSWORD: "Sup3rSec4et!"
7878
stable_cre:
79-
image: checkmk/check-mk-raw:2.4.0p13
79+
image: checkmk/check-mk-raw:2.4.0p15
8080
ports:
8181
- 5024:5000
8282
env:
8383
CMK_SITE_ID: "stable_cre"
8484
CMK_PASSWORD: "Sup3rSec4et!"
8585
stable_cme:
86-
image: checkmk/check-mk-managed:2.4.0p13
86+
image: checkmk/check-mk-managed:2.4.0p15
8787
ports:
8888
- 5324:5000
8989
env:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,28 +55,28 @@ jobs:
5555

5656
services:
5757
ancient_cce:
58-
image: checkmk/check-mk-cloud:2.2.0p46
58+
image: checkmk/check-mk-cloud:2.2.0p47
5959
ports:
6060
- 5222:5000
6161
env:
6262
CMK_SITE_ID: "ancient_cce"
6363
CMK_PASSWORD: "Sup3rSec4et!"
6464
old_cme:
65-
image: checkmk/check-mk-managed:2.3.0p38
65+
image: checkmk/check-mk-managed:2.3.0p40
6666
ports:
6767
- 5323:5000
6868
env:
6969
CMK_SITE_ID: "old_cme"
7070
CMK_PASSWORD: "Sup3rSec4et!"
7171
stable_cre:
72-
image: checkmk/check-mk-raw:2.4.0p13
72+
image: checkmk/check-mk-raw:2.4.0p15
7373
ports:
7474
- 5024:5000
7575
env:
7676
CMK_SITE_ID: "stable_cre"
7777
CMK_PASSWORD: "Sup3rSec4et!"
7878
stable_cme:
79-
image: checkmk/check-mk-managed:2.4.0p13
79+
image: checkmk/check-mk-managed:2.4.0p15
8080
ports:
8181
- 5324:5000
8282
env:

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,35 +55,35 @@ jobs:
5555

5656
services:
5757
ancient_cre:
58-
image: checkmk/check-mk-raw:2.2.0p46
58+
image: checkmk/check-mk-raw:2.2.0p47
5959
ports:
6060
- 5022:5000
6161
env:
6262
CMK_SITE_ID: "ancient_cre"
6363
CMK_PASSWORD: "Sup3rSec4et!"
6464
old_cre:
65-
image: checkmk/check-mk-raw:2.3.0p38
65+
image: checkmk/check-mk-raw:2.3.0p40
6666
ports:
6767
- 5023:5000
6868
env:
6969
CMK_SITE_ID: "old_cre"
7070
CMK_PASSWORD: "Sup3rSec4et!"
7171
old_cme:
72-
image: checkmk/check-mk-managed:2.3.0p38
72+
image: checkmk/check-mk-managed:2.3.0p40
7373
ports:
7474
- 5323:5000
7575
env:
7676
CMK_SITE_ID: "old_cme"
7777
CMK_PASSWORD: "Sup3rSec4et!"
7878
stable_cre:
79-
image: checkmk/check-mk-raw:2.4.0p13
79+
image: checkmk/check-mk-raw:2.4.0p15
8080
ports:
8181
- 5024:5000
8282
env:
8383
CMK_SITE_ID: "stable_cre"
8484
CMK_PASSWORD: "Sup3rSec4et!"
8585
stable_cme:
86-
image: checkmk/check-mk-managed:2.4.0p13
86+
image: checkmk/check-mk-managed:2.4.0p15
8787
ports:
8888
- 5324:5000
8989
env:
Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
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: dcd
12+
13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.ref }}
15+
cancel-in-progress: true
16+
17+
name: Ansible Integration Tests for DCD 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/dcd.py'
28+
push:
29+
paths:
30+
- '.github/workflows/ans-int-test-dcd.yaml'
31+
- 'plugins/modules/dcd.py'
32+
- 'tests/integration/files/includes/'
33+
- 'tests/integration/targets/activation/'
34+
35+
jobs:
36+
37+
integration:
38+
runs-on: ubuntu-24.04
39+
name: Ⓐ${{ matrix.ansible }}+py${{ matrix.python }}
40+
strategy:
41+
fail-fast: false
42+
matrix:
43+
ansible:
44+
- stable-2.17
45+
- stable-2.18
46+
- stable-2.19
47+
- devel
48+
python:
49+
- '3.11'
50+
- '3.12'
51+
exclude:
52+
# Exclude unsupported sets.
53+
- ansible: devel
54+
python: '3.11'
55+
56+
services:
57+
old_cme:
58+
image: checkmk/check-mk-managed:2.3.0p40
59+
ports:
60+
- 5323:5000
61+
env:
62+
CMK_SITE_ID: "old_cme"
63+
CMK_PASSWORD: "Sup3rSec4et!"
64+
stable_cme:
65+
image: checkmk/check-mk-managed:2.4.0p15
66+
ports:
67+
- 5324:5000
68+
env:
69+
CMK_SITE_ID: "stable_cme"
70+
CMK_PASSWORD: "Sup3rSec4et!"
71+
72+
steps:
73+
- name: Check out code
74+
uses: actions/checkout@v5
75+
with:
76+
path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
77+
78+
- name: "Install uv and set the python version."
79+
uses: astral-sh/setup-uv@v7
80+
with:
81+
python-version: ${{ matrix.python }}
82+
enable-cache: true
83+
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}/
84+
85+
- name: "Setup uv venv."
86+
run: uv venv
87+
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
88+
89+
- name: Install ansible-base (${{ matrix.ansible }})
90+
run: uv pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz
91+
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
92+
93+
- name: Run integration test
94+
run: uv run ansible-test integration ${{env.MODULE_NAME}} -v --color --continue-on-error --diff --python ${{ matrix.python }}
95+
working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,35 +55,35 @@ jobs:
5555

5656
services:
5757
ancient_cre:
58-
image: checkmk/check-mk-raw:2.2.0p46
58+
image: checkmk/check-mk-raw:2.2.0p47
5959
ports:
6060
- 5022:5000
6161
env:
6262
CMK_SITE_ID: "ancient_cre"
6363
CMK_PASSWORD: "Sup3rSec4et!"
6464
old_cre:
65-
image: checkmk/check-mk-raw:2.3.0p38
65+
image: checkmk/check-mk-raw:2.3.0p40
6666
ports:
6767
- 5023:5000
6868
env:
6969
CMK_SITE_ID: "old_cre"
7070
CMK_PASSWORD: "Sup3rSec4et!"
7171
old_cme:
72-
image: checkmk/check-mk-managed:2.3.0p38
72+
image: checkmk/check-mk-managed:2.3.0p40
7373
ports:
7474
- 5323:5000
7575
env:
7676
CMK_SITE_ID: "old_cme"
7777
CMK_PASSWORD: "Sup3rSec4et!"
7878
stable_cre:
79-
image: checkmk/check-mk-raw:2.4.0p13
79+
image: checkmk/check-mk-raw:2.4.0p15
8080
ports:
8181
- 5024:5000
8282
env:
8383
CMK_SITE_ID: "stable_cre"
8484
CMK_PASSWORD: "Sup3rSec4et!"
8585
stable_cme:
86-
image: checkmk/check-mk-managed:2.4.0p13
86+
image: checkmk/check-mk-managed:2.4.0p15
8787
ports:
8888
- 5324:5000
8989
env:

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,35 +55,35 @@ jobs:
5555

5656
services:
5757
ancient_cre:
58-
image: checkmk/check-mk-raw:2.2.0p46
58+
image: checkmk/check-mk-raw:2.2.0p47
5959
ports:
6060
- 5022:5000
6161
env:
6262
CMK_SITE_ID: "ancient_cre"
6363
CMK_PASSWORD: "Sup3rSec4et!"
6464
old_cre:
65-
image: checkmk/check-mk-raw:2.3.0p38
65+
image: checkmk/check-mk-raw:2.3.0p40
6666
ports:
6767
- 5023:5000
6868
env:
6969
CMK_SITE_ID: "old_cre"
7070
CMK_PASSWORD: "Sup3rSec4et!"
7171
old_cme:
72-
image: checkmk/check-mk-managed:2.3.0p38
72+
image: checkmk/check-mk-managed:2.3.0p40
7373
ports:
7474
- 5323:5000
7575
env:
7676
CMK_SITE_ID: "old_cme"
7777
CMK_PASSWORD: "Sup3rSec4et!"
7878
stable_cre:
79-
image: checkmk/check-mk-raw:2.4.0p13
79+
image: checkmk/check-mk-raw:2.4.0p15
8080
ports:
8181
- 5024:5000
8282
env:
8383
CMK_SITE_ID: "stable_cre"
8484
CMK_PASSWORD: "Sup3rSec4et!"
8585
stable_cme:
86-
image: checkmk/check-mk-managed:2.4.0p13
86+
image: checkmk/check-mk-managed:2.4.0p15
8787
ports:
8888
- 5324:5000
8989
env:

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,35 +55,35 @@ jobs:
5555

5656
services:
5757
ancient_cre:
58-
image: checkmk/check-mk-raw:2.2.0p46
58+
image: checkmk/check-mk-raw:2.2.0p47
5959
ports:
6060
- 5022:5000
6161
env:
6262
CMK_SITE_ID: "ancient_cre"
6363
CMK_PASSWORD: "Sup3rSec4et!"
6464
old_cre:
65-
image: checkmk/check-mk-raw:2.3.0p38
65+
image: checkmk/check-mk-raw:2.3.0p40
6666
ports:
6767
- 5023:5000
6868
env:
6969
CMK_SITE_ID: "old_cre"
7070
CMK_PASSWORD: "Sup3rSec4et!"
7171
old_cme:
72-
image: checkmk/check-mk-managed:2.3.0p38
72+
image: checkmk/check-mk-managed:2.3.0p40
7373
ports:
7474
- 5323:5000
7575
env:
7676
CMK_SITE_ID: "old_cme"
7777
CMK_PASSWORD: "Sup3rSec4et!"
7878
stable_cre:
79-
image: checkmk/check-mk-raw:2.4.0p13
79+
image: checkmk/check-mk-raw:2.4.0p15
8080
ports:
8181
- 5024:5000
8282
env:
8383
CMK_SITE_ID: "stable_cre"
8484
CMK_PASSWORD: "Sup3rSec4et!"
8585
stable_cme:
86-
image: checkmk/check-mk-managed:2.4.0p13
86+
image: checkmk/check-mk-managed:2.4.0p15
8787
ports:
8888
- 5324:5000
8989
env:

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,35 +55,35 @@ jobs:
5555

5656
services:
5757
ancient_cre:
58-
image: checkmk/check-mk-raw:2.2.0p46
58+
image: checkmk/check-mk-raw:2.2.0p47
5959
ports:
6060
- 5022:5000
6161
env:
6262
CMK_SITE_ID: "ancient_cre"
6363
CMK_PASSWORD: "Sup3rSec4et!"
6464
old_cre:
65-
image: checkmk/check-mk-raw:2.3.0p38
65+
image: checkmk/check-mk-raw:2.3.0p40
6666
ports:
6767
- 5023:5000
6868
env:
6969
CMK_SITE_ID: "old_cre"
7070
CMK_PASSWORD: "Sup3rSec4et!"
7171
old_cme:
72-
image: checkmk/check-mk-managed:2.3.0p38
72+
image: checkmk/check-mk-managed:2.3.0p40
7373
ports:
7474
- 5323:5000
7575
env:
7676
CMK_SITE_ID: "old_cme"
7777
CMK_PASSWORD: "Sup3rSec4et!"
7878
stable_cre:
79-
image: checkmk/check-mk-raw:2.4.0p13
79+
image: checkmk/check-mk-raw:2.4.0p15
8080
ports:
8181
- 5024:5000
8282
env:
8383
CMK_SITE_ID: "stable_cre"
8484
CMK_PASSWORD: "Sup3rSec4et!"
8585
stable_cme:
86-
image: checkmk/check-mk-managed:2.4.0p13
86+
image: checkmk/check-mk-managed:2.4.0p15
8787
ports:
8888
- 5324:5000
8989
env:

0 commit comments

Comments
 (0)