Checkmk git commits March 2017

checkmk-commits@lists.checkmk.com

11 participants
379 discussions

4535 FIX emcvnx_writecache: Fixed discovery, id. if getcache command is not supported

by Simon Betz

Module: check_mk Branch: master Commit: e0ca4358fd5ba9530d78d080de0ba5ba37457216 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0ca4358fd5ba9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Mar 29 16:15:05 2017 +0200 4535 FIX emcvnx_writecache: Fixed discovery, id. if getcache command is not supported Change-Id: Id2c71e68b646935964cc50fc14debad4610464a6 --- .werks/4535 | 11 +++++++++++ checks/emcvnx_writecache | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/4535 b/.werks/4535 new file mode 100644 index 0000000..be2b0f9 --- /dev/null +++ b/.werks/4535 @@ -0,0 +1,11 @@ +Title: emcvnx_writecache: Fixed discovery, id. if getcache command is not supported +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1490796827 + + diff --git a/checks/emcvnx_writecache b/checks/emcvnx_writecache index 961e6ce..ac37cd4 100644 --- a/checks/emcvnx_writecache +++ b/checks/emcvnx_writecache @@ -30,7 +30,12 @@ def inventory_emcvnx_writecache(info): - return [ (line[0], None) for line in info ] + inventory = [] + for line in info: + if " ".join(line) == "Error: getcache command failed": + return [] + inventory.append((line[0], None)) + return inventory def check_emcvnx_writecache(item, params, info):

7 years, 6 months

Simple werk reclassication

by Mathias Kettner

Module: check_mk Branch: master Commit: d9b08b5a14438c6e14e15ee10469b2026ce4222a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9b08b5a14438c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 29 15:17:16 2017 +0200 Simple werk reclassication Change-Id: I17ce3930c9c590800357ae408a7eb62fec42ea8b --- .werks/1306 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/1306 b/.werks/1306 index 32b003f..6f66633 100644 --- a/.werks/1306 +++ b/.werks/1306 @@ -1,4 +1,4 @@ -Title: mkeventd: The recent event history can now be filtered by extended regular expressions +Title: Recent event history can now be filtered by extended regular expressions Level: 1 Component: ec Compatible: compat

7 years, 6 months

Minor code cleanup

by Konstantin Büttner

