Checkmk git commits May 2015

checkmk-commits@lists.checkmk.com

7 participants
200 discussions

Check_MK Git: check_mk: #2296 win_dhcp_pools: Convert global option for discovery empty pools into rule set

by Mathias Kettner

Module: check_mk Branch: master Commit: 221cef050095ee3c1020070962d5ae7c444939a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=221cef050095ee… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 20 16:09:57 2015 +0200 #2296 win_dhcp_pools: Convert global option for discovery empty pools into rule set The selection wether empty DHCP should be discovered has now been moved into a rule set. If you had set the global option then it is still functioning and can be overridden on a per-host-basis with rules. --- .werks/2296 | 11 +++++++++++ ChangeLog | 1 + checks/win_dhcp_pools | 9 ++++++--- web/plugins/wato/check_mk_configuration.py | 15 --------------- web/plugins/wato/check_parameters.py | 16 ++++++++++++++++ 5 files changed, 34 insertions(+), 18 deletions(-) diff --git a/.werks/2296 b/.werks/2296 new file mode 100644 index 0000000..6c8051c --- /dev/null +++ b/.werks/2296 @@ -0,0 +1,11 @@ +Title: win_dhcp_pools: Convert global option for discovery empty pools into rule set +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1432130938 +Class: feature + +The selection wether empty DHCP should be discovered has now been moved into +a rule set. If you had set the global option then it is still functioning +and can be overridden on a per-host-basis with rules. diff --git a/ChangeLog b/ChangeLog index 0a6494f..be4552e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -188,6 +188,7 @@ * 2232 printer_supply: move setting for "some remaining" status from global option to check parameters... * 2293 logwatch: Remove global setting logwatch_service_output from WATO... * 2294 if, if64: Move global option for padding port numbers with zeroes into rule... + * 2296 win_dhcp_pools: Convert global option for discovery empty pools into rule set... * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checks/win_dhcp_pools b/checks/win_dhcp_pools index 081dd64..7adfa42 100644 --- a/checks/win_dhcp_pools +++ b/checks/win_dhcp_pools @@ -24,8 +24,6 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Author: Lars Michelsen <lm(a)mathias-kettner.de> - # Example outputs from agent: # # <<<win_dhcp_pools>>> @@ -62,6 +60,7 @@ win_dhcp_pools_default_levels = (10, 5) win_dhcp_pools_inventorize_empty = False +discovery_win_dhcp_pools = [] win_dhcp_pools_stats_translate = { 'Entdeckungen': 'Discovers', @@ -82,6 +81,10 @@ def parse_win_dhcp_pools(info): return [ ' '.join(line).rstrip('.').split(' = ') for line in info ] def inventory_win_dhcp_pools(info): + settings = host_extra_conf_merged(g_hostname, discovery_win_dhcp_pools) + discover_empty = settings.get("empty_pools", win_dhcp_pools_inventorize_empty) + print discover_empty + inventory = [] in_block = False last_pool = "" @@ -98,7 +101,7 @@ def inventory_win_dhcp_pools(info): in_block = False used, free, pending = pool_stats size = used + free + pending - if size > 0 or win_dhcp_pools_inventorize_empty: + if size > 0 or discover_empty: inventory.append((last_pool, 'win_dhcp_pools_default_levels')) return inventory diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index f635458..359e5f3 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1434,21 +1434,6 @@ register_configvar(group, )) -# WAS IST DAS??? -register_configvar(group, - "win_dhcp_pools_inventorize_empty", - Checkbox( - title = _("Inventorize empty windows dhcp pools"), - help = _("You can activate the inventorization of " - "dhcp pools, which have no ip addresses in it"), - ), - need_restart = True - ) - -group = _("Check configuration") - - - #. # .--Rulesets------------------------------------------------------------. # | ____ _ _ | diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 5a5ef10..e0fd84b 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -426,6 +426,22 @@ register_rule(group + '/' + subgroup_inventory, match = 'all', ) +register_rule(group + '/' + subgroup_inventory, + varname = "discovery_win_dhcp_pools", + title = _("Discovery of Windows DHCP Pools"), + valuespec = Dictionary( + elements = [ + ( "empty_pools", + Checkbox( + title = _("Discovery of empty DHCP pools"), + label = _("Include empty pools into the monitoring"), + help = _("You can activate the creation of services for " + "DHCP pools, which contain no IP addresses."), + )), + ] + ), + match = 'dict', +) register_rule(group + '/' + subgroup_inventory,

