Checkmk git commits June 2016

checkmk-commits@lists.checkmk.com

8 participants
185 discussions

by Simon Betz

Module: check_mk Branch: master Commit: 96e1c7dfe980d79cd073110df2819d0aee91e54e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96e1c7dfe980d7… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jun 30 17:21:59 2016 +0200 added includes --- checks/perle_chassis | 1 + 1 file changed, 1 insertion(+) diff --git a/checks/perle_chassis b/checks/perle_chassis index 26652c6..ae5f60d 100644 --- a/checks/perle_chassis +++ b/checks/perle_chassis @@ -65,6 +65,7 @@ check_info['perle_chassis'] = { '9', # PERLE-MCR-MGT-MIB::chassisTemperature ]), 'snmp_scan_function' : perle_scan_function, + 'includes' : [ 'perle.include' ], }

8 years, 5 months

windows agent: re-fixed the makefile

by Sebastian Herbord

Module: check_mk Branch: master Commit: 0ff781254a3728a58360b2aab59dcd4a1f2081b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ff781254a3728… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Jun 30 14:39:06 2016 +0200 windows agent: re-fixed the makefile --- agents/windows/Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 8e86cd8..a145938 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -123,10 +123,10 @@ check_mk_agent-64.unstripped.exe: $(OBJS64) $(CXX_64) $(COPTIONS) -o $@ $^ check_mk_agent-64.res -lwsock32 -lws2_32 -lole32 -loleaut32 -lwbemuuid -lpsapi -lshlwapi -limagehlp -check_mk_agent.unversioned.exe: +check_mk_agent.unversioned.exe: check_mk_agent.unstripped.exe strip -o $@ $^ -check_mk_agent-64.unversioned.exe: +check_mk_agent-64.unversioned.exe: check_mk_agent-64.unstripped.exe strip -o $@ $^ @@ -135,16 +135,18 @@ check_mk_agent-64.unversioned.exe: # recompilation is thus needed during 'make version' # ----------------------------------------------------------------------------- -check_mk_agent.exe.versioned: check_mk_agent.unversioned.exe +check_mk_agent.exe.versioned: ./bin_replace $(VERSION_DUMMY) "$(VERSION)" < check_mk_agent.unversioned.exe > check_mk_agent.exe chmod 755 check_mk_agent.exe -check_mk_agent-64.exe.versioned: check_mk_agent-64.unversioned.exe +check_mk_agent-64.exe.versioned: ./bin_replace $(VERSION_DUMMY) "$(VERSION)" < check_mk_agent-64.unversioned.exe > check_mk_agent-64.exe chmod 755 check_mk_agent-64.exe - -%.exe: %.exe.versioned +# important: %.exe.versioned must not depend on %.exe.unversioned because on the +# automated build system, "make ...versioned" is called and that system doesn't +# provide the right compiler to build this agent +%.exe: %.exe.unversioned %.exe.versioned true # -----------------------------------------------------------------------------

8 years, 5 months

updated binaries

by Sebastian Herbord

Module: check_mk Branch: master Commit: 87a58e88a266a600e57553de76b5f66886684b2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87a58e88a266a6… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Jun 30 14:34:07 2016 +0200 updated binaries --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1272320 -> 1272320 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1272320 -> 1272320 bytes agents/windows/check_mk_agent.exe | Bin 1240576 -> 1240576 bytes agents/windows/check_mk_agent.msi | Bin 248320 -> 2781696 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1240576 -> 1240576 bytes agents/windows/crash.exe | Bin 101058 -> 101624 bytes agents/windows/install_agent-64.exe | Bin 567132 -> 567258 bytes agents/windows/install_agent.exe | Bin 560935 -> 560902 bytes agents/windows/nowin.exe | Bin 103194 -> 103760 bytes 10 files changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index fdd3a56..77de926 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1765 +1767 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index c5086f0..6d77af8 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index e973884..d21d014 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 5d3a06b..8172581 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 1f309af..a1b5970 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 4b78b1e..6e74c04 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index d956227..5402584 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 13db09e..8b48d18 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 2b48325..5744b96 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 6fa7286..3dbbe12 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ

8 years, 5 months

3151 FIX windows agent: further fix to crashes on failures to query wmi

by Sebastian Herbord

Module: check_mk Branch: master Commit: 2dcbdded040c99d989bf0eddc11a087de0a7d331 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2dcbdded040c99… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Jun 30 14:20:09 2016 +0200 3151 FIX windows agent: further fix to crashes on failures to query wmi --- .werks/3151 | 10 ++++++++++ ChangeLog | 1 + agents/windows/check_mk_agent.cc | 8 +++++++- agents/windows/check_mk_agent.msi | Bin 2779136 -> 248320 bytes agents/windows/install_agent-64.exe | Bin 567138 -> 567132 bytes agents/windows/install_agent.exe | Bin 560942 -> 560935 bytes 6 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/3151 b/.werks/3151 new file mode 100644 index 0000000..5d5628b --- /dev/null +++ b/.werks/3151 @@ -0,0 +1,10 @@ +Title: windows agent: further fix to crashes on failures to query wmi +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1467289042 + + diff --git a/ChangeLog b/ChangeLog index 1513450..25b0939 100644 --- a/ChangeLog +++ b/ChangeLog @@ -290,6 +290,7 @@ * 3685 FIX: brocade_fcport: fixed unknown state texts * 3686 FIX: hp_proliant_temp: fixed wrong device thresholds handling. If no thresholds available the device reports -99 * 3150 FIX: fixed helpers failing to start and high cpu load when an unparsable local check is installed... + * 3151 FIX: windows agent: further fix to crashes on failures to query wmi Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 3e9de18..980db65 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1556,7 +1556,13 @@ void dump_wmi_table(OutputProxy &out, wmi::Result &result) { bool output_wmi_table(OutputProxy &out, const wchar_t *table_name, const char *section_name, bool as_subtable = false) { - wmi::Result result = WMILookup::get().getClass(table_name); + wmi::Result result; + try { + result = WMILookup::get().getClass(table_name); + } catch (const wmi::ComException &e) { + crash_log("wmi request for %ls failed: %s", table_name, e.what()); + return true; + } if (!result.valid()) { crash_log("table %ls is empty or doesn't exist", table_name); diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 15a3f15..1f309af 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 6a9eb78..13db09e 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 6f40bfa..2b48325 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 5 months

skype: perfometer for mobile checks, reliably use a combined graph for mobile check and updated a default level

by Sebastian Herbord

Module: check_mk Branch: master Commit: 45a22914bb7f2c136c3955df0ae743d448fbf23d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45a22914bb7f2c… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Jun 30 13:36:37 2016 +0200 skype: perfometer for mobile checks, reliably use a combined graph for mobile check and updated a default level --- checks/skype | 7 ++++++- web/plugins/metrics/check_mk.py | 16 +++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/checks/skype b/checks/skype index 7144968..a98df85 100644 --- a/checks/skype +++ b/checks/skype @@ -49,7 +49,7 @@ factory_settings['skype_defaultlevels'] = { 'allocation_latency': {"upper": (5000, 10000)}, 'timedout_incoming_messages': {"upper": (2, 4)}, - 'holding_time_incoming': {"upper": (1.0, 2.0)}, + 'holding_time_incoming': {"upper": (6.0, 12.0)}, 'flow_controlled_connections': {"upper": (1, 2)}, 'outgoing_queue_delay': {"upper": (2.0, 4.0)}, 'timedout_sends': {"upper": (0.01, 0.02)}, @@ -554,6 +554,11 @@ def check_skype_mobile(item, params, parsed): perfdata = [perfdata] yield status, "%s: %s" % (name, infotext), perfdata + else: + # add a perfcounter with 0 sessions for all missing devices so we can + # still properly build a combined graph for active sessions + yield 0, None, [("active_sessions_%s" % name.lower(), 0)] + yield wmi_yield_raw_counter(parsed["LS:WEB - Throttling and Authentication"], item, "WEB - Total Requests In Processing", label=" requested", diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 2570e0a..65ca01e 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -3396,7 +3396,8 @@ metric_info["failed_inbound_streams"] = { skype_mobile_devices = [("android", "Android", "33/a"), ("iphone", "iPhone", "42/a"), - ("ipad", "iPad", "45/a")] + ("ipad", "iPad", "45/a"), + ("mac", "Mac", "23/a")] for device, name, color in skype_mobile_devices: metric_info["active_sessions_%s" % device] = { @@ -3515,6 +3516,7 @@ metric_info["dns_nxdomain"] = { "color" : "34/a", } + #. # .--Checks--------------------------------------------------------------. # | ____ _ _ | @@ -5434,6 +5436,14 @@ perfometer_info.append({ "exponent" : 2, }) +perfometer_info.append({ + "type" : "linear", + "segments" : ["active_sessions_%s" % device + for device, name, color in skype_mobile_devices], + # there is no limit and no way to determine the max so far for + # all segments +}) + #. # .--Graphs--------------------------------------------------------------. @@ -6972,8 +6982,8 @@ graph_info.append({ graph_info.append({ "title" : _("Active Sessions"), - "metrics" : [("active_sessions_%s" % device, "line") - for device, name, color in skype_mobile_devices[::-1]] + "metrics" : [("active_sessions_%s" % device, idx == 0 and "area" or "stack") + for idx, (device, name, color) in enumerate(skype_mobile_devices[::-1])] }) graph_info.append({

8 years, 5 months

3150 FIX fixed helpers failing to start and high cpu load when an unparsable local check is installed

by Sebastian Herbord

Module: check_mk Branch: master Commit: 856ba26abdf898a200ef126a5f2bdbda4293ad11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=856ba26abdf898… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Jun 30 11:25:34 2016 +0200 3150 FIX fixed helpers failing to start and high cpu load when an unparsable local check is installed When python fails to parse a check file (local or shipped), the check_mk helpers would produce an erro message and exit. check_mk would then restart the helper, repeating the process infinitely which left check_mk in a non-working state, causing high cpu load and quickly growing the cmc.log. This only occurs when installing syntactically broken checks so most users shouldn't be affected. --- .werks/3150 | 14 ++++++++++++++ ChangeLog | 1 + modules/check_mk.py | 7 ++++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/3150 b/.werks/3150 new file mode 100644 index 0000000..0ccf0b0 --- /dev/null +++ b/.werks/3150 @@ -0,0 +1,14 @@ +Title: fixed helpers failing to start and high cpu load when an unparsable local check is installed +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1467278454 + +When python fails to parse a check file (local or shipped), the check_mk helpers would produce an +erro message and exit. check_mk would then restart the helper, repeating the process infinitely +which left check_mk in a non-working state, causing high cpu load and quickly growing the cmc.log. + +This only occurs when installing syntactically broken checks so most users shouldn't be affected. diff --git a/ChangeLog b/ChangeLog index 9c4eef9..1513450 100644 --- a/ChangeLog +++ b/ChangeLog @@ -289,6 +289,7 @@ * 3655 FIX: if64adm: Can now be used with OID range limits * 3685 FIX: brocade_fcport: fixed unknown state texts * 3686 FIX: hp_proliant_temp: fixed wrong device thresholds handling. If no thresholds available the device reports -99 + * 3150 FIX: fixed helpers failing to start and high cpu load when an unparsable local check is installed... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/modules/check_mk.py b/modules/check_mk.py index 32b9715..6a61d27 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -429,7 +429,12 @@ def load_checks(): sys.stderr.write("Error in plugin file %s: %s\n" % (f, e)) if opt_debug: raise - sys.exit(5) + # If we exit here, from a check_mk helper, check_mk will just + # try to restart the helper. This causes a tight loop of helper + # crashing and helper restarting that spams the log file and + # causes high cpu load which is a bit pointless because an + # invalid plugin file isn't going to fix itself + #sys.exit(5) for varname, value in globals().iteritems(): if varname[0] != '_' \

8 years, 5 months

cmk-lib: new functions render.timespan and render.time_since

by Mathias Kettner

Module: check_mk Branch: master Commit: 70556b99a66865cf983775282143d4c8a1591db0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70556b99a66865… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 29 16:29:45 2016 +0200 cmk-lib: new functions render.timespan and render.time_since --- lib/render.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/render.py b/lib/render.py index 0ad5c70..326e096 100644 --- a/lib/render.py +++ b/lib/render.py @@ -54,6 +54,17 @@ def time_of_day(timestamp): return time.strftime("%H:%M:%S", time.localtime(timestamp)) +def timespan(seconds): + hours, secs = divmod(seconds, 3600) + mins, secs = divmod(secs, 60) + return "%d:%02d:%02d" % (hours, mins, secs) + + +def time_since(timestamp): + return timespan(time.time() - timestamp) + + + # Precise size of a file - separated decimal separator # 1234 -> "1234" # 12345 => "12,345"

8 years, 5 months

3689 brocade_fcport: now monitors BBcredit zero stats and the number of encoding error or disparity error inside frames received

by Simon Betz

Module: check_mk Branch: master Commit: 7d2ddc6f2dadae881da392214dce16907acd3666 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d2ddc6f2dadae… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jun 29 16:20:06 2016 +0200 3689 brocade_fcport: now monitors BBcredit zero stats and the number of encoding error or disparity error inside frames received --- .werks/3689 | 9 +++++++++ ChangeLog | 1 + checkman/brocade_fcport | 2 +- checks/brocade_fcport | 21 ++++++++++++++++++--- web/plugins/metrics/check_mk.py | 33 ++++++++++++++++++++++++++------- web/plugins/wato/check_parameters.py | 9 +++++++++ 6 files changed, 64 insertions(+), 11 deletions(-) diff --git a/.werks/3689 b/.werks/3689 new file mode 100644 index 0000000..aaf4940 --- /dev/null +++ b/.werks/3689 @@ -0,0 +1,9 @@ +Title: brocade_fcport: now monitors BBcredit zero stats and the number of encoding error or disparity error inside frames received +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1467209823 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 9fd0561..9c4eef9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -107,6 +107,7 @@ * 2240 check_mk_agent.openwrt: New agent for OpenWRT based systems... * 3684 infoblox_systeminfo: new inventory plugin for Infoblox devices which support the IB-PLATFORMONE MIB * 3688 perle_chassis, perle_chassis.temp, perle_chassis_slots, perle_modules_cm1000, perle_modules_cm1110, perle_modules_mgt, perle_psmu, perle_psmu.fan: new checks for Perle Mediaconverter devices which support the PERLE-MCR-MGT MIB + * 3689 brocade_fcport: now monitors BBcredit zero stats and the number of encoding error or disparity error inside frames received * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checkman/brocade_fcport b/checkman/brocade_fcport index a17ef09..6cef3de 100644 --- a/checkman/brocade_fcport +++ b/checkman/brocade_fcport @@ -15,7 +15,7 @@ description: percentual levels. {[3]} An error counter exceeds its configured levels (CRC errors, Enc-OUT - frames, no Tx credits, C3 discards) + Enc-IN, frames, no Tx credits, C3 discards) Averaging: This check supports averaging on all counters. Averaging is turned on but setting the check parameter {"average"} to a number of minutes. diff --git a/checks/brocade_fcport b/checks/brocade_fcport index 1969573..cb205b4 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -100,6 +100,7 @@ brocade_fcport_inventory = [] factory_settings["brocade_fcport_default_levels"] = { "rxcrcs": (3.0, 20.0), # allowed percentage of CRC errors "rxencoutframes": (3.0, 20.0), # allowed percentage of Enc-OUT Frames + "rxencinframes": (3.0, 20.0), # allowed percentage of Enc-In Frames "notxcredits": (3.0, 20.0), # allowed percentage of No Tx Credits "c3discards": (3.0, 20.0), # allowed percentage of C3 discards "assumed_speed": 2.0, # used if speed not available in SNMP data @@ -135,7 +136,7 @@ def inventory_brocade_fcport(info): isl_ports = dict(info[1]) for line in info[0]: - if len(line) == 14: + if len(line) >= 14: try: index = int(line[0]) phystate = int(line[1]) @@ -162,7 +163,7 @@ def check_brocade_fcport(item, params, info): item_index = int(item.split()[0]) portinfo = [ line for line in info[0] if int(line[0]) == item_index + 1] index, phystate, opstate, admstate, txwords, rxwords, txframes, rxframes, \ - notxcredits, rxcrcs, rxencoutframes, c3discards = map(int, portinfo[0][:-2]) + notxcredits, rxcrcs, rxencinframes, rxencoutframes, c3discards = map(int, portinfo[0][:-2]) speed = saveint(portinfo[0][-2]) summarystate = 0 @@ -277,6 +278,7 @@ def check_brocade_fcport(item, params, info): for descr, counter, value, ref in [ ("CRC errors", "rxcrcs", rxcrcs, rxframes_rate, ), ("ENC-Out", "rxencoutframes", rxencoutframes, rxframes_rate, ), + ("ENC-In", "rxencinframes", rxencinframes, rxframes_rate, ), ("C3 discards", "c3discards", c3discards, txframes_rate, ), ("no TX buffer credits", "notxcredits", notxcredits, txframes_rate, ),]: per_sec = get_rate("brocade_fcport.%s.%s" % (counter, index), this_time, value) @@ -303,7 +305,7 @@ def check_brocade_fcport(item, params, info): text += ", Avg: %.2f%%" % (rate * 100.0) error_percentage = rate * 100.0 - warn, crit = params[counter] + warn, crit = params.get(counter, (None, None)) if crit != None and error_percentage >= crit: summarystate = 2 text += "(!!)" @@ -353,6 +355,13 @@ def check_brocade_fcport(item, params, info): summarystate = 2 output.append("Adm:%s(%d)%s" % (brocade_fcport_admstates.get(admstate, "unknown"), admstate, errorflag)) + if info[3]: + for oidend, bbcredit in info[3]: + if index == int(oidend.split(".")[-1]): + bbcredit_rate = get_rate("brocade_fcport.bbcredit.%s" % (item), + this_time, binstring_to_int(bbcredit)) + perfdata.append( ("fc_bbcredit_zero", bbcredit_rate) ) + return (summarystate, ', '.join(output), perfdata) check_info["brocade_fcport"] = { @@ -372,6 +381,7 @@ check_info["brocade_fcport"] = { 14, # swFCPortRxFrames 20, # swFCPortNoTxCredits 22, # swFCPortRxCrcs + 21, # swFCPortRxEncInFrs 26, # swFCPortRxEncOutFrs 28, # swFCPortC3Discards 35, # swFCPortSpeed, deprecated from at least firmware version 7.2.1 @@ -389,6 +399,11 @@ check_info["brocade_fcport"] = { "2.2.1.3", # ifType, needed to extract fibre channel ifs only (type 56) "31.1.1.1.15", # IF-MIB::ifHighSpeed ]), + # Not every device supports that + (".1.3.6.1.3.94.4.5.1", [ + OID_END, + "8", # FCMGMT-MIB::connUnitPortStatCountBBCreditZero + ]), ], 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588.2.1.1") \ and oid(".1.3.6.1.4.1.1588.2.1.1.1.6.2.1.*") != None, diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index fe668e6..2570e0a 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -1862,13 +1862,25 @@ metric_info["fc_tx_frames"] = { metric_info["fc_crc_errors"] = { "title" : _("Receive CRC errors"), "unit" : "1/s", - "color" : "12/a", + "color" : "21/a", } metric_info["fc_encouts"] = { "title" : _("Enc-Outs"), "unit" : "1/s", - "color" : "13/a", + "color" : "12/a", +} + +metric_info["fc_encins"] = { + "title" : _("Enc-Ins"), + "unit" : "1/s", + "color" : "13/b", +} + +metric_info["fc_bbcredit_zero"] = { + "title" : _("BBcredit zero"), + "unit" : "1/s", + "color" : "46/a", } metric_info["fc_c3discards"] = { @@ -3902,6 +3914,7 @@ check_metrics["check_mk-brocade_fcport"] = { "txframes" : { "name": "fc_tx_frames", }, "rxcrcs" : { "name": "fc_crc_errors" }, "rxencoutframes" : { "name": "fc_encouts" }, + "rxencinframes" : { "name": "fc_encins" }, "c3discards" : { "name": "fc_c3discards" }, "notxcredits" : { "name": "fc_notxcredits" }, } @@ -6671,11 +6684,17 @@ graph_info.append({ graph_info.append({ "title" : _("Errors"), "metrics" : [ - ( "fc_crc_errors", "area" ), - ( "fc_encouts", "stack" ), - ( "fc_c3discards", "stack" ), - ( "fc_notxcredits", "stack" ), - ] + ( "fc_crc_errors", "area" ), + ( "fc_c3discards", "stack" ), + ( "fc_notxcredits", "stack" ), + ( "fc_encouts", "stack" ), + ( "fc_encins", "stack" ), + ( "fc_bbcredit_zero", "stack" ), + ], + "optional_metrics" : [ + "fc_encins", + "fc_bbcredit_zero", + ], }) graph_info.append({ diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 65c3bd5..8b144ff 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2986,6 +2986,15 @@ register_check_parameters( ] ) ), + ("rxencinframes", + Tuple ( + title = _("Enc-In frames rate"), + elements = [ + Percentage( title = _("Warning at"), unit = _("percent")), + Percentage( title = _("Critical at"), unit = _("percent")), + ] + ) + ), ("notxcredits", Tuple ( title = _("No-TxCredits errors"),

8 years, 5 months

pylint-Fehler in kür zlichem Commit behoben

by Mathias Kettner

Module: check_mk Branch: master Commit: 80399b3a0a636cfc26dbc597a0d96b99e24af7e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80399b3a0a636c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 29 15:03:10 2016 +0200 pylint-Fehler in kürzlichem Commit behoben --- web/htdocs/valuespec.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index a6929ef..ffb2045 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1495,7 +1495,8 @@ class CascadingDropdown(ValueSpec): type(value) == self._encoding_type and value[0] == val): if vs: if type(value) != self._encoding_type or len(value) != 2: - raise MKUserError(varprefix + "_sel", _("Value must a %s with two elements."), self._encoding_type.__name__) + raise MKUserError(varprefix + "_sel", + _("Value must be a %s with two elements.") % self._encoding_type.__name__) vs.validate_datatype(value[1], varprefix + "_%d" % nr) return raise MKUserError(varprefix, _("Value %r is not allowed here.") % value)

8 years, 5 months

3149 FIX fixed rare crash if alert handling tried to long non-latin characters

by Sebastian Herbord

Module: check_mk Branch: master Commit: a5709952183748b1ce7e14ca18c46ff32a2029dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5709952183748… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Jun 29 14:43:38 2016 +0200 3149 FIX fixed rare crash if alert handling tried to long non-latin characters --- .werks/3149 | 10 ++++++++++ ChangeLog | 1 + modules/events.py | 2 ++ 3 files changed, 13 insertions(+) diff --git a/.werks/3149 b/.werks/3149 new file mode 100644 index 0000000..96361b6 --- /dev/null +++ b/.werks/3149 @@ -0,0 +1,10 @@ +Title: fixed rare crash if alert handling tried to long non-latin characters +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1467204048 + + diff --git a/ChangeLog b/ChangeLog index dc1b951..9fd0561 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * 3471 FIX: Repair ignoring discovery errors when bogus %s is contained in service description... * 3616 FIX: Fix cmk -I ignoring the option --cache... * 3617 FIX: cmk -I without host specification now (again) always uses cache files... + * 3149 FIX: fixed rare crash if alert handling tried to long non-latin characters Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller diff --git a/modules/events.py b/modules/events.py index bfdbadf..a659703 100644 --- a/modules/events.py +++ b/modules/events.py @@ -168,6 +168,8 @@ def render_context_dump(raw_context): def event_log(logfile_path, message): + if isinstance(message, str): + message = message.decode("utf-8") formatted = u"%s %s\n" % (time.strftime("%F %T", time.localtime()), message) file(logfile_path, "a").write(formatted.encode("utf-8"))

8 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2016