Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64412 discussions

Check_MK Git: check_mk: Remove unused variable in mknotifyd

by Mathias Kettner

Module: check_mk Branch: master Commit: 07083ef1f8ce38e60783265042acecde65703202 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07083ef1f8ce38… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 11 11:56:01 2013 +0100 Remove unused variable in mknotifyd --- mknotifyd/bin/mknotifyd | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/mknotifyd/bin/mknotifyd b/mknotifyd/bin/mknotifyd index e8ecdb4..258ae54 100755 --- a/mknotifyd/bin/mknotifyd +++ b/mknotifyd/bin/mknotifyd @@ -178,7 +178,6 @@ class SpoolfilesHandler: class TcpServer: def __init__(self): self._tcp_socket = None - self._reopen_sockets = False self._should_terminate = False self._is_running = False self.open_sockets()

11 years, 7 months

Check_MK Git: check_mk: mknotifyd: now uses separate threads

by Andreas Boesl

Module: check_mk Branch: master Commit: 1022b4a439ce8501da87e49cf56d6be9a212ec3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1022b4a439ce85… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jan 31 14:34:04 2013 +0100 mknotifyd: now uses separate threads --- mknotifyd/bin/mknotifyd | 380 +++++++++++++++++++++++++++++++---------------- 1 files changed, 250 insertions(+), 130 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1022b4a439…

11 years, 7 months

Check_MK Git: check_mk: mknotifyd initial version

by Andreas Boesl

Module: check_mk Branch: master Commit: a601c08d4d5888079a8439f7da604a010505b86a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a601c08d4d5888… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jan 31 09:06:24 2013 +0100 mknotifyd initial version --- mknotifyd/.f12 | 22 ++ mknotifyd/.gitignore | 4 + mknotifyd/bin/clienttest | 32 +++ mknotifyd/bin/mknotifyd | 394 +++++++++++++++++++++++++++++++ mknotifyd/omd/.f12 | 31 +++ mknotifyd/omd/MKNOTIFYD.hook | 25 ++ mknotifyd/omd/Makefile | 18 ++ mknotifyd/omd/mknotifyd.init | 54 +++++ mknotifyd/web/.f12 | 8 + mknotifyd/web/plugins/wato/mknotifyd.py | 99 ++++++++ modules/check_mk.py | 4 +- modules/notify.py | 320 +++++++++++++++++-------- 12 files changed, 903 insertions(+), 108 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a601c08d4d…

11 years, 7 months

Check_MK Git: check_mk: notify.py: fixed creation of spoolsfiles

by Andreas Boesl

Module: check_mk Branch: master Commit: 47f9a73b0056e38ecb23db839e0f1f4da8ad6b59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47f9a73b0056e3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jan 31 14:35:41 2013 +0100 notify.py: fixed creation of spoolsfiles --- modules/notify.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index 15a9685..be1116e 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -200,8 +200,7 @@ def create_spoolfile(data): file_path = "%s/%0.2f_%s" % (target_dir, time.time(), uuid.uuid1()) notify_log("Creating spoolfile: %s" % file_path) # TODO: pprint entfernen - # file(file_path,"w").write(pprint.pformat(data)) - file(file_path,"w").write(data) + file(file_path,"w").write(pprint.pformat(data)) def get_readable_rel_date(timestamp): try:

11 years, 7 months

Check_MK Git: check_mk: mknotifyd update

by Andreas Boesl

Module: check_mk Branch: master Commit: bcd7187e21b353f1b3151849969dc64c26805c79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bcd7187e21b353… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Feb 4 11:44:48 2013 +0100 mknotifyd update --- checks/oracle_tablespaces | 13 ++++++ mknotifyd/.f12 | 2 +- mknotifyd/omd/.f12 | 3 + mknotifyd/omd/logrotate.conf | 12 +++++ mknotifyd/web/plugins/wato/mknotifyd.py | 69 ++++++++++++++++++++---------- modules/notify.py | 32 ++++++++------- notifications/opcmsg | 2 +- web/plugins/wato/check_parameters.py | 37 ++++++++++++++++- 8 files changed, 129 insertions(+), 41 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bcd7187e21…