9 years, 6 months

Check_MK Git: check_mk: #2295 FIX Fix exception in reporting for views that do not show a host name

by Mathias Kettner

Module: check_mk Branch: master Commit: ec5c0ccb3fd0fa4765f5b2e0cbfaa9db6202324d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec5c0ccb3fd0fa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 20 14:50:46 2015 +0200 #2295 FIX Fix exception in reporting for views that do not show a host name --- .werks/2295 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/views.py | 9 +++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.werks/2295 b/.werks/2295 new file mode 100644 index 0000000..d911ed7 --- /dev/null +++ b/.werks/2295 @@ -0,0 +1,10 @@ +Title: Fix exception in reporting for views that do not show a host name +Level: 1 +Component: reporting +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1432126221 + + diff --git a/ChangeLog b/ChangeLog index 645229f..0a6494f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -542,6 +542,7 @@ * 1990 FIX: Fix two exceptions in PDF exports of host group views * 2189 FIX: Allow changing graph number from 1 to "all" when editing PNP graph in report... * 2206 FIX: Add missing option "Show timeline of each object directly in table" for reports... + * 2295 FIX: Fix exception in reporting for views that do not show a host name Event Console: * 1845 Keep record of original source IP address of a syslog message or SNMP trap... diff --git a/web/htdocs/views.py b/web/htdocs/views.py index e140c36..f26fef7 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -971,6 +971,10 @@ def show_view(view, show_heading = False, show_buttons = True, need_inventory_data = False # Prepare Filter headers for Livestatus + # TODO: When this is used by the reporting then *all* filters are + # active. That way the inventory data will always be loaded. When + # we convert this to the visuals principle the we need to optimize + # this. filterheaders = "" only_sites = None all_active_filters = [ f for f in use_filters if f.available() ] @@ -1080,10 +1084,11 @@ def show_view(view, show_heading = False, show_buttons = True, if len(join_painters) > 0: do_table_join(datasource, rows, filterheaders, join_painters, join_columns, only_sites) - # Add inventory data if one of the painters needs it + # Add inventory data if one of the painters or filters needs it if need_inventory_data: for row in rows: - row["host_inventory"] = inventory.host(row["host_name"]) + if "host_name" in row: + row["host_inventory"] = inventory.host(row["host_name"]) sort_data(rows, sorters) else:

9 years, 6 months

Check_MK Git: check_mk: #2294 if, if64: Move global option for padding port numbers with zeroes into rule

by Mathias Kettner

Module: check_mk Branch: master Commit: cc0072cad87ccab34e498a9a80839707785e72bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc0072cad87cca… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 20 14:23:50 2015 +0200 #2294 if, if64: Move global option for padding port numbers with zeroes into rule You now can configure wether port numbers should be padded with zero on a per host basis in the rule set Network Interface and Switch Port Discovery. The global option has been remove from WATO. Any setting you have made is still functioning, though. --- .werks/2294 | 12 ++ ChangeLog | 1 + checks/if.include | 10 +- web/htdocs/lib.py | 12 +- web/plugins/wato/check_mk_configuration.py | 209 +--------------------------- web/plugins/wato/check_parameters.py | 69 ++++++--- 6 files changed, 75 insertions(+), 238 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cc0072cad8…

9 years, 6 months

Check_MK Git: check_mk: #2293 logwatch: Remove global setting logwatch_service_output from WATO

