Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64160 discussions

Check_MK Git: check_mk: FIX: Disallow settings downtimes that end in the past

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d4cbfafedcf5f1306a8aabe7360e64222fb0dd66 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4cbfafedcf5f1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 14 17:16:26 2011 +0100 FIX: Disallow settings downtimes that end in the past --- ChangeLog | 1 + web/htdocs/htmllib.py | 5 +++++ web/htdocs/views.py | 4 ++++ 3 files changed, 10 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9dafa4..a301df6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ Multisite: * FIX: Fixed encoding problem when opening dashboard * FIX: Fixed styling of view header in older IE browsers + * FIX: Disallow settings downtimes that end in the past Livestatus: * New columns num_hosts and num_services in status table diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 68f10a8..8f1a1d8 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -462,6 +462,11 @@ class html: except: t = default_value + if varname in self.user_errors: + self.add_user_error(varname + "_date", self.user_errors[varname]) + self.add_user_error(varname + "_time", self.user_errors[varname]) + self.set_focus(varname + "_date") + br = time.localtime(t) self.date_input(varname + "_date", br.tm_year, br.tm_mon, br.tm_mday) self.write(" ") diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 5f0d6c8..f663e03 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2176,6 +2176,10 @@ def nagios_host_service_action_command(what, dataset): elif html.var("_down_custom") and config.may("action.downtimes"): down_from = html.get_datetime_input("_down_from") down_to = html.get_datetime_input("_down_to") + if down_to < time.time(): + raise MKUserError("_down_to", _("You cannot set a downtime that ends in the past. " + "This incident will be reported.")) + title = _("<b>schedule a downtime from %s to %s</b> on ") % ( time.asctime(time.localtime(down_from)), time.asctime(time.localtime(down_to)))

12 years, 10 months

Check_MK Git: check_mk: Repaired ChangeLog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e40009a852a6af9eb2d840d76bbc6d27691726c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e40009a852a6af… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 14 17:26:03 2011 +0100 Repaired ChangeLog --- ChangeLog | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index a301df6..118cd8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,8 @@ * Implemented logout functionality in OMD environments * New filter for the (new) state in host/service alerts * New command for sending custom notifications + * FIX: Fixed encoding problem when opening dashboard + * FIX: Fixed styling of view header in older IE browsers WATO: * Evolved to full featured monitoring configuration tool! @@ -44,6 +46,8 @@ by making use of external helper processes. Set livecheck=PATH_TO_bin/livecheck in nagios.cfg where you load Livestatus. Optional set num_livecheck_helpers=NUM to set number of processes. Nagios will not fork() anymore for check exection. + * New columns num_hosts and num_services in status table + * New aggregation functions suminv and avginv (see Documentation) 1.1.12p2: Core, Setup, etc.: @@ -56,15 +60,7 @@ * FIX: blade_bays: fix naming of item and man page Multisite: - * FIX: Fixed encoding problem when opening dashboard - * FIX: Fixed styling of view header in older IE browsers * FIX: Disallow settings downtimes that end in the past - - Livestatus: - * New columns num_hosts and num_services in status table - * New aggregation functions suminv and avginv (see Documentation) - -1.1.12p2: * FIX: Do not show WATO button in views if WATO is disabled * FIX: Remove WATO Folder filter if WATO is disabled

12 years, 10 months

Check_MK Git: check_mk: Repaired ChangeLog section of 1.1.12p2

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5c6b09feede9be0e8f3f3cd2914b9a57f57d95f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c6b09feede9be… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 14 17:30:19 2011 +0100 Repaired ChangeLog section of 1.1.12p2 --- ChangeLog | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 118cd8e..72425f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,7 +21,6 @@ * New filter for the (new) state in host/service alerts * New command for sending custom notifications * FIX: Fixed encoding problem when opening dashboard - * FIX: Fixed styling of view header in older IE browsers WATO: * Evolved to full featured monitoring configuration tool! @@ -60,9 +59,11 @@ * FIX: blade_bays: fix naming of item and man page Multisite: - * FIX: Disallow settings downtimes that end in the past + * FIX: Fixed styling of view header in older IE browsers * FIX: Do not show WATO button in views if WATO is disabled - * FIX: Remove WATO Folder filter if WATO is disabled + * FIX: Remove WATO Folder filter if WATO is disabled + * FIX: Snapin 'Performance': fix text align for numbers + * FIX: Disallow settings downtimes that end in the past 1.1.12p1: Core, Setup, etc.:

12 years, 10 months

Check_MK Git: check_mk: Multisite: New command for sending custom notifications

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4a984c4600faa5a1d1025c1d14e2a7a911fc2362 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a984c4600faa5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 14 17:04:44 2011 +0100 Multisite: New command for sending custom notifications --- ChangeLog | 1 + web/htdocs/views.py | 72 ++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 52 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index e862d05..b9dafa4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ * New nifty sidebar snapin "Speed-O-Meter" * Implemented logout functionality in OMD environments * New filter for the (new) state in host/service alerts + * New command for sending custom notifications WATO: * Evolved to full featured monitoring configuration tool! diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 7e89114..5f0d6c8 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -79,6 +79,11 @@ def load_plugins(): _("Fake check results"), _("Manually submit check results for host and service checks"), [ "admin" ]) + config.declare_permission("action.customnotification", + _("Send custom notification"), + _("Manually let the core send a notification to a host or service in order " + "to test if notifications are setup correctly"), + [ "user", "admin" ]) config.declare_permission("action.acknowledge", _("Acknowledge"), _("Acknowledge host and service problems and remove acknowledgements"), @@ -1895,14 +1900,14 @@ def show_downtime_actions(): if config.may("action.downtimes"): html.write("<tr><td class=legend>"+_('Downtimes')+"</td>\n" "<td class=content>\n" - "<input type=submit name=_remove_downtimes value=\""+_('Remove')+"\">   " + "<input type=submit name=_remove_downtimes value=\""+_('Remove')+"\">" "</td></tr>\n") def show_comment_actions(): if config.may("action.addcomment"): html.write("<tr><td class=legend>"+_('Comments')+"</td>\n" "<td class=content>\n" - "<input type=submit name=_remove_comments value=\""+_('Remove')+"\">   " + "<input type=submit name=_remove_comments value=\""+_('Remove')+"\">" "</td></tr>\n") @@ -1910,16 +1915,16 @@ def show_host_service_actions(what): if config.may("action.notifications"): html.write("<tr><td class=legend>"+_('Notifications')+"</td>\n" "<td class=content>\n" - "<input type=submit name=_enable_notifications value=\""+_('Enable')+"\">   " - "<input type=submit name=_disable_notifications value=\""+_('Disable')+"\">   " + "<input type=submit name=_enable_notifications value=\""+_('Enable')+"\"> " + "<input type=submit name=_disable_notifications value=\""+_('Disable')+"\">" "</td></tr>\n") if config.may("action.enablechecks") or config.may("action.reschedule"): html.write("<tr><td class=legend>"+_('Active checks')+"</td>\n" "<td class=content>\n") if config.may("action.enablechecks"): - html.write("<input type=submit name=_enable_checks value=\""+_('Enable')+"\">   " - "<input type=submit name=_disable_checks value=\""+_('Disable')+"\">   ") + html.write("<input type=submit name=_enable_checks value=\""+_('Enable')+"\"> " + "<input type=submit name=_disable_checks value=\""+_('Disable')+"\"> ") if config.may("action.reschedule"): html.write("<input type=submit name=_resched_checks value=\""+_('Reschedule next check now')+"\">\n" "</td></tr>\n") @@ -1927,8 +1932,8 @@ def show_host_service_actions(what): if config.may("action.enablechecks"): html.write("<tr><td class=legend>"+_('Passive checks')+"</td>\n" "<td class=content>\n") - html.write("<input type=submit name=_enable_passive_checks value=\""+_('Enable')+"\">   " - "<input type=submit name=_disable_passive_checks value=\""+_('Disable')+"\">   " + html.write("<input type=submit name=_enable_passive_checks value=\""+_('Enable')+"\"> " + "<input type=submit name=_disable_passive_checks value=\""+_('Disable')+"\">" "</td></tr>\n") if config.may("action.clearmodattr"): @@ -1948,29 +1953,46 @@ def show_host_service_actions(what): html.write(" ") html.write("</td></tr>\n") + if config.may("action.customnotification"): + html.write("<tr><td class=legend>"+_('Custom notification')+"</td>\n") + html.write("<td class=content>") + html.write(_('Comment') + ": ") + html.text_input("_cusnot_comment", "TEST", size=20) + html.write("   ") + html.checkbox("_cusnot_forced", False) + html.write(_("forced") + " ") + html.checkbox("_cusnot_broadcast", False) + html.write(_("broadcast") + " ") + html.write("   ") + html.write("<input type=submit name=_customnotification value=\"" + _('Send') +"\">") + html.write("</td></tr>\n") + if config.may("action.acknowledge"): html.write("<tr><td rowspan=3 class=legend>"+_('Acknowledge')+"</td>\n") - html.write("<td class=content><input type=submit name=_acknowledge value=\""+_('Acknowledge')+"\">   " + html.write("<td class=content><input type=submit name=_acknowledge value=\""+_('Acknowledge')+"\"> " "<input type=submit name=_remove_ack value=\""+_('Remove Acknowledgement')+"\"></td></tr>\n") html.write("<tr><td class=content>") html.checkbox("_ack_sticky", True) - html.write(" "+_('sticky')+"   ") + html.write(_('sticky')+"   ") html.checkbox("_ack_notify", True) - html.write(" "+_('send notification')+"   ") + html.write(_('send notification')+"   ") html.checkbox("_ack_persistent", False) - html.write(" "+_('persistent comment')) + html.write(_('persistent comment')) html.write("</td></tr>\n") - html.write("<tr><td class=content><div class=textinputlegend>"+_('Comment:')+"</div>") - html.text_input("_ack_comment", size=65) + html.write("<tr><td class=content>") + html.write(_("Comment") + ": ") + html.text_input("_ack_comment", size=48) html.write("</td></tr>\n") if config.may("action.addcomment"): - html.write("<tr><td rowspan=2 class=legend>"+_('Add comment')+"</td>\n") - html.write("<td class=content><input type=submit name=_add_comment value=\""+_('Add comment')+"\"></td></tr>\n" - "<tr><td class=content><div class=textinputlegend>"+_('Comment')+":</div>") - html.text_input("_comment", size=65) + html.write("<tr><td class=legend>"+_('Add comment')+"</td>\n") + html.write("<td class=content>") + html.write(_('Comment')+": ") + html.text_input("_comment", size=33) + html.write("   ") + html.write("<input type=submit name=_add_comment value=\""+_('Add comment')+"\">") html.write("</td></tr>\n") if config.may("action.downtimes"): @@ -1992,11 +2014,11 @@ def show_host_service_actions(what): html.write("</td></tr>") html.write("<tr><td class=content>") html.checkbox("_down_flexible", False) - html.write(" "+_('flexible with max. duration')+" ") + html.write(_('flexible with max. duration')+" ") html.time_input("_down_duration", 2, 0) html.write(" "+_('(HH:MM)')+"</td></tr>\n") - html.write("<tr><td class=content><div class=textinputlegend>"+_('Comment')+":</div>\n") - html.text_input("_down_comment", size=65) + html.write("<tr><td class=content>" + _('Comment')+": ") + html.text_input("_down_comment", size=48) def nagios_action_command(what, row): if what in [ "host", "service" ]: @@ -2087,6 +2109,14 @@ def nagios_host_service_action_command(what, dataset): command = "PROCESS_HOST_CHECK_RESULT;%s;%s;%s" % (spec, hoststate, pluginoutput) title = _("<b>manually set check results to %s</b> for") % statename + elif html.var("_customnotification") and config.may("action.customnotification"): + comment = html.var("_cusnot_comment") + broadcast = html.get_checkbox("_cusnot_broadcast") and 1 or 0 + forced = html.get_checkbox("_cusnot_forced") and 2 or 0 + command = "SEND_CUSTOM_%s_NOTIFICATION;%s;%s;%s;%s" % \ + ( cmdtag, spec, broadcast + forced, config.user_id, comment) + title = _("<b>send a custom notification</b> regarding") + elif html.var("_acknowledge") and config.may("action.acknowledge"): comment = html.var_utf8("_ack_comment") if not comment:

12 years, 10 months

Check_MK Git: check_mk: New filter for the (new) state in host/ service alerts

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ff54d7106a50ad69d8e82f0b0e8bc9013d926692 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff54d7106a50ad… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 14 16:20:25 2011 +0100 New filter for the (new) state in host/service alerts --- ChangeLog | 1 + web/htdocs/views.py | 5 +---- web/plugins/views/builtin.py | 8 +++++--- web/plugins/views/filters.py | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index b6f11e7..e862d05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ Multisite: * New nifty sidebar snapin "Speed-O-Meter" * Implemented logout functionality in OMD environments + * New filter for the (new) state in host/service alerts WATO: * Evolved to full featured monitoring configuration tool! diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 7a1b648..7e89114 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -600,7 +600,7 @@ function toggle_section(nr, oImg) { html.write("<table class=filters>") html.write("<tr><th>") html.write(_("Filter")) - html.write("</th><th>"+_('usage')+"</th><th>"+_('hardcoded settings')+"</th><th>"+_('HTML variables')+"</th></tr>\n") + html.write("</th><th>"+_('usage')+"</th><th>"+_('hardcoded settings')+"</th></tr>\n") allowed_filters = filters_allowed_for_datasource(datasourcename) # sort filters according to title s = [(filt.sort_index, filt.title, fname, filt) @@ -623,9 +623,6 @@ function toggle_section(nr, oImg) { html.write("</td><td class=widget>") filt.display() html.write("</td>") - html.write("<td><tt>") - html.write(" ".join(filt.htmlvars)) - html.write("</tt></td>") html.write("</tr>\n") html.write("</table>\n") # Set all filters into the proper display state diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index b010dc7..661a083 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1581,7 +1581,8 @@ multisite_builtin_views.update({ 'show_filters': ['hostregex', 'serviceregex', 'logtime', - 'log_plugin_output'], + 'log_plugin_output', + 'log_state',], 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Host- and Service events'), 'topic': _('Other')}, @@ -1680,7 +1681,7 @@ multisite_builtin_views.update({ ], 'play_sounds': False, 'public': True, - 'show_filters': ['logtime'], + 'show_filters': ['logtime', 'log_state'], 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Events of host & services')}, 'logfile': {'browser_reload': 0, @@ -1732,7 +1733,8 @@ multisite_builtin_views.update({ 'hostregex', 'serviceregex', 'opthostgroup', - 'logtime'], + 'logtime', + 'log_state'], 'sorters': [('log_time', True), ('log_lineno', True)], 'title': _('Search Global Logfile'), 'topic': _('Other')}, diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 60da59c..2a22f2d 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -510,3 +510,39 @@ declare_filter(255, FilterLogClass()) declare_filter(202, FilterText("log_plugin_output", _("Log: plugin output"), "log", "log_plugin_output", "log_plugin_output", "~~")) declare_filter(260, FilterText("log_contact_name", _("Log: contact name"), "log", "log_contact_name", "log_contact_name", "="), _("Exact match, used for linking")) + +class FilterLogState(Filter): + def __init__(self): + self._items = [ ("h0", "host", 0, _("Up")),("h1", "host", 1, _("Down")),("h2", "host", 2, _("Unreachable")), + ("s0", "service", 0, _("OK")), ("s1", "service", 1, _("Warning")), + ("s2", "service", 2, _("Critical")),("s3", "service", 3, _("Unknown")) ] + + Filter.__init__(self, "log_state", _("Type of alerts of hosts and services"), + "log", [ "logst_" + e[0] for e in self._items ], []) + + def display(self): + html.write("<table><tr><td>") + for varsuffix, what, state, text in self._items: + if state == 0: + html.write("%s %s:<br>" % (_(what.title()), _("alerts"))) + html.write("  ") + html.checkbox("logst_" + varsuffix, True) + html.write(" " + text + "<br>") + if varsuffix == "h2": + html.write("</td><td>") + html.write("</td></tr></table>") + + def filter(self, infoname): + headers = [] + for varsuffix, what, state, text in self._items: + if html.get_checkbox("logst_" + varsuffix) != False: # None = form not filled in = allow + headers.append("Filter: log_type = %s ALERT\nFilter: log_state = %d\nAnd: 2\n" % + (what.upper(), state)) + if len(headers) == 0: + return "Limit: 0\n" # no allowed state + elif len(headers) == len(self._items): + return "" # all allowed or form not filled in + else: + return "".join(headers) + ("Or: %d\n" % len(headers)) + +declare_filter(270, FilterLogState())

12 years, 10 months

Check_MK Git: check_mk: recompiled windows agent

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 89ba2158926b186fe773f671350eba4f64c465a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89ba2158926b18… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 14 15:27:44 2011 +0100 recompiled windows agent --- agents/windows/check_mk_agent.exe | Bin 99840 -> 99840 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 9f04016..a229d51 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ

12 years, 10 months

Check_MK Git: check_mk: Livecheck: do not keep ICMP socket open

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c5722db7dc535493213b709de8afed31a7387591 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5722db7dc5354… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 14 13:24:26 2011 +0100 Livecheck: do not keep ICMP socket open Because this is a massive performance problem. The open socket will see all ICMP traffic coming an and buffer that until we use it again. --- livestatus/src/check_icmp.c | 3 +++ livestatus/src/livecheck.c | 12 +++++------- livestatus/src/livechecking.c | 37 +++++++++++++++++++++++++++++-------- 3 files changed, 37 insertions(+), 15 deletions(-) diff --git a/livestatus/src/check_icmp.c b/livestatus/src/check_icmp.c index fd29a7c..9b0919c 100644 --- a/livestatus/src/check_icmp.c +++ b/livestatus/src/check_icmp.c @@ -384,8 +384,11 @@ int check_icmp(int argc, char **argv, char *output, int size) g_output_buffer_size = size; g_output_pointer = output; + icmp_sock = socket(PF_INET, SOCK_RAW, IPPROTO_ICMP); + exit_code = 3; if (setjmp(exit_jmp)) { + close(icmp_sock); return exit_code; } diff --git a/livestatus/src/livecheck.c b/livestatus/src/livecheck.c index 693c539..3af345c 100644 --- a/livestatus/src/livecheck.c +++ b/livestatus/src/livecheck.c @@ -66,12 +66,6 @@ int main(int argc, char **argv) signal(SIGQUIT, term_handler); signal(SIGTERM, term_handler); - // Setup raw socket for inline check_icmp if we are root - if (geteuid() == 0) { - icmp_sock = socket(PF_INET, SOCK_RAW, IPPROTO_ICMP); - setuid(getuid()); /* Drop root priviledges */ - } - while (1) { write(1, "*", 1); // Signal Nagios that we are finished if (NULL == fgets(host, sizeof(host), stdin) @@ -92,7 +86,7 @@ int main(int argc, char **argv) // If it's check_icmp, we use our inline version // of that. But only if we have (had) root priviledges // and had been able to create a raw socket - if (icmp_sock != -1 && strstr(command, "/check_icmp ")) { + if (geteuid() == 0 && strstr(command, "/check_icmp ")) { char **arguments = parse_into_arguments(command); int arg_c = 0; while (arguments[arg_c]) @@ -106,6 +100,10 @@ int main(int argc, char **argv) pid = fork(); if (pid == 0) { + // Drop root priviledges: only needed for ICMP socket + if (geteuid() == 0) + setuid(getuid()); + close(fd[0]); // close read end dup2(fd[1], 1); // point stdout into pipe dup2(fd[1], 2); // also point stderr into pipe diff --git a/livestatus/src/livechecking.c b/livestatus/src/livechecking.c index 534132c..f4b2d42 100644 --- a/livestatus/src/livechecking.c +++ b/livestatus/src/livechecking.c @@ -46,6 +46,7 @@ struct live_helper { pid_t pid; int sock; FILE *fsock; + int is_free; }; struct live_helper *g_live_helpers; @@ -65,10 +66,21 @@ void execute_livecheck(struct live_helper *lh, const char *host_name, struct live_helper *get_free_live_helper() { - // Check if one of our helpers is free + // Check if one of our helpers is free. First look + // at the flag + unsigned i; + for (i=0; i<g_num_livehelpers; i++) { + if (g_live_helpers[i].is_free) { + g_live_helpers[i].is_free = 0; + return &g_live_helpers[i]; + } + } + + // None none to be free -> use select to detect livehelpers + // that have signalled us (by sending a byte) that they are + // free again. fd_set fds; FD_ZERO(&fds); - unsigned i; int max_fd = 0; for (i=0; i<g_num_livehelpers; i++) { int fd = g_live_helpers[i].sock; @@ -83,11 +95,13 @@ struct live_helper *get_free_live_helper() if (r == 0) return 0; + struct live_helper *free_helper = 0; for (i=0; i<g_num_livehelpers; i++) { if (FD_ISSET(g_live_helpers[i].sock, &fds)) - break; + g_live_helpers[i].is_free = 1; + free_helper = &g_live_helpers[i]; } - return &g_live_helpers[i]; + return free_helper; } int broker_host_livecheck(int event_type __attribute__ ((__unused__)), void *data) @@ -136,6 +150,7 @@ int broker_service_livecheck(int event_type __attribute__ ((__unused__)), void * struct live_helper *lh = get_free_live_helper(); if (!lh) { logger(LG_INFO, "No livecheck helper free."); + // Let the core handle this check himself return NEB_OK; } @@ -183,11 +198,11 @@ void init_livecheck() snprintf(ht, sizeof(ht), "%u", host_check_timeout); char st[32]; snprintf(st, sizeof(st), "%u", service_check_timeout); + // reduce stack size in order to save memory struct rlimit rl; getrlimit(RLIMIT_STACK, &rl); - logger(LG_INFO, "Stacksize is %d", rl.rlim_cur); - rl.rlim_cur = 32768; + rl.rlim_cur = 65536; setrlimit(RLIMIT_STACK, &rl); execl(g_livecheck_path, "livecheck", check_result_path, ht, st, (char *)0); logger(LG_INFO, "ERROR: Cannot start livecheck helper: %s", strerror(errno)); @@ -197,6 +212,7 @@ void init_livecheck() g_live_helpers[i].pid = pid; g_live_helpers[i].sock = fd[0]; g_live_helpers[i].fsock = fdopen(fd[0], "r+"); + g_live_helpers[i].is_free = 0; // wait until helper sends "ready" byte. } } @@ -212,8 +228,13 @@ void deinit_livecheck() kill(g_live_helpers[i].pid, SIGTERM); int status; waitpid(g_live_helpers[i].pid, &status, 0); - if (g_debug_level > 0) - logger(LG_INFO, "Livecheck helper %d exited with status %d.", g_live_helpers[i].pid, status); + if (WIFSIGNALED(status) && WTERMSIG(status) != SIGTERM) { + logger(LG_INFO, "Livecheck helper %d exited with signal %d.", + g_live_helpers[i].pid, WTERMSIG(status)); + } + else if (g_debug_level > 0) + logger(LG_INFO, "Livecheck helper %d exited with status %d.", + g_live_helpers[i].pid, status); } free(g_live_helpers); }

12 years, 10 months

Check_MK Git: check_mk: Windows: send messages as 'I' if loglevel is set to 'all'

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 18574c407948221cb777af8e9bd1df759248762a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18574c40794822… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 14 15:10:58 2011 +0100 Windows: send messages as 'I' if loglevel is set to 'all' Also remove trailing spaces in complete file and introduce debuggin option [logwatch] sendall = yes --- agents/windows/check_mk_agent.cc | 296 +++++++++++++++++++++----------------- 1 files changed, 162 insertions(+), 134 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=18574c4079…

12 years, 10 months

Check_MK Git: check_mk: logwatch: allow to classify messages based on their count

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 19587113966e62c2669648fc5a01d9831e0651ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19587113966e62… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 14 15:26:50 2011 +0100 logwatch: allow to classify messages based on their count --- ChangeLog | 2 ++ checkman/logwatch | 17 ++++++++++++++++- checks/logwatch | 46 ++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 58 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0304ab..b6f11e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,8 @@ to process and which levels of messages to send. * Windows agent: new config variable "host" in all sections that restricts the folling entries to certain hosts. + * logwatch: allow to classify messages based on their count (see + man page of logwatch for details) Multisite: * New nifty sidebar snapin "Speed-O-Meter" diff --git a/checkman/logwatch b/checkman/logwatch index fe9f1a8..c769e62 100644 --- a/checkman/logwatch +++ b/checkman/logwatch @@ -33,6 +33,7 @@ examples: logwatch_patterns = { "System": [ ('W', "crash"), ('I', "svchost") ], + ((10,30), "login.*failed") ], "/var/log/messages": [ ( ['test'], ALL_HOSTS, 'I', "sshd") ] } @@ -41,7 +42,14 @@ patterns (list): The parameter can be used to reclassify log messages sent by the agent. You can assign one of the three levels {'I'} (ignore), {'W'} (warning) or {'C'} (critical) to each message. It is only possible - to reclassify messages with an original level of {W} or {C}. + to reclassify messages that have already been classified + by the agent with an original level of {I}, {W} or {C}. + As of version 1.1.13i1 the Windows agent supports sending + always all messages and classifying non-problems as {I}. + This is done by a configution + via {check_mk.ini} and setting the level for a logfile to {all}. + Those messages can later be reclassified. + Each entry of the list is a pair of the new level and an extended regular expression searched in the log line. Please note, that because logwatch checks are usually @@ -49,6 +57,13 @@ patterns (list): The parameter can be used to reclassify {logwatch_patterns} instead of explicit check parameters. Example: {[ ('I', "sshd"), ('C', "foo.*bar") ]} + In the current version of this check a level can be substituted + by a pair of numbers, e.g. instead of {'W'} you can write {(10, 20)}. + In that case the message will be considered as {'I'} for the first + 9 appearances, further appearances will be classified as {'W'} and + from the 20th message on it will be {'C'}. The counts are reset each + time the host is being checked. + [configuration] logwatch_patterns (dict): A dictionary for reclassifying the level of certain messages. This is especially useful diff --git a/checks/logwatch b/checks/logwatch index 16a91e3..4e118cf 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -44,9 +44,9 @@ def inventory_logwatch(info): #logwatch_patterns = { # 'System': [ # ( 'W', 'sshd' ), -# ( ['host1', 'host2'], 'C', 'ssh' ), # only applies to certain hosts +# ( ['host1', 'host2'], 'C', 'ssh' ), # only applies to certain hosts # ( ['lnx', 'dmz'], ALL_HOSTS, 'C', 'ssh' ), # only applies to host having certain tags - +# ( ALL_HOSTS, (10, 20), 'x' ), # at 10 messages per interval warn, at 20 crit # ( 'I', '0' ) # ], # 'Application': [ @@ -55,7 +55,25 @@ def inventory_logwatch(info): # ] # } -# Extracts only pattern relevant for current host and item. +# New rule-stule logwatch_rules in WATO friendly consistent rule notation: +# +# logwatch_rules = [ +# ( [ PATTERNS ], ALL_HOSTS, [ "Application", "System" ] ), +# ] +# All [ PATTERNS ] of matching rules will be concatenated in order of +# appearance. +# +# PATTERN is a list like: +# [ ( 'I', ".*ssh.*" ), # Ignore these messages +# ( (10, 20), "login" ), # Warning at 10 messages, Critical at 20 +# ( 'C', "bad" ), # Always critical +# ( 'W', "not entirely bad" ), # Always warning +# ] +# + + + +# Extracts patterns that are relevant for the current host and item. # Constructs simple list of pairs: [ ('W', 'crash.exe'), ('C', 'sshd.*test') ] def logwatch_precompile(hostname, item, params): patterns = logwatch_patterns.get(item) @@ -82,16 +100,31 @@ def logwatch_precompile(hostname, item, params): return params -def logwatch_reclassify(patterns, text): +def logwatch_reclassify(counts, patterns, text): for level, pattern in patterns: reg = compiled_regexes.get(pattern) if not reg: reg = re.compile(pattern) compiled_regexes[pattern] = reg if reg.search(text): - return level + # If the level is not fixed like 'C' or 'W' but a pair like (10, 20), + # then we count how many times this pattern has already matched and + # assign the levels according to the number of matches of this pattern. + if type(level) == tuple: + warn, crit = level + newcount = counts.setdefault(id(pattern), 0) + 1 + counts[id(pattern)] = newcount + if newcount >= crit: + return 'C' + elif newcount >= warn: + return 'W' + else: + return 'I' + else: + return level return None + # In case of a precompiled check, params contains the precompiled # logwatch_patterns for the logfile we deal with. If using check_mk # without precompiled checks, the params must be None an will be @@ -183,6 +216,7 @@ def check_logwatch(item, params, info): else: patterns = logwatch_precompile(g_hostname, item, None) + counts = {} # for counting number of matches of a certain pattern if len(loglines) > 0: worst = 0 newloglines = [] @@ -194,7 +228,7 @@ def check_logwatch(item, params, info): else: text = "" if patterns and level != '.': # do never reclassify informational context messages - newlevel = logwatch_reclassify(patterns, text) + newlevel = logwatch_reclassify(counts, patterns, text) if newlevel != None: level = newlevel

12 years, 10 months

Check_MK Git: check_mk: Remove test code

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b1f418ef160acf0bad3196ae856e4837095ebacf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1f418ef160acf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 13 20:54:10 2011 +0100 Remove test code --- modules/check_mk_base.py | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index a7a1765..747b025 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -673,9 +673,6 @@ def save_counters(hostname): # This is the main check function - the central entry point to all and # everything def do_check(hostname, ipaddress): -# HIRN - import time - time.sleep(30) if opt_verbose: sys.stderr.write("Check_mk version %s\n" % check_mk_version)

12 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits