Checkmk git commits October 2012

checkmk-commits@lists.checkmk.com

1 participants
252 discussions

Check_MK Git: check_mk: BI: Using parameters for hosttags

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d28596681f352071acaa3e553fa7f3ff755b77da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d28596681f3520… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Oct 18 19:56:08 2012 +0200 BI: Using parameters for hosttags --- ChangeLog | 1 + web/htdocs/bi.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce284ac..c0b093c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ aggregation compilations * Correct representation of (!), (!!) and (?) markers in check output * Corrected representation of assumed state in box layout + * Feature: Using parameters for hosttags WATO: * Added progress indicator in single site WATO "Activate Changes" diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 33e6100..b4f75b0 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -693,7 +693,7 @@ def compile_aggregation_rule(aggr_type, rule, args, lvl): # 2: (['waage'], '(.*)') calllist = [] for n in node[1:-2]: - if type(n) in [ str, unicode ]: + if type(n) in [ str, unicode, list ]: n = subst_vars(n, arginfo) calllist.append(n) matches = find_matching_services(aggr_type, node[0], calllist) @@ -777,6 +777,9 @@ def find_variables(pattern, varname): # replace variables in a string def subst_vars(pattern, arginfo): + if type(pattern) == list: + return [subst_vars(x, arginfo) for x in pattern ] + for name, value in arginfo.items(): if type(pattern) in [ str, unicode ]: pattern = pattern.replace('$'+name+'$', value)

