Checkmk git commits June 2013

checkmk-commits@lists.checkmk.com

4 participants
186 discussions

Check_MK Git: check_mk: Try to fix exception in WATO when manual checks miss sections

by Mathias Kettner

Module: check_mk Branch: master Commit: 4688d0338e1208ed0d408225834e160af0ea8009 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4688d0338e1208… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 13 11:13:15 2013 +0200 Try to fix exception in WATO when manual checks miss sections --- modules/automation.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index 195bf92..73f31bd 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -253,8 +253,16 @@ def automation_try_inventory_node(hostname): # Collect current status information about all existing checks table = [] for (ct, item), (state_type, paramstring) in found.items(): - params = None if state_type not in [ 'legacy', 'active' ]: + # apply check_parameters + try: + if type(paramstring) == str: + params = eval(paramstring) + else: + params = paramstring + except: + raise MKAutomationError("Invalid check parameter string '%s'" % paramstring) + descr = service_description(ct, item) global g_service_description g_service_description = descr @@ -292,14 +300,6 @@ def automation_try_inventory_node(hostname): if exitcode == None: check_function = check_info[ct]["check_function"] - # apply check_parameters - try: - if type(paramstring) == str: - params = eval(paramstring) - else: - params = paramstring - except: - raise MKAutomationError("Invalid check parameter string '%s'" % paramstring) if state_type != 'manual': params = compute_check_parameters(hostname, ct, item, params)

11 years

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 5fde5a4c4a603951c78e47e4dbca6c326fc5c31c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fde5a4c4a6039… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 13 11:13:20 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years

Check_MK Git: check_mk: check_mk-df.php now uses names instead of offsets

by Andreas Boesl

