Checkmk git commits March 2011

checkmk-commits@lists.checkmk.com

3 participants
205 discussions

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e638ff26410644cd9609257e0ffa39b68e454335 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e638ff26410644… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 15 17:04:10 2011 +0100 Updated bug entries --- .bugs/210 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/210 b/.bugs/210 new file mode 100644 index 0000000..6a31f23 --- /dev/null +++ b/.bugs/210 @@ -0,0 +1,10 @@ +Title: check_mk -D HOST does not display datasource_programs +Component: core +Benefit: 1 +State: open +Cost: 1 +Date: 2011-03-15 15:20:50 +Class: cleanup + +It should rather display the command line of that host +than (TCP port 6556).

13 years, 3 months

Check_MK Git: check_mk: df: split PNP graphs for growth/trend

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7e4a8a6ca0b0ce372113100528ce5ca2a6eabe7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e4a8a6ca0b0ce… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 14 14:20:44 2011 +0100 df: split PNP graphs for growth/trend --- ChangeLog | 1 + pnp-templates/check_mk-df.php | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index dff84f6..94a177f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ * FIX: df: fix trend computation (thanks to Sebastian Talmon) * FIX: df: fix status in case of critical trend and warning used * FIX: df: fix display of trend warn/crit in PNP-graph + * df: split PNP graphs for growth/trend into two graphs 1.1.10: diff --git a/pnp-templates/check_mk-df.php b/pnp-templates/check_mk-df.php index 9d32a3a..a4b5d3a 100644 --- a/pnp-templates/check_mk-df.php +++ b/pnp-templates/check_mk-df.php @@ -65,7 +65,8 @@ if (isset($DS[2])) { $hours = 1.0 / ($size_mb_per_hours / $size_mb); $range = sprintf("%.0fh", $hours); - $opt[2] = "--vertical-label '+/- MB / $range' -l -1 -u 1 --title '$hostname: Trend for $fstitle' "; + // Current growth / shrinking + $opt[2] = "--vertical-label '+/- MB / $range' -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 "; @@ -76,18 +77,24 @@ if (isset($DS[2])) { $def[2] .= "HRULE:0#c0c0c0 "; $def[2] .= "AREA:growth_pos#3060f0:\"Grow\" "; $def[2] .= "AREA:growth_neg#30f060:\"Shrink \" "; - $def[2] .= "LINE1:trend#000000:\"Trend \" "; + $def[2] .= "GPRINT:growth:LAST:\"Current\: %+9.2lfMB / $range\" "; + $def[2] .= "GPRINT:growth:MAX:\"Max\: %+9.2lfMB / $range\\n\" "; + + // Trend + $opt[3] = "--vertical-label '+/- MB / $range' -l -1 -u 1 -X0 --title '$hostname: Trend for $fstitle' "; + $def[3] = "DEF:trend=$RRDFILE[3]:$DS[3]:AVERAGE "; + $def[3] .= "HRULE:0#c0c0c0 "; + $def[3] .= "LINE1:trend#000000:\"Trend\:\" "; + $def[3] .= "GPRINT:trend:LAST:\"%+7.2lf MB/$range\" "; if ($WARN[3]) { $warn_mb = sprintf("%.2fMB", $WARN[3]); - $def[2] .= "LINE1:$WARN[3]#ffff00:\"Warn\: $warn_mb / $range\" "; + $def[3] .= "LINE1:$WARN[3]#ffff00:\"Warn\: $warn_mb / $range\" "; } if ($CRIT[3]) { $crit_mb = sprintf("%.2fMB", $CRIT[3]); - $def[2] .= "LINE1:$CRIT[3]#ff0000:\"Crit\: $crit_mb / $range\" "; + $def[3] .= "LINE1:$CRIT[3]#ff0000:\"Crit\: $crit_mb / $range\" "; } - $def[2] .= "COMMENT:\"\\n\" "; - $def[2] .= "GPRINT:growth:LAST:\"Current\: %+9.2lf MB/$range\" "; - $def[2] .= "GPRINT:trend:LAST:\" Average trend\: %+7.2lf MB/$range\\n\" "; + $def[3] .= "COMMENT:\"\\n\" "; }

13 years, 3 months

Check_MK Git: check_mk: FIX: cmctc: fix inventory in case of incomplete entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bfc9387a2260648e22fe45877fbf611be3d1dcd8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfc9387a226064… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 14 17:43:05 2011 +0100 FIX: cmctc: fix inventory in case of incomplete entries --- ChangeLog | 1 + checks/cmctc | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 94a177f..0500cb2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * FIX: df: fix status in case of critical trend and warning used * FIX: df: fix display of trend warn/crit in PNP-graph * df: split PNP graphs for growth/trend into two graphs + * FIX: cmctc: fix inventory in case of incomplete entries 1.1.10: diff --git a/checks/cmctc b/checks/cmctc index ed5bb33..d74bc66 100644 --- a/checks/cmctc +++ b/checks/cmctc @@ -35,9 +35,7 @@ # 7: description def inventory_cmctc_temp(checkname, info): - # return all temperature sensors - return [ (line[0], line[7], None) \ - for line in info if int(line[1]) == 10 ] + return [ (line[0], None) for line in info if saveint(line[1]) == 10 ] def check_cmctc_temp(item, no_params, info): for line in info: # , value1, value2 in info:

13 years, 3 months

Check_MK Git: check_mk: FIX: fix syntax error in df-manpages (in examples)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: eb349be4d1ff5bed3a1775f41f499b57137ba357 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb349be4d1ff5b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 14 09:48:39 2011 +0100 FIX: fix syntax error in df-manpages (in examples) --- .bugs/208 | 10 ++++++++++ .bugs/209 | 9 +++++++++ .bugs/222 | 4 ++++ checkman/df | 2 +- checkman/df_netapp | 2 +- checkman/df_netapp32 | 2 +- 6 files changed, 26 insertions(+), 3 deletions(-) diff --git a/.bugs/208 b/.bugs/208 new file mode 100644 index 0000000..6b31dae --- /dev/null +++ b/.bugs/208 @@ -0,0 +1,10 @@ +Title: Describe trends in "Monitoring filesystems" +Component: doku +Benefit: 1 +State: open +Cost: 1 +Date: 2011-03-14 09:33:22 +Class: cleanup + +The article about filesystems should contain all information about +trends. Also hints to the various filesystem checks. diff --git a/.bugs/209 b/.bugs/209 new file mode 100644 index 0000000..c97b61b --- /dev/null +++ b/.bugs/209 @@ -0,0 +1,9 @@ +Title: Man-Pages in HTML format have formatting errors +Component: doku +Benefit: 2 +State: open +Cost: 2 +Date: 2011-03-14 09:38:59 +Class: bug + +See the documentation of the df-Check. diff --git a/.bugs/222 b/.bugs/222 index ed6e751..9b86204 100644 --- a/.bugs/222 +++ b/.bugs/222 @@ -10,3 +10,7 @@ Quicksearch should also do a refresh every 10 Seconds but only retrieve the start time of the nagios sites. These are always available in the html.live object. If at least one site as restarted since the last time, all items (hosts, services) should be loaded new. + +The See Also: should link to all check manpages concerning df.include +checks. Also there should be a table of these checks. + diff --git a/checkman/df b/checkman/df index 93b270b..97b7c0a 100644 --- a/checkman/df +++ b/checkman/df @@ -47,7 +47,7 @@ examples: "trend_range" : 48, # hours "trend_mb" : (10, 20), # MB of change during trend_range "trend_perc" : (1, 2), # Percent change during trend_range - "trend_timeleft" : (72, 48) # run time left in hours until full + "trend_timeleft" : (72, 48), # run time left in hours until full "trend_perfdata" : False # no performance data for trends } diff --git a/checkman/df_netapp b/checkman/df_netapp index ca6cde7..0adff30 100644 --- a/checkman/df_netapp +++ b/checkman/df_netapp @@ -44,7 +44,7 @@ examples: "trend_range" : 48, # hours "trend_mb" : (10, 20), # MB of change during trend_range "trend_perc" : (1, 2), # Percent change during trend_range - "trend_timeleft" : (72, 48) # run time left in hours until full + "trend_timeleft" : (72, 48), # run time left in hours until full "trend_perfdata" : False # no performance data for trends } diff --git a/checkman/df_netapp32 b/checkman/df_netapp32 index 374efae..0327e87 100644 --- a/checkman/df_netapp32 +++ b/checkman/df_netapp32 @@ -49,7 +49,7 @@ examples: "trend_range" : 48, # hours "trend_mb" : (10, 20), # MB of change during trend_range "trend_perc" : (1, 2), # Percent change during trend_range - "trend_timeleft" : (72, 48) # run time left in hours until full + "trend_timeleft" : (72, 48), # run time left in hours until full "trend_perfdata" : False # no performance data for trends }

13 years, 3 months

Check_MK Git: check_mk: FIX: fix layout problems in df template

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e8f573108e9c8b06e99a417ecdf553dc79547532 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8f573108e9c8b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 14 09:59:19 2011 +0100 FIX: fix layout problems in df template --- ChangeLog | 1 + pnp-templates/check_mk-df.php | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5d79fc3..e2b045f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ has not the index 1 * cisco_temp/cisco_temp_perf: scan function handles sensors not beginning with index 1 + * FIX: df: fix layout problems in PNP template 1.1.10: diff --git a/pnp-templates/check_mk-df.php b/pnp-templates/check_mk-df.php index 7c0bdd3..9d32a3a 100644 --- a/pnp-templates/check_mk-df.php +++ b/pnp-templates/check_mk-df.php @@ -63,7 +63,7 @@ if (isset($DS[2])) { $size_mb_per_hours = floatval($MAX[3]); // this is size_mb / range(hours) $size_mb = floatval($MAX[1]); $hours = 1.0 / ($size_mb_per_hours / $size_mb); - $range = sprintf("%.1fh", $hours); + $range = sprintf("%.0fh", $hours); $opt[2] = "--vertical-label '+/- MB / $range' -l -1 -u 1 --title '$hostname: Trend for $fstitle' "; $def[2] = "DEF:growth_max=$RRDFILE[2]:$DS[2]:MAX "; @@ -77,13 +77,17 @@ if (isset($DS[2])) { $def[2] .= "AREA:growth_pos#3060f0:\"Grow\" "; $def[2] .= "AREA:growth_neg#30f060:\"Shrink \" "; $def[2] .= "LINE1:trend#000000:\"Trend \" "; - if ($WARN[3]) - $def[2] .= "LINE1:$WARN[3]#ffff00:\"Warning at $WARN[3]MB/$range\" "; - if ($CRIT[3]) - $def[2] .= "LINE1:$CRIT[3]#ff0000:\"Critical at $CRIT[3]MB/$range\" "; + if ($WARN[3]) { + $warn_mb = sprintf("%.2fMB", $WARN[3]); + $def[2] .= "LINE1:$WARN[3]#ffff00:\"Warn\: $warn_mb / $range\" "; + } + if ($CRIT[3]) { + $crit_mb = sprintf("%.2fMB", $CRIT[3]); + $def[2] .= "LINE1:$CRIT[3]#ff0000:\"Crit\: $crit_mb / $range\" "; + } $def[2] .= "COMMENT:\"\\n\" "; $def[2] .= "GPRINT:growth:LAST:\"Current\: %+9.2lf MB/$range\" "; - $def[2] .= "GPRINT:trend:LAST:\" Trend\: %+7.2lf MB/$range\\n\" "; + $def[2] .= "GPRINT:trend:LAST:\" Average trend\: %+7.2lf MB/$range\\n\" "; }

13 years, 3 months

Check_MK Git: check_mk: FIX: df: fix trend computation ( thanks to Sebastian Talmon)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 56e042bc3704234315960a8bebbd9a4cc415bdb0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56e042bc370423… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 14 10:06:03 2011 +0100 FIX: df: fix trend computation (thanks to Sebastian Talmon) --- ChangeLog | 1 + checks/df.include | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2b045f..16de0ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ * cisco_temp/cisco_temp_perf: scan function handles sensors not beginning with index 1 * FIX: df: fix layout problems in PNP template + * FIX: df: fix trend computation (thanks to Sebastian Talmon) 1.1.10: diff --git a/checks/df.include b/checks/df.include index 6baec92..5314c3c 100644 --- a/checks/df.include +++ b/checks/df.include @@ -204,7 +204,7 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, params): # compute time until filesystem is full (only for positive trend, of course) if trend > 0: space_left = size_mb - used_mb - hours_left = space_left / trend + hours_left = space_left / trend * range timeleft = levels.get("trend_timeleft") if timeleft: wa, cr = timeleft

13 years, 3 months

Check_MK Git: check_mk: FIX: df: fix status in case of critical trend and warning used

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dbde7d2c98fda2d5de974d9a78365b0c265239f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dbde7d2c98fda2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 14 10:07:29 2011 +0100 FIX: df: fix status in case of critical trend and warning used --- ChangeLog | 1 + checks/df.include | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16de0ca..33e215e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ with index 1 * FIX: df: fix layout problems in PNP template * FIX: df: fix trend computation (thanks to Sebastian Talmon) + * FIX: df: fix status in case of critical trend and warning used 1.1.10: diff --git a/checks/df.include b/checks/df.include index 5314c3c..34356e0 100644 --- a/checks/df.include +++ b/checks/df.include @@ -229,7 +229,7 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, params): if used_mb >= crit_mb: status = 2 elif used_mb >= warn_mb: - status = 1 + status = max(1, status) if len(problems) > 0: infotext += " - " + ", ".join(problems)

