Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

Check_MK Git: check_mk: Remove bogus space for % in df output

by Mathias Kettner

Module: check_mk Branch: master Commit: 9ca1226c60575ac973166dad489e500787c729da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ca1226c60575a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 31 14:40:35 2014 +0100 Remove bogus space for % in df output --- checks/df.include | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/checks/df.include b/checks/df.include index cf55dd7..b6de5d7 100644 --- a/checks/df.include +++ b/checks/df.include @@ -203,7 +203,7 @@ def get_filesystem_levels(host, mountpoint, size_gb, params): crit_scaled *= -1 else: label = 'levels at' - levels["levels_text"] = "(%s %.2f/%.2f %%)" % (label, warn_scaled, crit_scaled) + levels["levels_text"] = "(%s %.2f/%.2f%%)" % (label, warn_scaled, crit_scaled) else: if warn * mega < 0 and crit * mega < 0: label = 'levels at free space below' @@ -306,10 +306,10 @@ def df_check_filesystem_single(hostname, mountpoint, size_mb, avail_mb, inodes_t perfdata = [(perf_var, str(used_mb) + 'MB', warn_mb, crit_mb, 0, size_mb)] if size_gb < 10240: - infotext = "%.1f %% used (%.2f of %.2f GB), %s" % \ + infotext = "%.1f%% used (%.2f of %.2f GB), %s" % \ (used_perc, used_mb / 1024.0, size_gb, levels["levels_text"]) else: - infotext = "%.1f %% used (%.2f of %.2f TB), %s" % \ + infotext = "%.1f%% used (%.2f of %.2f TB), %s" % \ (used_perc, used_mb / 1024.0 / 1024.0, size_gb / 1024.0, levels["levels_text"]) # Trends. The trends are computed in two steps. In the first step we @@ -384,7 +384,7 @@ def df_check_filesystem_single(hostname, mountpoint, size_mb, avail_mb, inodes_t else: warn_perf, crit_perf = wa, cr if trend >= wa: - problems.append("growing too fast (levels at %.3f %%/%.3f %% per %.1f h)(!" % + problems.append("growing too fast (levels at %.3f%%/%.3f%% per %.1f h)(!" % ( wa_perc, cr_perc, range)) status = max(1, status) if trend >= cr: @@ -484,7 +484,7 @@ def df_check_filesystem_single(hostname, mountpoint, size_mb, avail_mb, inodes_t elif inodes_warn > inodes_avail_perc: status = max(1, status) problems.append("less than %.02f%% inodes available(!)" % inodes_warn) - infotext += ", inodes available %dk/%0.2f %%" % (inodes_avail / 1000, inodes_avail_perc) + infotext += ", inodes available %dk/%0.2f%%" % (inodes_avail / 1000, inodes_avail_perc) if problems: infotext += " - %s" % ", ".join(problems)

9 years, 8 months

Check_MK Git: check_mk: Remove debug output in mem check

by Mathias Kettner

Module: check_mk Branch: master Commit: c3b0af5e77e43ba538bf1fcd15dfd8e6e94dc135 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3b0af5e77e43b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 23 13:56:09 2014 +0100 Remove debug output in mem check --- checks/mem | 3 --- 1 file changed, 3 deletions(-) diff --git a/checks/mem b/checks/mem index b9bd22b..75d362e 100644 --- a/checks/mem +++ b/checks/mem @@ -166,7 +166,6 @@ def check_mem_levels(title, used, total, levels, of_what=None, of_value=None): # Predictive Levels nur für ausgewählte Werte zulassen. # return check_levels(used, levels[1], unit = "GB") - print levels warn, crit = levels[1] if how.startswith("perc_"): perc_used = 100.0 * float(used) / of_value @@ -299,8 +298,6 @@ def check_mem_linux(_no_item, params, info): if hwc: yield 2, "Hardware defect of %s" % get_bytes_human_readable(hwc) - pprint.pprint(meminfo) - check_info["mem.linux"] = {

9 years, 8 months

Check_MK Git: check_mk: mem: Checking of levels and check output works

by Mathias Kettner

Module: check_mk Branch: master Commit: 1657414506bfe8f4001f3e10ef648947276ad75d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1657414506bfe8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 23 13:55:44 2014 +0100 mem: Checking of levels and check output works Missing: output of permormance data, PNP templates, Perf-O-Meters, Manpage --- checks/mem | 184 ++++++++++++++++++++++++++++------ web/plugins/wato/check_parameters.py | 24 +++-- 2 files changed, 167 insertions(+), 41 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1657414506…

9 years, 8 months

Check_MK Git: check_mk: Intermediate step to new Linux Memory check

by Mathias Kettner

Module: check_mk Branch: master Commit: 9b4c0d0b618ba0010a1b018b06e5cb4c59176e00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b4c0d0b618ba0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 23 10:48:14 2014 +0100 Intermediate step to new Linux Memory check --- checks/mem | 205 +++++++++++++++++++++++++++++++--- web/plugins/wato/check_parameters.py | 120 +++++++++++++++++++- 2 files changed, 305 insertions(+), 20 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9b4c0d0b61…

9 years, 8 months

Check_MK Git: check_mk: Manpage for mem.linux

by Mathias Kettner

Module: check_mk Branch: master Commit: ae8e9a0b61693482a318a3f8391e18a4beaf7c58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae8e9a0b616934… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 29 13:56:48 2014 +0100 Manpage for mem.linux --- checkman/mem.linux | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/checkman/mem.linux b/checkman/mem.linux new file mode 100644 index 0000000..2dac9cc --- /dev/null +++ b/checkman/mem.linux @@ -0,0 +1,44 @@ +title: Detailed usage of RAM, Swap, VMalloc and other memory areas on Linux +agents: linux +catalog: os/kernel +license: GPL +distribution: check_mk +description: + This check measures all of the available memory readings of the complex + Linux memory management, which are found in {/proc/meminfo}. You can + define levels on every useful value, not only on RAM and Swap. Please + note that the Linux memory management is very complex. This check takes + all this into account and also correctly handles the concept of + caching and the fact that Linux swaps out inactive parts of processes + even if there is enough RAM left. + + This is not a bug, it's a feature. In fact it is the only way to do it right + (at least for Linux): What parts of a process currently reside in physical + RAM and what parts are swapped out is not related in a direct way with the + current memory usage. + + Linux tends to swap out parts of processes even if RAM is available. It + does this in situations where disk buffers (are assumed to) speed up the + overall performance more than keeping rarely used parts of processes in RAM. + + For example after a complete backup of your system you might experiance + that your swap usage has increased while you have more RAM free then + before. That is because Linux has taken RAM from processes in order to + increase disk buffers. + + Per default there are various crit/warn levels set. Please use WATO + for viewing and adapting these levels. + +item: + {None} + +inventory: + One item per Linux host is being created. + +perfdata: + For every value in {/proc/meminfo} one performance variable + is being output. + +[parameters] +parameters (dict): This dictionary is very complex. Please create + a configuration with WATO.

9 years, 8 months

Check_MK Git: check_mk: mem.linux: added Perf-O-Meter

by Mathias Kettner

Module: check_mk Branch: master Commit: 94b46da050d5147f07a63daeee1d2d8c7459982e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94b46da050d514… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 29 13:50:37 2014 +0100 mem.linux: added Perf-O-Meter --- web/plugins/perfometer/check_mk.py | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 08728f2..52ae655 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -181,15 +181,28 @@ perfometers["check_mk-lparstat_aix.cpu_util"] = perfometer_check_mk_kernel_util def perfometer_check_mk_mem_used(row, check_command, perf_data): h = '<table><tr>' - ram_total = float(perf_data[0][6]) - swap_total = float(perf_data[1][6]) - virt_total = ram_total + swap_total + for entry in perf_data: + # Get total and used RAM + if entry[0] == "ramused": + ram_used = float(entry[1]) # mem.include + ram_total = float(entry[6]) # mem.include + elif entry[0] == "mem_used": + ram_used = float(entry[1]) # mem.linux + elif entry[0] == "mem_total": + ram_total = float(entry[1]) # mem.linux + + # Get total and used SWAP + elif entry[0] == "swapused": + swap_used = float(entry[1]) # mem.include + swap_total = float(entry[6]) # mem.include + elif entry[0] == "swap_used": + swap_used = float(entry[1]) # mem.linux + elif entry[0] == "swap_total": + swap_total = float(entry[1]) # mem.linux - ram_used = float(perf_data[0][1]) - swap_used = float(perf_data[1][1]) + virt_total = ram_total + swap_total virt_used = ram_used + swap_used - state = row["service_state"] # paint used ram and swap ram_color, swap_color = "#80ff40", "#008030" h += perfometer_td(100 * ram_used / virt_total, ram_color) @@ -206,12 +219,12 @@ def perfometer_check_mk_mem_used(row, check_command, perf_data): return "%d%%" % (100 * (virt_used / ram_total)), h perfometers["check_mk-mem.used"] = perfometer_check_mk_mem_used +perfometers["check_mk-mem.linux"] = perfometer_check_mk_mem_used perfometers["check_mk-aix_memory"] = perfometer_check_mk_mem_used perfometers["check_mk-hr_mem"] = perfometer_check_mk_mem_used def perfometer_check_mk_mem_win(row, check_command, perf_data): # only show mem usage, do omit page file - state = row["service_state"] color = "#5090c0" ram_total = float(perf_data[0][6]) ram_used = float(perf_data[0][1])

9 years, 8 months

Check_MK Git: check_mk: mem.linux: levels and check almost finished

by Mathias Kettner

Module: check_mk Branch: master Commit: 8fdd05fb27c2ffcb564096adfb4fb69e00b2df17 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fdd05fb27c2ff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 29 10:23:42 2014 +0100 mem.linux: levels and check almost finished --- checks/mem | 83 ++++++++++++++++++---------------- web/plugins/wato/check_parameters.py | 26 +++++++---- 2 files changed, 61 insertions(+), 48 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8fdd05fb27…

9 years, 8 months

Check_MK Git: check_mk: mem.linux: PNP templates are finished.

by Mathias Kettner

Module: check_mk Branch: master Commit: 4752335e0e57cb764e72ccba8560bfae5943ebd6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4752335e0e57cb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 29 13:41:15 2014 +0100 mem.linux: PNP templates are finished. --- checks/mem | 19 ++++ modules/check_mk_base.py | 23 +++++ pnp-templates/check_mk-mem.linux.php | 165 ++++++++++++++++++++++++++++++++++ 3 files changed, 207 insertions(+) diff --git a/checks/mem b/checks/mem index 29b7483..318ca7e 100644 --- a/checks/mem +++ b/checks/mem @@ -304,6 +304,25 @@ def check_mem_linux(_no_item, params, info): if hwc: yield 2, "Hardware defect of %s" % get_bytes_human_readable(hwc) + # Now send performance data. We simply output *all* fields of meminfo + # except for a few really useless values + perfdata = [] + items = meminfo.items() + items.sort() + for name, value in items: + if name.startswith("DirectMap"): + continue + if name.startswith("Vmalloc") and meminfo["VmallocTotal"] > 2**40: # useless on 64 Bit system + continue + if name.startswith("Huge"): + if meminfo["HugePages_Total"] == 0: # omit useless data + continue + if name == "Hugepagesize": + continue # not needed + value = value * meminfo["Hugepagesize"] # convert number to actual memory size + perfdata.append((camelcase_to_underscored(name.replace("(", "_").replace(")","")), value)) + yield 0, "", perfdata + check_info["mem.linux"] = { diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index ab7feec..2770fdb 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1922,6 +1922,29 @@ def get_age_human_readable(secs): def quote_shell_string(s): return "'" + s.replace("'", "'\"'\"'") + "'" +# ThisIsACamel -> this_is_a_camel +def camelcase_to_underscored(name): + previous_lower = False + previous_underscore = True + result = "" + for c in name: + if c.isupper(): + if previous_lower and not previous_underscore: + result += "_" + previous_lower = False + previous_underscore = False + result += c.lower() + elif c == "_": + previous_lower = False + previous_underscore = True + result += c + else: + previous_lower = True + previous_underscore = False + result += c + return result + + # Check if a timeperiod is currently active. We have no other way than # doing a Livestatus query. This is not really nice, but if you have a better diff --git a/pnp-templates/check_mk-mem.linux.php b/pnp-templates/check_mk-mem.linux.php new file mode 100644 index 0000000..9bae6f4 --- /dev/null +++ b/pnp-templates/check_mk-mem.linux.php @@ -0,0 +1,165 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +$defopt = "--vertical-label 'Bytes' -l0 -b 1024 ". + "--color MGRID\"#cccccc\" --color GRID\"#dddddd\" "; + +# Work with names rather then numbers. +global $mem_defines; +$mem_defines = array(); +foreach ($NAME as $i => $n) { + $mem_defines[$n] = "DEF:$n=$RRDFILE[$i]:$DS[$i]:MAX "; +} + +function mem_area($varname, $color, $title, $stacked) +{ + return mem_curve("AREA", $varname, $color, $title, $stacked); +} + +function mem_line($varname, $color, $title, $stacked) +{ + return mem_curve("LINE1", $varname, $color, $title, $stacked); +} + +function mem_curve($how, $varname, $color, $title, $stacked) +{ + global $mem_defines; + $tit = sprintf("%-30s", $title); + if (isset($mem_defines[$varname])) { + $x = $mem_defines[$varname] . "$how:$varname#$color:\"$tit\""; + if ($stacked) + $x .= ":STACK"; + $x .= " "; + $x .= "CDEF:${varname}_gb=$varname,1073741824,/ "; + $x .= "GPRINT:${varname}_gb:LAST:\"%6.1lf GB last\" "; + $x .= "GPRINT:${varname}_gb:AVERAGE:\"%6.1lf GB avg\" "; + $x .= "GPRINT:${varname}_gb:MAX:\"%6.1lf GB max\\n\" "; + return $x; + } + else { + return ""; + } +} + + +# 1. Overview +$opt[] = $defopt . "--title \"RAM + Swap overview\""; +$def[] = "" + . mem_area("mem_total", "f0f0f0", "RAM installed", FALSE) + . mem_area("swap_total", "e0e0e0", "Swap installed", TRUE) + . mem_area("mem_used", "80ff40", "RAM used", FALSE) + . mem_area("swap_used", "408f20", "Swap used", TRUE) + ; + +# 2. Swap +$opt[] = $defopt . "--title \"Swap\""; +$def[] = "" + . mem_area("swap_total", "e0e0e0", "Swap installed", FALSE) + . mem_area("swap_used", "408f20", "Swap used", FALSE) + . mem_area("swap_cached", "5bebc9", "Swap cached", TRUE) + ; + +# 3. Caches +$opt[] = $defopt . "--title \"Caches\""; +$def[] = "" + . mem_area("cached", "91cceb", "File contents", FALSE) + . mem_area("buffers", "5bb9eb", "Filesystem structure", TRUE) + . mem_area("swap_cached", "5bebc9", "Swap cached", TRUE) + . mem_area("slab", "af91eb", "Slab (Various smaller caches)", TRUE) + ; + +# 4. Active & Inactive +$opt[] = $defopt . "--title \"Active and Inactive Memory\""; +if (isset($mem_defines["active_anon"])) { + $def[] = "" + . mem_area("active_anon", "ff4040", "Active (anonymous)", FALSE) + . mem_area("active_file", "ff8080", "Active (files)", TRUE) + . mem_area("inactive_anon", "377cab", "Inactive (anonymous)", FALSE) + . mem_area("inactive_file", "4eb0f2", "Inactive (files)", TRUE) + ; +} +else { + $def[] = "" + . mem_area("active", "ff4040", "Active", FALSE) + . mem_area("inactive", "4040ff", "Inactive", FALSE) + ; +} + +# 5. Dirty +$opt[] = $defopt . "--title \"Filesystem Writeback\""; +$def[] = "" + . mem_area("dirty", "f2904e", "Dirty disk blocks", FALSE) + . mem_area("writeback", "f2df40", "Currently being written", TRUE) + . mem_area("nfs_unstable", "c6f24e", "Modified NFS data", TRUE) + . mem_area("bounce", "4ef26c", "Bounce buffers", TRUE) + . mem_area("writeback_tmp", "4eeaf2", "Dirty FUSE data", TRUE) + ; + +# 6. Committing +$opt[] = $defopt . "--title \"Memory committing\""; +$def[] = "" + . mem_area("total_total", "f0f0f0", "Total virtual memory", FALSE) + . mem_area("committed_as", "40a080", "Committed memory", FALSE) + . mem_area("commit_limit", "e0e0e0", "Commit limit", TRUE) + ; + +# 7. Shared memory +if (isset($mem_defines["shmem"])) { + $opt[] = $defopt . "--title \"Shared memory\""; + $def[] = "" + . mem_area("shmem", "bf9111", "Shared memory", FALSE) + ; +} + +# 8. Unswappable memory +$opt[] = $defopt . "--title \"Memory that cannot be swapped out\""; +$def[] = "" + . mem_area("kernel_stack", "7192ad", "Kernel stack", FALSE) + . mem_area("page_tables", "71ad9f", "Page tables", TRUE) + . mem_area("mlocked", "a671ad", "Locked mmap() data", TRUE) + ; + +# 9. Huge Pages +if (isset($mem_defines["huge_pages_total"])) { +$opt[] = $defopt . "--title \"Huge Pages\""; + $def[] = "" + . mem_area("huge_pages_total", "f0f0f0", "Total", FALSE) + . mem_area("huge_pages_free", "f0a0f0", "Free", FALSE) + . mem_area("huge_pages_rsvd", "40f0f0", "Reserved part of Free", FALSE) + . mem_line("huge_pages_surp", "90f0b0", "Surplus", TRUE) + ; +} + +# 10. VMalloc +if (isset($mem_defines["vmalloc_total"])) { + $opt[] = $defopt . "--title \"VMalloc Address Space\""; + $def[] = "" + . mem_area("vmalloc_total", "f0f0f0", "Total address space", FALSE) + . mem_area("vmalloc_used", "aaf76f", "Allocated space", FALSE) + . mem_area("vmalloc_chunk", "c6f7e9", "Largest free chunk", TRUE) + ; +} + +?>

9 years, 8 months

Check_MK Git: check_mk: #1820 mem.linux: new dedicated check for Linux memory management

by Mathias Kettner

Module: check_mk Branch: master Commit: 2e3084a4d730aedd4631a51c254aa6c8fd71f9b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e3084a4d730ae… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 29 14:01:50 2014 +0100 #1820 mem.linux: new dedicated check for Linux memory management The new check {mem.linux} replaces {mem.used} and {mem.vmalloc} for Linux hosts. It takes core of almost every aspect of the Linux memory management, such as page tables, shared memory, overcommitting, disk writeback areas and much more. It outputs lots of performance data. Depending on the kernel version and of which memory areas are present you will see up to ten predefined PNP graphs for a single host! Please note that this is an incompatible change since the new check's performance data is not compatible with that one from the superseeded checks. The new check will be selected as soon as you redo the service discovery for your Linux hosts. --- .werks/1820 | 19 +++++++++++++++++++ ChangeLog | 2 ++ 2 files changed, 21 insertions(+) diff --git a/.werks/1820 b/.werks/1820 new file mode 100644 index 0000000..c84f2fe --- /dev/null +++ b/.werks/1820 @@ -0,0 +1,19 @@ +Title: mem.linux: new dedicated check for Linux memory management +Level: 2 +Component: checks +Compatible: incomp +Version: 1.2.7i1 +Date: 1419857838 +Class: feature + +The new check {mem.linux} replaces {mem.used} and {mem.vmalloc} for Linux +hosts. It takes core of almost every aspect of the Linux memory management, +such as page tables, shared memory, overcommitting, disk writeback areas +and much more. It outputs lots of performance data. Depending on the kernel +version and of which memory areas are present you will see up to ten predefined +PNP graphs for a single host! + +Please note that this is an incompatible change since the new check's +performance data is not compatible with that one from the superseeded +checks. The new check will be selected as soon as you redo the service +discovery for your Linux hosts. diff --git a/ChangeLog b/ChangeLog index 2043cff..29b760d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,8 @@ NOTE: Please refer to the migration notes! * 1459 netscaler_cpu: new check to monitor the CPUs of Citrix Netscaler Appliances * 1460 df_netscaler: new check to monitor filesystem usage on Citrix Netscaler devices + * 1820 mem.linux: new dedicated check for Linux memory management... + NOTE: Please refer to the migration notes! * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0...

9 years, 8 months

Check_MK Git: check_mk: #1819 FIX dell_poweredge_temp: Make output and service description consistent with other temperature checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 89d197e0e34ad11e250d1c51c799e6b9c314f420 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89d197e0e34ad1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Dec 28 16:11:35 2014 +0100 #1819 FIX dell_poweredge_temp: Make output and service description consistent with other temperature checks The temperature checks for Dell PowerEdge now use a service description that starts with <tt>Temperature</tt> and a plugin output that is consistent with the other temperature checks in the system. Note: since the name of the item has changed you need to reinventorize all these checks. Also new RRD will be created since the service description has changed. --- .werks/1819 | 15 +++++++++++ ChangeLog | 2 ++ checks/dell_poweredge_temp | 59 +++++++++++++++++++++++++------------------- 3 files changed, 50 insertions(+), 26 deletions(-) diff --git a/.werks/1819 b/.werks/1819 new file mode 100644 index 0000000..3352460 --- /dev/null +++ b/.werks/1819 @@ -0,0 +1,15 @@ +Title: dell_poweredge_temp: Make output and service description consistent with other temperature checks +Level: 1 +Component: checks +Class: fix +Compatible: incomp +State: unknown +Version: 1.2.7i1 +Date: 1419779377 + +The temperature checks for Dell PowerEdge now use a service description that starts with +<tt>Temperature</tt> and a plugin output that is consistent with the other temperature +checks in the system. + +Note: since the name of the item has changed you need to reinventorize all these checks. +Also new RRD will be created since the service description has changed. diff --git a/ChangeLog b/ChangeLog index 5d7bb3a..2043cff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,8 @@ * 1795 FIX: Fix internal exception in WATO rule for filesystems... * 1522 FIX: quantum_libsmall_door, quantum libsmall_status: Fixed broken scan function * 1818 FIX: dell_poweredge_cpu: Fix exception where BrandName is missing + * 1819 FIX: dell_poweredge_temp: Make output and service description consistent with other temperature checks... + NOTE: Please refer to the migration notes! Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/dell_poweredge_temp b/checks/dell_poweredge_temp index 81feb77..ae1ce39 100644 --- a/checks/dell_poweredge_temp +++ b/checks/dell_poweredge_temp @@ -24,48 +24,54 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +def dell_poweredge_temp_makeitem(chassisIndex, Index, LocationName): + if LocationName: + item = LocationName + else: + item = chassisIndex + "-" + Index + if item.endswith(" Temp"): + item = item[:-5] + return item + + def inventory_dell_poweredge_temp(info): - inventory = [] for line in info: if line[2] != '1': # StateSettings not 'unknown' - if line[5] != "": - inventory.append( ( line[5], None ) ) - else: - inventory.append( ( line[0]+"-"+line[1], None ) ) - return inventory + item = dell_poweredge_temp_makeitem(line[0], line[1], line[5]) + yield item, None + def check_dell_poweredge_temp(item, _no_params, info): for chassisIndex, Index, StateSettings, Status, Reading, LocationName, \ UpperCritical, UpperNonCritical in info: - if item == LocationName or item == chassisIndex+"-"+Index: - temp = saveint(Reading)/10.0 - warn = saveint(UpperNonCritical)/10.0 - crit = saveint(UpperCritical)/10.0 + if item == dell_poweredge_temp_makeitem(chassisIndex, Index, LocationName): + temp = int(Reading) / 10.0 + warn = int(UpperNonCritical) / 10.0 + crit = int(UpperCritical) / 10.0 state_table = { - "1" : ( "other", 1 ), - "2" : ( "unknown", 1 ), - "3" : ( "", 0 ), - "4" : ( "nonCriticalUpper", 1 ), - "5" : ( "CriticalUpper", 2 ), - "6" : ( "NonRecoverableUpper", 2 ), - "7" : ( "nonCriticalLower", 1 ), - "8" : ( "CriticalLower", 2 ), - "9" : ( "NonRecoverableLower", 2 ), - "10" : ( "failed", 2 ), + "1" : ("other", 1), + "2" : ("unknown", 1), + "3" : ("", 0), + "4" : ("nonCriticalUpper", 1), + "5" : ("CriticalUpper", 2), + "6" : ("NonRecoverableUpper", 2), + "7" : ("nonCriticalLower", 1), + "8" : ("CriticalLower", 2), + "9" : ("NonRecoverableLower", 2), + "10" : ("failed", 2), } - state_txt, state = state_table.get(Status, ( "unknown state", 2 )) - infotext = "%.1f Degrees (upper limits %s/%s) %s" % ( temp, warn, crit, state_txt ) - perfdata = [( "temp", temp, warn, crit )] + state_txt, state = state_table.get(Status, ("unknown state", 3)) + if state: + yield state, state_txt + yield check_temperature(temp, (warn, crit)) - return state, infotext, perfdata - return 3, "Temp Sensor not found" check_info["dell_poweredge_temp"] = { "check_function" : check_dell_poweredge_temp, "inventory_function" : inventory_dell_poweredge_temp, - "service_description" : "%s", + "service_description" : "Temperature %s", "has_perfdata" : True, "snmp_info" : ( ".1.3.6.1.4.1.674.10892.5.4.700.20.1", [ "1", # temperatureProbechassisIndex @@ -85,5 +91,6 @@ check_info["dell_poweredge_temp"] = { #"16", # temperatureProbeDiscreteReading ]), "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0') == ".1.3.6.1.4.1.674.10892.5", + "includes" : [ "temperature.include" ], }

9 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2014