Checkmk git commits March 2015

checkmk-commits@lists.checkmk.com

7 participants
320 discussions

Check_MK Git: check_mk: #1229 MySQL: The MySQL Plugin now supports multiple instances

by Bastian Kuhn

Module: check_mk Branch: master Commit: 4ebbc7c38fd3b281d9b453c55b30e18252439a7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ebbc7c38fd3b2… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Mar 13 09:55:21 2015 +0100 #1229 MySQL: The MySQL Plugin now supports multiple instances For this new feature it was needed to pass the information about the used instance to the checks. Cause of this a re discovery is needed for all MySQL Hosts. Sorry for that. --- .werks/1229 | 11 ++++ ChangeLog | 2 + agents/plugins/mk_mysql | 56 ++++++++++++++---- checkman/mysql | 2 +- checkman/mysql.connections | 2 +- checkman/mysql.innodb_io | 2 +- checkman/mysql.sessions | 2 +- checkman/mysql_ping | 2 +- checkman/mysql_slave | 2 +- checks/mysql | 107 +++++++++++++++++++++------------- checks/mysql_capacity | 37 +++++++++--- checks/mysql_ping | 29 +++++++-- checks/mysql_slave | 45 ++++++++++---- web/plugins/wato/check_parameters.py | 22 +++++-- 14 files changed, 232 insertions(+), 89 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4ebbc7c38f…

9 years, 6 months

Check_MK Git: check_mk: merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: fde7baeb457f18848427b0992e6671cae69d401e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fde7baeb457f18… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Mar 13 09:55:50 2015 +0100 merge conflict ---

9 years, 6 months

Check_MK Git: check_mk: #2096 FIX jolokia_metrics: Now deal with missing thread related infos ( jboss might only send ThreadCount)

by Lars Michelsen

Module: check_mk Branch: master Commit: add5d0c995cb9b3d251dc4e2fa0059f16bf00b93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=add5d0c995cb9b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 13 09:03:40 2015 +0100 #2096 FIX jolokia_metrics: Now deal with missing thread related infos (jboss might only send ThreadCount) --- .werks/2096 | 10 ++++++++++ ChangeLog | 1 + checks/jolokia_metrics | 5 ++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/2096 b/.werks/2096 new file mode 100644 index 0000000..44217f4 --- /dev/null +++ b/.werks/2096 @@ -0,0 +1,10 @@ +Title: jolokia_metrics: Now deal with missing thread related infos (jboss might only send ThreadCount) +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1426233790 + + diff --git a/ChangeLog b/ChangeLog index e593b7e..c4d7ce0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -253,6 +253,7 @@ * 2101 FIX: cisco_temperature: check can now handle cases when no description of the sensor is available * 2103 FIX: mbg_lantime_ng_temp: levels were not working... NOTE: Please refer to the migration notes! + * 2096 FIX: jolokia_metrics: Now deal with missing thread related infos (jboss might only send ThreadCount) Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 8770010..fbddb46 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -327,7 +327,10 @@ def check_jolokia_metrics_threads(item, params, info): output = [] status = 0 for key in [ 'ThreadCount', 'DeamonThreadCount', 'PeakThreadCount', 'TotalStartedThreadCount' ]: - val = saveint(d[key]) + if key not in d: + continue # The keys might be optional (saw jboss only sending ThreadCount) + + val = int(d[key]) if key == 'ThreadCount': # Thread count might lead to a warn/crit state if val >= crit:

9 years, 6 months

Check_MK Git: check_mk: #2103 FIX mbg_lantime_ng_temp: levels were not working

by Goetz Golla

Module: check_mk Branch: master Commit: 8f3a013715a122f50529a4673a453b71b2685aab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f3a013715a122… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Mar 13 00:09:37 2015 +0100 #2103 FIX mbg_lantime_ng_temp: levels were not working please redo a service discovery to get a new service description for the service on your device --- .werks/2103 | 10 ++++++++++ ChangeLog | 2 ++ checkman/mbg_lantime_ng_temp | 3 +++ checks/mbg_lantime_ng_temp | 8 ++++---- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.werks/2103 b/.werks/2103 new file mode 100644 index 0000000..b7cf7c7 --- /dev/null +++ b/.werks/2103 @@ -0,0 +1,10 @@ +Title: mbg_lantime_ng_temp: levels were not working +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i1 +Date: 1426201624 +Class: fix + +please redo a service discovery to get a new service description for the +service on your device diff --git a/ChangeLog b/ChangeLog index 4305391..e593b7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -251,6 +251,8 @@ * 2094 FIX: Fixed missing agent section when ntpq times out after 5 seconds * 2095 FIX: oracle_crs_voting: Also handling voting disks with id 0 (seen on old CRS 10.2.0.5.0)... * 2101 FIX: cisco_temperature: check can now handle cases when no description of the sensor is available + * 2103 FIX: mbg_lantime_ng_temp: levels were not working... + 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/checkman/mbg_lantime_ng_temp b/checkman/mbg_lantime_ng_temp index 78657b6..0c76a45 100644 --- a/checkman/mbg_lantime_ng_temp +++ b/checkman/mbg_lantime_ng_temp @@ -10,6 +10,9 @@ description: inventory: One check per device is created. +item: + "System" + perfdata: The temperature diff --git a/checks/mbg_lantime_ng_temp b/checks/mbg_lantime_ng_temp index f32faea..624ef21 100644 --- a/checks/mbg_lantime_ng_temp +++ b/checks/mbg_lantime_ng_temp @@ -25,20 +25,20 @@ # Boston, MA 02110-1301 USA. factory_settings["mbg_lantime_ng_temp_default_levels"] = { - "levels": (90, 95), + "levels": (80, 90), # levels for system temperature } def inventory_mbg_lantime_ng_temp(info): if info: - return[ (None, {}) ] + return[ ("System", {}) ] -def check_mbg_lantime_ng_temp(_no_item, params, info): +def check_mbg_lantime_ng_temp(item, params, info): return check_temperature(float(info[0][0]), params) check_info["mbg_lantime_ng_temp"] = { "check_function" : check_mbg_lantime_ng_temp, "inventory_function" : inventory_mbg_lantime_ng_temp, - "service_description" : "Temperature", + "service_description" : "Temperature %s", "default_levels_variable" : "mbg_lantime_ng_temp_default_levels", "has_perfdata" : True, "group" : "temperature",

9 years, 6 months

Check_MK Git: check_mk: minor code rewrite

by Goetz Golla

