Merge pull request #422 from Checkmk/devel

Release 3.2.0

.github/labels-issues.yml

@@ -49,3 +49,12 @@ module:tag_group:
 
 module:user:
   - 'Component Name: user'
+
+lookup:version:
+  - 'Component Name: lookup_version'
+
+lookup:folder:
+  - 'Component Name: lookup_folder'
+
+lookup:folders:
+  - 'Component Name: lookup_folders'

.github/labels-prs.yml

@@ -49,3 +49,9 @@ module:user:
 
 lookup:version:
   - 'plugins/modules/lookup/version.py'
+
+lookup:folder:
+  - 'Component Name: lookup_folder'
+
+lookup:folders:
+  - 'Component Name: lookup_folders'

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

@@ -13,6 +13,8 @@ env:
 name: Ansible Integration Tests for Activation Module
 on:
   workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 0'
   pull_request:
     branches:
       - main

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

@@ -13,6 +13,8 @@ env:
 name: Ansible Integration Tests for Bakery Module
 on:
   workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 0'
   pull_request:
     branches:
       - main

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

@@ -13,6 +13,8 @@ env:
 name: Ansible Integration Tests for Contact Group Module
 on:
   workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 0'
   pull_request:
     branches:
       - main

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

@@ -13,6 +13,8 @@ env:
 name: Ansible Integration Tests for Discovery Module
 on:
   workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 0'
   pull_request:
     branches:
       - main

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

@@ -13,6 +13,8 @@ env:
 name: Ansible Integration Tests for Downtime Module
 on:
   workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 0'
   pull_request:
     branches:
       - main

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

@@ -13,6 +13,8 @@ env:
 name: Ansible Integration Tests for Folder Module
 on:
   workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 0'
   pull_request:
     branches:
       - main

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

@@ -13,6 +13,8 @@ env:
 name: Ansible Integration Tests for Host Module
 on:
   workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 0'
   pull_request:
     branches:
       - main

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

@@ -13,6 +13,8 @@ env:
 name: Ansible Integration Tests for Host Group Module
 on:
   workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 0'
   pull_request:
     branches:
       - main

.github/workflows/ans-int-tests-full.yaml → .github/workflows/ans-int-test-lkp-version.yaml

@@ -8,18 +8,25 @@
 env:
   NAMESPACE: checkmk
   COLLECTION_NAME: general
+  MODULE_NAME: lookup_version
 
-name: Ansible Integration Tests for all Modules
+name: Ansible Integration Tests for Version Lookup Module
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * *'
+    - cron: '0 0 * * 0'
+  pull_request:
+    branches:
+      - main
+      - devel
+    paths:
+      - 'plugins/lookup/version.py'
 
 jobs:
 
   integration:
     runs-on: ubuntu-latest
-    name: ${{ matrix.module }} (Ⓐ${{ matrix.ansible }}+py${{ matrix.python }})
+    name: Ⓐ${{ matrix.ansible }}+py${{ matrix.python }}
     strategy:
       fail-fast: false
       matrix:
@@ -33,20 +40,6 @@ jobs:
           - '3.9'
           - '3.10'
           - '3.11'
-        module:
-          - activation
-          - bakery
-          - contact_group
-          - discovery
-          - downtime
-          - folder
-          - host_group
-          - host
-          - password
-          - rule
-          - service_group
-          - tag_group
-          - user
         exclude:
           # Exclude unsupported sets.
           - ansible: stable-2.13
@@ -73,5 +66,5 @@ jobs:
           CHECKMK_DOWNLOAD_PW: ${{ secrets.CHECKMK_DOWNLOAD_PW }}
 
       - name: Run integration test
-        run: ansible-test integration ${{ matrix.module }} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker --coverage
+        run: ansible-test integration ${{env.MODULE_NAME}} -v --color --retry-on-error --continue-on-error --diff --python ${{ matrix.python }} --docker
         working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}

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

@@ -13,6 +13,8 @@ env:
 name: Ansible Integration Tests for Password Module
 on:
   workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 0'
   pull_request:
     branches:
       - main

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

@@ -13,6 +13,8 @@ env:
 name: Ansible Integration Tests for Rule Module
 on:
   workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 0'
   pull_request:
     branches:
       - main

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

@@ -13,6 +13,8 @@ env:
 name: Ansible Integration Tests for Service Group Module
 on:
   workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 0'
   pull_request:
     branches:
       - main

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

@@ -13,6 +13,8 @@ env:
 name: Ansible Integration Tests for Tag Group Module
 on:
   workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 0'
   pull_request:
     branches:
       - main

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

@@ -13,6 +13,8 @@ env:
 name: Ansible Integration Tests for User Module
 on:
   workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 0'
   pull_request:
     branches:
       - main

.github/workflows/molecule-role-agent.yaml

@@ -75,6 +75,5 @@ jobs:
       - name: "Run Molecule."
         run: |
           cd roles/agent/
-          # ln -s ../../requirements.yml requirements.yml
           molecule test -s ${{ matrix.checkmk }}
         working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}

