Checkmk git commits July 2018

checkmk-commits@lists.checkmk.com

10 participants
467 discussions

6325 FIX Fixed broken "Parameter rule set" link on check manpages

by Lars Michelsen

Module: check_mk Branch: master Commit: 64fec41aba23657a398d698bdb8359343099959f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64fec41aba2365… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 5 16:11:36 2018 +0200 6325 FIX Fixed broken "Parameter rule set" link on check manpages Change-Id: I556274d2986b9931cba832c992a002f2bcee41cf --- .werks/6325 | 10 ++++++++++ web/htdocs/wato.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/6325 b/.werks/6325 new file mode 100644 index 0000000..af11662 --- /dev/null +++ b/.werks/6325 @@ -0,0 +1,10 @@ +Title: Fixed broken "Parameter rule set" link on check manpages +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1530799839 +Class: fix + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d3776ce..9f7a6e0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16587,7 +16587,7 @@ class ModeCheckManPage(WatoMode): html.th(_("Parameter rule set")) html.open_td() html.icon_button(url, _("Edit parameter rule set for this check type"), "check_parameters") - html.write_text(' %s' % param_ruleset) + html.write(param_ruleset) html.close_td() html.close_tr() html.open_tr()

6 years, 2 months

Another fix for compiling mod_wsgi with SLES12SP0

by Lars Michelsen