13 years, 3 months

Check_MK Git: check_mk: FIX: df: fix display of trend warn/ crit in PNP-graph

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3a74af862dc22a0d50e15770b0290e0347a0d5b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a74af862dc22a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 14 10:26:48 2011 +0100 FIX: df: fix display of trend warn/crit in PNP-graph --- ChangeLog | 1 + checks/df.include | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 33e215e..dff84f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ * FIX: df: fix layout problems in PNP template * FIX: df: fix trend computation (thanks to Sebastian Talmon) * FIX: df: fix status in case of critical trend and warning used + * FIX: df: fix display of trend warn/crit in PNP-graph 1.1.10: diff --git a/checks/df.include b/checks/df.include index 34356e0..fd5edea 100644 --- a/checks/df.include +++ b/checks/df.include @@ -169,11 +169,14 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, params): trend = rate_avg * range_sec sign = trend > 0 and "+" or "" infotext += ", trend: %s%s / %g hours" % (sign, get_bytes_human_readable(trend * MB), range) + # levels for performance data + warn_perf, crit_perf = None, None # apply levels for absolute growth in MB / interval trend_mb = levels.get("trend_mb") if trend_mb: wa, cr = trend_mb + warn_perf, crit_perf = wa, cr if trend >= wa: problems.append("growing too fast (levels at %s/%s per %.1fh)!" % ( get_bytes_human_readable(wa * MB), get_bytes_human_readable(cr * MB), range)) @@ -190,6 +193,11 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, params): wa_perc, cr_perc = trend_perc wa = wa_perc / 100.0 * size_mb cr = cr_perc / 100.0 * size_mb + if warn_perf != None: + warn_perf = min(warn_perf, wa) + crit_perf = min(crit_perf, cr) + else: + warn_perf, crit_perf = wa, cr if trend >= wa: problems.append("growing too fast (levels at %.3f%%/%.3f%% per %.1fh)!" % ( wa_perc, cr_perc, range)) @@ -199,7 +207,7 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, params): problems[-1] += "!" if levels.get("trend_perfdata"): - perfdata.append(("trend", trend, wa, cr, 0, size_mb / range)) + perfdata.append(("trend", trend, warn_perf, crit_perf, 0, size_mb / range)) # compute time until filesystem is full (only for positive trend, of course) if trend > 0:

