diff --git a/nagixsc_conf2http.py b/nagixsc_conf2http.py
index 7698d43a18cfb8811a300ecf730850e69cfe9010..c738b7acfe7eaceae00e175dd8f2887e377b941a 100755 (executable)
--- a/nagixsc_conf2http.py
+++ b/nagixsc_conf2http.py
'ssl': False,
'sslcert': None,
'conf_dir': '',
- 'pidfile': '/var/run/nagixsc_conf2http.pid'
+ 'pidfile': '/var/run/nagixsc_conf2http.pid',
+ 'livestatus_socket' : None,
}
if 'ip' in cfgread.options('server'):
if 'pidfile' in cfgread.options('server'):
config['pidfile'] = cfgread.get('server', 'pidfile')
+if 'livestatus_socket' in cfgread.options('server'):
+ config['livestatus_socket'] = prepare_socket(cfgread.get('server', 'livestatus_socket'))
+
users = {}
for u in cfgread.options('users'):
self.http_error(500, 'Config file name contains invalid characters')
return
- check_config = read_inifile(os.path.join(config['conf_dir'], configfile))
- if not check_config:
- self.http_error(500, 'Could not read config file "%s"' % configfile)
- return
+ # Just be sure it exists
+ checks = None
+
+ # If config file name starts with "_" it's something special
+ if not configfile.startswith('_'):
+ # Try to read config file, execute checks
+ check_config = read_inifile(os.path.join(config['conf_dir'], configfile))
+ if not check_config:
+ self.http_error(500, 'Could not read config file "%s"' % configfile)
+ return
+ checks = conf2dict(check_config, host, service)
+
+ elif configfile=='_livestatus.conf' and config['livestatus_socket']:
+ # Read mk-livestatus and translate into XML
+ checks = livestatus2dict(config['livestatus_socket'], host, service)
+
- checks = conf2dict(check_config, host, service)
+ # No check results? No (good) answer...
if not checks:
- self.http_error(500, 'No checks executed')
+ self.http_error(500, 'No check results')
return
self.send_response(200)