Module: check_mk Branch: master Commit: eec9233a1e675de2b7e6624bce94a06a37a711aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eec9233a1e675d… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Mar 29 14:42:51 2017 +0200 Minor code cleanup Change-Id: Id30ed7be75093c601aba70c82420cbf78b215928 --- checks/diskstat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/diskstat b/checks/diskstat index 5f3d6e2..175398a 100644 --- a/checks/diskstat +++ b/checks/diskstat @@ -340,8 +340,8 @@ def inventory_diskstat(parsed): (disk["node"], device) for device, disk in converted_disks.items()]) -def check_diskstat(item, params, info): - return check_diskstat_dict(item, params, diskstat_convert_info(info)) +def check_diskstat(item, params, parsed): + return check_diskstat_dict(item, params, diskstat_convert_info(parsed)) check_info["diskstat"] = {

7 years, 6 months

4533 FIX cisco_vpn_tunnel: Fixed handling if tunnel is not yet open and phase two values are not set

by Simon Betz

Module: check_mk Branch: master Commit: 416f493c5b8a1430bc3cb1f35f8fb0eb799221b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=416f493c5b8a14… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Mar 29 14:21:54 2017 +0200 4533 FIX cisco_vpn_tunnel: Fixed handling if tunnel is not yet open and phase two values are not set Change-Id: I6a46e618ae2229c8ffd2a4b32ec6c0b225570799 --- .werks/4533 | 11 +++++++++++ checks/cisco_vpn_tunnel | 6 ++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/4533 b/.werks/4533 new file mode 100644 index 0000000..fdfa98d --- /dev/null +++ b/.werks/4533 @@ -0,0 +1,11 @@ +Title: cisco_vpn_tunnel: Fixed handling if tunnel is not yet open and phase two values are not set +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1490789927 + + diff --git a/checks/cisco_vpn_tunnel b/checks/cisco_vpn_tunnel index 0ebdf62..c5dc96e 100644 --- a/checks/cisco_vpn_tunnel +++ b/checks/cisco_vpn_tunnel @@ -407,8 +407,10 @@ def parse_cisco_vpn_tunnel(info): for index, state, phase_2_in, phase_2_out in info[1]: if state != "2": pre_parsed.setdefault(index, {'in' : 0, 'out' : 0, 'state' : state}) - pre_parsed[index]['in'] += float(phase_2_in) - pre_parsed[index]['out'] += float(phase_2_out) + if phase_2_in: + pre_parsed[index]['in'] += float(phase_2_in) + if phase_2_out: + pre_parsed[index]['out'] += float(phase_2_out) parsed = {} for oid_end, remote_ip, phase_1_in, phase_1_out in info[0]:

7 years, 6 months

4467 FIX BI aggregation compilation: fixed race condition exception, also forks less processes for compilation

by Andreas Boesl

Module: check_mk Branch: master Commit: 23065007a132e21e8e3b35182f4844fde8ae2e87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23065007a132e2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 29 12:59:36 2017 +0200 4467 FIX BI aggregation compilation: fixed race condition exception, also forks less processes for compilation The compiliation process now spawns less worker processes for the compilation, which reduces the overall CPU load. Furthermore a race condition has been fixed, which was likely to happen when all of these conditions were true:<br> <ul> <li>there were several dozens BI requests per minute, e.g. from multiple web browsers</li> <li>a distributed montitoring setup started to deploy new configurations</li> <li>there were lots (>100) of BI aggregations configured</li> <ul> Change-Id: I0145f39016b6ee52be0e71c857d8ffc278ba70b9 --- .werks/4467 | 17 +++ web/htdocs/bi.py | 322 ++++++++++++++++--------------------------------------- 2 files changed, 110 insertions(+), 229 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=23065007a1…

7 years, 6 months

8757 didactum_sensors_outlet, didactum_can_sensors_analog,

by Simon Betz

didactum_can_sensors.humidity, didactum_can_sensors.voltage: new check for Didactum devices Message-ID: <58db9185.zvWDKREiHjobRXLT%si(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 1d2d6463291d2ffa45f93537f92a2709bbce588c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d2d6463291d2f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 24 13:43:29 2017 +0100 8757 didactum_sensors_outlet, didactum_can_sensors_analog, didactum_can_sensors.humidity, didactum_can_sensors.voltage: new check for Didactum devices Change-Id: I3e16f8c6151d0a76579ca28f027f793153201174 --- .werks/8757 | 11 +++ checkman/didactum_can_sensors_analog | 17 ++++ checkman/didactum_can_sensors_analog.humidity | 16 ++++ checkman/didactum_can_sensors_analog.voltage | 17 ++++ checkman/didactum_sensors_outlet | 16 ++++ checks/didactum.include | 22 +++++ checks/didactum_can_sensors_analog | 119 ++++++++++++++++++++++++++ checks/didactum_sensors_analog | 32 +++---- checks/didactum_sensors_discrete | 10 ++- checks/didactum_sensors_outlet | 51 +++++++++++ 10 files changed, 288 insertions(+), 23 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1d2d646329…

7 years, 6 months

4566 Linux/Solaris Agent: add support for comments and blank lines in fileinfo.cfg

by Marcel Schulte

Module: check_mk Branch: master Commit: 7ded72174cd1c77a716d80f9e902185c56c595f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ded72174cd1c7… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Wed Mar 29 12:05:37 2017 +0200 4566 Linux/Solaris Agent: add support for comments and blank lines in fileinfo.cfg Support for comments and/or blank lines in fileinfo.cfg has been added to the Linux and Solaris Agents. Those lines are simply ignored now. Change-Id: Ic859ff75e1abf2e2b3fa3d205760ccfc89338406 (cherry picked from commit 6aad87d45ff8c9380b8f3674bf893555bd14c935) --- .werks/4566 | 13 +++++++++++++ agents/check_mk_agent.linux | 9 ++++++--- agents/check_mk_agent.solaris | 25 ++++++++++++++----------- 3 files changed, 33 insertions(+), 14 deletions(-) diff --git a/.werks/4566 b/.werks/4566 new file mode 100644 index 0000000..b43d3bc --- /dev/null +++ b/.werks/4566 @@ -0,0 +1,13 @@ +Title: Linux/Solaris Agent: add support for comments and blank lines in fileinfo.cfg +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.4.0b5 +Date: 1490781773 +Class: feature + +Support for comments and/or blank lines in fileinfo.cfg has been added to the Linux and Solaris Agents. +Those lines are simply ignored now. + + diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index e44fb80..5abe471 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -774,10 +774,13 @@ if [ -r "$MK_CONFDIR/fileinfo.cfg" ] ; then date +%s for line in $(cat "$MK_CONFDIR/fileinfo.cfg") do - stat -c "%n|%s|%Y" "${line}" 2>/dev/null + # only work on lines containing files, skip e.g. comments and blank lines + if [ ${line:0:1} = "/" ]; then + stat -c "%n|%s|%Y" "${line}" 2>/dev/null - if [ $? -ne 0 ]; then - echo "$line|missing|$(date +%s)" + if [ $? -ne 0 ]; then + echo "$line|missing|$(date +%s)" + fi fi done fi diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 0f4f3eb..20e46a1 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -354,17 +354,20 @@ then # note: patterns in the fileinfo.cfg are resolved inside this loop for file in $(cat "$MK_CONFDIR/fileinfo.cfg") do - ls $file > /dev/null 2>&1 - if [ $? -eq 0 ]; then - echo $file | \ - /usr/bin/perl -e ' - while(my $file = <>) { - $file =~ s/\n$//; - ($device, $inode, $mode, $nlink, $uid, $gid, $rdev, $size, $atime, $mtime, $ctime, $blksize, $blocks) = stat($file); - print("$file|$size|$mtime\n"); - }' - else - echo "$file|missing|$(/usr/bin/perl -e 'print time')" + # only work on lines containing files, skip e.g. comments and blank lines + if [ ${file:0:1} = "/" ]; then + ls $file > /dev/null 2>&1 + if [ $? -eq 0 ]; then + echo $file | \ + /usr/bin/perl -e ' + while(my $file = <>) { + $file =~ s/\n$//; + ($device, $inode, $mode, $nlink, $uid, $gid, $rdev, $size, $atime, $mtime, $ctime, $blksize, $blocks) = stat($file); + print("$file|$size|$mtime\n"); + }' + else + echo "$file|missing|$(/usr/bin/perl -e 'print time')" + fi fi done fi

7 years, 6 months

8754 ipmi, ipmi_sensors: Now individual sensor levels can be configured

by Simon Betz

Module: check_mk Branch: master Commit: 949e4353e8d1720d2daf0d08cd5c9d557af6e258 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=949e4353e8d172… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Feb 23 15:15:00 2017 +0100 8754 ipmi, ipmi_sensors: Now individual sensor levels can be configured Change-Id: I7bf6f29fea795853a8d122e4068461c3240042a4 --- .werks/8754 | 10 +++++ checks/ipmi_common.include | 81 +++++++++++++++++++++++++----------- web/plugins/wato/check_parameters.py | 23 ++++++++-- 3 files changed, 87 insertions(+), 27 deletions(-) diff --git a/.werks/8754 b/.werks/8754 new file mode 100644 index 0000000..269607f --- /dev/null +++ b/.werks/8754 @@ -0,0 +1,10 @@ +Title: ipmi, ipmi_sensors: Now individual sensor levels can be configured +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1487859245 +Class: feature + + diff --git a/checks/ipmi_common.include b/checks/ipmi_common.include index f296c7b..1798ce7 100644 --- a/checks/ipmi_common.include +++ b/checks/ipmi_common.include @@ -49,6 +49,26 @@ def check_ipmi_common(item, params, parsed, what, status_txt_mapping): return check_ipmi_common_detailed(item, params, parsed[item], what, status_txt_mapping) +def ipmi_common_check_levels(sensorname, val, params): + warn_texts, crit_texts = [], [] + for this_sensorname, levels in params.get("numerical_sensor_levels", []): + if this_sensorname == sensorname and levels and val is not None: + if levels.get("lower"): + warn, crit = levels["lower"] + if val < crit: + crit_texts.append("%s %s (warn/crit below %s/%s)" % (sensorname, val, warn, crit)) + elif val < warn: + warn_texts.append("%s %s (warn/crit below %s/%s)" % (sensorname, val, warn, crit)) + if levels.get("upper"): + warn, crit = levels["upper"] + if val >= crit: + crit_texts.append("%s %s (warn/crit at %s/%s)" % (sensorname, val, warn, crit)) + elif val >= warn: + warn_texts.append("%s %s (warn/crit at %s/%s)" % (sensorname, val, warn, crit)) + break + return warn_texts, crit_texts + + def check_ipmi_common_detailed(item, params, data, what, status_txt_mapping): val = data["value"] unit = data["unit"] @@ -80,37 +100,42 @@ def check_ipmi_common_detailed(item, params, data, what, status_txt_mapping): # much data and is - in my opinion - useless. perfdata = [ ("value", val, None, crit_high) ] - state = status_txt_mapping(status_txt) + warn_texts = [] + crit_texts = [] + state = status_txt_mapping(status_txt) + if state: + for ty, warn, crit in [ + ("below", warn_low, crit_low), + ("at", warn_high, crit_high) ]: + if warn is not None and crit is None: + warn_texts.append("warn %s %s" % (ty, warn)) + elif warn is not None and crit is not None: + crit_texts.append("warn/crit %s %s/%s" % (ty, warn, crit)) + elif warn is None and crit is not None: + crit_texts.append("crit %s %s" % (ty, crit)) + for wato_status_txt, wato_status in params.get("sensor_states", []): if status_txt.startswith(wato_status_txt): state = wato_status break - lvlstxts = [] - for ty, warn, crit in [ - ("at", warn_low, crit_low), - ("below", warn_high, crit_high) ]: - lvlstxt = "" - if warn is not None and crit is None: - lvlstxt = "warn %s %s" % (ty, warn) - elif warn is not None and crit is not None: - lvlstxt = "warn/crit %s %s/%s" % (ty, warn, crit) - elif warn is None and crit is not None: - lvlstxt = "crit %s %s" % (ty, crit) - if lvlstxt: - if unit is not None: - lvlstxt += " %s" % unit - lvlstxts.append(lvlstxt) + these_warn_texts, these_crit_texts = ipmi_common_check_levels(item, val, params) + warn_texts += these_warn_texts + crit_texts += these_crit_texts levelsinfo = "" - if state and lvlstxts: - levelsinfo = " (%s)" % ", ".join(lvlstxts) + if crit_texts: + state = 2 + levelsinfo = " (%s)" % ", ".join(crit_texts) + elif warn_texts: + state = 1 + levelsinfo = " (%s)" % ", ".join(warn_texts) return state, "Status: %s%s" % (infotext, levelsinfo), perfdata def check_ipmi_common_summarized(params, parsed, status_txt_mapping): - worst_state = 0 + states = [0] warn_texts = [] crit_texts = [] ok_texts = [] @@ -139,6 +164,10 @@ def check_ipmi_common_summarized(params, parsed, status_txt_mapping): sensorstate = wato_status break + these_warn_texts, these_crit_texts = ipmi_common_check_levels(sensorname, val, params) + warn_texts += these_warn_texts + crit_texts += these_crit_texts + infotext = "%s (%s)" % (sensorname, status_txt) if sensorstate == 1: warn_texts.append(infotext) @@ -147,7 +176,7 @@ def check_ipmi_common_summarized(params, parsed, status_txt_mapping): else: ok_texts.append(infotext) - worst_state = max(worst_state, sensorstate) + states.append(sensorstate) if "amb" in sensorname or "Ambient" in sensorname: try: @@ -162,10 +191,11 @@ def check_ipmi_common_summarized(params, parsed, status_txt_mapping): perfdata = [] infotexts = [ "%d sensors" % len(parsed) ] - for title, texts, extrainfo in [ - ("OK", ok_texts, ""), ("WARN", warn_texts, "(!)"), - ("CRIT", crit_texts, "(!!)"), ("skipped", skipped_texts, "") ]: + for title, texts, extrainfo, text_state in [ + ("OK", ok_texts, "", 0), ("WARN", warn_texts, "(!)", 1), + ("CRIT", crit_texts, "(!!)", 2), ("skipped", skipped_texts, "", 0) ]: if len(parsed) == len(texts): + # Everything OK infotext = "%d sensors %s" % (len(parsed), title) if extrainfo: infotext += ": %s%s" % (", ".join(texts), extrainfo) @@ -178,4 +208,7 @@ def check_ipmi_common_summarized(params, parsed, status_txt_mapping): infotext += ": %s%s" % (", ".join(texts), extrainfo) infotexts.append( infotext ) - return worst_state, ' - '.join(infotexts), perfdata + if text_state: + states.append(text_state) + + return max(states), ' - '.join(infotexts), perfdata diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index bb82c0b..9c7ff91 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3902,7 +3902,7 @@ register_check_parameters( ( "ignored_sensors", ListOfStrings( title = _("Ignore the following IPMI sensors"), - help = _("Names of IPMI sensors that should be ignored during inventory " + help = _("Names of IPMI sensors that should be ignored during discovery " "and when summarizing." "The pattern specified here must match exactly the beginning of " "the actual sensor name (case sensitive)."), @@ -3912,7 +3912,7 @@ register_check_parameters( ( "ignored_sensorstates", ListOfStrings( title = _("Ignore the following IPMI sensor states"), - help = _("IPMI sensors with these states that should be ignored during inventory " + help = _("IPMI sensors with these states that should be ignored during discovery " "and when summarizing." "The pattern specified here must match exactly the beginning of " "the actual sensor name (case sensitive)."), @@ -3920,10 +3920,27 @@ register_check_parameters( default_value = [ "nr", "ns" ] ) ), + ( "numerical_sensor_levels", ListOf(Tuple( + elements = [ + TextAscii(title = _("Sensor name (only summary)"), + help = _("In summary mode you have to state the sensor name. " + "In single mode the sensor name comes from service description.") + ), + Dictionary( + elements = [ + ("lower", Tuple( + title = _("Lower levels"), + elements = [ Float(), Float() ])), + ("upper", Tuple( + title = _("Upper levels"), + elements = [ Float(), Float() ])), + ]), + ], + ), title = _("Set lower and upper levels for numerical sensors"))), ], ignored_keys = ["ignored_sensors", "ignored_sensor_states"], ), - TextAscii(title = _("The sensor name.")), + TextAscii(title = _("The sensor name")), "dict", )

7 years, 6 months

Reserved 10 Werk IDS

by Marcel Schulte

Module: check_mk Branch: master Commit: 85310428774aa254ed27d6b126b671d58b249297 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85310428774aa2… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Wed Mar 29 11:58:09 2017 +0200 Reserved 10 Werk IDS Change-Id: Ib03ce7ee9354f464c0b649db7bfd35dccf24ce6b --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 835fe1b..3c86c24 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4566 +4576

7 years, 6 months

made output similar to previous implementation

by Marcel Arentz

Module: check_mk Branch: master Commit: af7a8e97562eebb84aaf971c4669d0eb1670db01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af7a8e97562eeb… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Mar 29 10:21:04 2017 +0200 made output similar to previous implementation Change-Id: I2fa18b3a504ebbe2d0c0a580d5185b40c0db6a4b --- agents/check_mk_agent.linux | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 80c5413..e44fb80 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -692,12 +692,12 @@ if type postfix >/dev/null ; then if [ -e "$i/pid/master.pid" ]; then postfix_pid=$(cat $i/pid/master.pid | sed 's/ //g') # handle possible spaces in output if [[ $(readlink -- /proc/$postfix_pid/exe) == *"postfix/master"* ]]; then - echo "$i:is running:PID:$postfix_pid" | sed 's/\/var\/spool\///g' + echo "$i:the Postfix mail system is running:PID:$postfix_pid" | sed 's/\/var\/spool\///g' else echo "$i:PID file exists but instance is not running!" | sed 's/\/var\/spool\///g' fi else - echo "$i:not running" | sed 's/\/var\/spool\///g' + echo "$i:the Postfix mail system is not running" | sed 's/\/var\/spool\///g' fi done fi

7 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2017