13 years, 3 months

Check_MK Git: check_mk: Agent simulator: fix sinus curve

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 54b8389ff5dca6f673e55b96f402e25fee28a0cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54b8389ff5dca6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 11 16:16:51 2011 +0100 Agent simulator: fix sinus curve --- modules/agent_simulator.py | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/modules/agent_simulator.py b/modules/agent_simulator.py index b6457dd..9847aec 100644 --- a/modules/agent_simulator.py +++ b/modules/agent_simulator.py @@ -3,7 +3,7 @@ import math def our_uptime(): - return int(float((file("/proc/uptime").read().split()[0]))) + return float((file("/proc/uptime").read().split()[0])) # replace simulator tags in output def agent_simulator_process(output): @@ -18,20 +18,24 @@ def agent_simulator_process(output): simfunc = output[i+2 : e] replacement = str(eval("agentsim_" + simfunc)) output = output[:i] + replacement + output[e+1:] - except: - pass + except Exception, e: + if opt_debug: + raise return output def agentsim_uptime(rate = 1.0, period = None): # period = sinus wave if period == None: - return our_uptime() * rate + return int(our_uptime() * rate) else: a = (rate * period) / (2.0 * math.pi) u = our_uptime() - return u * rate + int(a * math.sin(u / (2.0 * math.pi * period))) + return int(u * rate + int(a * math.sin(u * 2.0 * math.pi / period))) def agentsim_enum(values, period = 1): # period is in seconds - hit = our_uptime() / period % len(values) + hit = int(our_uptime()) / period % len(values) return values[hit] +def agentsim_sinus(base = 50, amplitude = 50, period = 300): + return math.sin(our_uptime() * 2.0 * math.pi / period) * amplitude + base +

13 years, 3 months

Check_MK Git: check_mk: Agent simulator use uptime(f, r) instead of sinus

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 01d57d7293e476949d49114f655b1f444dc3b7ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01d57d7293e476… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 11 16:02:05 2011 +0100 Agent simulator use uptime(f,r) instead of sinus --- modules/agent_simulator.py | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/modules/agent_simulator.py b/modules/agent_simulator.py index 8ecffbc..b6457dd 100644 --- a/modules/agent_simulator.py +++ b/modules/agent_simulator.py @@ -23,16 +23,15 @@ def agent_simulator_process(output): return output -def agentsim_uptime(factor = 1.0): - return our_uptime() * factor +def agentsim_uptime(rate = 1.0, period = None): # period = sinus wave + if period == None: + return our_uptime() * rate + else: + a = (rate * period) / (2.0 * math.pi) + u = our_uptime() + return u * rate + int(a * math.sin(u / (2.0 * math.pi * period))) def agentsim_enum(values, period = 1): # period is in seconds hit = our_uptime() / period % len(values) return values[hit] -# rate: average rate counter is raised per second -# period: period of sinus wave added to this (in seconds) -def agentsim_sinus(rate = 1, period = 360): - a = (rate * period) / (2.0 * math.pi) - u = our_uptime() - return u * rate + int(a * math.sin(u / (2.0 * math.pi * period)))

13 years, 3 months

← Newer
1
...
5
6
7
8
9
10
11
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2011