by Mathias Kettner

Module: check_mk Branch: master Commit: 3f3875ef3b5f45e33a6a75f997a594fc8405192d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f3875ef3b5f45… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 20 13:59:06 2015 +0200 #2293 logwatch: Remove global setting logwatch_service_output from WATO This setting decides wether (default) or not to output the last critical found message in a logfile in the output of the check plugin of logwatch checks. You still can set this variable in <tt>main.mk</tt> if you like. Existing setting still work. This make Check_MK more consistent: there are no settings for checks in the global settings any more now. --- .werks/2293 | 15 +++++++++++++++ ChangeLog | 1 + web/plugins/wato/check_mk_configuration.py | 16 ---------------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.werks/2293 b/.werks/2293 new file mode 100644 index 0000000..8cce36b --- /dev/null +++ b/.werks/2293 @@ -0,0 +1,15 @@ +Title: logwatch: Remove global setting logwatch_service_output from WATO +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1432123043 +Class: feature + +This setting decides wether (default) or not to output the last critical +found message in a logfile in the output of the check plugin of logwatch +checks. You still can set this variable in <tt>main.mk</tt> if you like. +Existing setting still work. + +This make Check_MK more consistent: there are no settings for checks +in the global settings any more now. diff --git a/ChangeLog b/ChangeLog index b119e3b..b5eb162 100644 --- a/ChangeLog +++ b/ChangeLog @@ -186,6 +186,7 @@ * 2277 mk_oracle.ps1: changed location of config file... NOTE: Please refer to the migration notes! * 2232 printer_supply: move setting for "some remaining" status from global option to check parameters... + * 2293 logwatch: Remove global setting logwatch_service_output from WATO... * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 2392076..8f57ca5 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1643,22 +1643,6 @@ register_configvar(deprecated, "by overridden on a per-host and per-port base by defining special check " "parameters via a rule."))) -register_configvar(group, - "logwatch_service_output", - DropdownChoice( - title = _("Service output for logwatch"), - help = _("You can change the plugin output of logwatch " - "to show only the count of messages or also " - "to show the last worst message"), - choices = [ - ( 'default' , _("Show count and last message") ), - ( 'count', _("Show only count")), - ], - default_value = 'default', - ), - need_restart = True - ) - #. # .--Rulesets------------------------------------------------------------.

9 years, 6 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: bc740f05b6cbc1d806253610ecac6b29dcea3bd0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc740f05b6cbc1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 20 13:57:18 2015 +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 c7ffbf8..49dd409 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2293 +2303

9 years, 6 months

Check_MK Git: check_mk: Minor code cleanup in logwatch check

by Mathias Kettner