11 years, 11 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2f2d772c7fbc0537088f7850226ec7e3971d44b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f2d772c7fbc05… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Oct 18 19:43:18 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Extened SNMP scan function for some ups checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e7f6e60dc68f30797d48d6a5247dace138bcae65 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7f6e60dc68f30… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Oct 18 19:43:03 2012 +0200 Extened SNMP scan function for some ups checks --- checks/ups_capacity | 2 +- checks/ups_in_freq | 2 +- checks/ups_in_voltage | 2 +- checks/ups_out_load | 2 +- checks/ups_out_voltage | 2 +- checks/ups_power | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/checks/ups_capacity b/checks/ups_capacity index 0e3684c..2b7c193 100644 --- a/checks/ups_capacity +++ b/checks/ups_capacity @@ -74,5 +74,5 @@ check_info["ups_capacity"] = { "has_perfdata" : True, "snmp_info" : ( ".1.3.6.1.2.1.33.1.2", [ "2.0" , "3.0" ,"4.0" ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" ] + [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" ] } diff --git a/checks/ups_in_freq b/checks/ups_in_freq index fb9bbac..d54f156 100644 --- a/checks/ups_in_freq +++ b/checks/ups_in_freq @@ -57,5 +57,5 @@ check_info['ups_in_freq'] = { "has_perfdata" : True, "snmp_info" : ( ".1.3.6.1.2.1.33.1.3.3.1", [ 0, 2 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" ] \ + [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" ] \ } diff --git a/checks/ups_in_voltage b/checks/ups_in_voltage index ae86dbc..c14d84a 100644 --- a/checks/ups_in_voltage +++ b/checks/ups_in_voltage @@ -56,5 +56,5 @@ check_info['ups_in_voltage'] = { "has_perfdata" : True, "snmp_info" : ( ".1.3.6.1.2.1.33.1.3.3.1", [ 0, 3 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" ] + [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" ] } diff --git a/checks/ups_out_load b/checks/ups_out_load index 686412e..f384489 100644 --- a/checks/ups_out_load +++ b/checks/ups_out_load @@ -56,5 +56,5 @@ check_info['ups_out_load'] = { "has_perfdata" : True, "snmp_info" : ( ".1.3.6.1.2.1.33.1.4.4.1", [ 0, 5 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" ] + [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" ] } diff --git a/checks/ups_out_voltage b/checks/ups_out_voltage index f29764b..000eade 100644 --- a/checks/ups_out_voltage +++ b/checks/ups_out_voltage @@ -56,5 +56,5 @@ check_info['ups_out_voltage'] = { "has_perfdata" : True, "snmp_info" : ( ".1.3.6.1.2.1.33.1.4.4.1", [ 0, 2 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" ] + [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" ] } diff --git a/checks/ups_power b/checks/ups_power index 53434e4..fe8df62 100644 --- a/checks/ups_power +++ b/checks/ups_power @@ -60,5 +60,5 @@ check_info['ups_power'] = { "group" : "hw_temperature", "snmp_info" : ( ".1.3.6.1.2.1.33.1.4.4.1", [ 0, 4 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" ] + [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" ] }

11 years, 11 months

Check_MK Git: check_mk: Added internal compile helper tool

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 596f507d02cf47184f7cc4ba8c482ae9b3844059 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=596f507d02cf47… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 18 17:21:24 2012 +0200 Added internal compile helper tool --- mkeventd/web/.f12 | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/mkeventd/web/.f12 b/mkeventd/web/.f12 new file mode 100644 index 0000000..2c8d957 --- /dev/null +++ b/mkeventd/web/.f12 @@ -0,0 +1,8 @@ +#!/bin/bash +SITE=${SITE:-$(omd sites --bare | head -n 1)} +C=$(sudo cp --preserve=mode -rv * /omd/versions/default/share/check_mk/web/ | wc -l) +#C=$(sudo cp --preserve=mode -rv htdocs/*.{css,py} /omd/versions/default/share/check_mk/web/htdocs/ | wc -l) +echo "$C files copied" +if [ "$SITE" != - ] ; then + sudo omd restart $SITE apache +fi

11 years, 11 months

Check_MK Git: check_mk: FIX: rule simulator ("Try out") now handles cancelling rules correctly

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5ef07d14765e49d527b2c212ed6438aff8492553 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ef07d14765e49… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 18 17:21:05 2012 +0200 FIX: rule simulator ("Try out") now handles cancelling rules correctly --- ChangeLog | 1 + mkeventd/web/htdocs/mkeventd.py | 17 ++++++++++++++++- mkeventd/web/plugins/wato/mkeventd.py | 12 ++++++++---- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d3b1a3c..ce284ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * New button for resetting all rule hits counters * When saving a rule then its hits counter is always reset * New feature of hiding certain actions from the commands in the status GUI + * FIX: rule simulator ("Try out") now handles cancelling rules correctly Multisite: * Enable automation login with _username= and _secret=, while diff --git a/mkeventd/web/htdocs/mkeventd.py b/mkeventd/web/htdocs/mkeventd.py index 6994caa..a5c165b 100644 --- a/mkeventd/web/htdocs/mkeventd.py +++ b/mkeventd/web/htdocs/mkeventd.py @@ -142,6 +142,21 @@ def event_rule_matches(rule, event): if "match_facility" in rule and event["facility"] != rule["match_facility"]: return _("The syslog facility does not match") + + # First try cancelling rules + if "match_ok" in rule or "cancel_priority" in rule: + if "cancel_priority" in rule: + up, lo = rule["cancel_priority"] + cp = event["priority"] >= lo and event["priority"] <= up + else: + cp = True + + match_groups = match(rule.get("match_ok", ""), event["text"], complete = False) + if match_groups != False and cp: + if match_groups == True: + match_groups = () + return True, match_groups + try: match_groups = match(rule.get("match"), event["text"], complete = False) except Exception, e: @@ -159,7 +174,7 @@ def event_rule_matches(rule, event): if match_groups == True: match_groups = () # no matching groups - return match_groups + return False, match_groups def match(pattern, text, complete = True): if pattern == None: diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 0ba0fa1..073f1a9 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -822,15 +822,19 @@ def mode_mkeventd_rules(phase): if rule.get("disabled"): html.icon(_("This rule is currently disabled and will not be applied"), "disabled") elif event: - groups = mkeventd.event_rule_matches(rule, event) - if type(groups) != tuple: - html.icon(_("Rule does not match: %s") % groups, "rulenmatch") + result = mkeventd.event_rule_matches(rule, event) + if type(result) != tuple: + html.icon(_("Rule does not match: %s") % result, "rulenmatch") else: + cancelling, groups = result if have_match: msg = _("This rule matches, but is overruled by a previous match.") icon = "rulepmatch" else: - msg = _("This rule matches.") + if cancelling: + msg = _("This rule does a cancelling match.") + else: + msg = _("This rule matches.") icon = "rulematch" have_match = True if groups:

11 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0795

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5b42c1eb9f94e95ad3db53f38dc42dae9ad6dc71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b42c1eb9f94e9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 18 16:39:43 2012 +0200 Updated bug entries #0795 --- .bugs/795 | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/.bugs/795 b/.bugs/795 new file mode 100644 index 0000000..654deb8 --- /dev/null +++ b/.bugs/795 @@ -0,0 +1,8 @@ +Title: mysql-Check: kleine Datenbanken immer kritisch +Component: checks +State: open +Date: 2012-10-18 16:39:13 +Targetversion: future +Class: bug + +aber nichtsdestotrotz laufen kleine MySQL DB's mit 0.00GB auf Fehler.

11 years, 11 months

Check_MK Git: check_mk: livecheck: FIX freeze if called plugin locks up

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f2ed72b6af671f3a674df3b8adb8fdcd78c681a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2ed72b6af671f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 18 12:13:06 2012 +0200 livecheck: FIX freeze if called plugin locks up --- ChangeLog | 2 ++ livestatus/src/livecheck.c | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 29fad82..d3b1a3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -98,6 +98,8 @@ * FIX: changed check_type to be always active (0) * FIX: fix bug in assignment of livecheck helpers * FIX: close inherited unused filedescriptors after fork() + * FIX: kill process group of called plugin if timeout is reached + -> preventing possible freeze of livecheck Checks & Agents: * FIX: Linux mk_logwatch: iregex Parameter was never used diff --git a/livestatus/src/livecheck.c b/livestatus/src/livecheck.c index ff3f369..9659404 100644 --- a/livestatus/src/livecheck.c +++ b/livestatus/src/livecheck.c @@ -34,9 +34,9 @@ #include "strutil.h" pid_t g_pid; -void alarm_handler(int); -void term_handler(int); -char **parse_into_arguments(char *command); +static void alarm_handler(int); +static void term_handler(int); +static char **parse_into_arguments(char *command); int check_icmp(int argc, char **argv, char *output); int icmp_sock = -1; @@ -83,7 +83,6 @@ int main(int argc, char **argv) ftime(&start); char output[8192]; int return_code; - // Optimization(1): // If it's check_icmp, we use our inline version // of that. But only if we have (had) root priviledges @@ -105,6 +104,10 @@ int main(int argc, char **argv) if (geteuid() == 0) setuid(getuid()); + // Assign this child its own process group, so + // we can kill its entire process group when a timeout occurs + setpgid(getpid(), 0); + close(fd[0]); // close read end dup2(fd[1], 1); // point stdout into pipe dup2(fd[1], 2); // also point stderr into pipe @@ -150,7 +153,6 @@ int main(int argc, char **argv) if (timeout) alarm(timeout); - int bytes_read = 0; char *ptr_output = output; const char *ptr_end = output + sizeof(output) - 1; @@ -214,7 +216,6 @@ int main(int argc, char **argv) (int)end.time, end.millitm, return_code); - char *ptr_output = output; char *ptr_walk = output; while (*ptr_walk != 0) { @@ -239,7 +240,7 @@ int main(int argc, char **argv) } } -char **parse_into_arguments(char *command) +static char **parse_into_arguments(char *command) { static char *arguments[128]; char *c = command; @@ -255,7 +256,7 @@ char **parse_into_arguments(char *command) } // Propagate signal to child, if we are killed -void term_handler(int signum) +static void term_handler(int signum) { if (g_pid) { kill(g_pid, signum); @@ -267,6 +268,6 @@ void term_handler(int signum) void alarm_handler(int signum) { if (g_pid) { - kill(g_pid, SIGKILL); + kill(-g_pid, SIGKILL); } }

11 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0790

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e5dd30c715688eee37890e3e33cc0672a5f66c8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5dd30c715688e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 18 10:48:11 2012 +0200 Updated bug entries #0790 --- .bugs/790 | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.bugs/790 b/.bugs/790 index 5e8b21f..2e1b710 100644 --- a/.bugs/790 +++ b/.bugs/790 @@ -1,9 +1,9 @@ Title: Three Livecheck issues Component: livecheck -State: open +Class: bug +State: done Date: 2012-10-09 14:20:28 Targetversion: 1.2.0 -Class: bug 1. In livecheck.c:53, int bytes_read = read(fd[0], output, sizeof(output)); does not guarantee a valid 0-byte terminated string. I propose a single @@ -20,3 +20,9 @@ escaped, there is a nagios function for this called escape_newlines. This is necessary for long plugin output to be functional. Ticket #442 + +2012-10-18 10:48:07: changed state open -> done + livecheck: + FIX: fixed problem with long plugin output + FIX: added /0 termination to strings + FIX: changed check_type to be always active (0)

11 years, 11 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7426fac0e911193b7e9774ee12c8ea87eb1964e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7426fac0e91119… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 18 11:48:47 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: FIX: close inherited unused filedescriptors after fork()

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 05a9ffb48aea11996c4682d26b3aa296ce572d4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05a9ffb48aea11… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 18 11:47:31 2012 +0200 FIX: close inherited unused filedescriptors after fork() --- ChangeLog | 1 + livestatus/src/livechecking.c | 7 +++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9741e98..29fad82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,6 +97,7 @@ * FIX: added /0 termination to strings * FIX: changed check_type to be always active (0) * FIX: fix bug in assignment of livecheck helpers + * FIX: close inherited unused filedescriptors after fork() Checks & Agents: * FIX: Linux mk_logwatch: iregex Parameter was never used diff --git a/livestatus/src/livechecking.c b/livestatus/src/livechecking.c index a1e7023..1acd9e5 100644 --- a/livestatus/src/livechecking.c +++ b/livestatus/src/livechecking.c @@ -66,6 +66,13 @@ void start_livecheck_helper(struct live_helper *lh) dup2(fd[1], 1); dup2(fd[1], 2); close(fd[0]); + + // close all other inherited filedescriptiors + unsigned i; + for (i=3; i<1024; i++) { + close(i); + } + char ht[32]; snprintf(ht, sizeof(ht), "%u", host_check_timeout); char st[32];

11 years, 11 months

← Newer
1
...
6
7
8
9
10
11
12
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2012