diff --git a/nagixsc/__init__.py b/nagixsc/__init__.py
index c47c0ea64ae85accf780046295bd1048b1461834..19ef4166cd963bfd5381b8a512144f299273a289 100644 (file)
--- a/nagixsc/__init__.py
+++ b/nagixsc/__init__.py
import string
import subprocess
import sys
+import urllib2
def debug(level, verb, string):
if level <= verb:
check['returncode'] = 127
return check
+ check['commandline'] = cmdline
+ check['command'] = cmdarray[0].split(os.path.sep)[-1]
+
if timeout:
signal.signal(signal.SIGALRM, exec_timeout_handler)
signal.alarm(timeout)
except (ConfigParser.NoSectionError, ConfigParser.NoOptionError):
timeout_returncode = 2
+ # Read "add_pnp4nagios_template_hint" from "[nagixsc]", default "False"
+ try:
+ add_pnp4nagios_template_hint = config.getboolean('nagixsc','add_pnp4nagios_template_hint')
+ except (ConfigParser.NoSectionError, ConfigParser.NoOptionError):
+ add_pnp4nagios_template_hint = False
+
# Sections are Hosts (not 'nagixsc'), options in sections are Services
hosts = config.sections()
if 'nagixsc' in hosts:
if '_host_check' in services and not opt_service:
cmdline = config.get(host, '_host_check')
check = exec_check(host_name, None, cmdline, timeout, timeout_returncode)
+ if add_pnp4nagios_template_hint and '|' in check['output']:
+ check['output'] += ' [%s]' % check['command']
checks.append(check)
cmdline = config.get(host, service)
check = exec_check(host_name, service, cmdline, timeout, timeout_returncode)
+ if add_pnp4nagios_template_hint and '|' in check['output']:
+ check['output'] += ' [%s]' % check['command']
checks.append(check)
return checks
timestamp = check['timestamp']
else:
timestamp = xmltimestamp
- count_services += 1
if check['service_description'] == None or check['service_description'] == '':
# Host check
- line = FORMAT_HOST % (now, check['host_name'], check['returncode'], check['output'].replace('\n', '\\n'))
+ line = FORMAT_HOST % (timestamp, check['host_name'], check['returncode'], check['output'].replace('\n', '\\n'))
else:
# Service check
- line = FORMAT_SERVICE % (now, check['host_name'], check['service_description'], check['returncode'], check['output'].replace('\n', '\\n'))
+ line = FORMAT_SERVICE % (timestamp, check['host_name'], check['service_description'], check['returncode'], check['output'].replace('\n', '\\n'))
if pipe:
pipe.write(line + '\n')
return count_services
-def dict2out_checkresult(checks, xmltimestamp, opt_checkresultdir, opt_verb):
+def dict2out_checkresult(checks, xmltimestamp, opt_checkresultdir, opt_verb=0):
count_services = 0
count_failed = 0
list_failed = []
chars = string.letters + string.digits
ctimestamp = datetime.datetime.now().ctime()
+ random.seed()
for check in checks:
count_services += 1
def read_xml(options):
if options.url != None:
- import urllib2
if options.httpuser and options.httppasswd:
passman = urllib2.HTTPPasswordMgrWithDefaultRealm()
return libxml2.parseDoc(content)
+def write_xml(xmldoc, outfile, httpuser=None, httppasswd=None):
+ if outfile.startswith('http'):
+ (headers, body) = encode_multipart(xmldoc, httpuser, httppasswd)
+ response = urllib2.urlopen(urllib2.Request(outfile, body, headers)).read()
+ return response
+
+ elif outfile == '-':
+ xmldoc.saveFormatFile('-', format=1)
+ return None
+
+ else:
+ xmldoc.saveFile(outfile)
+ return None
+
+
+def write_xml_or_die(xmldoc, outfile, httpuser=None, httppasswd=None):
+ try:
+ response = write_xml(xmldoc, outfile, httpuser, httppasswd)
+ except urllib2.HTTPError, error:
+ print error
+ sys.exit(11)
+ except urllib2.URLError, error:
+ print error.reason[1]
+ sys.exit(12)
+
+ return response
+
+
##############################################################################
def xml_check_version(xmldoc):
##############################################################################
-def encode_multipart(xmldoc, httpuser, httppasswd):
+def encode_multipart(xmldoc, httpuser=None, httppasswd=None):
BOUNDARY = mimetools.choose_boundary()
CRLF = '\r\n'
L = []