Module: check_mk Branch: master Commit: 026db4decf67333703a7a7c2cede0b0c938d1a14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=026db4decf6733… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 20 13:49:09 2015 +0200 Minor code cleanup in logwatch check --- checks/logwatch | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/checks/logwatch b/checks/logwatch index eb505be..19a56cf 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -35,6 +35,17 @@ logwatch_groups = [] # Variables embedded in precompiled checks check_config_variables += [ "logwatch_dir", "logwatch_max_filesize", "logwatch_service_output" ] +# .--General-------------------------------------------------------------. +# | ____ _ | +# | / ___| ___ _ __ ___ _ __ __ _| | | +# | | | _ / _ \ '_ \ / _ \ '__/ _` | | | +# | | |_| | __/ | | | __/ | | (_| | | | +# | \____|\___|_| |_|\___|_| \__,_|_| | +# | | +# +----------------------------------------------------------------------+ +# | General functions, for normal and forwarding logwatch check | +# '----------------------------------------------------------------------' + def logwatch_ec_forwarding_enabled(params, item): if 'restrict_logfiles' not in params: return True # matches all logs on this host @@ -208,6 +219,18 @@ def logwatch_parse_line(line): text = "" return level, text +#. +# .--Logwatch------------------------------------------------------------. +# | _ _ _ | +# | | | ___ __ ___ ____ _| |_ ___| |__ | +# | | |/ _ \ / _` \ \ /\ / / _` | __/ __| '_ \ | +# | | | (_) | (_| |\ V V / (_| | || (__| | | | | +# | |_|\___/ \__, | \_/\_/ \__,_|\__\___|_| |_| | +# | |___/ | +# +----------------------------------------------------------------------+ +# | Normal logwatch check | +# '----------------------------------------------------------------------' + # In case of a precompiled check, params contains the precompiled # logwatch_patterns for the logfile we deal with. If using check_mk # without precompiled checks, the params must be None an will be @@ -487,19 +510,18 @@ def check_logwatch_generic(item, params, loglines, found, groups=False): else: return (worst, "%s messages" % ', '.join(count_txt)) -# .----------------------------------------------------------------------. -# | _____ ____ _____ ___ ______ ___ ____ ____ | -# | | ____/ ___| | ___/ _ \| _ \ \ / / \ | _ \| _ \ | -# | | _|| | | |_ | | | | |_) \ \ /\ / / _ \ | |_) | | | | | -# | | |__| |___ | _|| |_| | _ < \ V V / ___ \| _ <| |_| | | -# | |_____\____| |_| \___/|_| \_\ \_/\_/_/ \_\_| \_\____/ | -# | | +#. +# .--Event Console Forwarding--------------------------------------------. +# | _ _ _ | +# | | | ___ __ ___ ____ _| |_ ___| |__ ___ ___ | +# | | |/ _ \ / _` \ \ /\ / / _` | __/ __| '_ \ / _ \/ __| | +# | | | (_) | (_| |\ V V / (_| | || (__| | | || __/ (__ | +# | |_|\___/ \__, | \_/\_/ \__,_|\__\___|_| |_(_)___|\___| | +# | |___/ | # +----------------------------------------------------------------------+ # | Forwarding logwatch messages to event console | # '----------------------------------------------------------------------' -import socket, time - # OK -> priority 5 (notice) # WARN -> priority 4 (warning) # CRIT -> priority 2 (crit)

9 years, 6 months

Check_MK Git: check_mk: #2232 printer_supply: move setting for " some remaining" status from global option to check parameters

by Mathias Kettner

Module: check_mk Branch: master Commit: 26354b95a73afcd4a38ada24991f514b1a0e82d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26354b95a73afc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 20 13:39:24 2015 +0200 #2232 printer_supply: move setting for "some remaining" status from global option to check parameters This is due to a cleanup and for making Check_MK more consitent. If you already have changed the global variable, your setting will still work. --- .werks/2232 | 10 ++++ ChangeLog | 1 + checks/printer_supply | 34 +++++++++---- web/plugins/wato/check_mk_configuration.py | 32 ------------ web/plugins/wato/check_parameters.py | 76 ++++++++++++++++++---------- 5 files changed, 84 insertions(+), 69 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=26354b95a7…

9 years, 6 months

Check_MK Git: check_mk: Fixed exceptions in several SNMP scan functions

by Mathias Kettner

