Checkmk git commits March 2011

checkmk-commits@lists.checkmk.com

3 participants
205 discussions

Check_MK Git: check_mk: Updated bug entries

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 092b3da15f7e30a147ca8d7dceb04eac1ddc1ecb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=092b3da15f7e30… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 17 14:28:33 2011 +0100 Updated bug entries --- .bugs/182 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/182 b/.bugs/182 new file mode 100644 index 0000000..8a0a2b3 --- /dev/null +++ b/.bugs/182 @@ -0,0 +1,11 @@ +Title: extend oracle monitoring documentation to handle the windows plugin +Component: doku +Benefit: 3 +State: open +Cost: 3 +Date: 2011-03-17 14:26:18 +Class: feature + +Es gibt nun auch ein Agent Plugin für Oracle auf Windows. Das produziert die gleichen Ausgaben, +wie das Agent Plugin für Linux. Das sollte in der Oracle Monitoring Doku erwähnt werden und die +Installation noch kurz gesondert behandelt werden.

13 years, 3 months

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 80b22e62f482f17d4b4f4493e93aeb373f6596bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80b22e62f482f1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 18 15:26:11 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk Conflicts: ChangeLog ---

13 years, 3 months

Check_MK Git: check_mk: FIX: fix computation of weight when averaging

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ed838a78f64ae4c40f0384b06cdf86fa8380d8f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed838a78f64ae4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 17 13:44:07 2011 +0100 FIX: fix computation of weight when averaging --- ChangeLog | 1 + checks/df.include | 2 +- checks/diskstat | 2 +- checks/if.include | 2 +- modules/check_mk_base.py | 18 ++++++++++++++++-- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a368655..33adf6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.1.11i1: Core, Setup, etc.: + * FIX: fix computation of weight when averaging * SNMP scan functions can now call oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.*") That will return the *first* OID beginning with .1.3.6.1.4.1.9.9.13.1.3.1.3 * New config option: Set check_submission = "file" in order to write diff --git a/checks/df.include b/checks/df.include index fd5edea..01d0b22 100644 --- a/checks/df.include +++ b/checks/df.include @@ -163,7 +163,7 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, params): if levels.get("trend_perfdata"): perfdata.append(("growth", rate * range_sec)) # average trend, initialize with zero - timedif, rate_avg = get_average("df.%s.trend" % mountpoint, this_time, rate, range_sec, True) + timedif, rate_avg = get_average("df.%s.trend" % mountpoint, this_time, rate, range_sec / 60.0, True) # rate_avg is groth in MB/sec trend = rate_avg * range_sec diff --git a/checks/diskstat b/checks/diskstat index 7324ef7..cf9e03e 100644 --- a/checks/diskstat +++ b/checks/diskstat @@ -91,7 +91,7 @@ def check_diskstat_line(this_time, item, params, line): # compute average of the rate over ___ minutes if average_range != None: - timedif, avg = get_average(countername + ".avg", this_time, bytes_per_sec, average_range * 60) + timedif, avg = get_average(countername + ".avg", this_time, bytes_per_sec, average_range) perfdata.append( (what + ".avg", avg) ) bytes_per_sec = avg diff --git a/checks/if.include b/checks/if.include index 223051d..358e650 100644 --- a/checks/if.include +++ b/checks/if.include @@ -212,7 +212,7 @@ def check_if_common(item, params, info): # handle computation of average if average: - timedif, traffic_avg = get_average("if.%s.%s.avg" % (what, item), this_time, traffic, average * 60) + timedif, traffic_avg = get_average("if.%s.%s.avg" % (what, item), this_time, traffic, average) infotext += ", %dmin avg: %s/s" % (average, get_bytes_human_readable(traffic_avg)) perfdata.append( ("%s_avg_%d" % (what, average), traffic_avg, bw_warn, bw_crit, 0, ref_speed) ) traffic = traffic_avg # apply levels to average traffic diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 0cdfa75..9667140 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -651,10 +651,24 @@ def get_average(itemname, this_time, this_val, backlog, initialize_zero = True): last_time, last_val = g_counters.get(itemname) timedif = this_time - last_time - # compute weight, but how? - weight = math.e ** (-timedif / backlog) + # Compute the weight: We do it like this: First we assume that + # we get one sample per minute. And that backlog is the number + # of minutes we should average over. Then we want that the weight + # of the values of the last average minutes have a fraction of W% + # in the result and the rest until infinity the rest (1-W%). + # Then the weight can be computed as backlog'th root of 1-W + percentile = 0.50 + + weight_per_minute = (1 - percentile) ** (1.0 / backlog) + + # now let's compute the weight per second. This is done + weight = weight_per_minute ** (timedif / 60.0) new_val = last_val * weight + this_val * (1 - weight) + + # print "Alt: %.5f, Jetzt: %.5f, Timedif: %.1f, Gewicht: %.5f, Neu: %.5f" % \ + # (last_val, this_val, timedif, weight, new_val) + g_counters[itemname] = (this_time, new_val) return timedif, new_val

