Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update zabbix_action.py #50149

Merged
merged 1 commit into from
Dec 19, 2018
Merged

Update zabbix_action.py #50149

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions lib/ansible/modules/monitoring/zabbix/zabbix_action.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,18 @@
default: 'present'
status:
description:
- Monitoring status of the action.
- Status of the action.
choices: ['enabled', 'disabled']
default: 'enabled'
esc_period:
description:
- Default operation step duration. Must be greater than 60 seconds. Accepts seconds, time unit with suffix and user macro
- Default operation step duration. Must be greater than 60 seconds. Accepts seconds, time unit with suffix and user macro.
default: '60'
conditions:
type: list
description:
- List of dictionaries of conditions to evaluate.
- For more information about suboptions of this options please
- For more information about suboptions of this option please
check out Zabbix API documentation U(https://www.zabbix.com/documentation/3.4/manual/api/reference/action/object#action_filter_condition)
suboptions:
type:
Expand Down Expand Up @@ -129,7 +129,7 @@
formulaid:
description:
- Arbitrary unique ID that is used to reference the condition from a custom expression.
- Can only contain capital-case letters.
- Can only contain upper-case letters.
formula:
description:
- User-defined expression to be used for evaluating conditions of filters with a custom expression.
Expand Down Expand Up @@ -235,7 +235,7 @@
- proxy
run_on_groups:
description:
- Host groups to run remote commands on
- Host groups to run remote commands on.
- Required when I(type=remote_command) if I(run_on_hosts) is not set
run_on_hosts:
description:
Expand Down Expand Up @@ -276,17 +276,17 @@
type: list
description:
- List of recovery operations
- C(Suboptions) are the same as I(operations)
- C(Suboptions) are the same as for I(operations)
- Works only with >= Zabbix 3.2
acknowledge_operations:
type: list
description:
- List of acknowledge operations
- C(Suboptions) are the same as I(operations)
- C(Suboptions) are the same as for I(operations)
- Works only with >= Zabbix 3.4

notes:
- Only Zabbix Server >= 3.0 is supported.
- Only Zabbix >= 3.0 is supported.


extends_documentation_fragment:
Expand Down Expand Up @@ -346,7 +346,7 @@
run_on_hosts:
- 0

# Trigger action with recovery and aknowledge operations
# Trigger action with recovery and acknowledge operations
- name: Deploy trigger action
zabbix_action:
server_url: "http://zabbix.example.com/zabbix/"
Expand Down