From b03d1da39329c01a345b92d0d68393e9fb0fe690 Mon Sep 17 00:00:00 2001 From: "t.goto" Date: Tue, 15 Mar 2016 16:12:56 +0900 Subject: [PATCH] change host.delete() parameter for newer ZBX api. As of Zabbix API 2.4, host.delete() will not takes parameter with `hostid` property but only the array of it. https://www.zabbix.com/documentation/2.2/manual/api/reference/host/delete fix #1800 --- lib/ansible/modules/extras/monitoring/zabbix_host.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/ansible/modules/extras/monitoring/zabbix_host.py b/lib/ansible/modules/extras/monitoring/zabbix_host.py index fd8af087ebe..0b48d6bc955 100644 --- a/lib/ansible/modules/extras/monitoring/zabbix_host.py +++ b/lib/ansible/modules/extras/monitoring/zabbix_host.py @@ -26,7 +26,10 @@ short_description: Zabbix host creates/updates/deletes description: - This module allows you to create, modify and delete Zabbix host entries and associated group and template data. version_added: "2.0" -author: Tony Minfei Ding, Harrison Gu +author: + - "(@cove)" + - "Tony Minfei Ding" + - "Harrison Gu (@harrisongu)" requirements: - "python >= 2.6" - zabbix-api @@ -237,7 +240,7 @@ class Host(object): try: if self._module.check_mode: self._module.exit_json(changed=True) - self._zapi.host.delete({'hostid': host_id}) + self._zapi.host.delete([host_id]) except Exception, e: self._module.fail_json(msg="Failed to delete host %s: %s" % (host_name, e)) @@ -437,7 +440,7 @@ def main(): proxy_id = host.get_proxyid_by_proxy_name(proxy) else: proxy_id = None - + # get host id by host name zabbix_host_obj = host.get_host_by_host_name(host_name) host_id = zabbix_host_obj['hostid'] @@ -502,4 +505,3 @@ def main(): from ansible.module_utils.basic import * main() -