cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

improved zabbix inventory. added sys.exit(1) where needed, added some exception handling.

Browse source
This commit is contained in:
René Moser 2013-08-22 22:55:48 +02:00
parent 500e6fa374
commit 308026f234
2 changed files with 31 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/inventory/zabbix.ini
View file

@ -4,8 +4,8 @@
[zabbix] [zabbix]
# Server location # Server location
server = http://192.168.0.1/zabbix server = http://zabbix.example.com/zabbix
# Login # Login
username = username = admin
password = password = zabbix

36
plugins/inventory/zabbix.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/python #!/usr/bin/env python
# (c) 2013, Greg Buehler # (c) 2013, Greg Buehler
# #
@ -20,16 +20,26 @@
###################################################################### ######################################################################
""" """
Zabbix external inventory script. Returns hosts and hostgroups from Zabbix. Zabbix Server external inventory script.
========================================
Returns hosts and hostgroups from Zabbix Server.
Configuration is read from `zabbix.ini`.
Tested with Zabbix Server 2.0.6.
""" """
import os, sys import os, sys
import json import json
import argparse import argparse
import ConfigParser import ConfigParser
from zabbix_api import ZabbixAPI
try:
from zabbix_api import ZabbixAPI
except:
print "Error: Zabbix API library must be installed: pip install zabbix-api."
sys.exit(1)
try: try:
import json import json
@ -97,8 +107,12 @@ class ZabbixInventory(object):
self.read_cli() self.read_cli()
if self.zabbix_server and self.zabbix_username: if self.zabbix_server and self.zabbix_username:
api = ZabbixAPI(server=self.zabbix_server) try:
api.login(user=self.zabbix_username, password=self.zabbix_password) api = ZabbixAPI(server=self.zabbix_server)
api.login(user=self.zabbix_username, password=self.zabbix_password)
except BaseException, e:
print "Error: Could not login to Zabbix server. Check your zabbix.ini."
sys.exit(1)
if self.options.host: if self.options.host:
data = self.get_host(api, self.options.host) data = self.get_host(api, self.options.host)
@ -107,7 +121,13 @@ class ZabbixInventory(object):
elif self.options.list: elif self.options.list:
data = self.get_list(api) data = self.get_list(api)
print json.dumps(data, indent=2) print json.dumps(data, indent=2)
else:
print "Configuration of server and credentials is required"
ZabbixInventory() else:
print "usage: --list ..OR.. --host <hostname>"
sys.exit(1)
else:
print "Error: Configuration of server and credentials are required. See zabbix.ini."
sys.exit(1)
ZabbixInventory()