13 years, 3 months

Check_MK Git: check_mk: diskstat: updated man page

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 512cbf9c904ef316422a0b9f495d47adc0323492 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=512cbf9c904ef3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 17 14:00:55 2011 +0100 diskstat: updated man page --- checkman/diskstat | 97 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 81 insertions(+), 16 deletions(-) diff --git a/checkman/diskstat b/checkman/diskstat index 9ef5a5b..928034a 100644 --- a/checkman/diskstat +++ b/checkman/diskstat @@ -4,27 +4,92 @@ author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk description: - This check measures the cumulative throughput of - all block (disk) devices of a Linux host. In the current - version this check is always OK. There is now way - to define levels. This might come in a future release, - but is not trivial: A sensible level would have to - be matched against an average throughput over a - longer period of time, not just over one check cycle. + + This check measures the throughput of block devices (disks) on Linux + hosts. You can either have a single check for every single disk + (which is the default) or a summary check summing up the throughput + of all disks. + + For legacy reasons it is also possible (but not advisable) to have all disks + summarized but with a separate check for read and write (this is how this + check worked up to version 1.1.10). + + You can apply separate warning and critical levels for the read + and write throughput. Optionally you can have the check compute + average values on a configurable time period and have the levels + applied on the average instead of the current values. This makes + it possible to ignore short "peaks" and only trigger and longer + phases of high disk activity. item: - Either {"read"}- for input - or {"write"}- for output. + Either {"SUMMARY"} for a summarized check of alls disks or the + name of the disk device, e.g. {"sda"}. In order to support configurations + up to version 1.1.10 also the items {"read"} and {"write"} are supported. examples: - checks = [ - ("zbghora12", "diskstat", "read", None), - ("zbghora12", "diskstat", "write", None), - ] + # switch inventory behaviour to 1.1.10 mode + diskstat_inventory_mode = "legacy" + + # alternative: create one check for all disks + diskstat_inventory_mode = "summary" + + # Set default levels for diskstat + diskstat_default_levels = { + "read" : (10, 20), # level for read MB/sec + "write" : (20, 40), # level for write MB/sec + "average" : 15, # averaging in minutes + } + + # Alternative: just enable averaging over 10 minutes, + # do not apply levels: + diskstat_default_levels = { + "average" : 15 + } + + # Settings for certain hosts: + check_parameters += [ + ( {"write" : (20, 50), "average" : 10 }, [ "oracle" ], ALL_HOSTS, [ "Disk IO" ]) + ] perfdata: - One variable: the throughput since the last check - in in bytes(!) per second. + The disk throughput for read and write in bytes per second. If averaging + is turned on, then two additional values are sent: the averaged read and + write throughput. + + In the legacy mode only one variable: the throughput since the last check + in in bytes(!) per second, either for read or for write. inventory: - The inventory will automatically find two services: - one for {read} and one for {write}. + The inventory is configured via {diskstat_inventory_mode}. If this is set + to {"single"} (the default), then one check will be created for each + disk. If it is set to {"summary"} then only one service per host will be + created that has at least one hard disk. If set to {"legacy"} then a + separate check for read and write will be created (deprecated). + +[parameters] +"read": The levels to be applied to the read throughput. It this entry is + {None} or missing in the dictionary, then no levels are applied. This is + the defaut. The values are in MB per second. Setting {"read"} to {(20, 40)} + will warn if 20 MB/s is exceeded and make the check critical at 40 MB/s. + If averaging is turned on, then the levels are applied to the averaged + values! + +"write": The levels for the write throughput. + +"average": If this is not {None}, it will be interpreted as a time range + in minutes to do averaging over. Set this to {15} in order to have + the levels applied to a 15-minute average instead of the current + values (approx.). Turning the average on will also create two additional + performance values. Make sure that your graphing tool is setup to + a changing number of variables. + +[configuration] +diskstat_defaul_levels(dict): The default parameter used for inventorized + checks. This is preset to the empty dictionary. + That means that no averaging is done and no + levels are applied. + +diskstat_inventory_mode(string): Either {"single"} for one service per disk + or {"summary"} for the throughput of all disks summed up in one service. + Also possible is {"legacy"} for the old style mode (see above). Default + is {"single"}.

