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 #50490

Merged
merged 1 commit into from Jan 3, 2019
Merged

Update zabbix_action.py #50490

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
39 changes: 20 additions & 19 deletions lib/ansible/modules/monitoring/zabbix/zabbix_action.py
View file
Open in desktop
Expand Up @@ -66,7 +66,7 @@
check out Zabbix API documentation U(https://www.zabbix.com/documentation/3.4/manual/api/reference/action/object#action_filter_condition)
suboptions:
type:
description: Type (label) of the condition
description: Type (label) of the condition.
choices:
# trigger
- host_group
Expand Down Expand Up @@ -105,13 +105,13 @@
description:
- Value to compare with.
- When I(type) is set to C(discovery_status), the choices
are C(up), C(down), C(discovered), C(lost)
are C(up), C(down), C(discovered), C(lost).
- When I(type) is set to C(discovery_object), the choices
are C(host), C(service)
are C(host), C(service).
- When I(type) is set to C(event_type), the choices
are C(item in not supported state), C(item in normal state),
C(LLD rule in not supported state),
C(LLD rule in normal state), C(trigger in unknown state), C(trigger in normal state)
C(LLD rule in normal state), C(trigger in unknown state), C(trigger in normal state).
- Besides the above options, this is usualy either the name
of the object or a string to compare with.
operator:
Expand Down Expand Up @@ -228,61 +228,62 @@
execute_on:
description:
- Target on which the custom script operation command will be executed.
- Required when I(type=remote_command) and I(command_type=custom_script)
- Required when I(type=remote_command) and I(command_type=custom_script).
choices:
- agent
- server
- proxy
run_on_groups:
description:
- Host groups to run remote commands on.
- Required when I(type=remote_command) if I(run_on_hosts) is not set
- Required when I(type=remote_command) if I(run_on_hosts) is not set.
run_on_hosts:
description:
- Hosts to run remote commands on
- Required when I(type=remote_command) if I(run_on_groups) is not set
- Hosts to run remote commands on.
- Required when I(type=remote_command) if I(run_on_groups) is not set.
- If set to 0 the command will be run on the current host.
ssh_auth_type:
description:
- Authentication method used for SSH commands.
- Required when I(type=remote_command) and I(command_type=ssh)
- Required when I(type=remote_command) and I(command_type=ssh).
choices:
- password
- public_key
ssh_privatekey_file:
description:
- Name of the private key file used for SSH commands with public key authentication.
- Required when I(type=remote_command) and I(command_type=ssh)
- Required when I(type=remote_command) and I(command_type=ssh).
ssh_publickey_file:
description:
- Name of the public key file used for SSH commands with public key authentication.
- Required when I(type=remote_command) and I(command_type=ssh)
- Required when I(type=remote_command) and I(command_type=ssh).
username:
description:
- User name used for authentication.
- Required when I(type=remote_command) and I(command_type in [ssh, telnet])
- Required when I(type=remote_command) and I(command_type in [ssh, telnet]).
password:
description:
- Password used for authentication.
- Required when I(type=remote_command) and I(command_type in [ssh, telnet])
- Required when I(type=remote_command) and I(command_type in [ssh, telnet]).
port:
description:
- Port number used for authentication.
- Required when I(type=remote_command) and I(command_type in [ssh, telnet])
- Required when I(type=remote_command) and I(command_type in [ssh, telnet]).
script_name:
description:
- The name of script used for global script commands.
- Required when I(type=remote_command) and I(command_type=global_script)
- Required when I(type=remote_command) and I(command_type=global_script).
recovery_operations:
type: list
description:
- List of recovery operations
- C(Suboptions) are the same as for I(operations)
- List of recovery 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 for I(operations)
- List of acknowledge operations.
- C(Suboptions) are the same as for I(operations).
- Works only with >= Zabbix 3.4

notes:
Expand Down