Merge pull request #637 from Checkmk/devel

Release 5.2.0

.gitignore

@@ -10,9 +10,4 @@ build/
 tests/output
 playbooks/vars/config.yml
 playbooks/test*.yml
-playbooks/hosts
-playbooks/hosts.bak
-venv/
-Vagrantfile
-Vagrantfile.bak
-venv
+venv/

Makefile

@@ -12,17 +12,11 @@ CONTAINER_NAME="ansible-checkmk-test"
 help:
 	@echo "setup           			- Run all setup target at once."
 	@echo ""
-	@echo "setup-python    			- Prepare the system for development with Python."
+	@echo "python	    			- Prepare the system for development with Python."
 	@echo ""
-	@echo "setup-kvm       			- Install and enable KVM and prepare Vagrant."
+	@echo "kvm			       		- Install and enable KVM."
 	@echo ""
-	@echo "kvm             			- Only copy the correct Vagrantfile for use with KVM."
-	@echo ""
-	@echo "setup-vbox 	     		- Copy the correct Vagrantfile for use with VirtualBox."
-	@echo ""
-	@echo "vbox 	           		- Copy the correct Vagrantfile for use with VirtualBox."
-	@echo ""
-	@echo "setup-vagrant   			- Install and enable Vagrant."
+	@echo "vagrant   				- Install and enable Vagrant."
 	@echo ""
 	@echo "venv		       			- Install Python Virtual Environment. You need to activate it yourself though!"
 	@echo ""
@@ -61,9 +55,9 @@ version:
 	@newversion=$$(dialog --stdout --inputbox "New Version:" 0 0 "$(VERSION)") ; \
 	if [ -n "$$newversion" ] ; then ./scripts/release.sh -s "$(VERSION)" -t $$newversion ; fi
 
-setup: setup-python setup-kvm
+setup: setup-python kvm vagrant
 
-setup-python:
+python:
 	@sudo apt-get -y update --quiet
 	@sudo apt-get -y install -y \
 		python3-pip \
@@ -76,36 +70,21 @@ setup-python:
 	@python3 -m pip install -r requirements.txt
 
 kvm:
-	if [ -f Vagrantfile ] ; then cp Vagrantfile Vagrantfile.bak ; fi
-	cp Vagrantfile.kvm Vagrantfile
-	if [ -f playbooks/hosts ] ; then cp playbooks/hosts playbooks/hosts.bak ; fi
-	cp playbooks/hosts.kvm playbooks/hosts
-
-setup-kvm: kvm
 	@sudo apt update -y
 	@sudo apt install -y \
 		virt-manager \
 		qemu-kvm \
 		libvirt-clients \
 		libvirt-daemon-system \
-		bridge-utils \--build-arg DL_PW=$$(cat .secret)
+		bridge-utils \
 		libvirt-daemon\
 		libvirt-dev \
 		libxslt-dev \
 		libxml2-dev \
 		zlib1g-dev
 	@sudo systemctl enable --now libvirtd
-	@vagrant plugin install vagrant-libvirt
 
-vbox:
-	if [ -f Vagrantfile ] ; then cp Vagrantfile Vagrantfile.bak ; fi
-	cp Vagrantfile.vbox Vagrantfile
-	if [ -f playbooks/hosts ] ; then cp playbooks/hosts playbooks/hosts.bak ; fi
-	cp playbooks/hosts.vbox playbooks/hosts
-
-setup-vbox: vbox
-
-setup-vagrant:
+vagrant:
 	@sudo apt update -y
 	@sudo apt install -y \
 		apt-transport-https \
@@ -121,15 +100,16 @@ setup-vagrant:
 
 venv:
 	@python3 -m venv venv
+	@(. venv/bin/activate && python3 -m pip install pip --upgrade && python3 -m pip install -r requirements.txt)
 	@echo
 	@echo "Run the following command to actually activate the venv!"
 	@echo ". venv/bin/activate"
 	@echo
-	@(. venv/bin/activate && python3 -m pip install pip --upgrade && python3 -m pip install -r requirements.txt)
 
 clean:
 	@rm -rf .tox/
-	@rm -rf venv/
+	@rm -rf ./venv/
+	@rm -rf ./tests/output/*
 	@vagrant destroy --force
 
 vm:

README.md

@@ -19,6 +19,7 @@ This is an open source endeavour, on which we want to collaborate with the commu
 ## Dependencies
 
  - [ansible.posix](https://github.com/ansible-collections/ansible.posix)
+ - [ansible.utils](https://github.com/ansible-collections/ansible.utils)
  - [community.general](https://github.com/ansible-collections/community.general)
 
 Although the Ansible project notes, that collections should have no or very little dependencies, we want to make sure the  collection works for you out-of-the-box. Currently we only depend on very basic collections, which are most likely already installed in your environment. For version constraints, see [galaxy.yml](galaxy.yml).

SUPPORT.md

@@ -55,3 +55,4 @@ Collection Version | Checkmk Versions | Ansible Versions | Remarks
 4.4.1 | 2.0.0p39, 2.1.0p41, 2.2.0p24 | 2.14, 2.15, 2.16 | None
 5.0.0 | 2.1.0p44, 2.2.0p27, 2.3.0p5 | 2.15, 2.16, 2.17 | Breaking changes to the following modules: `lookup_folder`, `rule` and role: `agent`.
 5.1.0 | 2.1.0p44, 2.2.0p27, 2.3.0p6 | 2.15, 2.16, 2.17 | None
+5.2.0 | 2.1.0p46, 2.2.0p31, 2.3.0p11 | 2.15, 2.16, 2.17 | None

changelogs/fragments/agent.yaml

@@ -0,0 +1,6 @@
+minor_changes:
+  - Agent role - Allow registration on mixed protocol environments.
+    This means the central and remote site do not both have to use either HTTP or HTTPS.
+
+bugfixes:
+  - Agent role - Fix registration in cases where a prior registration failed.

changelogs/fragments/build.yaml

@@ -0,0 +1,5 @@
+minor_changes:
+  - The local development environment was cleaned up. We removed all traces of
+    VirtualBox and now exclusively use KVM/QEMU virtualization. This has no
+    effect on using the collection. It only affects you, if you develop for this
+    collection and used the `Vagrantfile` or `Makefile`.

changelogs/fragments/downtime.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+  - Downtime module - Downtimes are now correctly removed when only specifying a single service.

changelogs/fragments/release_summary.yaml

@@ -0,0 +1 @@
+release_summary: "Some bug fixing and a module update."

changelogs/fragments/tag_group.yaml

@@ -0,0 +1,5 @@
+minor_changes:
+  - Tag_group module - Enable module for Checkmk 2.4.0 by using
+    `id` instead of `ident` to identify tag groups and their tags.
+    See https://checkmk.com/werk/16364 for background information.
+  - Tag_group module - Migrate module to new collection API.

galaxy.yml

@@ -10,7 +10,7 @@ name: general
 
 # The version of the collection. Must be compatible with semantic versioning
 
-version: 5.1.0
+version: 5.2.0
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md

playbooks/roles.yml

@@ -8,6 +8,11 @@
 
   tasks:
 
+    - name: "Run server role."
+      tags: [server]
+      ansible.builtin.import_role:
+        name: server
+
     - name: "Create folders."
       tags: [agent]
       checkmk.general.folder:
@@ -23,11 +28,6 @@
       run_once: true  # noqa run-once[task]
       loop: "{{ checkmk_var_folders }}"
 
-    - name: "Run server role."
-      tags: [server]
-      ansible.builtin.import_role:
-        name: server
-
     - name: "Run agent role."
       tags: [agent]
       ansible.builtin.import_role: