Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64653 discussions

Check_MK Git: check_mk: qlogic_fcport: New Check for Fibre Channel Ports in QLogic SANbox FC Switches

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: ec5179cb6f9fc7887082109301a9063bffe78319 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec5179cb6f9fc7… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Jul 21 16:04:04 2014 +0200 qlogic_fcport: New Check for Fibre Channel Ports in QLogic SANbox FC Switches --- .werks/1132 | 8 ++ ChangeLog | 1 + checkman/qlogic_fcport | 45 +++++++ checks/qlogic_fcport | 199 ++++++++++++++++++++++++++++++ pnp-templates/check_mk-qlogic_fcport.php | 172 ++++++++++++++++++++++++++ web/plugins/perfometer/check_mk.py | 1 + 6 files changed, 426 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ec5179cb6f…

10 years, 2 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: ee14b15cdc64d2eb90895e5b4467f522069495aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee14b15cdc64d2… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Jul 21 16:03:42 2014 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 4880c9f..b4fd007 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1132 +1142

10 years, 2 months

Check_MK Git: check_mk: Small cleanup of pdu_gude

by Mathias Kettner

Module: check_mk Branch: master Commit: 2cb81012f03527d9450eafd720572144d0cf608c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2cb81012f03527… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 21 15:39:24 2014 +0200 Small cleanup of pdu_gude --- checkman/pdu_gude_8310 | 2 +- checks/pdu_gude.include | 48 ++++++++++++++++++++++++----------------------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/checkman/pdu_gude_8310 b/checkman/pdu_gude_8310 index 97b647c..a36e6a4 100644 --- a/checkman/pdu_gude_8310 +++ b/checkman/pdu_gude_8310 @@ -7,7 +7,7 @@ description: Monitors Power and Voltage on Gude PDU Units. item: - ID of the Phase + ID of the phase, an integer beginning with {1} for the first phase. perfdata: kWh, W, A, V, VA diff --git a/checks/pdu_gude.include b/checks/pdu_gude.include index 64fc745..cb9c2df 100644 --- a/checks/pdu_gude.include +++ b/checks/pdu_gude.include @@ -25,51 +25,53 @@ # Boston, MA 02110-1301 USA. pdu_gude_default_levels = { - "V" : ( 220, 210 ), - "A" : ( 15, 16 ), - "W" : ( 3500, 3600 ), - } + "V" : ( 220, 210 ), # Volt + "A" : ( 15, 16 ), # Ampere + "W" : ( 3500, 3600 ), # Watt +} + def inventory_pdu_gude(info): if len(info) > 0: - return [(x + 1, "pdu_gude_default_levels") for x in xrange(len(info))] + return [(x + 1, "pdu_gude_default_levels") for x in range(len(info))] + def check_pdu_gude(item, params, info): try: values = info[item - 1] except ValueError: - yield 3, "Item not found" + yield 3, "No phase %d found in agent output" % item return units = { 0 : ("kWh", 1000), - 1 : ("W", False ), - 2 : ("A", 1000), - 3 : ("V", False), - 4 : ("VA",False), + 1 : ("W", False), + 2 : ("A", 1000), + 3 : ("V", False), + 4 : ("VA", False), } - for pos, data in units.items(): - value = savefloat(values[pos]) - unit, div = data + for pos, (unit, div) in units.items(): + value = float(values[pos]) if div: value = value / div + infotext = "%.2f %s" % (value, unit) + warn, crit = params.get(unit, (None, None)) - perf = unit, value, warn, crit - message = "%.2f%s" % (value, unit) + perfdata = [ (unit, value, warn, crit) ] + status = 0 + if warn > crit: if value < crit: - yield 2, message, perf + status = 2 elif value < warn: - yield 1, message, perf - else: - yield 0, message, perf + status = 1 + else: if crit != None and value > crit: - yield 2, message, perf + status = 2 elif warn != None and value > warn: - yield 1, message, perf - else: - yield 0, message, perf + status = 1 + yield status, infotext, perfdata

10 years, 2 months

Check_MK Git: check_mk: Updated bug entries #2158

by Mathias Kettner

Module: check_mk Branch: master Commit: 680d3dd0737c80f11df27562a0bf9a4968bd9b71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=680d3dd0737c80… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 21 15:38:53 2014 +0200 Updated bug entries #2158 --- .bugs/2158 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2158 b/.bugs/2158 new file mode 100644 index 0000000..ae57849 --- /dev/null +++ b/.bugs/2158 @@ -0,0 +1,8 @@ +Title: Change all levels of all checks and use always value >= crit, not value > crit +Component: checks +State: open +Date: 2014-07-21 15:38:03 +Targetversion: future +Class: nastiness + +The behaviour of all checks needs to be consistent!

10 years, 2 months

Check_MK Git: check_mk: Removed link to nagios doku

by Mathias Kettner