11 years, 7 months

Check_MK Git: check_mk: opcmsg notification plugin

by Andreas Boesl

Module: check_mk Branch: master Commit: 27a6d76b3fed76399eaf8a0d402ff6161bf27ace URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27a6d76b3fed76… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jan 31 14:33:35 2013 +0100 opcmsg notification plugin --- notifications/opcmsg | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/notifications/opcmsg b/notifications/opcmsg new file mode 100755 index 0000000..8d953cf --- /dev/null +++ b/notifications/opcmsg @@ -0,0 +1,68 @@ +#!/usr/bin/python +# Create message for HPOpenView +# This plugin forwards the notification to the +# local HPOpenView instance + +import os, sys, re + +def substitute_context(template, context): + # First replace all known variables + for varname, value in context.items(): + template = template.replace('$'+varname+'$', value) + + # Remove the rest of the variables and make them empty + template = re.sub("\$[A-Z]+\$", "", template) + return template + +def main(): + try: + opcmsg_bin = "/opt/OV/bin/opcmsg" + + # gather all options from env + context = dict([ + (var[7:], value.decode("utf-8")) + for (var, value) + in os.environ.items() + if var.startswith("NOTIFY_")]) + + + # Severity and message text + if context["WHAT"] == "HOST": + msg_t = context["HOSTOUTPUT"] + severity = context["HOSTSTATEID"] == "0" and "ok" or "critical" + else: + msg_t = context["SERVICEOUTPUT"] + state_map = { "0": "normal", "1": "warning", "2": "critical", "3": "warning" } + try: + severity = state_map[context["SERVICESTATEID"]] + except: + severity = "normal" + + # application + application = "RWWS4.0" + + # object + # Wichtig: " escapen + the_object = context["HOSTNAME"] + if context["WHAT"] == "SERVICE": + the_object += ":" + context["SERVICEDESC"] + + # msg_grp + msg_grp = os.getenv("NOTIFY_PARAMETER_1") + + # node + node = context['MONITORING_HOST'] + + # Assemble the command + command = "%s severity=%s application=%s object=\"%s\" msg_grp=\"%s\" msg_t=\"%s\" node=%s" % ( + opcmsg_bin, severity, application, the_object, msg_grp, msg_t, node) + + # Execute the command + print "executing command" , command + file("/tmp/opc","w").write(command) + # return os.system(command) + except Exception, e: + sys.stdout.write("ERROR %r" % e) + sys.exit(1) + +main()

11 years, 7 months

Check_MK Git: check_mk: mknotifyd: now able to reload on config changes

by Andreas Boesl

