ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-05-10 19:21:31 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

zabbix_action: Fixing the default message checking (#54953)

Browse source
This commit is contained in:
Ruben Tsirunyan 2019-04-08 12:43:15 +04:00 • committed by ansibot
parent 1532e31ec0
commit 0fe63ec2d6
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/ansible/modules/monitoring/zabbix/zabbix_action.py
View file

@ -227,9 +227,11 @@ options:
message: message:
description: description:
- Operation message text. - Operation message text.
- Will check the 'default message' and use the text from I(default_message) if this and I(default_subject) are not specified
subject: subject:
description: description:
- Operation message subject. - Operation message subject.
- Will check the 'default message' and use the text from I(default_subject) if this and I(default_subject) are not specified
media_type: media_type:
description: description:
- Media type that will be used to send the message. - Media type that will be used to send the message.
@ -921,7 +923,7 @@ class Operations(object):
""" """
try: try:
return { return {
'default_msg': '0' if 'message' in operation or 'subject' in operation else '1', 'default_msg': '0' if operation.get('message') is not None or operation.get('subject')is not None else '1',
'mediatypeid': self._zapi_wrapper.get_mediatype_by_mediatype_name( 'mediatypeid': self._zapi_wrapper.get_mediatype_by_mediatype_name(
operation.get('media_type') operation.get('media_type')
) if operation.get('media_type') is not None else '0', ) if operation.get('media_type') is not None else '0',
@ -1660,12 +1662,12 @@ def main():
state=dict(type='str', required=False, default='present', choices=['present', 'absent']), state=dict(type='str', required=False, default='present', choices=['present', 'absent']),
status=dict(type='str', required=False, default='enabled', choices=['enabled', 'disabled']), status=dict(type='str', required=False, default='enabled', choices=['enabled', 'disabled']),
pause_in_maintenance=dict(type='bool', required=False, default=True), pause_in_maintenance=dict(type='bool', required=False, default=True),
default_message=dict(type='str', required=False, default=None), default_message=dict(type='str', required=False, default=''),
default_subject=dict(type='str', required=False, default=None), default_subject=dict(type='str', required=False, default=''),
recovery_default_message=dict(type='str', required=False, default=None), recovery_default_message=dict(type='str', required=False, default=''),
recovery_default_subject=dict(type='str', required=False, default=None), recovery_default_subject=dict(type='str', required=False, default=''),
acknowledge_default_message=dict(type='str', required=False, default=None), acknowledge_default_message=dict(type='str', required=False, default=''),
acknowledge_default_subject=dict(type='str', required=False, default=None), acknowledge_default_subject=dict(type='str', required=False, default=''),
conditions=dict( conditions=dict(
type='list', type='list',
required=False, required=False,