Module: check_mk Branch: master Commit: b23c26f59d49bb007d401533d39e72411f702a96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b23c26f59d49bb… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Mar 12 23:27:12 2015 +0100 minor code rewrite --- checks/mbg_lantime.include | 4 ++-- checks/mbg_lantime_ng_fan | 20 +++++++++++--------- checks/mbg_lantime_ng_power | 8 +++++--- checks/mbg_lantime_ng_state | 9 +++++---- 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/checks/mbg_lantime.include b/checks/mbg_lantime.include index ecde50a..934e8a8 100644 --- a/checks/mbg_lantime.include +++ b/checks/mbg_lantime.include @@ -49,9 +49,9 @@ def check_mbg_lantime_state_common(states, _no_item, params, info): state = 0 levels_text = "" warn, crit = params["stratum"] - if int(stratum) > crit: + if int(stratum) >= crit: state = 2 - elif int(stratum) > warn: + elif int(stratum) >= warn: state = 1 if state != 0: levels_text = " (warn/crit at %d/%d)" % (warn, crit) diff --git a/checks/mbg_lantime_ng_fan b/checks/mbg_lantime_ng_fan index c14f0ce..41405a5 100644 --- a/checks/mbg_lantime_ng_fan +++ b/checks/mbg_lantime_ng_fan @@ -31,25 +31,27 @@ def inventory_mbg_lantime_ng_fan(info): def check_mbg_lantime_ng_fan(item, _no_params, info): fan_stati = { - "1": ("on", 0), - "2": ("off", 2), + "1": (0, "on"), + "2": (2, "off"), } fan_errors = { - "0": ("not available", 0), - "1": ("no", 0), - "2": ("yes", 2), + "0": (0, "not available"), + "1": (0, "no"), + "2": (2, "yes"), } for line in info: - index, status, error = line + index, fan_status, fan_error = line if index == item: - infotext = "%s, errors: %s" % (fan_stati[status][0], fan_errors[error][0]) - state = max(fan_stati[status][1], fan_errors[error][1]) + fan_state, fan_state_name = fan_states[fan_status] + error_state, error_name = fan_errors[fan_error] + infotext = "%s, errors: %s" % (fan_state_name, error_name) + state = max(fan_state, error_state) return state, infotext check_info["mbg_lantime_ng_fan"] = { "check_function" : check_mbg_lantime_ng_fan, "inventory_function" : inventory_mbg_lantime_ng_fan, - "service_description" : "Fan", + "service_description" : "Fan %s", "snmp_info" : (".1.3.6.1.4.1.5597.30.0.5.1.2.1", [ 1, # mgbLtNgSysFanIndex 2, # mgbLtNgSysFanStatus diff --git a/checks/mbg_lantime_ng_power b/checks/mbg_lantime_ng_power index 21d6356..175caf5 100644 --- a/checks/mbg_lantime_ng_power +++ b/checks/mbg_lantime_ng_power @@ -35,15 +35,17 @@ def check_mbg_lantime_ng_power(item, _no_params, info): "1" : ( 2, "down" ), "2" : ( 0, "up" ), } - for index, status in info: + for index, power_status in info: if item == index: - return power_states[status][0], "Status: %s" % power_states[status][1] + power_state, power_state_name = power_states[power_status] + infotext = "Status: %s" % power_state_name + return power_state, infotext check_info["mbg_lantime_ng_power"] = { "check_function" : check_mbg_lantime_ng_power, "inventory_function" : inventory_mbg_lantime_ng_power, - "service_description" : "Power Supply", + "service_description" : "Power Supply %s", "snmp_info" : (".1.3.6.1.4.1.5597.30.0.5.0.2.1", [ 1, # MBG-SNMP-LTNG-MIB::mbgLtNgSysPsIndex 2, # MBG-SNMP-LTNG-MIB::mbgLtNgSysPsStatus diff --git a/checks/mbg_lantime_ng_state b/checks/mbg_lantime_ng_state index 6c486b5..7ec3dbd 100644 --- a/checks/mbg_lantime_ng_state +++ b/checks/mbg_lantime_ng_state @@ -34,10 +34,11 @@ def check_mbg_lantime_ng_state(_no_item, params, info): '1': (2, 'not synchronized'), '2': (0, 'synchronized'), } - converted_info = info[0] - #Convert to microseconds - converted_info[3] = float(converted_info[3]) * 1000 - return check_mbg_lantime_state_common(states, _no_item, params, [converted_info]) + ntp_state, stratum, refclock_name = info[0][:-1] + # Convert to microseconds + refclock_offset = float(info[0][-1]) * 1000 + newinfo = [[ntp_state, stratum, refclock_name, refclock_offset]] + return check_mbg_lantime_state_common(states, _no_item, params, newinfo) check_info["mbg_lantime_ng_state"] = {

9 years, 6 months

Check_MK Git: check_mk: Fix failed in inventory when one of the extra sections is missing

by Mathias Kettner

Module: check_mk Branch: master Commit: 568ed1584d09dda92b9f6045daa46752d469ccfe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=568ed1584d09dd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 12 16:13:00 2015 +0100 Fix failed in inventory when one of the extra sections is missing --- modules/discovery.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/discovery.py b/modules/discovery.py index 9f87fb7..9e70635 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -230,10 +230,15 @@ def get_info_for_discovery(hostname, ipaddress, section_name, use_caches): with_node_info = add_nodeinfo(bare_info, es) parsed = apply_parse_function(with_node_info, es) info.append(parsed) + + except MKAgentError: + info.append(None) + except: if opt_debug: raise info.append(None) + return info #.

9 years, 6 months

Check_MK Git: check_mk: Better decision of how many digits to output in get_bytes_human_readable

by Mathias Kettner

Module: check_mk Branch: master Commit: b1ac75b0a39f3b57cf22d4d74e7d8d4f454ec352 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1ac75b0a39f3b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 12 16:15:40 2015 +0100 Better decision of how many digits to output in get_bytes_human_readable --- web/htdocs/lib.py | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index e77db8c..7e0ffe5 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -435,6 +435,7 @@ def num_split(s): first_word = regex("[0-9]").split(s)[0] return ( first_word.lower(), ) + num_split(s[len(first_word):]) + def number_human_readable(n, precision=1, unit="B"): base = 1024.0 if unit == "Bit": @@ -451,6 +452,7 @@ def number_human_readable(n, precision=1, unit="B"): else: return (f + "%s") % (n, unit) + def age_human_readable(secs, min_only=False): if secs < 0: return "- " + age_human_readable(-secs, min_only) @@ -476,6 +478,7 @@ def age_human_readable(secs, min_only=False): days = hours / 24 return "%d %s" % (days, _("days")) + def bytes_human_readable(b, base=1024.0, bytefrac=True, unit="B"): base = float(base) # Handle negative bytes correctly @@ -484,19 +487,36 @@ def bytes_human_readable(b, base=1024.0, bytefrac=True, unit="B"): prefix = '-' b *= -1 - if b >= base * base * base * base: - return '%s%.2f T%s' % (prefix, b / base / base / base / base, unit) - elif b >= base * base * base: - return '%s%.2f G%s' % (prefix, b / base / base / base, unit) - elif b >= base * base: - return '%s%.2f M%s' % (prefix, b / base / base, unit) + digits = 1 + if b >= base ** 4: + symbol = "T" + b /= base ** 4 + + elif b >= base ** 3: + symbol = "G" + b /= base ** 3 + + elif b >= base ** 2: + symbol = "M" + b /= base ** 2 + elif b >= base: - return '%s%.2f k%s' % (prefix, b / base, unit) - elif bytefrac: - return '%s%.2f %s' % (prefix, b, unit) - else: # Omit byte fractions - return '%s%.0f %s' % (prefix, b, unit) + symbol = "k" + b /= base + + else: + symbol = "" + + if not bytefrac: + digits = 0 + elif b >= 100: + digits = 0 + elif b >= 10: + digits = 1 + else: + digits = 2 + return "%%s%%.%df %%s%%s" % digits % (prefix, b, symbol, unit)

9 years, 6 months

Check_MK Git: check_mk: Fix option onwrap=0.0 in new get_rate() function

by Mathias Kettner

Module: check_mk Branch: master Commit: 409f3c6532718a53f58c36e20498c40d756cc8f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=409f3c6532718a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 12 16:14:18 2015 +0100 Fix option onwrap=0.0 in new get_rate() function --- modules/check_mk_base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 81643af..c48a12e 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -976,9 +976,9 @@ def get_rate(countername, this_time, this_val, allow_negative=False, onwrap=SKIP timedif, rate = get_counter(countername, this_time, this_val, allow_negative) return rate except MKCounterWrapped, e: - if onwrap == RAISE: + if onwrap is RAISE: raise - elif onwrap == SKIP: + elif onwrap is SKIP: global g_last_counter_wrap g_last_counter_wrap = e return 0.0

9 years, 6 months

Check_MK Git: check_mk: default.php: Fix problem with too long filename, add graph titles

by Mathias Kettner

Module: check_mk Branch: master Commit: fa30ad14678ec668e44caf1c1c9b549372d49b14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa30ad14678ec6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 12 16:16:20 2015 +0100 default.php: Fix problem with too long filename, add graph titles --- pnp-templates/default.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pnp-templates/default.php b/pnp-templates/default.php index 9c5bf89..3c67728 100644 --- a/pnp-templates/default.php +++ b/pnp-templates/default.php @@ -25,7 +25,7 @@ sort($perf_vars); $id_string = $NAGIOS_CHECK_COMMAND . ":" . implode(",", $perf_vars); # Get current state of previously cached template data for this ID -$template_cache_path = $template_cache_dir . "/" . $id_string; +$template_cache_path = $template_cache_dir . "/" . md5($id_string); if (file_exists($template_cache_path)) { $age = time() - filemtime($template_cache_path); if ($age < 60 * 10) @@ -60,9 +60,11 @@ if ($cache_state == "uptodate") { $rrdbase = substr($NAGIOS_XMLFILE, 0, strlen($NAGIOS_XMLFILE) - 4); $fd = fopen($template_cache_path, "r"); while (!feof($fd)) { + $dsname_line = trim(fgets($fd)); $option_line = trim(fgets($fd)); $graph_line = str_replace('$RRDBASE$', $rrdbase, fgets($fd)); - if ($option_line && $graph_line) { + if ($dsname_line && $option_line && $graph_line) { + $ds_name[] = $dsname_line; $opt[] = $option_line; $def[] = $graph_line; }

9 years, 6 months

Check_MK Git: check_mk: The <tt>diskstat</tt> check for Linux has been reimplemented from scratch. It now

by Mathias Kettner

Module: check_mk Branch: master Commit: 6f42e9ccef61a312816915aede937b67db52d333 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f42e9ccef61a3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 12 16:19:05 2015 +0100 The <tt>diskstat</tt> check for Linux has been reimplemented from scratch. It now gets much more specific metrics information like average wait time, IO queue length, latency, IOs per seconds und more. Six graphs are being created. Note: this check is new parametrized by a new rule set in WATO. You need to redo your configuration of this check, sorry. Also if you have a very old legacy setup with two seperate checks for read and write, you also need to rediscover. These checks are not longer supported. --- .werks/2137 | 16 ++ ChangeLog | 2 + checks/diskstat | 282 +++++++++++++++----- checks/diskstat.include | 158 +++++++++++ pnp-templates/check_mk-aix_diskiod.php | 2 +- pnp-templates/check_mk-emcvnx_disks.php | 2 +- .../check_mk-esx_vsphere_counters.diskio.php | 2 +- pnp-templates/check_mk-hpux_lunstats.php | 2 +- .../check_mk-ibm_svc_nodestats.diskio.php | 2 +- .../check_mk-ibm_svc_systemstats.diskio.php | 2 +- pnp-templates/check_mk-kernel.util.php | 64 ----- pnp-templates/check_mk-mysql.innodb_io.php | 2 +- pnp-templates/check_mk-winperf_phydisk.php | 2 +- ...check_mk-diskstat.php => template-diskstat.php} | 0 web/htdocs/metrics.py | 110 ++++++-- web/plugins/metrics/check_mk.py | 154 ++++++++++- web/plugins/perfometer/check_mk.py | 1 - web/plugins/wato/check_parameters.py | 67 ++++- 18 files changed, 706 insertions(+), 164 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6f42e9ccef…

9 years, 6 months

← Newer
1
...
17
18
19
20
21
22
23
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2015