Initial commit

Author: Max-checkmk

plugins/modules/discovery.py

@@ -40,7 +40,7 @@
         description: The action to perform during discovery.
         type: str
         default: new
-        choices: [new, remove, fix_all, refresh, tabula_rasa, only_host_labels, update_service_labels, monitor_undecided_services]
+        choices: [new, remove, fix_all, refresh, tabula_rasa, only_host_labels, only_service_labels, monitor_undecided_services]
     do_full_scan:
         description: The option whether to perform a full scan or not. (Bulk mode only).
         type: bool
@@ -255,7 +255,7 @@ def post(self):
             options["monitor_undecided_services"] = True
         if self.params.get("state") in ["remove", "fix_all"]:
             options["remove_vanished_services"] = True
-        if self.params.get("state") in ["update_service_labels"]:
+        if self.params.get("state") in ["only_service_labels"]:
             options["update_service_labels"] = True
         if self.params.get("state") in ["new", "fix_all", "only_host_labels"]:
             options["update_host_labels"] = True
@@ -336,7 +336,7 @@ def run_module():
                 "refresh",
                 "tabula_rasa",
                 "only_host_labels",
-                "update_service_labels",
+                "only_service_labels",
                 "monitor_undecided_services",
             ],
         ),
@@ -400,7 +400,7 @@ def run_module():
         module.params["state"] = "refresh"
 
     if module.params.get("state") in [
-        "update_service_labels",
+        "only_service_labels",
         "monitor_undecided_services",
     ]:
         if ver < CheckmkVersion("2.3.0"):
@@ -426,7 +426,7 @@ def run_module():
                 module.fail_json(**result_as_dict(result))
             if module.params.get(
                 "state"
-            ) == "update_service_labels" and ver < CheckmkVersion("2.3.0p3"):
+            ) == "only_service_labels" and ver < CheckmkVersion("2.3.0p3"):
                 result = RESULT(
                     http_code=0,
                     msg="State can only be used in bulk mode",

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

@@ -72,7 +72,7 @@
         automation_user: "{{ checkmk_var_automation_user }}"
         automation_secret: "{{ checkmk_var_automation_secret }}"
         host_name: "{{ item.name }}"
-        state: "update_service_labels"
+        state: "only_service_labels"
       delegate_to: localhost
       run_once: true  # noqa run-once[task]
       loop: "{{ checkmk_hosts }}"
@@ -95,19 +95,17 @@
       failed_when: "'State is not supported before 2.3.0' not in monitorundecidedservices_output.msg"
       when: "not '2.3.0' in outer_item.version"      
 
-    - name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Update service labels. (Should fail in 2.3.0)"
+    - name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Update service labels."
       discovery:
         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 }}"
-        state: "update_service_labels"
+        state: "only_service_labels"
       delegate_to: localhost
       run_once: true  # noqa run-once[task]
       loop: "{{ checkmk_hosts }}"
-      register: stableupdateservicelabels_output
-      failed_when: "'State can only be used in bulk mode' not in stableupdateservicelabels_output.msg"
       when: "'2.3.0' in outer_item.version"
 
     - name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Monitor undecided services. (Should fail in 2.3.0)"
@@ -245,7 +243,7 @@
         automation_user: "{{ checkmk_var_automation_user }}"
         automation_secret: "{{ checkmk_var_automation_secret }}"
         hosts: "{{ checkmk_host_names }}"
-        state: "update_service_labels"
+        state: "only_service_labels"
         bulk_size: 5
       delegate_to: localhost
       register: bulkupdateservicelabels_output
@@ -273,7 +271,7 @@
         automation_user: "{{ checkmk_var_automation_user }}"
         automation_secret: "{{ checkmk_var_automation_secret }}"
         hosts: "{{ checkmk_host_names }}"
-        state: "update_service_labels"
+        state: "only_service_labels"
         bulk_size: 5
       delegate_to: localhost
       when: "'2.3.0' in outer_item.version"