Checkmk git commits December 2010

checkmk-commits@lists.checkmk.com

3 participants
155 discussions

Check_MK Git: check_mk: base: rename if.functions into if. include and check_libs into check_includes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7adb721130938d2108fae1145f1228a08d314d21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7adb721130938d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 8 13:22:37 2010 +0100 base: rename if.functions into if.include and check_libs into check_includes --- checks/if | 2 +- checks/{if.functions => if.include} | 0 checks/if64 | 2 +- modules/check_mk.py | 6 +++--- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/checks/if b/checks/if index 1c451d1..3a35a55 100644 --- a/checks/if +++ b/checks/if @@ -37,7 +37,7 @@ def if_convert_to_if64(info): return newinfo check_info['if'] = (check_if, "Interface %s", 1, inventory_if) -check_libs['if'] = [ "if.functions" ] +check_includes['if'] = [ "if.include" ] snmp_info['if'] = \ ( ".1.3.6.1.2.1.2.2.1", [ diff --git a/checks/if.functions b/checks/if.include similarity index 100% rename from checks/if.functions rename to checks/if.include diff --git a/checks/if64 b/checks/if64 index 79d21c4..6797c24 100644 --- a/checks/if64 +++ b/checks/if64 @@ -31,7 +31,7 @@ def check_if64(item, params, info): return check_if_common(item, params, info) check_info['if64'] = (check_if64, "Interface %s", 1, inventory_if64) -check_libs['if64'] = [ "if.functions" ] +check_includes['if64'] = [ "if.include" ] snmp_info['if64'] = \ ( ".1.3.6.1.2.1", [ diff --git a/modules/check_mk.py b/modules/check_mk.py index b5eec95..3062899 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -304,7 +304,7 @@ ip_to_hostname_cache = None # The following data structures will be filled by the various checks # found in the checks/ directory. check_info = {} # all known checks -check_libs = {} # library files needed by checks +check_includes = {} # library files needed by checks precompile_params = {} # optional functions for parameter precompilation, look at df for an example check_config_variables = [] # variables (names) in checks/* needed for check itself snmp_info = {} # whichs OIDs to fetch for which check (for tabular information) @@ -2025,11 +2025,11 @@ filesystem_default_levels = None filenames.add(path) # Add library files needed by check - for lib in check_libs.get(checktype, []): + for lib in check_includes.get(checktype, []): filenames.add(checks_dir + "/" + lib) output.write("check_info = {}\n" + - "check_libs = {}\n" + + "check_includes = {}\n" + "precompile_params = {}\n" + "check_config_variables = []\n" + "snmp_info = {}\n" +

13 years, 9 months

Check_MK Git: check_mk: if/if64: averaging, monitoring of unused ports

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b96d6183b965a9b7627c00fef64a18854efb2720 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b96d6183b965a9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 8 17:52:38 2010 +0100 if/if64: averaging, monitoring of unused ports --- ChangeLog | 4 + LIESMICH.zutun | 6 -- checks/if.include | 125 +++++++++++++++++++++++++++------------- modules/check_mk.py | 8 +- modules/check_mk_base.py | 11 +++- modules/snmp.py | 4 +- pnp-templates/check_mk-if.php | 28 ++++++++-- 7 files changed, 125 insertions(+), 61 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b96d6183b9…

13 years, 9 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 517b495d4f5caf66a7c8123fedf3964f6dab9f97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=517b495d4f5caf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 8 17:52:44 2010 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 9 months

Check_MK Git: check_mk: Fixed <<<cpu>>> output on SPARC machines with openSUSE

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 79210c0cccd50f91698bb4b606508958b0616ba3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79210c0cccd50f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 8 14:02:35 2010 +0100 Fixed <<<cpu>>> output on SPARC machines with openSUSE Thanks to Michael Kromer --- ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f3fcb7..92f23df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -101,6 +101,7 @@ * check_mk.only_from: new check for monitoring the IP address access restriction of the agent. The current Linux and Windows agents provide this information. * snmp_info check: Recoded not to use snmp_info_single anymore + * Linux Agent: Fixed <<<cpu>>> output on SPARC machines with openSUSE Multisite: * The custom open/close states of custom links are now stored for each diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 1837e7d..4b1ae52 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -117,7 +117,7 @@ egrep -v '^Swap:|^Mem:|total:' < /proc/meminfo # Load und Anzahl Prozesse echo '<<<cpu>>>' -echo "$(cat /proc/loadavg) $(grep ^processor < /proc/cpuinfo | wc -l)" +echo "$(cat /proc/loadavg) $(grep -E '^CPU|^processor' < /proc/cpuinfo | wc -l)" # Uptime echo '<<<uptime>>>'

13 years, 9 months

Check_MK Git: check_mk: df_netapp/df_netapp32: Made check inventory resistant against empty size values

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2f83a26d47653b932cd2568580b7232af8864af2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f83a26d47653b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 8 14:51:41 2010 +0100 df_netapp/df_netapp32: Made check inventory resistant against empty size values df_netapp32: Added better detection for possible 32bit counter wrap --- ChangeLog | 2 ++ checks/df_netapp | 2 +- checks/df_netapp32 | 16 +++++++++++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92f23df..6da71c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -102,6 +102,8 @@ agent. The current Linux and Windows agents provide this information. * snmp_info check: Recoded not to use snmp_info_single anymore * Linux Agent: Fixed <<<cpu>>> output on SPARC machines with openSUSE + * df_netapp/df_netapp32: Made check inventory resistant against empty size values + * df_netapp32: Added better detection for possible 32bit counter wrap Multisite: * The custom open/close states of custom links are now stored for each diff --git a/checks/df_netapp b/checks/df_netapp index 4d077f7..201a413 100644 --- a/checks/df_netapp +++ b/checks/df_netapp @@ -61,7 +61,7 @@ def check_df_netapp(volume, params, info): def inventory_df_netapp(checkname, info): inventory = [] for volume, size_kb, used_kb in info: - if int(size_kb) > 0: # Exclude filesystems with zero size (some snapshots) + if saveint(size_kb) > 0: # Exclude filesystems with zero size (some snapshots) inventory.append( (volume, "%.1fG" % (float(size_kb)/1024/1024), inventory_df_check_params) ) return inventory diff --git a/checks/df_netapp32 b/checks/df_netapp32 index 934a5d1..1a6ef8c 100644 --- a/checks/df_netapp32 +++ b/checks/df_netapp32 @@ -24,6 +24,17 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# Example output of wrapped counter: +# +#[['aggr1', '2038760', '1502030284']] +# dfFileSys 1.3.6.1.4.1.789.1.5.4.1.2 +# dfKBytesTotal 1.3.6.1.4.1.789.1.5.4.1.3 +# The total capacity in KBytes for the referenced file system. +# dfKBytesUsed 1.3.6.1.4.1.789.1.5.4.1.4 +# The total disk space in KBytes that is in use on the referenced file system. + +# .1.3.6.1.4.1.789.1.5.4.1.3.1 2038760 +# .1.3.6.1.4.1.789.1.5.4.1.4.1 1502030284 def check_df_netapp32(volume, params, info): # info columns: NAME SIZE USED @@ -46,6 +57,9 @@ def check_df_netapp32(volume, params, info): elif size_kb < 0 or used_kb < 0: return (3, "UNKNOWN - negative size or usage (32 bit SNMP counter wrap!)") + elif size_kb * 10 < used_kb: + return (3, "UNKNOWN - used disk space is much bigger than total space (32 bit SNMP counter wrap!) - use df_netapp check instead") + warn_mb, crit_mb, levelstext = get_filesystem_levels(g_hostname, volume, size_gb, params) used_perc = int(round(float(used_kb) / float(size_kb) * 100)) @@ -61,7 +75,7 @@ def check_df_netapp32(volume, params, info): def inventory_df_netapp32(checkname, info): inventory = [] for volume, size_kb, used_kb in info: - if int(size_kb) > 0: # Exclude filesystems with zero size (some snapshots) + if saveint(size_kb) > 0: # Exclude filesystems with zero size (some snapshots) inventory.append( (volume, "%.1fG" % (float(size_kb)/1024/1024), inventory_df_check_params) ) return inventory

13 years, 9 months

Check_MK Git: check_mk: Updated internal doc

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d0c5371074d56d667e3fda4716df84c19ad73b20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0c5371074d56d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 8 14:13:52 2010 +0100 Updated internal doc --- LIESMICH.zutun | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index c84b5d7..1cc6471 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -113,6 +113,11 @@ getrennte Checks für Memory and Pagefile. ------------------------------------------------------------------------------- ab 1.1.9i1: -------------------------------------------------------------------------------- + +SNMP Version pro Host erkennen und speichern. Man könnte als erstes mit v2 +versuchen und wenn das nicht geht auf v1 umschalten. Falls das nicht geht, dann +kann man eben kein SNMP machen. + PNP4Nagios-Popups automatisch einbauen, mit eigenen intelligenten Icons.

13 years, 9 months

Check_MK Git: check_mk: Made check handle phystate " noSystemControlAccessToSlot" (10)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d59cb3040382d4054c77cae2d987d19eadbf4084 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d59cb3040382d4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 8 15:31:53 2010 +0100 Made check handle phystate "noSystemControlAccessToSlot" (10) The check also handles unknown states better now --- ChangeLog | 2 ++ checks/fc_brocade_port_detailed | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6da71c8..97e3b34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -104,6 +104,8 @@ * Linux Agent: Fixed <<<cpu>>> output on SPARC machines with openSUSE * df_netapp/df_netapp32: Made check inventory resistant against empty size values * df_netapp32: Added better detection for possible 32bit counter wrap + * fc_brocade_port_detailed: Made check handle phystate "noSystemControlAccessToSlot" (10) + The check also handles unknown states better now Multisite: * The custom open/close states of custom links are now stored for each diff --git a/checks/fc_brocade_port_detailed b/checks/fc_brocade_port_detailed index dbbcb24..0d65e1a 100644 --- a/checks/fc_brocade_port_detailed +++ b/checks/fc_brocade_port_detailed @@ -27,8 +27,8 @@ # targetstate is 1 (used) or 0 (unused) # info columns: INDEX PHYSTATE OPSTATE TXWORDS RXWORDS -# 0 1 2 3 4 5 6 7 8 9 -brocade_phystate_names = [ '', 'noCard', 'noTransceiver', 'laserFault', 'noLight', 'noSync', 'inSync', 'portFault', 'diagFault', 'lockRef' ] +# 0 1 2 3 4 5 6 7 8 9 10 +brocade_phystate_names = [ '', 'noCard', 'noTransceiver', 'laserFault', 'noLight', 'noSync', 'inSync', 'portFault', 'diagFault', 'lockRef', 'noSystemControlAccessToSlot' ] # 0 1 2 3 4 brocade_opstate_names = [ 'unknown', 'online', 'offline', 'testing', 'faulty' ] @@ -37,6 +37,7 @@ fc_brocade_port_detailed_default_levels = ( (1, 0.1), (1, 0.1), (1, 0.1), (2, 16 def inventory_brocade_port(checkname, info): porttable, isltable = info inventory = [] + print for index, phystate, opstate, txwords, rxwords, txframes, rxframes, crcerrors, encout, c3discards in porttable: state = (int(phystate), int(opstate)) if state == (4,2): @@ -116,8 +117,10 @@ def check_brocade_port(portno, params, info): if (phy,op) == (phystate, opstate): nagioscode = ncode break + print phystate, len(brocade_phystate_names) return (nagioscode, "%s - physical state %s(%d), opstate %s(%d)" % ( - nagios_state_names[nagioscode], brocade_phystate_names[phystate], + nagios_state_names[nagioscode], + (len(brocade_phystate_names) > phystate and brocade_phystate_names[phystate] or 'UNHANDLED'), phystate, brocade_opstate_names[opstate], opstate), perfdata) # Now check rates of various error counters

13 years, 9 months

Check_MK Git: check_mk: printer_supply: Added new parameter " printer_supply_some_remaining_status" to configure the reported state on small remaining capacity.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6e866ccb3c1c07abbebbb43761db654ee5e5c4c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e866ccb3c1c07… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 8 16:08:13 2010 +0100 printer_supply: Added new parameter "printer_supply_some_remaining_status" to configure the reported state on small remaining capacity. imm_health: Renamed to ibm_imm_health rsa_health: Renamed to ibm_rsa_health --- ChangeLog | 2 ++ checkman/printer_supply | 2 ++ checks/{imm_health => ibm_imm_health} | 10 ++++------ checks/{rsa_health => ibm_rsa_health} | 10 +++++----- checks/printer_supply | 10 +++++++++- 5 files changed, 22 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 97e3b34..448a345 100644 --- a/ChangeLog +++ b/ChangeLog @@ -106,6 +106,8 @@ * df_netapp32: Added better detection for possible 32bit counter wrap * fc_brocade_port_detailed: Made check handle phystate "noSystemControlAccessToSlot" (10) The check also handles unknown states better now + * printer_supply: Added new parameter "printer_supply_some_remaining_status" to + configure the reported state on small remaining capacity. Multisite: * The custom open/close states of custom links are now stored for each diff --git a/checkman/printer_supply b/checkman/printer_supply index 7f3118b..bd79c91 100644 --- a/checkman/printer_supply +++ b/checkman/printer_supply @@ -31,4 +31,6 @@ critical(int): The supply level in percentage at which (and below) a critical st [configuration] printer_supply_default_levels(int, int): Set global default levels for warning and critical +printer_supply_some_remaining_status (int): Set the reported nagios state when the fill state + is something between empty and small remaining capacity. Default is: 1 (WARN). diff --git a/checks/imm_health b/checks/ibm_imm_health similarity index 87% rename from checks/imm_health rename to checks/ibm_imm_health index 3dd09de..79a3d46 100644 --- a/checks/imm_health +++ b/checks/ibm_imm_health @@ -26,11 +26,11 @@ # Author: Michael Nieporte <micha.nieporte(a)gmail.com> - Based on rsa_health by Mathias Kettner -def inventory_imm_health(checkname, info): +def inventory_ibm_imm_health(checkname, info): if len(info) > 0: return [(None, None)] -def check_imm_health(_no_item, _no_params, info): +def check_ibm_imm_health(_no_item, _no_params, info): num_alerts = (len(info) - 1) / 3 infotext = "" for i in range(0, num_alerts): @@ -52,7 +52,5 @@ def check_imm_health(_no_item, _no_params, info): else: return (3, "UNKNOWN - " + infotext) -check_info['imm_health'] = ( check_imm_health, "System health", 0, inventory_imm_health) -snmp_info['imm_health'] = ( ".1.3.6.1.4.1.2.3.51.3.1", ["4"] ) -snmp_scan_functions['imm_health'] = \ - lambda oid: "IMM" in oid(".1.3.6.1.2.1.1.1.0") +check_info['ibm_imm_health'] = ( check_ibm_imm_health, "System health", 0, no_inventory_possible ) +snmp_info['ibm_imm_health'] = ( ".1.3.6.1.4.1.2.3.51.3.1", ["4"] ) diff --git a/checks/rsa_health b/checks/ibm_rsa_health similarity index 89% rename from checks/rsa_health rename to checks/ibm_rsa_health index d8fa1e5..61a6cc6 100644 --- a/checks/rsa_health +++ b/checks/ibm_rsa_health @@ -32,11 +32,11 @@ # systemLevel(4), # normal(255) -def inventory_rsa_health(checkname, info): +def inventory_ibm_rsa_health(checkname, info): if len(info) > 0: return [(None, None)] -def check_rsa_health(_no_item, _no_params, info): +def check_ibm_rsa_health(_no_item, _no_params, info): num_alerts = (len(info) - 1) / 3 infotext = "" for i in range(0, num_alerts): @@ -56,7 +56,7 @@ def check_rsa_health(_no_item, _no_params, info): else: return (3, "UNKNOWN - " + infotext) -check_info['rsa_health'] = ( check_rsa_health, "System health", 0, inventory_rsa_health) -snmp_info['rsa_health'] = ( ".1.3.6.1.4.1.2.3.51.1.2", ["7"] ) -snmp_scan_functions['rsa_health'] = \ +check_info['ibm_rsa_health'] = ( check_ibm_rsa_health, "System health", 0, inventory_ibm_rsa_health) +snmp_info['ibm_rsa_health'] = ( ".1.3.6.1.4.1.2.3.51.1.2", ["7"] ) +snmp_scan_functions['ibm_rsa_health'] = \ lambda oid: "Remote Supervisor Adapter" in oid(".1.3.6.1.2.1.1.1.0") diff --git a/checks/printer_supply b/checks/printer_supply index 2c9d742..a6df030 100644 --- a/checks/printer_supply +++ b/checks/printer_supply @@ -50,6 +50,12 @@ printer_supply_default_levels = (20, 10) +# When the printer reports -3 as fill threshold the toner +# might be empty or might have some small remaining capacities +# the exact amount is unknown. This makes the nagios state reported +# in this state configurable +printer_supply_some_remaining_status = 1 + # Workaround for toners and drum units in c5900 devices # which have equal names for the single parts. # Add the color description to that item @@ -83,7 +89,7 @@ def check_printer_supply(item, params, info): elif current == -2 or maxlevel == -2: return (3, "UNKNOWN - Couldn't get info about supply") elif current == -3: - return (0, "OK - Some remaining", perfdata) + return (printer_supply_some_remaining_status, "%s - Some remaining" % (nagios_state_names[printer_supply_some_remaining_status]), perfdata) elif leftperc <= crit: return (2, "CRIT - %s" % infotext, perfdata) elif leftperc <= warn: @@ -100,5 +106,7 @@ snmp_info['printer_supply'] = ( ".1.3.6.1.2.1.43", [ '11.1.1.6', '11.1.1.9', '12.1.1.4' ] ) +check_config_variables.append("printer_supply_some_remaining_status") + snmp_scan_functions['printer_supply'] = \ lambda oid: not not oid(".1.3.6.1.2.1.43.11.1.1.6.1.1")

13 years, 9 months

Check_MK Git: check_mk: Added new livestatus columns no_more_notifications check_flapping_recovery_notification ; Typ fixes - thanks to Matthew Kent

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1639fd2144ddecc43685eeee9aaccd67378ed2f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1639fd2144ddec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 8 13:58:18 2010 +0100 Added new livestatus columns no_more_notifications check_flapping_recovery_notification; Typ fixes - thanks to Matthew Kent --- livestatus/src/TableHosts.cc | 32 ++++++++++++++++++-------------- livestatus/src/TableServices.cc | 28 +++++++++++++++------------- 2 files changed, 33 insertions(+), 27 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1639fd2144…

13 years, 9 months

Check_MK Git: check_mk: Merge branch 'master' of git@mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8604c5d11540edbf3eaad26d93ff8f53909f63d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8604c5d11540ed… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 8 13:49:35 2010 +0100 Merge branch 'master' of git@mathias-kettner.de:check_mk ---

13 years, 9 months

← Newer
1
...
9
10
11
12
13
14
15
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2010