Module: check_mk Branch: master Commit: ca7f44f718ecbf245824774476f17aa14746c5a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca7f44f718ecbf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 5 15:52:01 2018 +0200 Another fix for compiling mod_wsgi with SLES12SP0 Change-Id: I4868d8daa141fc7fe753525413af52d574963e38 --- omd/packages/mod_wsgi/Makefile | 5 +++ .../mod_wsgi/patches/0001-wsgi_fixVersionCheck.dif | 38 ++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/omd/packages/mod_wsgi/Makefile b/omd/packages/mod_wsgi/Makefile index c72dd7d..4cf27cb 100644 --- a/omd/packages/mod_wsgi/Makefile +++ b/omd/packages/mod_wsgi/Makefile @@ -29,6 +29,11 @@ endif build: check-python tar xzf $(DIR).tar.gz + set -e ; for p in patches/*.dif ; do \ + echo "applying $$p..." ; \ + patch -p1 -b -d $(DIR) < $$p ; \ + done + set -e ; \ export PYTHONPATH="$$PYTHONPATH:$(PACKAGE_PYTHON_PYTHONPATH)" ; \ export LDFLAGS="$(PACKAGE_PYTHON_LDFLAGS)" ; \ diff --git a/omd/packages/mod_wsgi/patches/0001-wsgi_fixVersionCheck.dif b/omd/packages/mod_wsgi/patches/0001-wsgi_fixVersionCheck.dif new file mode 100644 index 0000000..16fa7c6 --- /dev/null +++ b/omd/packages/mod_wsgi/patches/0001-wsgi_fixVersionCheck.dif @@ -0,0 +1,38 @@ +From c440dfa6000b8c608147cce98d163ead19e63643 Mon Sep 17 00:00:00 2001 +From: Robert Schweikert <rjschwei(a)suse.com> +Date: Fri, 30 Jan 2015 12:40:40 -0500 +Subject: [PATCH] - Fix the version check for the presence of the trailers + + Currently the minor version of the version check is set such that for + version 2.4.10 (minor 37) the entries trailers_in and trailers_out are + expected in the request_rec struct. However these members of the struct + do not show up until 2.4.12 (minor 41). + This fixes a compile error when + building against 2.4.10 + +--- + src/server/mod_wsgi.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/server/mod_wsgi.c b/src/server/mod_wsgi.c +index 30ddbe5..4813af8 100644 +--- a/src/server/mod_wsgi.c ++++ b/src/server/mod_wsgi.c +@@ -11440,7 +11440,7 @@ static int wsgi_hook_daemon_handler(conn_rec *c) + + int queue_timeout_occurred = 0; + +-#if ! (AP_MODULE_MAGIC_AT_LEAST(20120211, 37) || \ ++#if ! (AP_MODULE_MAGIC_AT_LEAST(20120211, 41) || \ + (AP_SERVER_MAJORVERSION_NUMBER == 2 && \ + AP_SERVER_MINORVERSION_NUMBER <= 2 && \ + AP_MODULE_MAGIC_AT_LEAST(20051115, 36))) +@@ -11539,7 +11539,7 @@ static int wsgi_hook_daemon_handler(conn_rec *c) + r->proto_input_filters = c->input_filters; + r->input_filters = r->proto_input_filters; + +-#if AP_MODULE_MAGIC_AT_LEAST(20120211, 37) || \ ++#if AP_MODULE_MAGIC_AT_LEAST(20120211, 41) || \ + (AP_SERVER_MAJORVERSION_NUMBER == 2 && \ + AP_SERVER_MINORVERSION_NUMBER <= 2 && \ + AP_MODULE_MAGIC_AT_LEAST(20051115, 36)) +-- +1.8.4.5

6 years, 2 months

Fixed wrong apxs2-prefork paths for SLES12 SP0

by Lars Michelsen

Module: check_mk Branch: master Commit: 71e8a88c69082c449f40a5b10fc004fbafcbac5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71e8a88c69082c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 5 13:30:59 2018 +0200 Fixed wrong apxs2-prefork paths for SLES12 SP0 Change-Id: Id1ad4f90a29caba69b14f948a63ab514b961e3f3 --- omd/packages/mod_wsgi/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/omd/packages/mod_wsgi/Makefile b/omd/packages/mod_wsgi/Makefile index 5dfc070..c72dd7d 100644 --- a/omd/packages/mod_wsgi/Makefile +++ b/omd/packages/mod_wsgi/Makefile @@ -20,6 +20,10 @@ endif ifneq ("$(wildcard /usr/sbin/apxs2-prefork)","") APXS=/usr/sbin/apxs2-prefork endif +# SLES12SP0 special case +ifneq ("$(wildcard /usr/bin/apxs2-prefork)","") + APXS=/usr/bin/apxs2-prefork +endif build: check-python

6 years, 2 months

Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: 71e5723f7d97ff9fea72f623abc8df59f8706aca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71e5723f7d97ff… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jul 5 13:04:05 2018 +0200 Minor cleanup Change-Id: I19fddd251ecd24641225fa18c7d1d373293fc4ca --- checks/brocade_fcport | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/checks/brocade_fcport b/checks/brocade_fcport index a2e3ff7..d12df26 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -126,7 +126,6 @@ def parse_brocade_fcport(info): if_table = [x + ["", x[-2]] for x in if_info] parsed = [] - for index, phystate, opstate, admstate, txwords, rxwords, txframes, \ rxframes, notxcredits, rxcrcs, rxencinframes, rxencoutframes, \ c3discards, brocade_speed, portname, porttype, ifspeed in if_table: @@ -177,7 +176,7 @@ def parse_brocade_fcport(info): "islspeed": islspeed, # Might be None "bbcredits": bbcredits, # Might be None }) - except: # missing vital data. Skipping this port + except ValueError: continue return parsed

6 years, 2 months

6119 FIX asciimail, mail: display the custom host and service notes URL correctly in notifications

by Tom Baerwinkel

Module: check_mk Branch: master Commit: fab45e2b3d7d747f33c542c91fb38ff8df70c43e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fab45e2b3d7d74… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Jul 5 11:33:47 2018 +0200 6119 FIX asciimail, mail: display the custom host and service notes URL correctly in notifications Change-Id: Id93aac1983f38d7c4a06ecda022dfc690ae2f71e --- .werks/6119 | 10 ++++++++++ notifications/asciimail | 5 +++++ notifications/mail | 7 +++++++ 3 files changed, 22 insertions(+) diff --git a/.werks/6119 b/.werks/6119 new file mode 100644 index 0000000..00e5256 --- /dev/null +++ b/.werks/6119 @@ -0,0 +1,10 @@ +Title: asciimail, mail: display the custom host and service notes URL correctly in notifications +Level: 1 +Component: notifications +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1530782196 + diff --git a/notifications/asciimail b/notifications/asciimail index c0a2d90..fbd11bf 100755 --- a/notifications/asciimail +++ b/notifications/asciimail @@ -66,6 +66,11 @@ def substitute_context(template, context): for varname, value in context.items(): template = template.replace('$'+varname+'$', value) + if re.search(r"\$[A-Z_][A-Z_0-9]*\$", template): + # Second pass to replace nested variables inside e.g. SERVICENOTESURL + for varname, value in context.items(): + template = template.replace('$'+varname+'$', value) + # Remove the rest of the variables and make them empty template = re.sub(r"\$[A-Z_][A-Z_0-9]*\$", "", template) return template diff --git a/notifications/mail b/notifications/mail index 8c4a8c4..7d5f749 100755 --- a/notifications/mail +++ b/notifications/mail @@ -394,14 +394,21 @@ tmpl_service_subject = 'Check_MK: $HOSTNAME$/$SERVICEDESC$ $EVENT_TXT$' opt_debug = '-d' in sys.argv bulk_mode = '--bulk' in sys.argv + class GraphException(Exception): pass + def substitute_context(template, context): # First replace all known variables for varname, value in context.items(): template = template.replace('$'+varname+'$', value) + if re.search(r"\$[A-Z_][A-Z_0-9]*\$", template): + # Second pass to replace nested variables inside e.g. SERVICENOTESURL + for varname, value in context.items(): + template = template.replace('$'+varname+'$', value) + # Debugging of variables. Create content only on demand if "$CONTEXT_ASCII$" in template or "$CONTEXT_HTML$" in template: template = replace_variable_context(template, context)

6 years, 2 months

6306 FIX check_mk_agent.aix: Prevent timeout of Check_MK service if LPARs of a PowerHA are hanging

by Simon Betz

Module: check_mk Branch: master Commit: bbbe07b68a1bd1aaa8e4f25d45ed0adfbe3c0736 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbbe07b68a1bd1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jul 5 11:27:21 2018 +0200 6306 FIX check_mk_agent.aix: Prevent timeout of Check_MK service if LPARs of a PowerHA are hanging Change-Id: I573146f561b9d1b3f23bffd8298ba924a66bebdf --- .werks/6306 | 11 +++++++++++ agents/check_mk_agent.aix | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/6306 b/.werks/6306 new file mode 100644 index 0000000..2c97859 --- /dev/null +++ b/.werks/6306 @@ -0,0 +1,11 @@ +Title: check_mk_agent.aix: Prevent timeout of Check_MK service if LPARs of a PowerHA are hanging +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1530782811 + + diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index dc7ad5f..e820990 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -337,13 +337,13 @@ then echo '<<<aix_hacmp_services>>>' if type clshowsrv ; then - clshowsrv -v + waitmax 5 clshowsrv -v else # fallback, hardcoded base installation path - /usr/es/sbin/cluster/utilities/clshowsrv -v + waitmax 5 /usr/es/sbin/cluster/utilities/clshowsrv -v fi echo '<<<aix_hacmp_resources:sep(58)>>>' - clRGinfo -s + waitmax 5 clRGinfo -s fi fi

6 years, 2 months

fixed werk formatting

by Andreas

Module: check_mk Branch: master Commit: d29c34d9d6e1fc24cbc54be2a5720a914881ad38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d29c34d9d6e1fc… Author: Andreas <ab(a)mathias-kettner.de> Date: Thu Jul 5 11:20:37 2018 +0200 fixed werk formatting Change-Id: I7925653623802aa62829bffc5532da2bbe807893 --- .werks/6096 | 78 ++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 41 insertions(+), 37 deletions(-) diff --git a/.werks/6096 b/.werks/6096 index 2eaa12f..061dfc4 100644 --- a/.werks/6096 +++ b/.werks/6096 @@ -38,44 +38,48 @@ Some other cleanups and modifications have been made on the way. The following changes have been made to the htmllib.html API: -html.set_cookie() -> html.response.set_cookie() -html.del_cookie() -> html.response.del_cookie() -html.get_request_header() -> html.request.get_request_header() -html.lowlevel_write() -> html._lowlevel_write() -html.remote_ip() -> html.request.remote_ip -html.is_ssl_request() -> html.request.is_ssl_request -html.request_method() -> html.request.request_method -html.get_user_agent() -> html.request.user_agent -html.get_referer() -> html.request.referer -html.requested_url() -> html.request.requested_url -html.request_uri() -> html.request.requested_url -html.http_redirect() -> html.response.http_redirect() -html.client_request_timeout() -> html.request.request_timeout -html.get_cookie_names() -> html.request.get_cookie_names() -html.has_cookie() -> html.request.has_cookie() -html.cookie() -> html.request.cookie() -html.uploaded_file() -> html.request.uploaded_file() -html.request_timeout() -> html.request.request_timeout -html.get_request_timeout() -> html.request.request_timeout -html.set_ignore_transids() -> html.transaction_ids.ignore() -html.get_transid() -> html.transaction_ids.get() -html.store_new_transids() -> html.transaction_ids.store_new() -html.urlencode_plus() -> html.urlencode() +<ul> +<li>html.set_cookie() -> html.response.set_cookie()</li> +<li>html.del_cookie() -> html.response.del_cookie()</li> +<li>html.get_request_header() -> html.request.get_request_header()</li> +<li>html.lowlevel_write() -> html._lowlevel_write()</li> +<li>html.remote_ip() -> html.request.remote_ip</li> +<li>html.is_ssl_request() -> html.request.is_ssl_request</li> +<li>html.request_method() -> html.request.request_method</li> +<li>html.get_user_agent() -> html.request.user_agent</li> +<li>html.get_referer() -> html.request.referer</li> +<li>html.requested_url() -> html.request.requested_url</li> +<li>html.request_uri() -> html.request.requested_url</li> +<li>html.http_redirect() -> html.response.http_redirect()</li> +<li>html.client_request_timeout() -> html.request.request_timeout</li> +<li>html.get_cookie_names() -> html.request.get_cookie_names()</li> +<li>html.has_cookie() -> html.request.has_cookie()</li> +<li>html.cookie() -> html.request.cookie()</li> +<li>html.uploaded_file() -> html.request.uploaded_file()</li> +<li>html.request_timeout() -> html.request.request_timeout</li> +<li>html.get_request_timeout() -> html.request.request_timeout</li> +<li>html.set_ignore_transids() -> html.transaction_ids.ignore()</li> +<li>html.get_transid() -> html.transaction_ids.get()</li> +<li>html.store_new_transids() -> html.transaction_ids.store_new()</li> +<li>html.urlencode_plus() -> html.urlencode()</li> +</ul> Dropped things: -html.add_keybinding() -html.add_keybidings() -html.disable_keybindings() -html.keybindings_enabled -html.keybindings -html.RETURN -html.SHIFT -html.CTRL -html.ALT -html.BACKSPACE -html.F1 -html.u8() -html.utf8_to_entities() -html.varencode() +<ul> +<li>html.add_keybinding()</li> +<li>html.add_keybidings()</li> +<li>html.disable_keybindings()</li> +<li>html.keybindings_enabled</li> +<li>html.keybindings</li> +<li>html.RETURN</li> +<li>html.SHIFT</li> +<li>html.CTRL</li> +<li>html.ALT</li> +<li>html.BACKSPACE</li> +<li>html.F1</li> +<li>html.u8()</li> +<li>html.utf8_to_entities()</li> +<li>html.varencode()</li> +</ul>

6 years, 2 months

Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: d1df143f24cd4e6c32c1473f8536209baaf0e09d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1df143f24cd4e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jul 5 10:55:28 2018 +0200 Minor cleanup Change-Id: I4c7597685c3b7a6ae2b0b15dadf3f29053ef4138 --- checks/aix_diskiod | 13 +++++-------- checks/hpux_lunstats | 15 +++++++-------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/checks/aix_diskiod b/checks/aix_diskiod index 78e21c0..bc86746 100644 --- a/checks/aix_diskiod +++ b/checks/aix_diskiod @@ -44,7 +44,7 @@ # 5. Kb_read -> Kilobytes read since system boot # 6. Kb_wrtn -> Kilobytes written since system boot -def aix_diskiod_convert(info): +def parse_aix_diskiod(info): #TODO use 'check_diskstat_dict' which needs the following format # disks = { "sda" : { # 'node' : None, @@ -70,20 +70,17 @@ def aix_diskiod_convert(info): return converted -def inventory_aix_diskiod(info): - return inventory_diskstat_generic(aix_diskiod_convert(info)) +def check_aix_diskiod(item, params, parsed): + return check_diskstat_generic(item, params, time.time(), parsed, mode='bytes') -def check_aix_diskiod(item, params, info): - return check_diskstat_generic(item, params, time.time(), aix_diskiod_convert(info), mode='bytes') - check_info["aix_diskiod"] = { + 'parse_function': parse_aix_diskiod, 'check_function': check_aix_diskiod, - 'inventory_function': inventory_aix_diskiod, + 'inventory_function': inventory_diskstat_generic, 'service_description': 'Disk IO %s', 'has_perfdata': True, 'node_info': True, 'group': 'disk_io', 'includes': [ "diskstat.include" ], } - diff --git a/checks/hpux_lunstats b/checks/hpux_lunstats index a76addc..33d0708 100644 --- a/checks/hpux_lunstats +++ b/checks/hpux_lunstats @@ -47,10 +47,8 @@ # STATISTICS FOR LUN :/dev/rdisk/disk6 -check_includes['hpux_lunstats'] = [ "diskstat.include" ] - # Convert info to output needed for generic diskstat check -def hpux_lunstats_convert(info): +def parse_hpux_lunstats(info): #TODO use 'check_diskstat_dict' which needs the following format # disks = { "sda" : { # 'node' : None, @@ -84,16 +82,17 @@ def hpux_lunstats_convert(info): luns.append((None, lun, bytes_read, bytes_written)) return luns -def check_hpux_lunstats(item, params, info): - return check_diskstat_generic(item, params, time.time(), hpux_lunstats_convert(info)) -def inventory_hpux_lunstats(info): - return inventory_diskstat_generic(hpux_lunstats_convert(info)) +def check_hpux_lunstats(item, params, parsed): + return check_diskstat_generic(item, params, time.time(), parsed) + check_info["hpux_lunstats"] = { + 'parse_function': parse_hpux_lunstats, 'check_function': check_hpux_lunstats, - 'inventory_function': inventory_hpux_lunstats, + 'inventory_function': inventory_diskstat_generic, 'service_description': 'Disk IO %s', 'has_perfdata': True, 'group': 'disk_io', + 'includes': [ "diskstat.include" ], }

6 years, 2 months

Fixed wrong apxs2-prefork paths for SLES

by Lars Michelsen

Module: check_mk Branch: master Commit: 95371d9d607a5a31ed6f919088ccc27f6765b69e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95371d9d607a5a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 5 10:02:12 2018 +0200 Fixed wrong apxs2-prefork paths for SLES Change-Id: I68648237929709adf68e10bece10cf724e8156b8 --- omd/packages/mod_wsgi/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omd/packages/mod_wsgi/Makefile b/omd/packages/mod_wsgi/Makefile index 9f2c247..5dfc070 100644 --- a/omd/packages/mod_wsgi/Makefile +++ b/omd/packages/mod_wsgi/Makefile @@ -17,8 +17,8 @@ endif # Special case to make compilation work with SLES11. It has apxs2 but we need # to use the MPM specific apxs2-prefork binary to make compilation find the # correct mpm.h. -ifneq ("$(wildcard /usr/bin/apxs2-prefork)","") - APXS=/usr/bin/apxs2-prefork +ifneq ("$(wildcard /usr/sbin/apxs2-prefork)","") + APXS=/usr/sbin/apxs2-prefork endif

6 years, 2 months

hr_mem got parse function

by Simon Betz

Module: check_mk Branch: master Commit: 34c8f35c931a511a5c7d6161334c7ad9b0d75403 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34c8f35c931a51… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jul 5 08:50:19 2018 +0200 hr_mem got parse function Change-Id: Iff809958a519597e1960f48a3087f9c3342bea1d --- checks/hr_mem | 86 ++++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 55 insertions(+), 31 deletions(-) diff --git a/checks/hr_mem b/checks/hr_mem index 772ede4..2025fdf 100644 --- a/checks/hr_mem +++ b/checks/hr_mem @@ -24,51 +24,73 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + +def parse_hr_mem(info): + map_types = { + '.1.3.6.1.2.1.25.2.1.1' : 'other', + '.1.3.6.1.2.1.25.2.1.2' : 'RAM', + '.1.3.6.1.2.1.25.2.1.3' : 'virtual memory', + '.1.3.6.1.2.1.25.2.1.4' : 'fixed disk', + '.1.3.6.1.2.1.25.2.1.5' : 'removeable disk', + '.1.3.6.1.2.1.25.2.1.6' : 'floppy disk', + '.1.3.6.1.2.1.25.2.1.7' : 'compact disk', + '.1.3.6.1.2.1.25.2.1.8' : 'RAM disk', + '.1.3.6.1.2.1.25.2.1.9' : 'flash memory', + '.1.3.6.1.2.1.25.2.1.10': 'network disk', + } + + parsed = {} + for hrtype, hrdescr, hrunits, hrsize, hrused in info: + try: + size = int(hrsize) * int(hrunits) / 1048576.0 + used = int(hrused) * int(hrunits) / 1048576.0 + parsed.setdefault(map_types[hrtype], []).append((hrdescr.lower(), size, used)) + except ValueError, KeyError: + pass + + return parsed + + memused_default_levels = (150.0, 200.0) + # Memory information is - together with filesystems - in # hrStorage. We need the entries of the types hrStorageVirtualMemory # and hrStorageRam -def inventory_hr_mem(info): +def inventory_hr_mem(parsed): # Do we find at least one entry concerning memory? - for hrtype, hrdescr, hrunits, hrsize, hrused in info: - if hrtype in [ ".1.3.6.1.2.1.25.2.1.2", - ".1.3.6.1.2.1.25.2.1.3" ]: - if saveint(hrsize) > 1: # some device have zero (broken) values - return [(None, "memused_default_levels")] + for _, size, __ in parsed.get('RAM', []) + parsed.get('virtual memory', []): + if size > 1: + # some device have zero (broken) values + return [(None, "memused_default_levels")] + -def check_hr_mem(_no_item, params, info): +def check_hr_mem(_no_item, params, parsed): # This check does not yet support averaging. We need to # convert it to mem.include if type(params) == dict: params = params["levels"] usage = {} - for hrtype, hrdescr, hrunits, hrsize, hrused in info: - if hrtype in [ ".1.3.6.1.2.1.25.2.1.2", - ".1.3.6.1.2.1.25.2.1.3" ]: - size = saveint(hrsize) * saveint(hrunits) / 1048576.0 - used = saveint(hrused) * saveint(hrunits) / 1048576.0 - # We use only the first entry of each type. We have - # seen devices (pfSense), that have lots of additional - # entries that are not useful. - if hrtype not in usage and hrdescr != "Virtual memory": - usage[hrtype] = (size, used) - - # Account for cached memory (this works at least for systems using - # the UCD snmpd (such as Linux based applicances) cached_mb = 0 - for hrtype, hrdescr, hrunits, hrsize, hrused in info: - if hrdescr in [ "Cached memory", "Memory buffers" ]: - hr_mem = saveint(hrused) - if hr_mem < 0: # some devices report negative used cache values... - hr_mem = saveint(hrsize) - cached_mb += hr_mem * saveint(hrunits) / 1048576.0 + for type_readable, entries in parsed.iteritems(): + for descr, size, used in entries: + if type_readable in ['RAM', 'virtual memory'] and descr != "virtual memory": + # We use only the first entry of each type. We have + # seen devices (pfSense), that have lots of additional + # entries that are not useful. + usage.setdefault(type_readable, (size, used)) + + if descr in [ "cached memory", "memory buffers" ] and used > 0: + # Account for cached memory (this works at least for systems using + # the UCD snmpd (such as Linux based applicances) + # some devices report negative used cache values... + cached_mb += used - totalram_mb, ramused_mb = usage.get(".1.3.6.1.2.1.25.2.1.2", (0,0)) + totalram_mb, ramused_mb = usage.get("RAM", (0, 0)) ramused_mb -= cached_mb - totalvirt_mb, virtused_mb = usage.get(".1.3.6.1.2.1.25.2.1.3", (0,0)) - totalmem_mb, totalused_mb = totalram_mb + totalvirt_mb, ramused_mb + virtused_mb + totalvirt_mb, virtused_mb = usage.get("virtual memory", (0, 0)) + totalmem_mb, totalused_mb = totalram_mb + totalvirt_mb, ramused_mb + virtused_mb if totalmem_mb > 0 and totalram_mb > 0: totalused_perc = 100 * totalused_mb / totalram_mb @@ -99,9 +121,11 @@ def check_hr_mem(_no_item, params, info): else: return (0, '%s' % infotext, perfdata) - return (3, "Invalid information. Total memory is empty.") + return 3, "Invalid information. Total memory is empty." + check_info["hr_mem"] = { + 'parse_function' : parse_hr_mem, 'inventory_function' : inventory_hr_mem, 'check_function' : check_hr_mem, 'service_description' : 'Memory used', @@ -112,7 +136,7 @@ check_info["hr_mem"] = { 4, # hrStorageAllocationUnits 5, # hrStorageSize 6, # hrStorageUsed - ]), + ]), # Some devices are reporting wrong data on # HOST-RESOURCES-MIB. Use UCD-MIB in these # cases instead

6 years, 2 months

← Newer
1
...
36
37
38
39
40
41
42
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2018