13 years, 3 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: 2fc908e0b32c6a905fa3ed346e02d68b34794049 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fc908e0b32c6a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 17 14:01:38 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: web/plugins/perfometer/check_mk.py ---

13 years, 3 months

Check_MK Git: check_mk: FIX: cmctc: add scan function

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e202be2d8a8cbdfc3e928f9b182af361f4e8b0cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e202be2d8a8cbd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 17 09:46:48 2011 +0100 FIX: cmctc: add scan function --- ChangeLog | 1 + checks/cmctc | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8bfd637..d6de430 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * FIX: df: fix status in case of critical trend and warning used * FIX: df: fix display of trend warn/crit in PNP-graph * FIX: cmctc: fix inventory in case of incomplete entries + * FIX: cmctc: add scan function * FIX: ucd_cpu_load and ucd_cpu_util: make scan function find Rittal * FIX: ucd_cpu_util: fix check in case of missing hi, si and st * printer_supply: Changed order of tests. When a printer reports -3 this diff --git a/checks/cmctc b/checks/cmctc index d74bc66..b00413d 100644 --- a/checks/cmctc +++ b/checks/cmctc @@ -95,3 +95,6 @@ snmp_info['cmctc'] = ( "7.2.1.2" ] ) + +snmp_scan_functions["cmctc.temp"] = \ + lambda oid: "CMC-TC" in oid(".1.3.6.1.2.1.1.1.0")

13 years, 3 months

Check_MK Git: check_mk: disktat: support legacy and summary mode

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 27d16e31ab6d8fd7dc3d3530a7915aed191ce6b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27d16e31ab6d8f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 17 10:37:32 2011 +0100 disktat: support legacy and summary mode --- checks/diskstat | 146 +++++++++++++++++++++++------------ pnp-templates/check_mk-diskstat.php | 86 ++++++++++++-------- web/plugins/perfometer/check_mk.py | 7 ++ 3 files changed, 155 insertions(+), 84 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=27d16e31ab…

13 years, 3 months

Check_MK Git: check_mk: diskstat: rewritten check: now show different devices

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4ceb309e259023ad5c329a032354162b27c40e72 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ceb309e259023… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 17 09:48:02 2011 +0100 diskstat: rewritten check: now show different devices --- ChangeLog | 1 + checkman/diskstat | 2 +- checks/diskstat | 99 +++++++++++++++++++++++----------- pnp-templates/check_mk-diskstat.php | 48 ++++++++++++++--- web/plugins/perfometer/check_mk.py | 13 +++++ web/plugins/views/perfometer.py | 28 ++++++++++ 6 files changed, 151 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index d6de430..a368655 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,7 @@ with index 1 * df: split PNP graphs for growth/trend into two graphs * omd_status: new check for checking status of OMD sites + * diskstat: rewritten check: now show different devices, r+w in one check 1.1.10: diff --git a/checkman/diskstat b/checkman/diskstat index 098bbb9..9ef5a5b 100644 --- a/checkman/diskstat +++ b/checkman/diskstat @@ -1,4 +1,4 @@ -title: Measure Disk IO +title: Monitor disk throughput on Linux agents: linux author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL diff --git a/checks/diskstat b/checks/diskstat index 8819cd2..e4bff2b 100644 --- a/checks/diskstat +++ b/checks/diskstat @@ -24,46 +24,81 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# <<<diskstat>>> +# 1300264105 +# 8 0 sda 691860 951191 13559915 491748 234686 197346 3359512 94944 0 56844 586312 +# 8 32 sdb 791860 91191 23589915 491748 234686 197346 3359512 94944 0 56844 586312 -def inventory_diskstat(checkname, info): - if len(info) > 1: # first line is timestamp - return [('read', "", "None"), - ('write', "", "None")] - -# Fields in /proc/diskstat -# At the beginning: major minor devicename -# -# Field 1 -- # of reads issued -# Field 2 -- # of reads merged, field 6 -- # of writes merged -# Field 3 -- # of sectors read -# Field 4 -- # of milliseconds spent reading -# Field 5 -- # of writes completed -# Field 7 -- # of sectors written -# Field 8 -- # of milliseconds spent writing -# Field 9 -- # of I/Os currently in progress -# Field 10 -- # of milliseconds spent doing I/Os -# Field 11 -- weighted # of milliseconds spent doing I/Os +# Fields in /proc/diskstats +# Index 0 -- major number +# Index 1 -- minor number +# Index 2 -- device name +# Index 3 -- # of reads issued +# Index 4 -- # of reads merged, field 6 -- # of writes merged +# Index 5 -- # of sectors read (a 512 Byte) +# Index 6 -- # of milliseconds spent reading +# Index 7 -- # of writes completed +# Index 8 -- # of sectors written (a 512 Byte) +# Index 9 -- # of milliseconds spent writing +# Index 10 -- # of I/Os currently in progress +# Index 11 -- # of milliseconds spent doing I/Os +# Index 12 -- weighted # of milliseconds spent doing I/Os # # -> Field 1 has index 3 +diskstat_default_levels = { +# "read" : (10, 20), # MB/sec +# "write" : (20, 40), # MB/sec +# "average" : 15, # min +} -# major minor device ... -def check_diskstat(item, params, info): - # sum up over all devices - if item == 'read': - index = 5 # sectors read - elif item == 'write': - index = 9 # sectors written - else: - return (3, "UNKNOWN - invalid item %s" % (item,)) +def inventory_diskstat(checkname, info): + inventory = [] + for line in info[1:]: + inventory.append( (line[2], "diskstat_default_levels" ) ) + return inventory +def check_diskstat(item, params, info): + average_range = params.get("average") this_time = int(info[0][0]) - this_val = sum([int(x[index]) for x in info[1:]]) + for line in info[1:]: + if line[2] == item: + perfdata = [] + infos = [] + status = 0 + for what, ctr in [ ("read", line[5]), ("write", line[8]) ]: + countername = "diskstat.%s.%s" % (item, what) + + # compute IO rate in bytes/sec + timedif, sectors_per_sec = get_counter(countername, this_time, int(ctr)) + bytes_per_sec = sectors_per_sec * 512 + infos.append("%s/sec %s" % (get_bytes_human_readable(bytes_per_sec), what)) + perfdata.append( (what, bytes_per_sec) ) + + # compute average of the rate over ___ minutes + if average_range != None: + timedif, avg = get_average(countername + ".avg", this_time, bytes_per_sec, average_range * 60) + perfdata.append( (what + ".avg", avg) ) + bytes_per_sec = avg + + # check levels + levels = params.get(what) + if levels != None: + mb_per_sec = bytes_per_sec / 1048576 + warn, crit = levels + if mb_per_sec >= crit: + status = 2 + infos[-1] += "!!" + elif mb_per_sec >= warn: + status = max(status, 1) + infos[-1] += "!" + + if average_range != None: + perfdata = [ perfdata[0], perfdata[2], perfdata[1], perfdata[3] ] - timedif, per_sec = get_counter("diskstat." + item, this_time, this_val) - mb_per_s = per_sec / 2048.0 # Diskstat output is in sectors a 512 Byte - perfdata = [ (item, "%dc" % this_val ) ] - return (0, "OK - %.1fMB/s (in last %d secs)" % (mb_per_s, timedif), perfdata) + return (status, nagios_state_names[status] + " - " + ", ".join(infos) , perfdata) + + return (3, "UNKNOWN - device missing") check_info['diskstat'] = (check_diskstat, "Disk IO %s", 1, inventory_diskstat) diff --git a/pnp-templates/check_mk-diskstat.php b/pnp-templates/check_mk-diskstat.php index 195c0e4..48b006d 100644 --- a/pnp-templates/check_mk-diskstat.php +++ b/pnp-templates/check_mk-diskstat.php @@ -23,12 +23,46 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -$opt[1] = "--vertical-label 'Througput (MByte/s)' -l0 -u 1 --title \"Disk throughput $hostname / $servicedesc\" "; +$parts = explode("_", $servicedesc); +$disk = $parts[2]; -$def[1] = "DEF:kb=$RRDFILE[1]:$DS[1]:AVERAGE " ; -$def[1] .= "CDEF:mb=kb,1024,/ " ; -$def[1] .= "AREA:mb#40c080 " ; -$def[1] .= "GPRINT:mb:LAST:\"%6.1lf MByte/s last\" " ; -$def[1] .= "GPRINT:mb:AVERAGE:\"%6.1lf MByte/s avg\" " ; -$def[1] .= "GPRINT:mb:MAX:\"%6.1lf MByte/s max\\n\" "; +$opt[1] = "--vertical-label 'Throughput (MB/s)' -X0 --title \"Disk throughput $hostname / $disk\" "; + +$def[1] = + "HRULE:0#a0a0a0 ". +# read + "DEF:read=$RRDFILE[1]:$DS[1]:MAX ". + "CDEF:read_mb=read,1048576,/ ". + "AREA:read_mb#40c080:\"Read \" ". + "GPRINT:read_mb:LAST:\"%6.1lf MByte/s last\" ". + "GPRINT:read_mb:AVERAGE:\"%6.1lf MByte/s avg\" ". + "GPRINT:read_mb:MAX:\"%6.1lf MByte/s max\\n\" "; + +# read average +if (isset($DS[3])) { + $def[1] .= + "DEF:read_avg=$RRDFILE[3]:$DS[3]:MAX ". + "CDEF:read_avg_mb=read_avg,1048576,/ ". + "LINE:read_avg_mb#202020 "; +} + +# write +$def[1] .= + "DEF:write=$RRDFILE[2]:$DS[2]:MAX ". + "CDEF:write_mb=write,1048576,/ ". + "CDEF:write_mb_neg=write_mb,-1,* ". + "AREA:write_mb_neg#4080c0:Write ". + "GPRINT:write_mb:LAST:\"%6.1lf MByte/s last\" ". + "GPRINT:write_mb:AVERAGE:\"%6.1lf MByte/s avg\" ". + "GPRINT:write_mb:MAX:\"%6.1lf MByte/s max\\n\" ". + ""; + +# write average +if (isset($DS[3])) { + $def[1] .= + "DEF:write_avg=$RRDFILE[4]:$DS[4]:MAX ". + "CDEF:write_avg_mb=write_avg,1048576,/ ". + "CDEF:write_avg_mb_neg=write_avg_mb,-1,* ". + "LINE:write_avg_mb_neg#202020 "; +} ?> diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index f7be5aa..8aaa712 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -271,3 +271,16 @@ def perfometer_check_mk_uptime(row, check_command, perf_data): perfometers["check_mk-uptime"] = perfometer_check_mk_uptime perfometers["check_mk-snmp_uptime"] = perfometer_check_mk_uptime + +def perfometer_check_mk_diskstat(row, check_command, perf_data): + read_bytes = float(perf_data[0][1]) + write_bytes = float(perf_data[1][1]) + + text = "%-.2fM/s %-.2fM/s" % \ + (read_bytes / (1024*1024.0), write_bytes / (1024*1024.0)) + + return text, perfometer_logarithmic_dual( + read_bytes, "#60e0a0", write_bytes, "#60a0e0", 5000000, 10) + +perfometers["check_mk-diskstat"] = perfometer_check_mk_diskstat + diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index afd7b84..2fdac40 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -61,6 +61,34 @@ def perfometer_logarithmic(value, half_value, base, color): "</tr></table>" +# Dual logarithmic Perf-O-Meter +def perfometer_logarithmic_dual(value_left, color_left, value_right, color_right, half_value, base): + result = '<table><tr>' + for where, value, color in [ + ("left", value_left, color_left), + ("right", value_right, color_right) ]: + value = float(value) + if value == 0.0: + pos = 0 + else: + half_value = float(half_value) + h = math.log(half_value, base) # value to be displayed at 50% + pos = 25 + 10.0 * (math.log(value, base) - h) + if pos < 1: + pos = 1 + if pos > 49: + pos = 49 + + if where == "right": + result += perfometer_td(pos, color) + \ + perfometer_td(50 - pos, "white") + else: + result += perfometer_td(50 - pos, "white") + \ + perfometer_td(pos, color) + + return result + '</tr></table>' + + perfometer_plugins_dir = defaults.web_dir + "/plugins/perfometer" for fn in os.listdir(perfometer_plugins_dir): if fn.endswith(".py"):