Module: check_mk Branch: master Commit: 9ef4544ef971d206e1c9a2b88bc5525eb7e2f165 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ef4544ef971d2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 21 15:21:58 2014 +0200 Removed link to nagios doku --- web/htdocs/wato.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 84854b5..ddc6157 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9335,12 +9335,9 @@ def mode_edit_timeperiod(phase): html.write("</table>") # Exceptions - nagurl = "../nagios/docs/objectdefinitions.html#timeperiod" forms.section(_("Exceptions")) html.help(_("Here you can specify exceptional time ranges for certain " - "relative or absolute dates. Please consult the " - "<a target='_blank' href='%s'>Nagios documentation about " - "timeperiods</a> for examples." % nagurl)) + "dates in the form YYYY-MM-DD.")) exceptions = [] for k in timeperiod:

10 years, 2 months

Check_MK Git: check_mk: MegaCli: Agent now also supports the 64bit version (Thanks to Philipp Lemke)

by Bastian Kuhn

Module: check_mk Branch: master Commit: 555cbb5825f4852c6fdfb35b882536eec7b7a922 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=555cbb5825f485… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jul 21 15:17:45 2014 +0200 MegaCli: Agent now also supports the 64bit version (Thanks to Philipp Lemke) --- .werks/182 | 8 ++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 16 ++++++++++++---- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.werks/182 b/.werks/182 new file mode 100644 index 0000000..6f5aff3 --- /dev/null +++ b/.werks/182 @@ -0,0 +1,8 @@ +Title: MegaCli: Agent now also supports the 64bit version (Thanks to Philipp Lemke) +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1405948589 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 97e98c0..11664c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,7 @@ * 0637 jolokia_metrics.gc, jolokia_metrics.tp, jolokia_info: two new subchecks for the jolokia_metrics checks and better error handling for jolokia_info... * 1000 qlogic_sanbox.temp: New Check for temperature sensors in QLogic SANbox Fibre Channel Switches * 1001 qlogic_sanbox.psu: New Check for power supplies in QLogic SANbox Fibre Channel Switches + * 0182 MegaCli: Agent now also supports the 64bit version (Thanks to Philipp Lemke) * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index afb5de4..63b5a1a 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -317,19 +317,27 @@ fi # http://www.lsi.com/downloads/Public/MegaRAID%20Common%20Files/8.02.16_MegaC… if type MegaCli >/dev/null ; then + MegaCli_bin="MegaCli" +elif type MegaCli64 >/dev/null ; then + MegaCli_bin="MegaCli64" +else + MegaCli_bin="unknown" +fi + +if [ "$MegaCli_bin" != "unknown" ]; then echo '<<<megaraid_pdisks>>>' - for part in $(MegaCli -EncInfo -aALL -NoLog < /dev/null \ + for part in $($MegaCli_bin -EncInfo -aALL -NoLog < /dev/null \ | sed -rn 's/:/ /g; s/[[:space:]]+/ /g; s/^ //; s/ $//; s/Number of enclosures on adapter ([0-9]+).*/adapter \1/g; /^(Enclosure|Device ID|adapter) [0-9]+$/ p'); do [ $part = adapter ] && echo "" [ $part = 'Enclosure' ] && echo -ne "\ndev2enc" echo -n " $part" done echo - MegaCli -PDList -aALL -NoLog < /dev/null | egrep 'Enclosure|Raw Size|Slot Number|Device Id|Firmware state|Inquiry|Adapter' + $MegaCli_bin -PDList -aALL -NoLog < /dev/null | egrep 'Enclosure|Raw Size|Slot Number|Device Id|Firmware state|Inquiry|Adapter' echo '<<<megaraid_ldisks>>>' - MegaCli -LDInfo -Lall -aALL -NoLog < /dev/null | egrep 'Size|State|Number|Adapter|Virtual' + $MegaCli_bin -LDInfo -Lall -aALL -NoLog < /dev/null | egrep 'Size|State|Number|Adapter|Virtual' echo '<<<megaraid_bbu>>>' - MegaCli -AdpBbuCmd -GetBbuStatus -aALL -NoLog < /dev/null | grep -v Exit + $MegaCli_bin -AdpBbuCmd -GetBbuStatus -aALL -NoLog < /dev/null | grep -v Exit fi # 3WARE disk controller (by Radoslaw Bak)

10 years, 2 months

Check_MK Git: check_mk: Added yield support for inventory functions

by Bastian Kuhn

Module: check_mk Branch: master Commit: 300c23a1cb9759e9199caf99c3cecd76a16cad52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=300c23a1cb9759… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jul 21 15:09:54 2014 +0200 Added yield support for inventory functions --- checks/omd_status | 4 +++- modules/check_mk.py | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/checks/omd_status b/checks/omd_status index ce68071..0eb5680 100644 --- a/checks/omd_status +++ b/checks/omd_status @@ -41,7 +41,9 @@ # OVERALL 2 def inventory_omd_status(info): - return [ ( line[0][1:-1], None ) for line in info if line[0][0] == '[' ] + for line in info: + if line[0][0] == '[': + yield line[0][1:-1], None def check_omd_status(item, _no_params, info): active = False diff --git a/modules/check_mk.py b/modules/check_mk.py index acca7d3..c657767 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2966,9 +2966,12 @@ def make_inventory(checkname, hostnamelist, check_only=False, include_state=Fals else: # New preferred style since 1.1.11i3: only one argument: info inventory = inventory_function(info) - if inventory == None: # tolerate if function does no explicit return inventory = [] + + # New yield based api style + if type(inventory) != list: + inventory = list(inventory) except Exception, e: if opt_debug: sys.stderr.write("Exception in inventory function of check type %s\n" % checkname)

