Merge branch 'devel' of github.com:Checkmk/ansible-collection-checkmk…

….general into feature/agent-adv-fw-mgmt
Checkmk · May 24, 2024 · 0d44c5b · 0d44c5b
2 parents 3163e16 + 1b68329
commit 0d44c5b
Show file tree

Hide file tree

Showing 74 changed files with 294 additions and 194 deletions.
diff --git a/.github/workflows/ans-int-test-activation.yaml b/.github/workflows/ans-int-test-activation.yaml
@@ -16,9 +16,13 @@ on:
   schedule:
     - cron: '0 0 * * 0'
   pull_request:
+    types:
+      - opened
     branches:
       - main
       - devel
+    paths:
+      - 'plugins/modules/activation.py'
   push:
     paths:
       - 'plugins/modules/activation.py'

diff --git a/.github/workflows/ans-int-test-bakery.yaml b/.github/workflows/ans-int-test-bakery.yaml
@@ -16,9 +16,13 @@ on:
   schedule:
     - cron: '0 0 * * 0'
   pull_request:
+    types:
+      - opened
     branches:
       - main
       - devel
+    paths:
+      - 'plugins/modules/bakery.py'
   push:
     paths:
       - 'plugins/modules/bakery.py'

diff --git a/.github/workflows/ans-int-test-contact_group.yaml b/.github/workflows/ans-int-test-contact_group.yaml
@@ -16,9 +16,13 @@ on:
   schedule:
     - cron: '0 0 * * 0'
   pull_request:
+    types:
+      - opened
     branches:
       - main
       - devel
+    paths:
+      - 'plugins/modules/contact_group.py'
   push:
     paths:
       - 'plugins/modules/contact_group.py'

diff --git a/.github/workflows/ans-int-test-discovery.yaml b/.github/workflows/ans-int-test-discovery.yaml
@@ -16,11 +16,16 @@ on:
   schedule:
     - cron: '0 0 * * 0'
   pull_request:
+    types:
+      - opened
     branches:
       - main
       - devel
     paths:
       - 'plugins/modules/discovery.py'
+  push:
+    paths:
+      - 'plugins/modules/discovery.py'
 
 jobs:
 

diff --git a/.github/workflows/ans-int-test-downtime.yaml b/.github/workflows/ans-int-test-downtime.yaml
@@ -16,9 +16,13 @@ on:
   schedule:
     - cron: '0 0 * * 0'
   pull_request:
+    types:
+      - opened
     branches:
       - main
       - devel
+    paths:
+      - 'plugins/modules/downtime.py'
   push:
     paths:
       - 'plugins/modules/downtime.py'

diff --git a/.github/workflows/ans-int-test-folder.yaml b/.github/workflows/ans-int-test-folder.yaml
@@ -16,9 +16,13 @@ on:
   schedule:
     - cron: '0 0 * * 0'
   pull_request:
+    types:
+      - opened
     branches:
       - main
       - devel
+    paths:
+      - 'plugins/modules/folder.py'
   push:
     paths:
       - 'plugins/modules/folder.py'

diff --git a/.github/workflows/ans-int-test-host.yaml b/.github/workflows/ans-int-test-host.yaml
@@ -16,9 +16,13 @@ on:
   schedule:
     - cron: '0 0 * * 0'
   pull_request:
+    types:
+      - opened
     branches:
       - main
       - devel
+    paths:
+      - 'plugins/modules/host.py'
   push:
     paths:
       - 'plugins/modules/host.py'

diff --git a/.github/workflows/ans-int-test-host_group.yaml b/.github/workflows/ans-int-test-host_group.yaml
@@ -16,9 +16,13 @@ on:
   schedule:
     - cron: '0 0 * * 0'
   pull_request:
+    types:
+      - opened
     branches:
       - main
       - devel
+    paths:
+      - 'plugins/modules/host_group.py'
   push:
     paths:
       - 'plugins/modules/host_group.py'

diff --git a/.github/workflows/ans-int-test-lkp-bakery.yaml b/.github/workflows/ans-int-test-lkp-bakery.yaml
@@ -16,9 +16,13 @@ on:
   schedule:
     - cron: '0 0 * * 0'
   pull_request:
+    types:
+      - opened
     branches:
       - main
       - devel
+    paths:
+      - 'plugins/lookup/bakery.py'
   push:
     paths:
       - 'plugins/lookup/bakery.py'

diff --git a/.github/workflows/ans-int-test-lkp-folder.yaml b/.github/workflows/ans-int-test-lkp-folder.yaml
@@ -14,9 +14,13 @@ name: Ansible Integration Tests for Folder Lookup Module
 on:
   workflow_dispatch:
   pull_request:
+    types:
+      - opened
     branches:
       - main
       - devel
+    paths:
+      - 'plugins/lookup/folder.py'
   push:
     paths:
       - 'plugins/lookup/folder.py'

diff --git a/.github/workflows/ans-int-test-lkp-folders.yaml b/.github/workflows/ans-int-test-lkp-folders.yaml
@@ -14,9 +14,13 @@ name: Ansible Integration Tests for Folders Lookup Module
 on:
   workflow_dispatch:
   pull_request:
+    types:
+      - opened
     branches:
       - main
       - devel
+    paths:
+      - 'plugins/lookup/folders.py'
   push:
     paths:
       - 'plugins/lookup/folders.py'

diff --git a/.github/workflows/ans-int-test-lkp-host.yaml b/.github/workflows/ans-int-test-lkp-host.yaml
@@ -14,9 +14,13 @@ name: Ansible Integration Tests for Host Lookup Module
 on:
   workflow_dispatch:
   pull_request:
+    types:
+      - opened
     branches:
       - main
       - devel
+    paths:
+      - 'plugins/lookup/host.py'
   push:
     paths:
       - 'plugins/lookup/host.py'

diff --git a/.github/workflows/ans-int-test-lkp-hosts.yaml b/.github/workflows/ans-int-test-lkp-hosts.yaml
@@ -14,9 +14,13 @@ name: Ansible Integration Tests for Hosts Lookup Module
 on:
   workflow_dispatch:
   pull_request:
+    types:
+      - opened
     branches:
       - main
       - devel
+    paths:
+      - 'plugins/lookup/hosts.py'
   push:
     paths:
       - 'plugins/lookup/hosts.py'

diff --git a/.github/workflows/ans-int-test-lkp-rules.yaml b/.github/workflows/ans-int-test-lkp-rules.yaml
@@ -14,9 +14,14 @@ name: Ansible Integration Tests for Rule Lookup Modules
 on:
   workflow_dispatch:
   pull_request:
+    types:
+      - opened
     branches:
       - main
       - devel
+    paths:
+      - 'plugins/lookup/rule.py'
+      - 'plugins/lookup/rules.py'
   push:
     paths:
       - 'plugins/lookup/rule.py'

diff --git a/.github/workflows/ans-int-test-lkp-rulesets.yaml b/.github/workflows/ans-int-test-lkp-rulesets.yaml
@@ -14,9 +14,14 @@ name: Ansible Integration Tests for Ruleset Lookup Modules
 on:
   workflow_dispatch:
   pull_request:
+    types:
+      - opened
     branches:
       - main
       - devel
+    paths:
+      - 'plugins/lookup/ruleset.py'
+      - 'plugins/lookup/rulesets.py'
   push:
     paths:
       - 'plugins/lookup/ruleset.py'

diff --git a/.github/workflows/ans-int-test-lkp-version.yaml b/.github/workflows/ans-int-test-lkp-version.yaml
@@ -16,9 +16,13 @@ on:
   schedule:
     - cron: '0 0 * * 0'
   pull_request:
+    types:
+      - opened
     branches:
       - main
       - devel
+    paths:
+      - 'plugins/lookup/version.py'
   push:
     paths:
       - 'plugins/lookup/version.py'

diff --git a/.github/workflows/ans-int-test-password.yaml b/.github/workflows/ans-int-test-password.yaml
@@ -16,9 +16,13 @@ on:
   schedule:
     - cron: '0 0 * * 0'
   pull_request:
+    types:
+      - opened
     branches:
       - main
       - devel
+    paths:
+      - 'plugins/modules/password.py'
   push:
     paths:
       - 'plugins/modules/password.py'

diff --git a/.github/workflows/ans-int-test-rule.yaml b/.github/workflows/ans-int-test-rule.yaml
@@ -16,9 +16,13 @@ on:
   schedule:
     - cron: '0 0 * * 0'
   pull_request:
+    types:
+      - opened
     branches:
       - main
       - devel
+    paths:
+      - 'plugins/modules/rule.py'
   push:
     paths:
       - 'plugins/modules/rule.py'

diff --git a/.github/workflows/ans-int-test-service_group.yaml b/.github/workflows/ans-int-test-service_group.yaml
@@ -16,9 +16,13 @@ on:
   schedule:
     - cron: '0 0 * * 0'
   pull_request:
+    types:
+      - opened
     branches:
       - main
       - devel
+    paths:
+      - 'plugins/modules/service_group.py'
   push:
     paths:
       - 'plugins/modules/service_group.py'

diff --git a/.github/workflows/ans-int-test-tag_group.yaml b/.github/workflows/ans-int-test-tag_group.yaml
@@ -16,9 +16,13 @@ on:
   schedule:
     - cron: '0 0 * * 0'
   pull_request:
+    types:
+      - opened
     branches:
       - main
       - devel
+    paths:
+      - 'plugins/modules/tag_group.py'
   push:
     paths:
       - 'plugins/modules/tag_group.py'

diff --git a/.github/workflows/ans-int-test-timeperiod.yaml b/.github/workflows/ans-int-test-timeperiod.yaml
@@ -16,9 +16,13 @@ on:
   schedule:
     - cron: '0 0 * * 0'
   pull_request:
+    types:
+      - opened
     branches:
       - main
       - devel
+    paths:
+      - 'plugins/modules/timeperiod.py'
   push:
     paths:
       - 'plugins/modules/timeperiod.py'

diff --git a/.github/workflows/ans-int-test-user.yaml b/.github/workflows/ans-int-test-user.yaml
@@ -16,9 +16,13 @@ on:
   schedule:
     - cron: '0 0 * * 0'
   pull_request:
+    types:
+      - opened
     branches:
       - main
       - devel
+    paths:
+      - 'plugins/modules/user.py'
   push:
     paths:
       - 'plugins/modules/user.py'

diff --git a/.github/workflows/ansible-lint.yaml b/.github/workflows/ansible-lint.yaml
@@ -13,7 +13,6 @@ on:
     branches:
       - main
       - devel
-      - build/checkmk-2-3-support
     paths:
       - 'roles/**'
       - 'playbooks/**'

diff --git a/.github/workflows/ansible-sanity-tests.yaml b/.github/workflows/ansible-sanity-tests.yaml
@@ -19,7 +19,8 @@ on:
       - '**.rst'
       - 'roles/**'
   pull_request:
-    types: [opened]
+    types:
+      - opened
     paths-ignore:
       - '.github/ISSUE_TEMPLATE/*'
       - 'docs/**'

diff --git a/.github/workflows/molecule-role-agent.yaml b/.github/workflows/molecule-role-agent.yaml
@@ -8,14 +8,17 @@ name: Molecule Tests for Agent Role
 on:
   workflow_dispatch:
   pull_request:
+    types:
+      - opened
     branches:
       - main
       - devel
+    paths:
+      - 'roles/agent/**'
   push:
     branches:
       - main
       - devel
-      - build/checkmk-2-3-support
     paths:
       - 'roles/agent/**'
 

diff --git a/.github/workflows/molecule-role-server.yaml b/.github/workflows/molecule-role-server.yaml
@@ -8,14 +8,17 @@ name: Molecule Tests for Server Role
 on:
   workflow_dispatch:
   pull_request:
+    types:
+      - opened
     branches:
       - main
       - devel
+    paths:
+      - 'roles/server/**'
   push:
     branches:
       - main
       - devel
-      - build/checkmk-2-3-support
     paths:
       - 'roles/server/**'
 

diff --git a/Makefile b/Makefile
@@ -155,7 +155,16 @@ container:
 	docker build -t $(CONTAINER_NAME) $(CONTAINER_BUILD_ROOT) --build-arg DL_PW=$$(cat .secret) && \
 	docker save $(CONTAINER_NAME):latest > $(COLLECTION_ROOT)/$(CONTAINER_NAME)-latest-image.tar.gz"
 
-tests: tests-sanity tests-integration
+tests: tests-linting tests-sanity tests-integration
+
+tests-linting: vm
+	@vagrant ssh collection -c "\
+	cd $(COLLECTION_ROOT) && \
+	ansible-galaxy collection install ./ && \
+	yamllint -c .yamllint ./roles/ && \
+	yamllint -c .yamllint ./playbooks/ && \
+	ansible-lint -c .ansible-lint ./roles/ && \
+	ansible-lint -c .ansible-lint ./playbooks/"
 
 tests-sanity: vm
 	@vagrant ssh collection -c "\

diff --git a/changelogs/fragments/build.yml b/changelogs/fragments/build.yml
@@ -2,4 +2,5 @@ minor_changes:
   - Testing - All tests now cover Checkmk 2.3.0.
   - Testing - Remove Checkmk 2.0.0 from all tests, as it is EOL.
   - Testing - The Molecule tests now run on Ubuntu 22.04.
-  - Testing - Ubuntu 24.04 is added to the Molecule tests.
+  - Testing - Add Ubuntu 24.04 to the Molecule tests.
+  - Testing - Remove Ansible 2.14 from all tests, as it is EOL.
diff --git a/changelogs/fragments/lookup_folder.yml b/changelogs/fragments/lookup_folder.yml
@@ -1,2 +1,3 @@
-bugfixes:
+breaking_changes:
   - Folder lookup module - Return the complete folder information, not only the extensions.
+    Refer to the module documentation for more details.