13 years, 3 months

Check_MK Git: check_mk: diskstat: summary service description uppercase

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5e00a949ac63ea71f57f42adb371104f415766a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e00a949ac63ea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 17 10:42:57 2011 +0100 diskstat: summary service description uppercase --- checks/diskstat | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/diskstat b/checks/diskstat index 1209706..8a919d6 100644 --- a/checks/diskstat +++ b/checks/diskstat @@ -63,7 +63,7 @@ def inventory_diskstat(checkname, info): return inventory elif len(info) > 1: if diskstat_inventory_mode == "summary": - return [ ( "summary", "diskstat_default_levels") ] + return [ ( "SUMMARY", "diskstat_default_levels") ] else: return [ ( "read", None ), ( "write", None ) ] @@ -114,7 +114,7 @@ def check_diskstat(item, params, info): this_time = int(info[0][0]) # summary mode - if item == 'summary': # summary mode + if item == 'SUMMARY': # summary mode summary_line = [0] * 13 for line in info[1:]: summary_line = map(lambda e: e[0] + int(e[1]), zip(summary_line, line[3:]))

13 years, 3 months

Check_MK Git: check_mk: diskstat: output warn/crit levels in graph

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3ab26207db81d61f071a1ce79b5f634010da2320 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ab26207db81d6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 17 11:13:08 2011 +0100 diskstat: output warn/crit levels in graph --- checks/diskstat | 11 ++++++++--- pnp-templates/check_mk-diskstat.php | 26 +++++++++++++++++++------- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/checks/diskstat b/checks/diskstat index 8a919d6..7324ef7 100644 --- a/checks/diskstat +++ b/checks/diskstat @@ -76,11 +76,18 @@ def check_diskstat_line(this_time, item, params, line): for what, ctr in [ ("read", line[5]), ("write", line[9]) ]: countername = "diskstat.%s.%s" % (item, what) + # unpack levels now, need also for perfdata + levels = params.get(what) + if levels: + warn, crit = levels + else: + warn, crit = None, None + # compute IO rate in bytes/sec timedif, sectors_per_sec = get_counter(countername, this_time, int(ctr)) bytes_per_sec = sectors_per_sec * 512 infos.append("%s/sec %s" % (get_bytes_human_readable(bytes_per_sec), what)) - perfdata.append( (what, bytes_per_sec) ) + perfdata.append( (what, bytes_per_sec, warn, crit) ) # compute average of the rate over ___ minutes if average_range != None: @@ -89,10 +96,8 @@ def check_diskstat_line(this_time, item, params, line): bytes_per_sec = avg # check levels - levels = params.get(what) if levels != None: mb_per_sec = bytes_per_sec / 1048576 - warn, crit = levels if mb_per_sec >= crit: status = 2 infos[-1] += "!!" diff --git a/pnp-templates/check_mk-diskstat.php b/pnp-templates/check_mk-diskstat.php index 23cb413..a39119f 100644 --- a/pnp-templates/check_mk-diskstat.php +++ b/pnp-templates/check_mk-diskstat.php @@ -36,9 +36,9 @@ if (isset($DS[2])) { "DEF:read=$RRDFILE[1]:$DS[1]:MAX ". "CDEF:read_mb=read,1048576,/ ". "AREA:read_mb#40c080:\"Read \" ". - "GPRINT:read_mb:LAST:\"%6.1lf MByte/s last\" ". - "GPRINT:read_mb:AVERAGE:\"%6.1lf MByte/s avg\" ". - "GPRINT:read_mb:MAX:\"%6.1lf MByte/s max\\n\" "; + "GPRINT:read_mb:LAST:\"%8.1lf MB/s last\" ". + "GPRINT:read_mb:AVERAGE:\"%6.1lf MB/s avg\" ". + "GPRINT:read_mb:MAX:\"%6.1lf MB/s max\\n\" "; # read average if (isset($DS[3])) { @@ -53,12 +53,24 @@ if (isset($DS[2])) { "DEF:write=$RRDFILE[2]:$DS[2]:MAX ". "CDEF:write_mb=write,1048576,/ ". "CDEF:write_mb_neg=write_mb,-1,* ". - "AREA:write_mb_neg#4080c0:Write ". - "GPRINT:write_mb:LAST:\"%6.1lf MByte/s last\" ". - "GPRINT:write_mb:AVERAGE:\"%6.1lf MByte/s avg\" ". - "GPRINT:write_mb:MAX:\"%6.1lf MByte/s max\\n\" ". + "AREA:write_mb_neg#4080c0:\"Write \" ". + "GPRINT:write_mb:LAST:\"%6.1lf MB/s last\" ". + "GPRINT:write_mb:AVERAGE:\"%6.1lf MB/s avg\" ". + "GPRINT:write_mb:MAX:\"%6.1lf MB/s max\\n\" ". ""; + # show levels for read + if ($WARN[1]) { + $def[1] .= "HRULE:$WARN[1]#ffd000:\"Warning for read at " . sprintf("%6.1f", $WARN[1]) . " MB/s \" "; + $def[1] .= "HRULE:$CRIT[1]#ff0000:\"Critical for read at " . sprintf("%6.1f", $CRIT[1]) . " MB/s\\n\" "; + } + + # show levels for write + if ($WARN[2]) { + $def[1] .= "HRULE:-$WARN[2]#ffd000:\"Warning for write at " . sprintf("%6.1f", $WARN[2]) . " MB/s \" "; + $def[1] .= "HRULE:-$CRIT[2]#ff0000:\"Critical for write at " . sprintf("%6.1f", $CRIT[2]) . " MB/s\\n\" "; + } + # write average if (isset($DS[3])) { $def[1] .=

13 years, 3 months

← Newer
1
2
3
4
5
6
7
8
9
...
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