10 years, 2 months

Check_MK Git: check_mk: New api: missing perf

by Bastian Kuhn

Module: check_mk Branch: master Commit: a22d6e771abcfde48d77ed5df75e84533ca6c9a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a22d6e771abcfd… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jul 21 14:58:11 2014 +0200 New api: missing perf --- modules/check_mk_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 3c9adf7..3ca0383 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1221,7 +1221,7 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): status = max(return_states) - 1 else: status = max(return_states) - result = status, ", ".join( x[1]+state_markers[x[0]] for x in messages ) + result = status, ", ".join( x[1]+state_markers[x[0]] for x in messages ), perf # handle check implementations that do not yet support the # handling of wrapped counters via exception. Do not submit

10 years, 2 months

Check_MK Git: check_mk: First version of next yield based check api

by Bastian Kuhn

Module: check_mk Branch: master Commit: e2fdab6ddec88ae9cb099cb9f99ce44e25359f07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2fdab6ddec88a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jul 21 14:55:37 2014 +0200 First version of next yield based check api --- checks/pdu_gude.include | 28 ++++++++++++---------------- modules/check_mk_base.py | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 18 deletions(-) diff --git a/checks/pdu_gude.include b/checks/pdu_gude.include index 054a7de..64fc745 100644 --- a/checks/pdu_gude.include +++ b/checks/pdu_gude.include @@ -38,7 +38,8 @@ def check_pdu_gude(item, params, info): try: values = info[item - 1] except ValueError: - return (3, "Item not found") + yield 3, "Item not found" + return units = { 0 : ("kWh", 1000), @@ -48,32 +49,27 @@ def check_pdu_gude(item, params, info): 4 : ("VA",False), } - message = [] - perf = [] - state = 0 for pos, data in units.items(): value = savefloat(values[pos]) unit, div = data if div: value = value / div warn, crit = params.get(unit, (None, None)) - perf.append((unit, value, warn, crit)) - label = "" + perf = unit, value, warn, crit + message = "%.2f%s" % (value, unit) if warn > crit: if value < crit: - state = 2 - label = "(!!)" + yield 2, message, perf elif value < warn: - state = max(state, 1) - label = "(!)" + yield 1, message, perf + else: + yield 0, message, perf else: if crit != None and value > crit: - state = 2 - label = "(!!)" + yield 2, message, perf elif warn != None and value > warn: - state = max(state, 1) - label = "(!)" - message.append("%.2f%s%s" % (value, unit, label)) + yield 1, message, perf + else: + yield 0, message, perf - return(state, ", ".join(message), perf) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index bfea8f7..b165056 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1179,6 +1179,35 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): try: dont_submit = False result = check_function(item, params, info) + # the new api doesen't return a tuple, + # it's yield based instead. + if type(result) != tuple: + messages = [] + perf = [] + for line in result: + messages.append(( line[0], line[1] )) + if len(line) == 3: + # there can be a single perf value (tuple) + # or a list of multiple perf values + if type(line[2]) == tuple: + perf.append(line[2]) + elif type(line[2]) == list: + perf += list + # Check funktion returns only a single line + if len(messages) == 1: + result = messages[0][0], messages[0][1], perf + else: + # Get the overall status + return_states = [ x[0] for x in messages ] + if 3 in return_states: + if not 2 in return_states and not 1 in return_states: + status = 3 + else: + status = max(return_states) - 1 + else: + status = max(return_states) + result = status, ", ".join( x[1]+state_markers[x[0]] for x in messages ) + # handle check implementations that do not yet support the # handling of wrapped counters via exception. Do not submit # any check result in that case: @@ -1618,8 +1647,8 @@ def get_regex(pattern): # Names of texts usually output by checks nagios_state_names = ["OK", "WARN", "CRIT", "UNKNOWN"] -# Symbolic representations of states -state_markers = ["(.)", "(!)", "(!!)", "(?)"] +# Symbolic representations of states (Needed for new 2.0 check api) +state_markers = ["", "(!)", "(!!)", "(?)"] # int() function that return 0 for strings the # cannot be converted to a number

10 years, 2 months

Check_MK Git: check_mk: Syntax fix

by Goetz Golla

Module: check_mk Branch: master Commit: f494cae4bd94ed1a103c7ee77d216f1f54dcbdab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f494cae4bd94ed… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Jul 21 13:44:24 2014 +0200 Syntax fix --- doc/treasures/host_to_ping_check.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/treasures/host_to_ping_check.sh b/doc/treasures/host_to_ping_check.sh new file mode 100644 index 0000000..277aff2 --- /dev/null +++ b/doc/treasures/host_to_ping_check.sh @@ -0,0 +1 @@ +find . -name _HOST_\* | sed -re 's/(\S*)_HOST_(\S*)/\1_HOST_\2 \1PING\2/' | xargs -n 2 cp

10 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits