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

Merge pull request #4145 from resmo/fix/zabbix-inventory-stderr

Browse source 
zabbix inventory: print errors to stderr
This commit is contained in:
Michael DeHaan 2013-09-18 05:00:42 -07:00
commit 31ec42ef92
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/inventory/zabbix.py
View file

@ -38,7 +38,7 @@ import ConfigParser
try:
from zabbix_api import ZabbixAPI
except:
print "Error: Zabbix API library must be installed: pip install zabbix-api."
print >> sys.stderr, "Error: Zabbix API library must be installed: pip install zabbix-api."
sys.exit(1)
try:
@ -111,7 +111,7 @@ class ZabbixInventory(object):
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."
print >> sys.stderr, "Error: Could not login to Zabbix server. Check your zabbix.ini."
sys.exit(1)
if self.options.host:
@ -123,11 +123,11 @@ class ZabbixInventory(object):
print json.dumps(data, indent=2)
else:
print "usage: --list ..OR.. --host <hostname>"
print >> sys.stderr, "usage: --list ..OR.. --host <hostname>"
sys.exit(1)
else:
print "Error: Configuration of server and credentials are required. See zabbix.ini."
print >> sys.stderr, "Error: Configuration of server and credentials are required. See zabbix.ini."
sys.exit(1)
ZabbixInventory()