Module: check_mk Branch: master Commit: 1bd049bc3279cf915290e616542adfc726317cea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1bd049bc3279cf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 19 17:48:29 2015 +0200 Fixed exceptions in several SNMP scan functions --- checks/emerson_stat | 2 +- checks/emerson_temp | 2 +- checks/etherbox | 2 +- checks/hp_proliant_cpu | 2 +- checks/hp_proliant_da_cntlr | 2 +- checks/hp_proliant_da_phydrv | 2 +- checks/hp_proliant_fans | 2 +- checks/hp_proliant_mem | 2 +- checks/hp_proliant_power | 2 +- checks/hp_proliant_psu | 2 +- checks/hp_proliant_raid | 2 +- checks/hp_proliant_temp | 2 +- checks/hp_sts_drvbox | 2 +- checks/ups_bat_temp | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/checks/emerson_stat b/checks/emerson_stat index dd401b3..62d897e 100644 --- a/checks/emerson_stat +++ b/checks/emerson_stat @@ -85,5 +85,5 @@ check_info['emerson_stat'] = { "service_description" : "Status", "has_perfdata" : False, "snmp_info" : ( ".1.3.6.1.4.1.6302.2.1.2.1", ["0"] ), - "snmp_scan_function" : lambda oid: oid('.1.3.6.1.4.1.6302.2.1.1.1.0').startswith('Emerson Network Power'), + "snmp_scan_function" : lambda oid: oid('.1.3.6.1.4.1.6302.2.1.1.1.0', "").startswith('Emerson Network Power'), } diff --git a/checks/emerson_temp b/checks/emerson_temp index 7f24def..1758eb6 100644 --- a/checks/emerson_temp +++ b/checks/emerson_temp @@ -62,6 +62,6 @@ check_info['emerson_temp'] = { "has_perfdata" : True, "group" : "hw_temperature", "snmp_info" : ( ".1.3.6.1.4.1.6302.2.1.2", ["7"] ), - "snmp_scan_function" : lambda oid: oid('.1.3.6.1.4.1.6302.2.1.1.1.0').startswith('Emerson Network Power'), + "snmp_scan_function" : lambda oid: oid('.1.3.6.1.4.1.6302.2.1.1.1.0', "").startswith('Emerson Network Power'), "includes" : [ "temperature.include" ], } diff --git a/checks/etherbox b/checks/etherbox index fef4c54..e377683 100644 --- a/checks/etherbox +++ b/checks/etherbox @@ -71,7 +71,7 @@ def etherbox_scan(oid): # .1.3.6.1.2.1. (sysDescr). Yurks. We need to fetch # a vendor specific OID here and wait until all old devices # have vanished. - return oid(".1.3.6.1.4.1.14848.2.1.1.1.0").startswith("Version") + return oid(".1.3.6.1.4.1.14848.2.1.1.1.0", "").startswith("Version") etherbox_info = [ ( ".1.3.6.1.4.1.14848.2.1.1.3", [ '' ]), # temperature unit diff --git a/checks/hp_proliant_cpu b/checks/hp_proliant_cpu index 06d9bc1..47a9766 100644 --- a/checks/hp_proliant_cpu +++ b/checks/hp_proliant_cpu @@ -57,5 +57,5 @@ check_info["hp_proliant_cpu"] = { ] ), 'snmp_scan_function': \ - lambda oid: "proliant" in oid(".1.3.6.1.4.1.232.2.2.4.2.0").lower(), + lambda oid: "proliant" in oid(".1.3.6.1.4.1.232.2.2.4.2.0", "").lower(), } diff --git a/checks/hp_proliant_da_cntlr b/checks/hp_proliant_da_cntlr index 24e7d6e..ad9f295 100644 --- a/checks/hp_proliant_da_cntlr +++ b/checks/hp_proliant_da_cntlr @@ -97,5 +97,5 @@ check_info["hp_proliant_da_cntlr"] = { ] ), 'snmp_scan_function': \ - lambda oid: "proliant" in oid(".1.3.6.1.4.1.232.2.2.4.2.0").lower(), + lambda oid: "proliant" in oid(".1.3.6.1.4.1.232.2.2.4.2.0", "").lower(), } diff --git a/checks/hp_proliant_da_phydrv b/checks/hp_proliant_da_phydrv index e58dbed..5de5f0e 100644 --- a/checks/hp_proliant_da_phydrv +++ b/checks/hp_proliant_da_phydrv @@ -90,5 +90,5 @@ check_info["hp_proliant_da_phydrv"] = { ] ), 'snmp_scan_function': \ - lambda oid: "proliant" in oid(".1.3.6.1.4.1.232.2.2.4.2.0").lower(), + lambda oid: "proliant" in oid(".1.3.6.1.4.1.232.2.2.4.2.0", "").lower(), } diff --git a/checks/hp_proliant_fans b/checks/hp_proliant_fans index 347a828..732620c 100644 --- a/checks/hp_proliant_fans +++ b/checks/hp_proliant_fans @@ -96,5 +96,5 @@ check_info["hp_proliant_fans"] = { ] ), 'snmp_scan_function': \ - lambda oid: "proliant" in oid(".1.3.6.1.4.1.232.2.2.4.2.0").lower(), + lambda oid: "proliant" in oid(".1.3.6.1.4.1.232.2.2.4.2.0", "").lower(), } diff --git a/checks/hp_proliant_mem b/checks/hp_proliant_mem index 16994d1..466be36 100644 --- a/checks/hp_proliant_mem +++ b/checks/hp_proliant_mem @@ -164,5 +164,5 @@ check_info["hp_proliant_mem"] = { ] ), 'snmp_scan_function': \ - lambda oid: "proliant" in oid(".1.3.6.1.4.1.232.2.2.4.2.0").lower(), + lambda oid: "proliant" in oid(".1.3.6.1.4.1.232.2.2.4.2.0", "").lower(), } diff --git a/checks/hp_proliant_power b/checks/hp_proliant_power index 4031b3b..b837ce6 100644 --- a/checks/hp_proliant_power +++ b/checks/hp_proliant_power @@ -63,6 +63,6 @@ check_info["hp_proliant_power"] = { ] ), 'snmp_scan_function' : \ - lambda oid: "proliant" in oid(".1.3.6.1.4.1.232.2.2.4.2.0").lower(), + lambda oid: "proliant" in oid(".1.3.6.1.4.1.232.2.2.4.2.0", "").lower(), 'has_perfdata' : True } diff --git a/checks/hp_proliant_psu b/checks/hp_proliant_psu index d8c4dab..ea725ba 100644 --- a/checks/hp_proliant_psu +++ b/checks/hp_proliant_psu @@ -60,5 +60,5 @@ check_info["hp_proliant_psu"] = { ] ), 'snmp_scan_function': \ - lambda oid: "proliant" in oid(".1.3.6.1.4.1.232.2.2.4.2.0").lower(), + lambda oid: "proliant" in oid(".1.3.6.1.4.1.232.2.2.4.2.0", "").lower(), } diff --git a/checks/hp_proliant_raid b/checks/hp_proliant_raid index 669d27a..c7ccdea 100644 --- a/checks/hp_proliant_raid +++ b/checks/hp_proliant_raid @@ -74,5 +74,5 @@ check_info["hp_proliant_raid"] = { ] ), 'snmp_scan_function': \ - lambda oid: "proliant" in oid(".1.3.6.1.4.1.232.2.2.4.2.0").lower(), + lambda oid: "proliant" in oid(".1.3.6.1.4.1.232.2.2.4.2.0", "").lower(), } diff --git a/checks/hp_proliant_temp b/checks/hp_proliant_temp index f7dedd2..9fbc5ef 100644 --- a/checks/hp_proliant_temp +++ b/checks/hp_proliant_temp @@ -79,6 +79,6 @@ check_info["hp_proliant_temp"] = { "6", # cpqHeTemperatureCondition ] ), 'snmp_scan_function': \ - lambda oid: "proliant" in oid(".1.3.6.1.4.1.232.2.2.4.2.0").lower(), + lambda oid: "proliant" in oid(".1.3.6.1.4.1.232.2.2.4.2.0", "").lower(), 'group': 'temperature_auto', } diff --git a/checks/hp_sts_drvbox b/checks/hp_sts_drvbox index a4a918d..f483fe8 100644 --- a/checks/hp_sts_drvbox +++ b/checks/hp_sts_drvbox @@ -131,5 +131,5 @@ check_info["hp_sts_drvbox"] = { '23', # cpqSsBoxLocationString ]), 'snmp_scan_function': \ - lambda oid: "proliant" in oid(".1.3.6.1.4.1.232.2.2.4.2.0").lower(), + lambda oid: "proliant" in oid(".1.3.6.1.4.1.232.2.2.4.2.0", "").lower(), } diff --git a/checks/ups_bat_temp b/checks/ups_bat_temp index 830c59a..8a29847 100644 --- a/checks/ups_bat_temp +++ b/checks/ups_bat_temp @@ -54,6 +54,6 @@ check_info['ups_bat_temp'] = { "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.4.1.705.1.2", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.818.1.100.1.2" ] \ or oid(".1.3.6.1.2.1.1.2.0").startswith('.1.3.6.1.2.1.33') \ - or oid('.1.3.6.1.2.1.33.1.1.1.0').startswith('RPS'), + or oid('.1.3.6.1.2.1.33.1.1.1.0', "").startswith('RPS'), "includes" : [ "temperature.include" ], }

