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

….general into devel

changelogs/fragments/downtime.yaml

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

plugins/modules/downtime.py

@@ -221,7 +221,10 @@ def _get_current_downtimes(module, base_url, headers):
                 )
             ]
         else:
-            filters = ['{"op": "~", "left": "service_description", "right": "%s"}']
+            filters = [
+                '{"op": "~", "left": "service_description", "right": "%s"}'
+                % service_descriptions[0]
+            ]
         filters.append('{"op": "=", "left": "is_service", "right": "1"}')
     else:
         filters.append('{"op": "=", "left": "is_service", "right": "0"}')
@@ -356,6 +359,7 @@ def remove_downtime(module, base_url, headers):
         else:
             query_filters.append(
                 '{"op": "~", "left": "service_description", "right": "%s"}'
+                % service_descriptions[0]
             )
 
     if len(current_downtimes) == 0:  # and comment is not None:

tests/integration/targets/downtime/tasks/test.yml

@@ -280,6 +280,35 @@
     state: absent
   loop: "{{ checkmk_hosts }}"
 
+- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Schedule downtime on single service."
+  downtime:
+    server_url: "{{ checkmk_var_server_url }}"
+    site: "{{ outer_item.site }}"
+    automation_user: "{{ checkmk_var_automation_user }}"
+    automation_secret: "{{ checkmk_var_automation_secret }}"
+    host_name: "{{ item.name }}"
+    comment: Schedule downtime on single service
+    end_after:
+      minutes: 30
+    service_descriptions:
+      - "Check_MK"
+  loop: "{{ checkmk_hosts }}"
+
+- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Delete downtime on single service."
+  downtime:
+    server_url: "{{ checkmk_var_server_url }}"
+    site: "{{ outer_item.site }}"
+    automation_user: "{{ checkmk_var_automation_user }}"
+    automation_secret: "{{ checkmk_var_automation_secret }}"
+    host_name: "{{ item.name }}"
+    comment: Schedule downtime on single service
+    service_descriptions:
+      - "Check_MK"
+    state: absent
+  register: result
+  failed_when: result.changed == False
+  loop: "{{ checkmk_hosts }}"
+
 - name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Delete hosts."
   host:
     server_url: "{{ checkmk_var_server_url }}"