Added notify_if_canceled property to action module (ansible-collections#921)

pyrodie18 · web-flow · commit b89f54b353e2 · 2023-07-04T13:14:18.000-04:00
diff --git a/changelogs/fragments/921-action_notify_if_cancled.yml b/changelogs/fragments/921-action_notify_if_cancled.yml
@@ -0,0 +1,2 @@
+minor_changes:
+  - action module - Added notify_if_canceled property
diff --git a/plugins/modules/zabbix_action.py b/plugins/modules/zabbix_action.py
@@ -58,6 +58,12 @@
             - Can be used when I(event_source=trigger).
         type: "bool"
         default: true
+    notify_if_canceled:
+        description:
+            - Weather to notify when escalation is canceled.
+            - Can be used when I(event_source=trigger).
+        type: "bool"
+        default: true
     esc_period:
         type: str
         description:
@@ -1151,6 +1157,7 @@ def _construct_parameters(self, **kwargs):
             _params["pause_suppressed"] = "1" if kwargs["pause_in_maintenance"] else "0"
             if LooseVersion(self._zbx_api_version) >= LooseVersion("6.4"):
                 _params["pause_symptoms"] = "1" if kwargs["pause_symptoms"] else "0"
+            _params["notify_if_canceled"] = "1" if kwargs["notify_if_canceled"] else "0"
 
         _params["update_operations"] = kwargs.get("update_operations")
         if "update_operations" in _params and not isinstance(_params.get("update_operations", None), type(None)):
@@ -1504,6 +1511,7 @@ class RecoveryOperations(Operations):
     """
     Restructures the user defined recovery operations data to fit the Zabbix API requirements
     """
+
     def _construct_operationtype(self, operation):
         """Construct operation type.
 
@@ -1572,6 +1580,7 @@ class AcknowledgeOperations(Operations):
     """
     Restructures the user defined acknowledge operations data to fit the Zabbix API requirements
     """
+
     def _construct_operationtype(self, operation):
         """Construct operation type.
 
@@ -2177,7 +2186,8 @@ def main():
                 ["type", "send_message", ["send_to_users", "send_to_groups"], True]
             ]
         ),
-        pause_symptoms=dict(type="bool", required=False, default=True)
+        pause_symptoms=dict(type="bool", required=False, default=True),
+        notify_if_canceled=dict(type="bool", required=False, default=True)
     ))
     module = AnsibleModule(
         argument_spec=argument_spec,
@@ -2202,6 +2212,7 @@ def main():
     recovery_operations = module.params["recovery_operations"]
     acknowledge_operations = module.params["acknowledge_operations"]
     pause_symptoms = module.params["pause_symptoms"]
+    notify_if_canceled = module.params["notify_if_canceled"]
 
     zapi_wrapper = Zapi(module)
     action = Action(module)
@@ -2227,7 +2238,8 @@ def main():
                 pause_in_maintenance=pause_in_maintenance,
                 operations=ops.construct_the_data(operations, event_source),
                 recovery_operations=recovery_ops.construct_the_data(recovery_operations),
-                conditions=fltr.construct_the_data(eval_type, formula, conditions)
+                conditions=fltr.construct_the_data(eval_type, formula, conditions),
+                notify_if_canceled=notify_if_canceled
             )
 
             if LooseVersion(zapi_wrapper._zbx_api_version) >= LooseVersion("6.4"):
@@ -2257,7 +2269,8 @@ def main():
                 pause_in_maintenance=pause_in_maintenance,
                 operations=ops.construct_the_data(operations, event_source),
                 recovery_operations=recovery_ops.construct_the_data(recovery_operations),
-                conditions=fltr.construct_the_data(eval_type, formula, conditions)
+                conditions=fltr.construct_the_data(eval_type, formula, conditions),
+                notify_if_canceled=notify_if_canceled
             )
 
             kwargs[argument_spec["acknowledge_operations"]["aliases"][0]] = acknowledge_ops.construct_the_data(acknowledge_operations)
diff --git a/tests/integration/targets/test_zabbix_action/tasks/main.yml b/tests/integration/targets/test_zabbix_action/tasks/main.yml

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+minor_changes:`
	`2`	`+ - action module - Added notify_if_canceled property`