diff --git a/lib/ansible/modules/extras/monitoring/zabbix_group.py b/lib/ansible/modules/extras/monitoring/zabbix_group.py index 4aad121878..730f791190 100644 --- a/lib/ansible/modules/extras/monitoring/zabbix_group.py +++ b/lib/ansible/modules/extras/monitoring/zabbix_group.py @@ -150,10 +150,10 @@ class HostGroup(object): def main(): module = AnsibleModule( argument_spec=dict( - server_url=dict(required=True, aliases=['url']), - login_user=dict(required=True), - login_password=dict(required=True, no_log=True), - host_groups=dict(required=True, aliases=['host_group']), + server_url=dict(type='str', required=True, aliases=['url']), + login_user=dict(type='str', required=True), + login_password=dict(type='str', required=True, no_log=True), + host_groups=dict(type='list', required=True, aliases=['host_group']), state=dict(default="present", choices=['present','absent']), timeout=dict(type='int', default=10) ), diff --git a/lib/ansible/modules/extras/monitoring/zabbix_host.py b/lib/ansible/modules/extras/monitoring/zabbix_host.py index 5edf5f04d3..d71c8b8d58 100644 --- a/lib/ansible/modules/extras/monitoring/zabbix_host.py +++ b/lib/ansible/modules/extras/monitoring/zabbix_host.py @@ -364,18 +364,18 @@ class Host(object): def main(): module = AnsibleModule( argument_spec=dict( - server_url=dict(required=True, default=None, aliases=['url']), - login_user=dict(required=True), - login_password=dict(required=True, no_log=True), - host_name=dict(required=True), - host_groups=dict(required=False), - link_templates=dict(required=False), + server_url=dict(type='str', required=True, aliases=['url']), + login_user=dict(rtype='str', equired=True), + login_password=dict(type='str', required=True, no_log=True), + host_name=dict(type='str', required=True), + host_groups=dict(type='list', required=False), + link_templates=dict(type='list', required=False), status=dict(default="enabled", choices=['enabled', 'disabled']), state=dict(default="present", choices=['present', 'absent']), timeout=dict(type='int', default=10), - interfaces=dict(required=False), - force=dict(default=True, type='bool'), - proxy=dict(required=False) + interfaces=dict(type='list', required=False), + force=dict(type='bool', default=True), + proxy=dict(type='str', required=False) ), supports_check_mode=True ) diff --git a/lib/ansible/modules/extras/monitoring/zabbix_hostmacro.py b/lib/ansible/modules/extras/monitoring/zabbix_hostmacro.py index 8ab3e484ec..4f3eae881a 100644 --- a/lib/ansible/modules/extras/monitoring/zabbix_hostmacro.py +++ b/lib/ansible/modules/extras/monitoring/zabbix_hostmacro.py @@ -169,12 +169,12 @@ class HostMacro(object): def main(): module = AnsibleModule( argument_spec=dict( - server_url=dict(required=True, default=None, aliases=['url']), - login_user=dict(required=True), - login_password=dict(required=True, no_log=True), - host_name=dict(required=True), - macro_name=dict(required=True), - macro_value=dict(required=True), + server_url=dict(type='str', required=True, aliases=['url']), + login_user=dict(type='str', required=True), + login_password=dict(type='str', required=True, no_log=True), + host_name=dict(type='str', required=True), + macro_name=dict(type='str', required=True), + macro_value=dict(type='str', required=True), state=dict(default="present", choices=['present', 'absent']), timeout=dict(type='int', default=10) ), diff --git a/lib/ansible/modules/extras/monitoring/zabbix_maintenance.py b/lib/ansible/modules/extras/monitoring/zabbix_maintenance.py index 2d61138291..d8b6516581 100644 --- a/lib/ansible/modules/extras/monitoring/zabbix_maintenance.py +++ b/lib/ansible/modules/extras/monitoring/zabbix_maintenance.py @@ -266,14 +266,14 @@ def main(): module = AnsibleModule( argument_spec=dict( state=dict(required=False, default='present', choices=['present', 'absent']), - server_url=dict(required=True, default=None, aliases=['url']), + server_url=dict(type='str', required=True, default=None, aliases=['url']), host_names=dict(type='list', required=False, default=None, aliases=['host_name']), minutes=dict(type='int', required=False, default=10), host_groups=dict(type='list', required=False, default=None, aliases=['host_group']), - login_user=dict(required=True), - login_password=dict(required=True, no_log=True), - name=dict(required=True), - desc=dict(required=False, default="Created by Ansible"), + login_user=dict(type='str', required=True), + login_password=dict(type='str', required=True, no_log=True), + name=dict(type='str', required=True), + desc=dict(type='str', required=False, default="Created by Ansible"), collect_data=dict(type='bool', required=False, default=True), ), supports_check_mode=True, diff --git a/lib/ansible/modules/extras/monitoring/zabbix_screen.py b/lib/ansible/modules/extras/monitoring/zabbix_screen.py index dfa6196164..f904c550ae 100644 --- a/lib/ansible/modules/extras/monitoring/zabbix_screen.py +++ b/lib/ansible/modules/extras/monitoring/zabbix_screen.py @@ -315,9 +315,9 @@ class Screen(object): def main(): module = AnsibleModule( argument_spec=dict( - server_url=dict(required=True, default=None, aliases=['url']), - login_user=dict(required=True), - login_password=dict(required=True, no_log=True), + server_url=dict(type='str', required=True, aliases=['url']), + login_user=dict(type='str', required=True), + login_password=dict(type='str', required=True, no_log=True), timeout=dict(type='int', default=10), screens=dict(type='list', required=True) ),