Module: check_mk Branch: master Commit: acb7702b490ef28ae392e3d256b9b0051162ffc6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=acb7702b490ef2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 13 10:54:11 2013 +0200 check_mk-df.php now uses names instead of offsets --- ChangeLog | 1 + pnp-templates/check_mk-df.php | 36 +++++++++++++++++++----------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b72d7d..61a1d66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ performance value. This might not always be the one you like, but its far better than nothing. * logwatch: Logwatch icon no longer uses notes_url + * check_mk-if.pnp: fixed bug with pnp template on esx hosts without perfdata Checks & Agents: * esx_hostystem multipath: criticize standby paths only if not equal to active paths diff --git a/pnp-templates/check_mk-df.php b/pnp-templates/check_mk-df.php index 35c26df..4bb18da 100644 --- a/pnp-templates/check_mk-df.php +++ b/pnp-templates/check_mk-df.php @@ -28,7 +28,9 @@ setlocale(LC_ALL, "POSIX"); // Make data sources available via names $RRD = array(); foreach ($NAME as $i => $n) { - $RRD[$n] = "$RRDFILE[$i]:$DS[$i]:MAX"; + $RRD[$n] = "$RRDFILE[$i]:$DS[$i]:MAX"; + $RRD_MIN[$n] = "$RRDFILE[$i]:$DS[$i]:MIN"; + $RRD_AVG[$n] = "$RRDFILE[$i]:$DS[$i]:AVERAGE"; $WARN[$n] = $WARN[$i]; $CRIT[$n] = $CRIT[$i]; $MIN[$n] = $MIN[$i]; @@ -87,8 +89,8 @@ $def[1] .= "LINE1:total_gb#226600 "; # Second graph is optional and shows trend. The MAX field # of the third variable contains (size of the filesystem in MB # / range in hours). From that we can compute the configured range. -if (isset($DS[2])) { - $size_mb_per_hours = floatval($MAX[3]); // this is size_mb / range(hours) +if (isset($RRD['growth'])) { + $size_mb_per_hours = floatval($MAX['trend']); // this is size_mb / range(hours) $size_mb = floatval($MAX[1]); $hours = 1.0 / ($size_mb_per_hours / $size_mb); $range = sprintf("%.0fh", $hours); @@ -96,32 +98,32 @@ if (isset($DS[2])) { // Current growth / shrinking. This value is give as MB / 24 hours. // Note: This has changed in 1.1.13i3. Prior it was MB / trend_range! $opt[2] = "--vertical-label '+/- MB / 24h' -l -1 -u 1 -X0 --title '$hostname: Growth of $fstitle' "; - $def[2] = "DEF:growth_max=$RRDFILE[2]:$DS[2]:MAX "; - $def[2] .= "DEF:growth_min=$RRDFILE[2]:$DS[2]:MIN "; - $def[2] .= "DEF:trend=$RRDFILE[3]:$DS[3]:AVERAGE "; + $def[2] = "DEF:growth_max=${RRD['growth']} "; + $def[2] .= "DEF:growth_min=${RRD_MIN['growth']} "; + $def[2] .= "DEF:trend=${RRD_AVG['trend']} "; $def[2] .= "CDEF:growth_pos=growth_max,0,MAX "; $def[2] .= "CDEF:growth_neg=growth_min,0,MIN "; - $def[2] .= "CDEF:growth_minabs=0,growth_min,- "; + $def[2] .= "CDEF:growth_minabs=0,growth_min,- "; $def[2] .= "CDEF:growth=growth_minabs,growth_max,MAX "; $def[2] .= "HRULE:0#c0c0c0 "; - $def[2] .= "AREA:growth_pos#3060f0:\"Grow\" "; - $def[2] .= "AREA:growth_neg#30f060:\"Shrink \" "; + $def[2] .= "AREA:growth_pos#3060f0:\"Grow\" "; + $def[2] .= "AREA:growth_neg#30f060:\"Shrink \" "; $def[2] .= "GPRINT:growth:LAST:\"Current\: %+9.2lfMB / 24h\" "; $def[2] .= "GPRINT:growth:MAX:\"Max\: %+9.2lfMB / 24h\\n\" "; // Trend $opt[3] = "--vertical-label '+/- MB / 24h' -l -1 -u 1 -X0 --title '$hostname: Trend for $fstitle' "; - $def[3] = "DEF:trend=$RRDFILE[3]:$DS[3]:AVERAGE "; + $def[3] = "DEF:trend=${RRD_AVG['trend']} "; $def[3] .= "HRULE:0#c0c0c0 "; $def[3] .= "LINE1:trend#000000:\"Trend\:\" "; - $def[3] .= "GPRINT:trend:LAST:\"%+7.2lf MB/24h\" "; - if ($WARN[3]) { - $warn_mb = sprintf("%.2fMB", $WARN[3] * $hours / 24.0); - $def[3] .= "LINE1:$WARN[3]#ffff00:\"Warn\: $warn_mb / $range\" "; + $def[3] .= "GPRINT:trend:LAST:\"%+7.2lf MB/24h\" "; + if ($WARN['trend']) { + $warn_mb = sprintf("%.2fMB", $WARN['trend'] * $hours / 24.0); + $def[3] .= "LINE1:${WARN['trend']}#ffff00:\"Warn\: $warn_mb / $range\" "; } - if ($CRIT[3]) { - $crit_mb = sprintf("%.2fMB", $CRIT[3] * $hours / 24.0); - $def[3] .= "LINE1:$CRIT[3]#ff0000:\"Crit\: $crit_mb / $range\" "; + if ($CRIT['trend']) { + $crit_mb = sprintf("%.2fMB", $CRIT['trend'] * $hours / 24.0); + $def[3] .= "LINE1:${CRIT['trend']}#ff0000:\"Crit\: $crit_mb / $range\" "; } $def[3] .= "COMMENT:\"\\n\" "; }

11 years

Check_MK Git: check_mk: removed some informational text on creating config

by Andreas Boesl

Module: check_mk Branch: master Commit: b1425271da11ef7b66cbaec85e3f5c350124d5f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1425271da11ef… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 12 18:18:54 2013 +0200 removed some informational text on creating config --- modules/check_mk.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index bd7603e..bf37b74 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4136,10 +4136,6 @@ def do_create_config(): else: out = file(nagios_objects_file, "w") create_nagios_config(out) - sys.stdout.write(("Successfully created Nagios configuration file %s%s%s.\n\n" + - "Please make sure that file will be read by Nagios.\n" + - "You need to restart Nagios in order to activate " + - "the changes.\n") % (tty_green + tty_bold, nagios_objects_file, tty_normal)) sys.stdout.write(tty_ok + "\n") def do_output_nagios_conf(args):

