8000 updated zabbix modules to use missing_required_lib helper by D3DeFi · Pull Request #58002 · ansible/ansible · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

updated zabbix modules to use missing_required_lib helper #58002

New issue

Have a question about this project?< 8000 /strong> 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

Merged
merged 1 commit into from
Jun 18, 2019
Merged

updated zabbix modules to use missing_required_lib helper #58002

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 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 @@ -439,13 +439,17 @@
sample: 'Action Deleted: Register webservers, ID: 0001'
'''


import traceback

try:
from zabbix_api import ZabbixAPI
HAS_ZABBIX_API = True
except ImportError:
ZBX_IMP_ERR = traceback.format_exc()
HAS_ZABBIX_API = False

from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.basic import AnsibleModule, missing_required_lib


class Zapi(object):
Expand Down Expand Up @@ -1966,7 +1970,7 @@ def main():
)

if not HAS_ZABBIX_API:
module.fail_json(msg="Missing required zabbix-api module (check docs or install with: pip install zabbix-api)")
module.fail_json(msg=missing_required_lib('zabbix-api', url='https://pypi.org/project/zabbix-api/'), exception=ZBX_IMP_ERR)

server_url = module.params['server_url']
login_user = module.params['login_user']
Expand Down
8 changes: 6 additions & 2 deletions lib/ansible/modules/monitoring/zabbix/zabbix_group.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,19 @@
when: inventory_hostname==groups['group_name'][0]
'''


import traceback

try:
from zabbix_api import ZabbixAPI, ZabbixAPISubClass
from zabbix_api import Already_Exists

HAS_ZABBIX_API = True
except ImportError:
ZBX_IMP_ERR = traceback.format_exc()
HAS_ZABBIX_API = False

from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.basic import AnsibleModule, missing_required_lib


class HostGroup(object):
Expand Down Expand Up @@ -146,7 +150,7 @@ def main():
)

if not HAS_ZABBIX_API:
module.fail_json(msg="Missing required zabbix-api module (check docs or install with: pip install zabbix-api)")
module.fail_json(msg=missing_required_lib('zabbix-api', url='https://pypi.org/project/zabbix-api/'), exception=ZBX_IMP_ERR)

server_url = module.params['server_url']
login_user = module.params['login_user']
Expand Down
8 changes: 6 additions & 2 deletions lib/ansible/modules/monitoring/zabbix/zabbix_group_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,10 @@
timeout: 10
'''

from ansible.module_utils.basic import AnsibleModule

import traceback

from ansible.module_utils.basic import AnsibleModule, missing_required_lib

try:
from zabbix_api import ZabbixAPI, ZabbixAPISubClass
Expand All @@ -74,6 +77,7 @@ def __init__(self, server, timeout, user, passwd, validate_certs, **kwargs):

HAS_ZABBIX_API = True
except ImportError:
ZBX_IMP_ERR = traceback.format_exc()
HAS_ZABBIX_API = False


Expand Down Expand Up @@ -107,7 +111,7 @@ def main():
module.deprecate("The 'zabbix_group_facts' module has been renamed to 'zabbix_group_info'", version='2.13')

if not HAS_ZABBIX_API:
module.fail_json(msg="Missing required zabbix-api module (check docs or install with: pip install zabbix-api)")
module.fail_json(msg=missing_required_lib('zabbix-api', url='https://pypi.org/project/zabbix-api/'), exception=ZBX_IMP_ERR)

server_url = module.params['server_url']
login_user = module.params['login_user']
Expand Down
7 changes: 5 additions & 2 deletions lib/ansible/modules/monitoring/zabbix/zabbix_host.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,9 @@
tls_psk: 123456789abcdef123456789abcdef12
'''


import copy
import traceback

try:
from zabbix_api import ZabbixAPI, ZabbixAPISubClass
Expand All @@ -241,9 +243,10 @@ def __init__(self, server, timeout, user, passwd, validate_certs, **kwargs):

HAS_ZABBIX_API = True
except ImportError:
ZBX_IMP_ERR = traceback.format_exc()
HAS_ZABBIX_API = False

from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.basic import AnsibleModule, missing_required_lib


class Host(object):
Expand Down Expand Up @@ -657,7 +660,7 @@ def main():
)

if not HAS_ZABBIX_API:
module.fail_json(msg="Missing required zabbix-api module (check docs or install with: pip install zabbix-api)")
module.fail_json(msg=missing_required_lib('zabbix-api', url='https://pypi.org/project/zabbix-api/'), exception=ZBX_IMP_ERR)

server_url = module.params['server_url']
login_user = module.params['login_user']
Expand Down
8 changes: 6 additions & 2 deletions lib/ansible/modules/monitoring/zabbix/zabbix_host_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,10 @@
remove_duplicate: yes
'''

from ansible.module_utils.basic import AnsibleModule

import traceback

from ansible.module_utils.basic import AnsibleModule, missing_required_lib

try:
from zabbix_api import ZabbixAPI, ZabbixAPISubClass
Expand All @@ -113,6 +116,7 @@ def __init__(self, server, timeout, user, passwd, validate_certs, **kwargs):

HAS_ZABBIX_API = True
except ImportError:
ZBX_IMP_ERR = traceback.format_exc()
HAS_ZABBIX_API = False


Expand Down Expand Up @@ -190,7 +194,7 @@ def main():
module.deprecate("The 'zabbix_host_facts' module has been renamed to 'zabbix_host_info'", version='2.13')

if not HAS_ZABBIX_API:
module.fail_json(msg="Missing required zabbix-api module (check docs or install with: pip install zabbix-api)")
module.fail_json(msg=missing_required_lib('zabbix-api', url='https://pypi.org/project/zabbix-api/'), exception=ZBX_IMP_ERR)

server_url = module.params['server_url']
login_user = module.params['login_user']
Expand Down
8 changes: 6 additions & 2 deletions lib/ansible/modules/monitoring/zabbix/zabbix_hostmacro.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@
state: present
'''


import traceback

try:
from zabbix_api import ZabbixAPI, ZabbixAPISubClass

Expand All @@ -82,9 +85,10 @@ def __init__(self, server, timeout, user, passwd, validate_certs, **kwargs):

HAS_ZABBIX_API = True
except ImportError:
ZBX_IMP_ERR = traceback.format_exc()
HAS_ZABBIX_API = False

from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.basic import AnsibleModule, missing_required_lib


class HostMacro(object):
Expand Down Expand Up @@ -170,7 +174,7 @@ def main():
)

if not HAS_ZABBIX_API:
module.fail_json(msg="Missing required zabbix-api module (check docs or install with: pip install zabbix-api)")
module.fail_json(msg=missing_required_lib('zabbix-api', url='https://pypi.org/project/zabbix-api/'), exception=ZBX_IMP_ERR)

server_url = module.params['server_url']
login_user = module.params['login_user']
Expand Down
7 changes: 5 additions & 2 deletions lib/ansible/modules/monitoring/zabbix/zabbix_maintenance.py
View file
Open in desktop
F438
Original file line number Diff line numberDiff line change
Expand Up @@ -121,16 +121,19 @@
login_password: pAsSwOrD
'''


import datetime
import time
import traceback

try:
from zabbix_api import ZabbixAPI
HAS_ZABBIX_API = True
except ImportError:
ZBX_IMP_ERR = traceback.format_exc()
HAS_ZABBIX_API = False

from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.basic import AnsibleModule, missing_required_lib


def create_maintenance(zbx, group_ids, host_ids, start_time, maintenance_type, period, name, desc):
Expand Down Expand Up @@ -288,7 +291,7 @@ def main():
)

if not HAS_ZABBIX_API:
module.fail_json(msg="Missing required zabbix-api module (check docs or install with: pip install zabbix-api)")
module.fail_json(msg=missing_required_lib('zabbix-api', url='https://pypi.org/project/zabbix-api/'), exception=ZBX_IMP_ERR)

host_names = module.params['host_names']
host_groups = module.params['host_groups']
Expand Down
17 changes: 12 additions & 5 deletions lib/ansible/modules/monitoring/zabbix/zabbix_map.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,34 +172,41 @@
'status': ['preview']
}


import base64
import traceback

from io import BytesIO
from operator import itemgetter
from distutils.version import StrictVersion
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.basic import AnsibleModule, missing_required_lib

try:
import pydotplus
HAS_PYDOTPLUS = True
except ImportError:
PYDOT_IMP_ERR = traceback.format_exc()
HAS_PYDOTPLUS = False

try:
import webcolors
HAS_WEBCOLORS = True
except ImportError:
WEBCOLORS_IMP_ERR = traceback.format_exc()
HAS_WEBCOLORS = False

try:
from zabbix_api import ZabbixAPI, ZabbixAPISubClass
HAS_ZABBIX_API = True
except ImportError:
ZBX_IMP_ERR = traceback.format_exc()
HAS_ZABBIX_API = False

try:
from PIL import Image
HAS_PIL = True
except ImportError:
PIL_IMP_ERR = traceback.format_exc()
HAS_PIL = False


Expand Down Expand Up @@ -761,13 +768,13 @@ def main():
)

if not HAS_ZABBIX_API:
module.fail_json(msg="Missing required zabbix-api module (check docs or install with: pip install zabbix-api)")
module.fail_json(msg=missing_required_lib('zabbix-api', url='https://pypi.org/project/zabbix-api/'), exception=ZBX_IMP_ERR)
if not HAS_PYDOTPLUS:
module.fail_json(msg="Missing required pydotplus module (check docs or install with: pip install pydotplus)")
module.fail_json(msg=missing_required_lib('pydotplus', url='https://pypi.org/project/pydotplus/'), exception=PYDOT_IMP_ERR)
if not HAS_WEBCOLORS:
module.fail_json(msg="Missing required webcolors module (check docs or install with: pip install webcolors)")
module.fail_json(msg=missing_required_lib('webcolors', url='https://pypi.org/project/webcolors/'), exception=WEBCOLORS_IMP_ERR)
if not HAS_PIL:
module.fail_json(msg="Missing required Pillow module (check docs or install with: pip install Pillow)")
module.fail_json(msg=missing_required_lib('Pillow', url='https://pypi.org/project/Pillow/'), exception=PIL_IMP_ERR)

server_url = module.params['server_url']
login_user = module.params['login_user']
Expand Down
9 changes: 5 additions & 4 deletions lib/ansible/modules/monitoring/zabbix/zabbix_proxy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,15 @@
RETURN = ''' # '''


from ansible.module_utils.basic import AnsibleModule
import traceback

from ansible.module_utils.basic import AnsibleModule, missing_required_lib
try:
from zabbix_api import ZabbixAPI

HAS_ZABBIX_API = True
except ImportError:
ZBX_IMP_ERR = traceback.format_exc()
HAS_ZABBIX_API = False


Expand Down Expand Up @@ -260,9 +263,7 @@ def main():
)

if not HAS_ZABBIX_API:
module.fail_json(msg="Missing required zabbix-api module" +
" (check docs or install with:" +
" pip install zabbix-api)")
module.fail_json(msg=missing_required_lib('zabbix-api', url='https://pypi.org/project/zabbix-api/'), exception=ZBX_IMP_ERR)

server_url = module.params['server_url']
login_user = module.params['login_user']
Expand Down
8 changes: 6 additions & 2 deletions lib/ansible/modules/monitoring/zabbix/zabbix_screen.py
View file
Open in desktop
4EAF
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,9 @@
when: inventory_hostname==groups['group_name'][0]
'''


import traceback

try:
from zabbix_api import ZabbixAPI, ZabbixAPISubClass
from zabbix_api import ZabbixAPIException
Expand All @@ -170,9 +173,10 @@ def __init__(self, server, timeout, user, passwd, validate_certs, **kwargs):

HAS_ZABBIX_API = True
except ImportError:
ZBX_IMP_ERR = traceback.format_exc()
HAS_ZABBIX_API = False

from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.basic import AnsibleModule, missing_required_lib


class Screen(object):
Expand Down Expand Up @@ -372,7 +376,7 @@ def main():
)

if not HAS_ZABBIX_API:
module.fail_json(msg="Missing required zabbix-api module (check docs or install with: pip install zabbix-api)")
module.fail_json(msg=missing_required_lib('zabbix-api', url='https://pypi.org/project/zabbix-api/'), exception=ZBX_IMP_ERR)

server_url = module.params['server_url']
login_user = module.params['login_user']
Expand Down
7 changes: 3 additions & 4 deletions lib/ansible/modules/monitoring/zabbix/zabbix_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
'''

from distutils.version import LooseVersion
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.basic import AnsibleModule, missing_required_lib
from ansible.module_utils._text import to_native
import json
import traceback
Expand All @@ -205,6 +205,7 @@

HAS_ZABBIX_API = True
except ImportError:
ZBX_IMP_ERR = traceback.format_exc()
HAS_ZABBIX_API = False


Expand Down Expand Up @@ -467,9 +468,7 @@ def main():
)

if not HAS_ZABBIX_API:
module.fail_json(msg="Missing required zabbix-api module " +
"(check docs or install with: " +
"pip install zabbix-api)")
module.fail_json(msg=missing_required_lib('zabbix-api', url='https://pypi.org/project/zabbix-api/'), exception=ZBX_IMP_ERR)

server_url = module.params['server_url']
login_user = module.params['login_user']
Expand Down
0