Module: check_mk Branch: master Commit: 5977752692e37c1d60c831e94bd54448e57f1b44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5977752692e37c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Feb 11 19:05:11 2013 +0100 mknotifyd: now able to reload on config changes --- mknotifyd/bin/mknotifyd | 96 ++++++++++++++++++++---------- mknotifyd/web/plugins/wato/mknotifyd.py | 10 ++- modules/notify.py | 9 +-- 3 files changed, 75 insertions(+), 40 deletions(-) diff --git a/mknotifyd/bin/mknotifyd b/mknotifyd/bin/mknotifyd index 258ae54..bdb101f 100755 --- a/mknotifyd/bin/mknotifyd +++ b/mknotifyd/bin/mknotifyd @@ -88,6 +88,7 @@ class SpoolfilesHandler: self._is_running = False def run(self): + log("Starting SpoolfilesHandler") self._is_running = True try: while not self._should_terminate: @@ -180,25 +181,33 @@ class TcpServer: self._tcp_socket = None self._should_terminate = False self._is_running = False - self.open_sockets() + self._reopen_sockets = False def open_sockets(self): - if opt_verbose: - verbose("open tcp sockets", 2) - - self._tcp_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - self._tcp_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - self._tcp_socket.bind(("0.0.0.0", g_config["notification_daemon_listen_port"])) - # TODO: listen limit ? - self._tcp_socket.listen(200) + listen_port = g_config["notification_daemon_listen_port"] + log("Listen for remote notifications at port %d" % listen_port) + try: + self._tcp_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + self._tcp_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + self._tcp_socket.bind(("0.0.0.0", listen_port)) + # TODO: listen limit ? + self._tcp_socket.listen(200) + except: + log("Error opening socket.\n%s" % format_exception()) + self._should_terminate = True def close_sockets(self): if self._tcp_socket: self._tcp_socket.close() self._tcp_socket = None + log("No longer listen for remote notificiations") def run(self): + self._should_terminate = False self._is_running = True + log("Starting TcpServer") + self.open_sockets() + handled_connections = 0 # Debug info while not self._should_terminate: readable = select.select([self._tcp_socket], [], [], 0.5)[0] @@ -214,15 +223,14 @@ class TcpServer: if "context" in content: context = content["context"] if not context["CONTACTNAME"]: - log("ERROR: Unable to process data from %s %d" % (addr_info[0], addr_info[1])) + log("Error: Unable to process data from %s %d" % (addr_info[0], addr_info[1])) client_socket.send("ERROR") else: contact_dir = "%s/%s" % (g_spool_dir, context["CONTACTNAME"]) if not os.path.exists(contact_dir): os.makedirs(contact_dir) spoolfile = "%s/%0.2f_%s" % (contact_dir, time.time(), uuid.uuid1()) - file(spoolfile,"w").write("%r" % content) - #file(spoolfile,"w").write(pprint.pformat(content)) + file(spoolfile,"w").write(pprint.pformat(content)) verbose("client data processed - sending OK", 2) client_socket.send("OK") except Exception, e: @@ -236,6 +244,11 @@ class TcpServer: pass # TODO: wirklich ohne socket.close() client_socket = None + if self._reopen_sockets: + log("Reopen tcp socket") + self.close_sockets() + self.open_sockets() + self._reopen_sockets = False log("Stopping TcpServer") self.close_sockets() @@ -303,22 +316,18 @@ def daemonize(user=0, group=0): def load_configuration(): - global g_config, g_config_last_reload - g_config = { - "notification_daemon_listen_port": 6555, - "notification_deferred_retention_time": 180, - "notification_forward_to": "", - } - - list_of_files = reduce(lambda a,b: a+b, - [ [ "%s/%s" % (d, f) for f in fs if f.endswith(".mk")] - for d, sb, fs in os.walk(g_config_dir + "/mknotifyd.d" ) ], []) + global g_config, g_config_changed + last_config = g_config.copy() + config_file = "%s/mknotifyd.d/wato/global.mk" % g_config_dir + try: + execfile(config_file, {}, g_config) + except: + g_config = last_config - list_of_files.sort() - for path in list_of_files: - execfile(path, g_config, g_config) + if last_config != g_config: + log("Configuration has changed") + g_config_changed = True - g_last_config_reload = time.time() def usage(): sys.stdout.write("""Usage: mknotifyd [OPTIONS] @@ -346,6 +355,7 @@ def run_thread(run_function, args=()): def run_notifyd(): global g_tpc_server, g_spoolfiles_handler global g_spool_dir, g_deferred_dir + global g_config_changed g_spool_dir = "%s/notify/spool" % g_var_dir g_deferred_dir = "%s/notify/deferred" % g_var_dir @@ -357,17 +367,33 @@ def run_notifyd(): os.makedirs(g_deferred_dir) # Start worker threads - run_thread(g_tcp_server.run) + if g_config["notification_daemon_listen_port"]: + run_thread(g_tcp_server.run) + run_thread(g_spoolfiles_handler.run) while True: try: - time.sleep(2) + time.sleep(1) + # Read configuration again an check for changes + # Our tcp server might need a restart after its config has changed + load_configuration() + if g_config_changed: + if g_config["notification_daemon_listen_port"]: + if not g_tcp_server._is_running: + run_thread(g_tcp_server.run) + else: + g_tcp_server._reopen_sockets = True + else: + g_tcp_server._should_terminate = True + g_config_changed = False + time.sleep(0.2) + # Check if worker threads are still running - # and restart them if something strange happened - if not g_tcp_server._is_running: + if g_config["notification_daemon_listen_port"] and not g_tcp_server._is_running: log("TcpServer thread crashed. Restarting...") run_thread(g_tcp_server.run) + if not g_spoolfiles_handler._is_running: log("SpoolfilesHandler thread crashed. Restarting...") run_thread(g_spoolfiles_handler.run) @@ -429,8 +455,12 @@ else: g_pid_file = "/var/run/mknotifyd.pid" g_logfile_path = "/var/log/mknotifyd.log" -tcp_socket = None -reopen_sockets = False + +g_config = { + "notification_daemon_listen_port": None, + "notification_deferred_retention_time": 180, + "notification_forward_to": "", +} short_options = "hVvgs" long_options = [ "help", "version", "verbose", "foreground", "single" ] @@ -464,6 +494,7 @@ try: log("mknotifyd version %s starting" % VERSION) load_configuration() + g_config_changed = False # Of course its changed on startup... if os.path.exists(g_pid_file): old_pid = int(file(g_pid_file).read()) @@ -475,6 +506,7 @@ try: # Make sure paths exist make_parentdirs(g_logfile_path) + make_parentdirs(g_pid_file) # Create worker classes g_tcp_server = TcpServer() diff --git a/mknotifyd/web/plugins/wato/mknotifyd.py b/mknotifyd/web/plugins/wato/mknotifyd.py index 04b88bc..f7d90a1 100644 --- a/mknotifyd/web/plugins/wato/mknotifyd.py +++ b/mknotifyd/web/plugins/wato/mknotifyd.py @@ -100,14 +100,18 @@ if mknotifyd_enabled: # Daemon var register_configvar(group, "notification_daemon_listen_port", + Optional( Integer( - title = _("Port for receiving notifications"), - help = _("Here you can set port at which the notification spooler listens for forwarded" - "notification messages from spoolers on remote sites."), minvalue = 1, maxvalue = 65535, default_value = 6555, ), + help = _("Here you can set the port at which the notification spooler listens for forwarded" + "notification messages from spoolers on remote sites."), + title = _("Port for receiving notifications"), + label = _("Receive notifications from remote sites"), + none_label = _("(Do not receive notifications)"), + ), domain = "mknotifyd" ) diff --git a/modules/notify.py b/modules/notify.py index 3f093fb..8ede4bd 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -363,12 +363,11 @@ def do_notify(args): "that are prefixed with NOTIFY_\n") sys.exit(1) - notify_log("forward mode %s" % notification_forward_mode) - # TODO: Umbauen auf neue Parameter - if notification_forward_mode in ["forward", "forward_exclusive"]: + if notification_spooling: # Create spoolfile - create_spoolfile({"context": context, "forward": notification_forward_to}) - if notification_forward_mode == "forward_only": + target_site = "%s:%s" % notification_spool_to[0:2] + create_spoolfile({"context": context, "forward": target_site}) + if not notification_spool_to[2]: return 0 process_context(context, notification_spooling)

11 years, 7 months

Check_MK Git: check_mk: add mknotifyd tar.gz and subfolder to .gitignore

by Andreas Boesl

Module: check_mk Branch: master Commit: b5057ee5f8a0ad8cc9f90fcf2eb60f11a2e574ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5057ee5f8a0ad… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Feb 11 16:34:07 2013 +0100 add mknotifyd tar.gz and subfolder to .gitignore --- mknotifyd/.gitignore | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mknotifyd/.gitignore b/mknotifyd/.gitignore index fc91262..29ee6d9 100644 --- a/mknotifyd/.gitignore +++ b/mknotifyd/.gitignore @@ -1,4 +1,4 @@ .*.swp -mkeventd-*.*.*.tar.gz -mkeventd-*.*.* +mknotifyd-*.*.*.tar.gz +mknotifyd-*.*.*

11 years, 7 months

Check_MK Git: check_mk: mknotifyd: intermediate state

by Mathias Kettner

Module: check_mk Branch: master Commit: d96bfd184bc82952eb110c49ca0200c4fd24d3b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d96bfd184bc829… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 11 15:39:51 2013 +0100 mknotifyd: intermediate state --- mknotifyd/omd/MKNOTIFYD.hook | 4 ++-- mknotifyd/omd/logrotate.conf | 5 ----- mknotifyd/web/plugins/wato/mknotifyd.py | 1 + modules/check_mk.py | 8 +------- modules/notify.py | 20 ++++++++++---------- 5 files changed, 14 insertions(+), 24 deletions(-) diff --git a/mknotifyd/omd/MKNOTIFYD.hook b/mknotifyd/omd/MKNOTIFYD.hook index c769805..7d0409c 100755 --- a/mknotifyd/omd/MKNOTIFYD.hook +++ b/mknotifyd/omd/MKNOTIFYD.hook @@ -1,9 +1,9 @@ #!/bin/bash -# Alias: Start Daemon for Check_MK Notify +# Alias: Start Check_MK Notification Spooler # Menu: Addons # Description: -# This option enables mknotifyd +# This option enables the Check_MK notification spooler case "$1" in default) diff --git a/mknotifyd/omd/logrotate.conf b/mknotifyd/omd/logrotate.conf index 68caaaf..bca3d9c 100644 --- a/mknotifyd/omd/logrotate.conf +++ b/mknotifyd/omd/logrotate.conf @@ -4,9 +4,4 @@ compress delaycompress notifempty - sharedscripts - olddir mkeventd - postrotate - echo "COMMAND REOPENLOG" | unixcat ###ROOT###/tmp/run/mkeventd/status - endscript } diff --git a/mknotifyd/web/plugins/wato/mknotifyd.py b/mknotifyd/web/plugins/wato/mknotifyd.py index 80162cf..04b88bc 100644 --- a/mknotifyd/web/plugins/wato/mknotifyd.py +++ b/mknotifyd/web/plugins/wato/mknotifyd.py @@ -29,6 +29,7 @@ import config try: mknotifyd_enabled = config.mknotifyd_enabled except: + # Non OMD-users: always show Spooling options mknotifyd_enabled = True config_dir = defaults.default_config_dir + "/mknotifyd.d/wato/" diff --git a/modules/check_mk.py b/modules/check_mk.py index 9112a5b..6c1ea0b 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -319,11 +319,6 @@ host_attributes = {} # needed by WATO, ignored by Check_MK ping_levels = [] # special parameters for host/PING check_command check_periods = [] -# Notification Spooling -notification_spooling = False -notification_spool_to = None - - # global variables used to cache temporary values (not needed in check_mk_base) ip_to_hostname_cache = None @@ -346,7 +341,7 @@ special_agent_info = {} # Now include the other modules. They contain everything that is needed # at check time (and many of that is also needed at administration time). try: - modules = [ 'check_mk_base', 'snmp' ] + modules = [ 'check_mk_base', 'snmp', 'notify' ] for module in modules: filename = modules_dir + "/" + module + ".py" execfile(filename) @@ -4862,7 +4857,6 @@ if __name__ == "__main__": do_automation(a, args) done = True elif o == '--notify': - execfile(modules_dir + "/notify.py") sys.exit(do_notify(args)) except MKGeneralException, e: diff --git a/modules/notify.py b/modules/notify.py index 697b3f3..3f093fb 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -42,6 +42,11 @@ notification_spooldir = var_dir + "/notify/spool" notification_log = notification_logdir + "/notify.log" notification_logging = 0 +# Notification Spooling +notification_spooling = False +notification_spool_to = None + + notification_log_template = \ u"$CONTACTNAME$ - $NOTIFICATIONTYPE$ - " \ u"$HOSTNAME$ $HOSTSTATE$ - " \ @@ -175,7 +180,7 @@ def notify_usage(): sys.stderr.write("""Usage: check_mk --notify check_mk --notify fake-service <plugin> check_mk --notify fake-host <plugin> - check_mk --notify filename <spool_filename> + check_mk --notify spoolfile <filename> Normally the notify module is called without arguments to send real notification. But there are situations where this module is called with @@ -186,8 +191,8 @@ Available commands: notification data of a service notification. fake-host <plugin> ... Calls the given notification plugin with fake notification data of a host notification. - spoolfile <spool_filename> ... Reads the given spoolfile and creates a - notification event out of its data + spoolfile <filename> ... Reads the given spoolfile and creates a + notification out of its data """) @@ -198,7 +203,6 @@ def create_spoolfile(data): os.makedirs(target_dir) file_path = "%s/%0.2f_%s" % (target_dir, time.time(), uuid.uuid1()) notify_log("Creating spoolfile: %s" % file_path) - # TODO: pprint entfernen file(file_path,"w").write(pprint.pformat(data)) def get_readable_rel_date(timestamp): @@ -360,18 +364,14 @@ def do_notify(args): sys.exit(1) notify_log("forward mode %s" % notification_forward_mode) - # TODO: + # TODO: Umbauen auf neue Parameter if notification_forward_mode in ["forward", "forward_exclusive"]: # Create spoolfile create_spoolfile({"context": context, "forward": notification_forward_to}) if notification_forward_mode == "forward_only": return 0 - try: - write_into_spoolfile = config.mknotifyd_enabled - except: - write_into_spoolfile = False - process_context(context, write_into_spoolfile) + process_context(context, notification_spooling) except Exception, e: if g_interactive: raise