11 years

Check_MK Git: check_mk: Fix exception in WATO

by Mathias Kettner

Module: check_mk Branch: master Commit: 502fa7e028da21e1aba751c4146234b5b2a95677 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=502fa7e028da21… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 12 17:07:06 2013 +0200 Fix exception in WATO --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 6aed65c..c93267f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7445,7 +7445,7 @@ def cmc_rush_ahead_activation(): html.write("MIST: mtime_rush ist %r, mtime_pend ist %r" % (mtime_rush, mtime_pend)) except Exception, e: - if opt_debug: + if config.debug: raise def cmc_reload():

11 years

Check_MK Git: check_mk: mk_logwatch: fixed bug when rewriting logwatch messages

by Andreas Boesl

Module: check_mk Branch: master Commit: 027a2f4662e180bc31526250549b0756992007cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=027a2f4662e180… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 12 11:37:42 2013 +0200 mk_logwatch: fixed bug when rewriting logwatch messages --- ChangeLog | 3 ++- agents/plugins/mk_logwatch | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cf5e825..7b72d7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,7 +12,8 @@ * logwatch: Logwatch icon no longer uses notes_url Checks & Agents: - esx_hostystem multipath: criticize standby paths only if not equal to active paths + * esx_hostystem multipath: criticize standby paths only if not equal to active paths + * mk_logwatch: fixed bug when rewriting logwatch messages WATO: * Allow to configure check-/retry_interval in second precision diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index 46dce99..6823df4 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -225,12 +225,12 @@ def process_logfile(logfile, patterns): level = "." log_line = line[:-1] for lev, pattern, replace in patterns: - if pattern.search(line[:-1]): + matches = pattern.search(log_line) + if matches: level = lev levelint = {'C': 2, 'W': 1, 'O': 0, 'I': -1, '.': -1}[lev] worst = max(levelint, worst) if replace: - matches = pattern.match(log_line) replace_count = 1 new_message = replace.replace('\\0', log_line) for replacement in matches.groups():

11 years

Check_MK Git: check_mk: Reserved 10 bug IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 6504a61a888eb2b597ca5d5ef46ab7df8368be85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6504a61a888eb2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 12 10:44:29 2013 +0200 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 43c16f4..6943e4d 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -947 +957

11 years

Check_MK Git: check_mk: Add service filter to problems view

by Mathias Kettner

Module: check_mk Branch: master Commit: ab64f122d88f52aa2c7ae84c4a4def7dde5b007c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab64f122d88f52… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 12 08:41:13 2013 +0200 Add service filter to problems view --- web/plugins/views/builtin.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index f79b098..6dd78a2 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1387,6 +1387,7 @@ multisite_builtin_views.update({ 'service_acknowledged', 'svcstate', 'svchardstate', + 'serviceregex', 'hoststate'], 'sorters': [('svcstate', True), ('stateage', False),

11 years

Check_MK Git: check_mk: Keepalive mode: fix check_period for Check_MK services

by Mathias Kettner

Module: check_mk Branch: master Commit: 2f9324a9b16465a3e85e674404a386779a1fcb9b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f9324a9b16465… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 12 08:16:01 2013 +0200 Keepalive mode: fix check_period for Check_MK services --- modules/check_mk_base.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index ff694f6..d9be202 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -960,6 +960,8 @@ def cleanup_globals(): g_broken_agent_hosts = set([]) global g_broken_snmp_hosts g_broken_snmp_hosts = set([]) + global g_inactive_timerperiods + g_inactive_timerperiods = None

11 years

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

by Mathias Kettner

Module: check_mk Branch: master Commit: d66d905e533125dad0dc5c458e4b8efe405b58ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d66d905e533125… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 11 15:55:25 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: ChangeLog ---

11 years

← Newer
1
...
11
12
13
14
15
16
17
18
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2013