9 years, 6 months

Check_MK Git: check_mk: #2231 More transparently show errors during service discovery

by Mathias Kettner

Module: check_mk Branch: master Commit: 299c1962490d4a89efb27d85c079917766e2e825 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=299c1962490d4a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 19 17:56:40 2015 +0200 #2231 More transparently show errors during service discovery Checks might run into problems parsing the output of an agent plugin. When this happens during a normal check, you will soon know this as the according service goes UNKNOWN and you will be able to create a crash dump. Errors in single check plugins during service discovery, however, have been silently ignored unless you used <tt>--debug</tt> on the command line. This behaviour has been changed in the following way: H2:<tt>cmk -I</tt> on the command line Now for each files plugin a warning is being printed, but the discovery continues. <tt>--debug</tt> will let the Python exception come through and abort the discovery with a precise error message - just as it used to be. H2:Check_MK Discovery service The discovery check now in case of an error during the discovery goes to UNKNOWN and produces a crash dump - just as normal checks do. That way you can easily send us a crash report in case of any error. Previously error would be ignored silently. H2:Service list in WATO In WATO the list of a host's services will display a yellow error message if one of the plugins fails. This messages has a link for retrying the discovery without the error message and that way switch back to the old behaviours (temporarliy). H2:Bulk discovery in WATO The bulk discovery keeps to the old behaviour of silently ignoring errors but has got a new checkbox for letting a host fail if at least one check plugin of the host runs into an error. The default setting of the checkbox is to ignore errors. --- .werks/2231 | 43 ++++++++++++++++++++ ChangeLog | 1 + modules/automation.py | 20 +++++++++- modules/check_mk_base.py | 100 +++++++++++++++++++++++++--------------------- modules/discovery.py | 86 +++++++++++++++++++++++++-------------- web/htdocs/wato.py | 16 +++++++- 6 files changed, 188 insertions(+), 78 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=299c196249…

9 years, 6 months

Check_MK Git: check_mk: updated werk description

by Andreas Boesl

Module: check_mk Branch: master Commit: 45592b7f9eb49b8489912719fb5e0e60bae8ea75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45592b7f9eb49b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 19 17:42:42 2015 +0200 updated werk description --- .werks/2275 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/2275 b/.werks/2275 index 13400b1..a8a2715 100644 --- a/.werks/2275 +++ b/.werks/2275 @@ -14,7 +14,7 @@ The windows agent now comes with the following folders <tr><td>plugins</td><td>plugin scripts</td></tr> <tr><td>config</td><td>configuration files for scripts</td></tr> <tr><td>state</td><td>state files for scripts and the agent, e.g. logwatch state</td></tr> -<tr><td>spool</td><td>spoolfiles from other applications</td>/tr> +<tr><td>spool</td><td>spoolfiles from other applications</td></tr> <tr><td>log</td><td>logfiles from scripts and the agent</td></tr> <tr><td>temp</td><td>working directory for scripts</td></tr> </table>

9 years, 6 months

← Newer
1
...
5
6
7
8
9
10
11
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2015