Fix version checks

ansible-collections · Jan 18, 2025 · d1b6a1c · d1b6a1c
1 parent 760c209
commit d1b6a1c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/plugins/modules/zabbix_host_events_info.py b/plugins/modules/zabbix_host_events_info.py
@@ -301,8 +301,8 @@ def get_last_event_by_trigger_id(self, triggers_id):
         """ Get the last event from triggerid"""
         output = ["eventid", "clock", "acknowledged", "value"]
         parameters = {"output": output, "objectids": triggers_id, "selectAcknowledges": "extend",
-                            "selectTags": "extend", "limit": 1, "sortfield": "clock", "sortorder": "DESC"}
-        if LooseVersion(self._zbx_api_version) <= LooseVersion("6.4"):
+                      "selectTags": "extend", "limit": 1, "sortfield": "clock", "sortorder": "DESC"}
+        if LooseVersion(self._zbx_api_version) < LooseVersion("7.0"):
             parameters["select_acknowledges"] = parameters["selectAcknowledges"]
             del parameters["selectAcknowledges"]
         event = self._zapi.event.get(parameters)

diff --git a/plugins/modules/zabbix_maintenance.py b/plugins/modules/zabbix_maintenance.py
@@ -254,7 +254,7 @@ def create_maintenance(self, group_ids, host_ids, start_time,
                 "period": str(period),
             }]
         }
-        if LooseVersion(self._zbx_api_version) <= LooseVersion("6.0"):
+        if LooseVersion(self._zbx_api_version) < LooseVersion("6.2"):
             parameters["groupids"] = group_ids
             parameters["hostids"] = host_ids
             del parameters["groups"]
@@ -281,7 +281,7 @@ def update_maintenance(self, maintenance_id, group_ids, host_ids,
                 "period": str(period),
             }]
         }
-        if LooseVersion(self._zbx_api_version) <= LooseVersion("6.0"):
+        if LooseVersion(self._zbx_api_version) < LooseVersion("6.2"):
             parameters["groupids"] = group_ids
             parameters["hostids"] = host_ids
             del parameters["groups"]
@@ -298,15 +298,15 @@ def get_maintenance(self, name):
             "selectHosts": "extend",
             "selectTags": "extend",
         }
-        if LooseVersion(self._zbx_api_version) <= LooseVersion("6.0"):
+        if LooseVersion(self._zbx_api_version) < LooseVersion("6.2"):
             parameters["selectGroups"] = parameters["selectHostGroups"]
             del parameters["selectHostGroups"]
         maintenances = self._zapi.maintenance.get(parameters)
 
         for maintenance in maintenances:
             maintenance["groupids"] = [group["groupid"] for group
                                        in maintenance["hostgroups"]] if "hostgroups" in maintenance else []
-            if LooseVersion(self._zbx_api_version) <= LooseVersion("6.0"):
+            if LooseVersion(self._zbx_api_version) < LooseVersion("6.2"):
                 maintenance["groupids"] = [group["groupid"] for group
                                            in maintenance["groups"]] if "groups" in maintenance else []
             maintenance["hostids"] = [host["hostid"] for host

diff --git a/plugins/modules/zabbix_mediatype.py b/plugins/modules/zabbix_mediatype.py
@@ -538,7 +538,7 @@ def construct_parameters(self):
                 username=self._module.params["username"],
                 passwd=self._module.params["password"]
             ))
-            if LooseVersion(self._zbx_api_version) <= LooseVersion("6.4"):
+            if LooseVersion(self._zbx_api_version) < LooseVersion("7.0"):
                 parameters["content_type"] = parameters["message_format"]
                 del parameters["message_format"]
             if parameters["smtp_authentication"] == "0":