diff --git a/plugins/modules/zabbix_discoveryrule.py b/plugins/modules/zabbix_discoveryrule.py index 74455e13c..725fd43e3 100644 --- a/plugins/modules/zabbix_discoveryrule.py +++ b/plugins/modules/zabbix_discoveryrule.py @@ -15,7 +15,7 @@ - Create discoveryrules if they do not exist. - Delete existing discoveryrules if they exist. author: - - "Andrew Lathrop" + - "Andrew Lathrop (@aplathrop)" requirements: - "python >= 2.6" @@ -46,7 +46,7 @@ - Mutually exclusive with I(host_name). required: false type: str -params: + params: description: - Parameters to create/update discovery rule with. - Required if state is "present". @@ -63,7 +63,7 @@ type: str interval: description: - - Update interval of the LLD rule. + - Update interval of the LLD rule. - Alias for "delay" in API docs required: false type: str diff --git a/plugins/modules/zabbix_item.py b/plugins/modules/zabbix_item.py index 742a96d5a..845eac85d 100644 --- a/plugins/modules/zabbix_item.py +++ b/plugins/modules/zabbix_item.py @@ -15,7 +15,7 @@ - Create items if they do not exist. - Delete existing items if they exist. author: - - "Andrew Lathrop" + - "Andrew Lathrop (@aplathrop)" requirements: - "python >= 2.6" @@ -511,5 +511,6 @@ def main(): changed = True module.exit_json(changed=changed, result=results) + if __name__ == '__main__': main() diff --git a/plugins/modules/zabbix_itemprototype.py b/plugins/modules/zabbix_itemprototype.py index 0c158b478..66e756ed4 100644 --- a/plugins/modules/zabbix_itemprototype.py +++ b/plugins/modules/zabbix_itemprototype.py @@ -15,7 +15,7 @@ - Create item prototypes if they do not exist. - Delete existing item prototypes if they exist. author: - - "Andrew Lathrop" + - "Andrew Lathrop (@aplathrop)" requirements: - "python >= 2.6" @@ -124,7 +124,8 @@ preprocessing: description: - Item preprocessing options. - - Parameters as defined at https://www.zabbix.com/documentation/current/en/manual/api/reference/itemprototype/object#item-prototype-preprocessing + - Parameters as defined at + - https://www.zabbix.com/documentation/current/en/manual/api/reference/itemprototype/object#item-prototype-preprocessing - Additionally supported parameters are below required: false type: list diff --git a/plugins/modules/zabbix_trigger.py b/plugins/modules/zabbix_trigger.py index 20c6df8cd..9a84448c6 100644 --- a/plugins/modules/zabbix_trigger.py +++ b/plugins/modules/zabbix_trigger.py @@ -15,7 +15,7 @@ - Create triggers if they do not exist. - Delete existing triggers if they exist. author: - - "Andrew Lathrop" + - "Andrew Lathrop (@aplathrop)" requirements: - "python >= 2.6" @@ -60,6 +60,7 @@ - list of triggers that this trigger is dependent on required: false type: list + elements: dict suboptions: name: description: @@ -126,7 +127,7 @@ - OK event generation mode. - Overrides "recovery_mode" in API docs. required: false - type: string + type: str choices: - expression - recovery_expression @@ -136,7 +137,7 @@ - OK event closes. - Overrides "correlation_mode" in API docs. required: false - type: string + type: str choices: [ "all", "tag" ] manual_close: description: @@ -382,7 +383,7 @@ def main(): template_name=dict(type='str', required=False), params=dict(type='dict', required=False), desc=dict(type='str', required=False, aliases=['description']), - dependencies=dict(type='list', required=False), + dependencies=dict(type='list', elements='dict', required=False), state=dict(type='str', default="present", choices=['present', 'absent']), )) module = AnsibleModule( diff --git a/plugins/modules/zabbix_triggerprototype.py b/plugins/modules/zabbix_triggerprototype.py index 18ba8e0c5..410955be9 100644 --- a/plugins/modules/zabbix_triggerprototype.py +++ b/plugins/modules/zabbix_triggerprototype.py @@ -15,7 +15,7 @@ - Create triggerprototypes if they do not exist. - Delete existing triggerprototypes if they exist. author: - - "Andrew Lathrop" + - "Andrew Lathrop (@aplathrop)" requirements: - "python >= 2.6" @@ -60,6 +60,7 @@ - list of trigger prototypes that this trigger prototype is dependent on required: false type: list + elements: dict suboptions: name: description: @@ -127,7 +128,7 @@ - OK event generation mode. - Overrides "recovery_mode" in API docs. required: false - type: string + type: str choices: - expression - recovery_expression @@ -137,7 +138,7 @@ - OK event closes. - Overrides "correlation_mode" in API docs. required: false - type: string + type: str choices: [ "all", "tag" ] manual_close: description: @@ -386,7 +387,7 @@ def main(): template_name=dict(type='str', required=False), params=dict(type='dict', required=False), desc=dict(type='str', required=False, aliases=['description']), - dependencies=dict(type='list', required=False), + dependencies=dict(type='list', elements='dict', required=False), state=dict(type='str', default="present", choices=['present', 'absent']), )) module = AnsibleModule(