Module: check_mk
Branch: master
Commit: ef89374829d49451e440c2d389b9cfd6b4927002
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef89374829d494…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Feb 23 15:07:41 2015 +0100
Fix crash when working with stored SNMP walks and agent simulator
---
modules/check_mk.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/modules/check_mk.py b/modules/check_mk.py
index d6810d7..abe2248 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -254,7 +254,7 @@ config_variable_names = set(vars().keys()).difference(known_vars)
# at check time (and many of what is also needed at administration time).
try:
- modules = [ 'check_mk_base', 'discovery', 'snmp',
'notify', 'prediction', 'cmc', 'inline_snmp',
'agent_bakery', 'cap' ]
+ modules = [ 'check_mk_base', 'discovery', 'snmp',
'agent_simulator', 'notify', 'prediction', 'cmc',
'inline_snmp', 'agent_bakery', 'cap' ]
for module in modules:
filename = modules_dir + "/" + module + ".py"
if os.path.exists(filename):
@@ -5322,9 +5322,6 @@ def read_config_files(with_autochecks=True, with_conf_d=True):
('logwatch_dir', logwatch_dir, "",
"Logwatch", True, True, True ),
]
- # Load agent simulator if enabled in configuration
- execfile(modules_dir + "/agent_simulator.py", globals(), globals())
-
# Compute parameters for a check honoring factory settings,
# default settings of user in main.mk, check_parameters[] and