11 years, 7 months

Check_MK Git: check_mk: mknotifyd: Broke some things in settings

by Mathias Kettner

Module: check_mk Branch: master Commit: 5e4924ad44d1dbfaf133c7f3ace08ed3590b2c4b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e4924ad44d1db… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 11 12:30:05 2013 +0100 mknotifyd: Broke some things in settings --- mknotifyd/web/plugins/wato/mknotifyd.py | 80 +++++++++++++----------------- modules/check_mk.py | 9 +++- modules/notify.py | 9 ++-- 3 files changed, 47 insertions(+), 51 deletions(-) diff --git a/mknotifyd/web/plugins/wato/mknotifyd.py b/mknotifyd/web/plugins/wato/mknotifyd.py index e255464..80162cf 100644 --- a/mknotifyd/web/plugins/wato/mknotifyd.py +++ b/mknotifyd/web/plugins/wato/mknotifyd.py @@ -29,20 +29,16 @@ import config try: mknotifyd_enabled = config.mknotifyd_enabled except: - mknotifyd_enabled = False + mknotifyd_enabled = True config_dir = defaults.default_config_dir + "/mknotifyd.d/wato/" -def log_mkeventd(what, message): - log_entry(None, what, message, "audit.log") # central WATO audit log - log_entry(None, what, message, "mknotify.log") # pending changes for mknotifyd - if mknotifyd_enabled: group = _("Notification") # Check_MK var register_configvar(group, - "notification_spooling_enabled", + "notification_spooling", Checkbox( title = _("Spool notifications"), help = _("Here you can set if notifications are processed through a spooling mechanism." @@ -53,6 +49,36 @@ if mknotifyd_enabled: domain = "check_mk" ) + # Check_MK var + register_configvar(group, + "notification_spool_to", + Optional( + Tuple( + elements = [ + TextAscii( + title = _("Remote host"), + ), + Integer( + title = _("TCP port"), + minvalue = 1, + maxvalue = 65535, + default_value = 6555, + ), + Checkbox( + title = _("Local processing"), + label = _("Also process notification locally"), + ), + ]), + title = _("Remote notification spooling"), + help = _("This option allows you to forward notifications to another Check_MK site. " + "That site must have the notification spooler running and TCP listening enabled. " + "This allows you to create a centralized notification handling."), + label = _("Spool notifications to remote site"), + none_label = _("(Do not spool to remote site)"), + ), + domain = "check_mk" + ) + # Daemon var register_configvar_domain("mknotifyd", config_dir) register_configvar(group, @@ -70,50 +96,14 @@ if mknotifyd_enabled: ) - # Check_MK var - register_configvar(group, - "notification_forward_mode", - DropdownChoice( - title = _("Forwarding mode"), - help = _("How notifications should be forwarded<br>" - "No Forwarding: Notifications are processed locally according to the contact settings<br>" - "Forward an process local: Notifications are forwarded to the configured remote site, " - "but also processed locally according to the contacts settings<br>" - "Exclusive forwarding: Notifications are forwarded to the configured remote site and " - "never processed on the local site. This means that the configured notification plugins " - "for the local contacts do not apply" - ), - choices = [ - ('off', _("No Forwarding")), - ('forward' , _("Forward and process local")), - ('forward_exclusive', _("Exclusive forwarding")) - ]), - domain = "check_mk" - ) - - # Check_MK var - register_configvar(group, - "notification_forward_to", - Optional( - TextAscii( - title = _("{Host}:{Port}") - ), - title = _("Forward notifications to remote host"), - help = _("This will forward notifications to a remote site"), - label = _("Forward to remote host"), - none_label = _("Do not send to remote host"), - ), - domain = "check_mk" - ) - # Daemon var register_configvar(group, "notification_daemon_listen_port", Integer( title = _("Port for receiving notifications"), - help = _("Here you can set port at which the mknotifyd listens for forwarded" - "notification messages. The port number needs to be between 1025 and 65535"), - minvalue = 1025, + help = _("Here you can set port at which the notification spooler listens for forwarded" + "notification messages from spoolers on remote sites."), + minvalue = 1, maxvalue = 65535, default_value = 6555, ), diff --git a/modules/check_mk.py b/modules/check_mk.py index 5d7a3a0..9112a5b 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -319,6 +319,12 @@ host_attributes = {} # needed by WATO, ignored by Check_MK ping_levels = [] # special parameters for host/PING check_command check_periods = [] +# Notification Spooling +notification_spooling = False +notification_spool_to = None + + + # global variables used to cache temporary values (not needed in check_mk_base) ip_to_hostname_cache = None @@ -340,7 +346,7 @@ special_agent_info = {} # Now include the other modules. They contain everything that is needed # at check time (and many of that is also needed at administration time). try: - modules = [ 'check_mk_base', 'snmp', 'notify' ] + modules = [ 'check_mk_base', 'snmp' ] for module in modules: filename = modules_dir + "/" + module + ".py" execfile(filename) @@ -4856,6 +4862,7 @@ if __name__ == "__main__": do_automation(a, args) done = True elif o == '--notify': + execfile(modules_dir + "/notify.py") sys.exit(do_notify(args)) except MKGeneralException, e: diff --git a/modules/notify.py b/modules/notify.py index d5f6556..697b3f3 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -33,17 +33,15 @@ # encoded one) and can use any of the variables contact, email, # hostname, servicedesc, hoststate, servicestate, output in # the form %(variable)s + import pprint, uuid + # Default settings notification_logdir = var_dir + "/notify" notification_spooldir = var_dir + "/notify/spool" notification_log = notification_logdir + "/notify.log" notification_logging = 0 -notification_spooling_enabled = False -notification_forward_to = "" -notification_forward_mode = "off" - notification_log_template = \ u"$CONTACTNAME$ - $NOTIFICATIONTYPE$ - " \ u"$HOSTNAME$ $HOSTSTATE$ - " \ @@ -362,10 +360,11 @@ def do_notify(args): sys.exit(1) notify_log("forward mode %s" % notification_forward_mode) + # TODO: if notification_forward_mode in ["forward", "forward_exclusive"]: # Create spoolfile create_spoolfile({"context": context, "forward": notification_forward_to}) - if notification_forward_mode == "forward_exclusive": + if notification_forward_mode == "forward_only": return 0 try:

11 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits