diff --git a/nagixsc_xml2nagios.py b/nagixsc_xml2nagios.py
index 96b6a522b6090c3e9055c2ef7fca84b92b82cf54..3aee034cfbac0ade5d5ea0a499a4791d9afb2886 100755 (executable)
--- a/nagixsc_xml2nagios.py
+++ b/nagixsc_xml2nagios.py
elif options.mode == 'active':
debug(1, options.verb, 'Running in active/plugin mode')
if options.host == None:
- debug(1, options.verb, 'No host specified, using first host in XML file')
+ debug(1, options.verb, 'No host specified on command line')
if options.service == None:
- print 'No service specified on command line!'
- sys.exit(127)
+ debug(1, options.verb, 'No service specified on command line, looking at XML file later')
##############################################################################
elif options.mode.startswith('checkresult'):
(count_services, count_failed, list_failed) = dict2out_checkresult(checks, xml_get_timestamp(doc), options.checkresultdir, options.verb)
- if list_failed and options.mode == 'checkresult':
- for entry in list_failed:
- print 'Could not write checkresult files "%s(.ok)" for "%s"/"%s"!' % (entry[0], entry[1], entry[2])
+ if options.mode == 'checkresult':
+ if list_failed:
+ for entry in list_failed:
+ print 'Could not write checkresult files "%s(.ok)" for "%s"/"%s"!' % (entry[0], entry[1], entry[2])
if count_failed == 0:
sys.exit(0)
if len(checks) > 1:
print 'Nag(ix)SC UNKNOWN - Found more (%s) than one host/service!' % len(checks)
+ print 'Found: ' + ', '.join(['%s/%s' % (c['host_name'], c['service_description']) for c in checks])
sys.exit(3)
elif len(checks) == 0:
- print 'Nag(ix)SC UNKNOWN - No check for "%s"/"%s" found in XML' % (options.host, options.service)
+ output = 'Nag(ix)SC UNKNOWN - No check found in XML'
+ if options.host:
+ output += ' - Host filter: "%s"' % options.host
+ if options.service:
+ output += ' - Service filter: "%s"' % options.service
+ print output
sys.exit(3)
print checks[0]['output']