Module: check_mk
Branch: master
Commit: 7eba9a34cf9d1b236f60d49f64089d89059e20a2
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7eba9a34cf9d1b…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Feb 10 16:56:33 2016 +0100
Dropped the cmcrushd
---
modules/automation.py | 6 +++---
modules/check_mk.py | 6 +++---
web/htdocs/watolib.py | 20 --------------------
3 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/modules/automation.py b/modules/automation.py
index dc69294..490a372 100644
--- a/modules/automation.py
+++ b/modules/automation.py
@@ -436,7 +436,7 @@ def automation_delete_host(args):
shutil.rmtree("%s/%s" % (logwatch_dir, hostname))
-def automation_restart(job = "restart", use_rushd = True):
+def automation_restart(job = "restart"):
if check_plugins_have_changed():
forced = True
job = "restart"
@@ -486,7 +486,7 @@ def automation_restart(job = "restart", use_rushd = True):
backup_path = None
try:
- configuration_warnings = create_core_config(use_rushd=use_rushd)
+ configuration_warnings = create_core_config()
if "do_bake_agents" in globals() and bake_agents_on_restart:
do_bake_agents()
@@ -800,7 +800,7 @@ def automation_rename_hosts():
if core_was_running:
global ignore_ip_lookup_failures
ignore_ip_lookup_failures = True # force config generation to succeed. The core
*must* start.
- automation_restart("start", use_rushd = False)
+ automation_restart("start")
if monitoring_core == "cmc":
try:
os.remove(var_dir + "/core/config.rush")
diff --git a/modules/check_mk.py b/modules/check_mk.py
index ec546ab..23247f2 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -3152,7 +3152,7 @@ def configuration_warning(text):
sys.stdout.write("\n%sWARNING:%s %s\n" % (tty_bold + tty_yellow,
tty_normal, text))
-def create_core_config(use_rushd):
+def create_core_config():
global g_configuration_warnings
g_configuration_warnings = []
@@ -3160,7 +3160,7 @@ def create_core_config(use_rushd):
verify_non_deprecated_checkgroups()
if monitoring_core == "cmc":
- warnings = do_create_cmc_config(opt_cmc_relfilename, use_rushd=use_rushd)
+ warnings = do_create_cmc_config(opt_cmc_relfilename)
else:
load_module("nagios")
out = file(nagios_objects_file, "w")
@@ -3991,7 +3991,7 @@ NOTES:
def do_create_config(with_agents=True):
sys.stdout.write("Generating configuration for core (type %s)..." %
monitoring_core)
sys.stdout.flush()
- create_core_config(use_rushd=False)
+ create_core_config()
sys.stdout.write(tty_ok + "\n")
if bake_agents_on_restart and with_agents and 'do_bake_agents' in globals():
diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py
index aee3308..75e915d 100644
--- a/web/htdocs/watolib.py
+++ b/web/htdocs/watolib.py
@@ -212,8 +212,6 @@ def log_pending(status, linkinfo, what, message, user_id = None):
if not is_distributed() and not is_wato_slave_site():
if status != SYNC:
log_entry(linkinfo, what, message, "pending.log", user_id)
- cmc_rush_ahead()
-
# Currently we add the pending to each site, regardless if
# the site is really affected. This needs to be optimized
@@ -275,20 +273,6 @@ def parse_audit_log(what):
return []
-def cmc_rush_ahead():
- if defaults.omd_root:
- socket_path = defaults.omd_root + "/tmp/run/cmcrush"
- if os.path.exists(socket_path):
- try:
- changeid = str(random.randint(1, 100000000000000000))
- file(log_dir + "changeid", "w").write(changeid +
"\n")
- socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM) \
- .sendto(changeid, socket_path)
- except:
- if config.debug:
- raise
-
-
def log_commit_pending():
pending = log_dir + "pending.log"
if os.path.exists(pending):
@@ -3468,10 +3452,6 @@ def synchronize_profile(site, user_id):
return result
-# Try to do a rush-ahead-activation
-def cmc_rush_ahead_activation():
- return
-
def cmc_reload():
log_audit(None, "activate-config", "Reloading Check_MK Micro Core on
the fly")
html.live.command("[%d] RELOAD_CONFIG" % time.time())