From 286543a86f871d888804ee59f46f024d4d96bb49 Mon Sep 17 00:00:00 2001 From: Tim Dufrane Date: Thu, 28 Feb 2019 16:44:08 -0500 Subject: [PATCH 1/2] Remove nulls to prevent Zabbix API errors If IP or DNS are null, Zabbix API returns an error. Prefer empty string over null. --- salt/states/zabbix_host.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/states/zabbix_host.py b/salt/states/zabbix_host.py index 924fee95d5c8..6d1deb9f049d 100644 --- a/salt/states/zabbix_host.py +++ b/salt/states/zabbix_host.py @@ -122,8 +122,8 @@ def _interface_format(interfaces_data): interface_type = interface_ports[value['type'].lower()][0] main = '1' if six.text_type(value.get('main', 'true')).lower() == 'true' else '0' useip = '1' if six.text_type(value.get('useip', 'true')).lower() == 'true' else '0' - interface_ip = value.get('ip') - dns = value.get('dns', key) + interface_ip = value.get('ip') or "" + dns = value.get('dns', key) or "" port = six.text_type(value.get('port', interface_ports[value['type'].lower()][1])) interfaces_list.append({'type': interface_type, From 1e258be976f22846f5f16bb06b61cd3d8a54617f Mon Sep 17 00:00:00 2001 From: Tim Dufrane Date: Thu, 28 Feb 2019 18:52:57 -0500 Subject: [PATCH 2/2] Use preferred format Change to use default value in case of null, as per request --- salt/states/zabbix_host.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/states/zabbix_host.py b/salt/states/zabbix_host.py index 6d1deb9f049d..3bfde6c85284 100644 --- a/salt/states/zabbix_host.py +++ b/salt/states/zabbix_host.py @@ -122,8 +122,8 @@ def _interface_format(interfaces_data): interface_type = interface_ports[value['type'].lower()][0] main = '1' if six.text_type(value.get('main', 'true')).lower() == 'true' else '0' useip = '1' if six.text_type(value.get('useip', 'true')).lower() == 'true' else '0' - interface_ip = value.get('ip') or "" - dns = value.get('dns', key) or "" + interface_ip = value.get('ip', '') + dns = value.get('dns', key) port = six.text_type(value.get('port', interface_ports[value['type'].lower()][1])) interfaces_list.append({'type': interface_type,