.github/workflows/molecule-role-server.yaml

@@ -75,6 +75,5 @@ jobs:
       - name: "Run Molecule."
         run: |
           cd roles/server/
-          # ln -s ../../requirements.yml requirements.yml
           molecule test -s ${{ matrix.checkmk }}
         working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}

.github/workflows/release.yaml

@@ -5,7 +5,44 @@ on: # yamllint disable-line rule:truthy
   workflow_dispatch:
 
 jobs:
+
+  #
+  # Run sanity checks prior to release.
+  #
+
+  sanity:
+    runs-on: ubuntu-latest
+    name: Sanity (Ⓐ${{ matrix.ansible }})
+    strategy:
+      fail-fast: false
+      matrix:
+        ansible:
+          - stable-2.13
+          - stable-2.14
+          - stable-2.15
+          - devel
+
+    steps:
+
+      - name: Check out code
+        uses: actions/checkout@v3
+        with:
+          path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'  # Ansible 2.13 does not support Python 3.11.
+
+      - name: Install ansible-base (${{ matrix.ansible }})
+        run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
+
+      - name: Run sanity tests
+        run: ansible-test sanity --docker -v --color --coverage
+        working-directory: ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
+
   release:
+    needs: sanity
     runs-on: ubuntu-latest
 
     steps:

README.md

@@ -123,7 +123,7 @@ See [CONTRIBUTING](CONTRIBUTING.md).
 See [CHANGELOG.rst](CHANGELOG.rst).
 
 ## Roadmap
-<!-- Optional. Include the roadmap for this collection, and the proposed release/versioning strategy so users can anticipate the upgrade/update cycle. -->
+<!-- Optional. Include the Roadmap for this collection, and the proposed release/versioning strategy so users can anticipate the upgrade/update cycle. -->
 This is merely a collection of possible additions to the role.
 Please do **not** consider a concrete planning document!
 

SUPPORT.md

@@ -37,3 +37,4 @@ Collection Version | Checkmk Versions | Ansible Versions | Remarks
 2.4.1 | 2.0.0p37, 2.1.0p31, 2.2.0p7 | 2.13, 2.14, 2.15 | None
 3.0.0 | 2.0.0p38, 2.1.0p32, 2.2.0p7 | 2.13, 2.14, 2.15 | Breaking changes to the following modules: `folder`, `host`, `host_group`, `rule`.
 3.1.0 | 2.0.0p38, 2.1.0p32, 2.2.0p7 | 2.13, 2.14, 2.15 | None
+3.2.0 | 2.0.0p38, 2.1.0p32, 2.2.0p8 | 2.13, 2.14, 2.15 | None

changelogs/fragments/agent.yml

@@ -0,0 +1,6 @@
+minor_changes:
+  - Agent role - Allow the role to download folder-specific agents.
+  - Agent role - Add preflight check for correct Checkmk edition.
+bugfixes:
+  - Agent role - Fix agent and update registration on remote sites.
+  - Agent role - Fix activation handler URL.

changelogs/fragments/server.yml

@@ -0,0 +1,2 @@
+minor_changes:
+  - Server role - Add preflight check for correct Checkmk edition.

galaxy.yml

@@ -10,7 +10,7 @@ name: general
 
 # The version of the collection. Must be compatible with semantic versioning
 
-version: 3.1.0
+version: 3.2.0
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md
@@ -21,6 +21,7 @@ authors:
   - "Marcel Arentz (https://github.com/godspeed-you)"
   - "Robin Gierse (https://github.com/robin-checkmk)"
   - "Lars Getwan (https://github.com/lgetwan)"
+  - "Max Sickora (https://github.com/Max-checkmk)"
 
 ### OPTIONAL but strongly recommended
 

plugins/lookup/version.py

@@ -23,7 +23,7 @@
         description: automation secret for the REST API access
         required: True
       validate_certs:
-        description: Wether or not to validate TLS cerificates
+        description: Wether or not to validate TLS certificates
         type: boolean
         required: False
         default: True

plugins/modules/activation.py

@@ -29,7 +29,7 @@
         default: []
         type: raw
     force_foreign_changes:
-        description: Wheather to active foreign changes.
+        description: Whether to active foreign changes.
         default: false
         type: bool
 

roles/agent/README.md

@@ -17,7 +17,7 @@ It can be installed as easy as running:
 
 <!-- A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. -->
 
-    checkmk_agent_version: "2.2.0p7"
+    checkmk_agent_version: "2.2.0p8"
 
 The Checkmk version of your site.
 

roles/agent/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-checkmk_agent_version: "2.2.0p7"
+checkmk_agent_version: "2.2.0p8"
 checkmk_agent_edition: cre
 checkmk_agent_protocol: http
 checkmk_agent_server: localhost

roles/agent/molecule/2.2.0/group_vars/all.yml

@@ -1,6 +1,6 @@
 ---
 # General
-checkmk_version: "2.2.0p7"
+checkmk_version: "2.2.0p8"
 checkmk_edition: "cre"
 checkmk_site: "my_site"
 automation_user: "cmkadmin"