Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

4357 steelhead_connections: now you can set upper levels for all connection types

by Simon Betz

Module: check_mk Branch: master Commit: 3fa04a71cf6a6182cfa4bc3cc58748e8ad30b282 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fa04a71cf6a61… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 10 10:37:11 2017 +0100 4357 steelhead_connections: now you can set upper levels for all connection types Change-Id: I2639884331c46795fe0f4cda22cccd6e34413259 --- .werks/4357 | 9 ++++ ChangeLog | 1 + checkman/steelhead_connections | 3 +- checks/steelhead_connections | 79 ++++++++++++++++++++++++------------ web/plugins/wato/check_parameters.py | 63 ++++++++++++++++++++++++++++ 5 files changed, 126 insertions(+), 29 deletions(-) diff --git a/.werks/4357 b/.werks/4357 new file mode 100644 index 0000000..cab655f --- /dev/null +++ b/.werks/4357 @@ -0,0 +1,9 @@ +Title: steelhead_connections: now you can set upper levels for all connection types +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1486719400 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 7d7cea0..3b44b98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ * 4019 Windows powershell scripts are now always called with the options -noprofile -executionpolicy bypass... * 4020 windows/megaraid.bat: now also provides information for the megaraid_bbu check (Battery Backup Unit) * 4021 windows agent: improved error message in logfile when a specified winperf counter id could not get resolved + * 4357 steelhead_connections: now you can set upper levels for all connection types * 4171 FIX: perle_psmu: fixed value error... * 4172 FIX: smart.temp: fixed discovery and check function... * 4173 FIX: if.include: ignore some more keys in 'Network interfaces and switch ports' rule which are only used for interface grouping diff --git a/checkman/steelhead_connections b/checkman/steelhead_connections index bf9c647..9b6e77b 100644 --- a/checkman/steelhead_connections +++ b/checkman/steelhead_connections @@ -9,8 +9,7 @@ description: up into {optimized} and {passthrough}. The optimized connections are divided into {active}, {established}, {half opened} and {half closed}. - Currently there is no way to apply levels and the check is always {OK}. - + For all connection types upper levels can be set. There are no default levels. inventory: One service per Riverbed Steelhead appliance will be created. diff --git a/checks/steelhead_connections b/checks/steelhead_connections index 65457e3..89cf3c5 100644 --- a/checks/steelhead_connections +++ b/checks/steelhead_connections @@ -24,41 +24,66 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -steelhead_counter_names = { - 1: "optimized", - 2: "passthrough", - 3: "halfOpened", - 4: "halfClosed", - 5: "established", - 6: "active", - 7: "total", -} - def inventory_steelhead_connections(info): if len(info) >= 7: - return [(None, None)] + return [(None, {})] def check_steelhead_connections(item, params, info): + if params is None: + params = {} + + map_counter_types = { + "1" : "optimized", + "2" : "passthrough", + "3" : "halfOpened", + "4" : "halfClosed", + "5" : "established", + "6" : "active", + "7" : "total", } + values = {} - for line in info: - oid, value = line - oidparts = oid.strip('.').split('.') - itemname = steelhead_counter_names.get(int(oidparts[11]), "unknown") - values[itemname] = int(value) + for oid, value in info: + counter_type = oid.strip('.').split('.')[-2] + key = map_counter_types.get(counter_type, "unknown") + values[key] = int(value) - perfdata = [] - infos = [] - # leave out total and optimized since they can be computed - for v in [ "active", "established", "halfOpened", "halfClosed", "passthrough" ]: - infos.append("%s: %d" % (v, values[v])) - perfdata.append((v, values[v])) - return (0, "%d connections: %s" % (values["total"], ", ".join(infos)), perfdata) + # leave out total and optimized in perfdata since they can be computed + for key, title, has_perf in [ + ("total", "Total connections", False), + ("passthrough", "Passthrough", True), + ("optimized", "Optimized", False), + ("active", "Active", True), + ("established", "Established", True), + ("halfOpened", "Half opened", True), + ("halfClosed", "Half closed", True), + ]: + value = values[key] + if has_perf: + perfdata = [(key, value)] + else: + perfdata = [] + infotext = "%s: %d" % (title, value) + state = 0 + if params.get(key): + warn, crit = params[key] + if value >= crit: + state = 2 + elif value >= warn: + state = 1 + if state > 0: + infotext += " (warn/crit at %d/%d)" % (warn, crit) -check_info['steelhead_connections'] = (check_steelhead_connections, "Connections", 1, inventory_steelhead_connections) + yield state, infotext, perfdata -snmp_info['steelhead_connections'] = ( ".1.3.6.1.4.1.17163.1.1.5", [ OID_STRING, 2 ]) -snmp_scan_functions['steelhead_connections'] = \ - lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.17163.") +check_info['steelhead_connections'] = { + "inventory_function" : inventory_steelhead_connections, + "check_function" : check_steelhead_connections, + "service_description" : "Connections", + "has_perfdata" : True, + "snmp_info" : (".1.3.6.1.4.1.17163.1.1.5", [ OID_STRING, 2 ]), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.17163."), + "group" : "steelhead_connections", +} diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 6e2427b..de78519 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -12878,6 +12878,69 @@ register_check_parameters( match_type = "dict", ) + +register_check_parameters( + subgroup_networking, + "steelhead_connections", + _("Steelhead connections"), + Dictionary( + elements = [ + ("total", Tuple( + title = _("Levels for total amount of connections"), + elements = [ + Integer(title = _("Warning at")), + Integer(title = _("Critical at")), + ], + )), + ("optimized", Tuple( + title = _("Levels for optimized connections"), + elements = [ + Integer(title = _("Warning at")), + Integer(title = _("Critical at")), + ], + )), + ("passthrough", Tuple( + title = _("Levels for passthrough connections"), + elements = [ + Integer(title = _("Warning at")), + Integer(title = _("Critical at")), + ], + )), + ("halfOpened", Tuple( + title = _("Levels for half opened connections"), + elements = [ + Integer(title = _("Warning at")), + Integer(title = _("Critical at")), + ], + )), + ("halfClosed", Tuple( + title = _("Levels for half closed connections"), + elements = [ + Integer(title = _("Warning at")), + Integer(title = _("Critical at")), + ], + )), + ("established", Tuple( + title = _("Levels for established connections"), + elements = [ + Integer(title = _("Warning at")), + Integer(title = _("Critical at")), + ], + )), + ("active", Tuple( + title = _("Levels for active connections"), + elements = [ + Integer(title = _("Warning at")), + Integer(title = _("Critical at")), + ], + )), + ], + ), + None, + "dict", +) + + register_check_parameters( subgroup_storage, "fc_port",

7 years, 7 months

Refactoring mkeventd.

by Roland Halbig

Module: check_mk Branch: master Commit: 502485627ba17a043cd5eae2b8e86c42257e6c0c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=502485627ba17a… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Feb 9 17:26:10 2017 +0100 Refactoring mkeventd. Change-Id: Ib48cd7f63e7a02a992ed7487fb2452bf5fdeb14a --- web/plugins/views/mkeventd.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index 591f0a5..5119223 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -442,18 +442,28 @@ if mkeventd_enabled: [ "user", "admin" ]) def render_mkeventd_update(): - html.write('<table border=0 cellspacing=3 cellpadding=0>') + html.open_table(border=0, cellpadding=0, cellspacing=3) if config.user.may("mkeventd.update_comment"): - html.write('<tr><td>%s</td><td>' % _("Change comment:")) + html.open_tr() + html.open_td() + html.write(_("Change comment:")) + html.close_td() + html.open_td() html.text_input('_mkeventd_comment', size=50) html.close_td() html.close_tr() if config.user.may("mkeventd.update_contact"): - html.write('<tr><td>%s</td><td>' % _("Change contact:")) + html.open_tr() + html.open_td() + html.write(_("Change contact:")) + html.close_td() + html.open_td() html.text_input('_mkeventd_contact', size=50) html.close_td() html.close_tr() - html.write('<td></td><td>') + html.open_tr() + html.td('') + html.open_td() html.checkbox('_mkeventd_acknowledge', True, label=_("Set event to acknowledged")) html.close_td() html.close_tr()

7 years, 7 months

fixed non-lexicographic order in oids to walk

by Simon Betz

Module: check_mk Branch: master Commit: 8889df238bf9d6a695b872667d0a056b92d03633 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8889df238bf9d6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 10 10:17:24 2017 +0100 fixed non-lexicographic order in oids to walk Change-Id: I2fcf666dd705bf8c71c983e60a786d26c65e9abe --- modules/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index a4bb0cd..10ce0f7 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3183,7 +3183,7 @@ def do_snmpwalk_on(hostname, filename): ".1.3.6.1.4.1" # SNMPv2-SMI::enterprises ] + opt_extra_oids - for oid in oids_to_walk: + for oid in sorted(oids_to_walk, key = lambda x: map(int, x.strip(".").split("."))): try: console.verbose("Walk on \"%s\"..." % oid)

7 years, 7 months

4330 FIX Tactical overview: Show data of core even when Event Console is currently not reachable

by Lars Michelsen

Module: check_mk Branch: master Commit: d194fe547a5ab8bc32f733bb7cb00255fc9365bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d194fe547a5ab8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 10 09:00:07 2017 +0100 4330 FIX Tactical overview: Show data of core even when Event Console is currently not reachable The data of the core and failed notifications are shown even when the Event Console is not running Change-Id: I81373836a8fa57c9f920114f31597d8406f5c5cc --- .werks/4330 | 10 ++++++++++ ChangeLog | 1 + web/plugins/sidebar/shipped.py | 5 ++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/4330 b/.werks/4330 new file mode 100644 index 0000000..4aadfc6 --- /dev/null +++ b/.werks/4330 @@ -0,0 +1,10 @@ +Title: Tactical overview: Show data of core even when Event Console is currently not reachable +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i4 +Date: 1486713568 +Class: fix + +The data of the core and failed notifications are shown even when the Event Console +is not running diff --git a/ChangeLog b/ChangeLog index 2d7095e..7d7cea0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -131,6 +131,7 @@ * 4048 FIX: Fixed bug in tables: the notification message for reached row limits is visible again * 4049 FIX: Fixed cut-off of bulk options when row-limit is reached. * 4025 FIX: BI Aggregations: No longer suppressing error messages for invalid configured BI rules... + * 4330 FIX: Tactical overview: Show data of core even when Event Console is currently not reachable... WATO: * 4142 New extended search dialog for rulesets and rules... diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 03a012d..d325b8b 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -637,7 +637,10 @@ def get_tactical_overview_data(extra_filter_headers): if notdata is None: notdata = [0] - event_data = sites.live().query_summed_stats(event_query) + try: + event_data = sites.live().query_summed_stats(event_query) + except livestatus.MKLivestatusNotFoundError: + event_data = [0, 0, 0] except livestatus.MKLivestatusNotFoundError: return None, None, None, None

7 years, 7 months

Added global WATO buttons to service discovery page

by Lars Michelsen

Module: check_mk Branch: master Commit: 4745d160ec4533bf9dcaad64f98d9156f0151ce3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4745d160ec4533… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 10 08:49:12 2017 +0100 Added global WATO buttons to service discovery page Change-Id: I7fc041e1b784569c91bb0cae03c3326c7a48d4fe --- web/htdocs/wato.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index bcaf35b..aec3496 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2746,6 +2746,8 @@ class ModeDiscovery(WatoMode): def buttons(self): + global_buttons() + html.context_button(_("Folder"), folder_preserving_link([("mode", "folder")]), "back")

7 years, 7 months

Fixed exception on new service discovery page when changing services

by Lars Michelsen

Module: check_mk Branch: master Commit: 0c517a2a3f40217cad5e15235549e4242afb511b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c517a2a3f4021… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 9 17:29:20 2017 +0100 Fixed exception on new service discovery page when changing services Change-Id: I354b8c05c7da823a3f8251e0c47069746a932eed --- web/htdocs/watolib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 083aa4a..65e01d2 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -6120,7 +6120,7 @@ class RulesetCollection(object): if not g_rulespecs.exists(varname): continue # don't save unknown rulesets - if ruleset.is_empty(): + if ruleset.is_empty_in_folder(folder): continue # don't save empty rule sets content += ruleset.to_config(folder)

7 years, 7 months

tests: Fixed storing of crawl results

by Lars Michelsen

Module: check_mk Branch: master Commit: 5e4dfa43dec3c8670a923755fc6083bda7da9663 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e4dfa43dec3c8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 9 17:22:20 2017 +0100 tests: Fixed storing of crawl results Change-Id: I4bf7dc3bd7645983b71d22d5e80d32831ed95a5a --- tests/testlib/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 4d4002b..918366c 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -40,7 +40,7 @@ def cmc_path(): # Directory for persisting variable data produced by tests def var_dir(): if "WORKSPACE" in os.environ: - base_dir = os.environ["WORKSPACE"] + base_dir = os.environ["WORKSPACE"] + "/results" else: base_dir = repo_path() + "/tests"

7 years, 7 months

4125 FIX kaspersky_av_client: made fullscan state optional,

by Marcel Schulte

simplified plugin Message-ID: <589c7631.KrRs7PGCNdRP9DtG%ms(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: application/octet-stream Content-Transfer-Encoding: base64 TW9kdWxlOiBjaGVja19tawpCcmFuY2g6IG1hc3RlcgpDb21taXQ6IDQ2OWU5M2MyYzg2ZDhl Y2U2NDkyZTNhNWRiYTk5NTEwNGIzNDQyZWEKVVJMOiAgICBodHRwOi8vZ2l0Lm1hdGhpYXMt a2V0dG5lci5kZS9naXQvP3A9Y2hlY2tfbWsuZ2l0O2E9Y29tbWl0O2g9NDY5ZTkzYzJjODZk OGVjZTY0OTJlM2E1ZGJhOTk1MTA0YjM0NDJlYQoKQXV0aG9yOiBNYXJjZWwgU2NodWx0ZSA8 bXNAbWF0aGlhcy1rZXR0bmVyLmRlPgpEYXRlOiAgIFRodSBGZWIgIDkgMTQ6NTM6MjUgMjAx NyArMDEwMAoKNDEyNSBGSVgga2FzcGVyc2t5X2F2X2NsaWVudDogbWFkZSBmdWxsc2NhbiBz dGF0ZSBvcHRpb25hbCwgc2ltcGxpZmllZCBwbHVnaW4KClNpbXBsaWZpZWQgdGhlIHZicyBw bHVnaW4gcmVnYXJkaW5nIGRldGVjdGlvbiBvZiBpbnN0YWxsZWQgQVYgY2xpZW50LgoKRnVs bHNjYW4gc3RhdGUgaXMgbm93IG9wdGlvbmFsIGluIG9yZGVyIHRvIGJlIG1vcmUgY29tcGF0 aWJsZSB0byBzdGF0dXMgS2FzcGVyc2t5IExhYnMgcmVwb3J0cy4KCkNoYW5nZS1JZDogSTVm NDMzZWNiNjY2ZjA2ZDRhNWYyNzQ0NWQ3Y2JjZmU3MTBjZjZlYjMKCi0tLQoKIC53ZXJrcy80 MTI1ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAxMiArKysrKwogQ2hh bmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAxICsKIGFn ZW50cy93aW5kb3dzL3BsdWdpbnMva2FzcGVyc2t5X2F2X2NsaWVudC52YnMgfCA2MSArKysr KysrKysrKysrKy0tLS0tLS0tLS0tLQogY2hlY2tzL2thc3BlcnNreV9hdl9jbGllbnQgICAg ICAgICAgICAgICAgICAgICB8ICA5ICsrKy0KIDQgZmlsZXMgY2hhbmdlZCwgNTQgaW5zZXJ0 aW9ucygrKSwgMjkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvLndlcmtzLzQxMjUgYi8u d2Vya3MvNDEyNQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zZTU2NTMy Ci0tLSAvZGV2L251bGwKKysrIGIvLndlcmtzLzQxMjUKQEAgLTAsMCArMSwxMiBAQAorVGl0 bGU6IGthc3BlcnNreV9hdl9jbGllbnQ6IG1hZGUgZnVsbHNjYW4gc3RhdGUgb3B0aW9uYWws IHNpbXBsaWZpZWQgcGx1Z2luCitMZXZlbDogMQorQ29tcG9uZW50OiBjaGVja3MKK0NsYXNz OiBmaXgKK0NvbXBhdGlibGU6IGNvbXBhdAorU3RhdGU6IHVua25vd24KK1ZlcnNpb246IDEu NC4waTQKK0RhdGU6IDE0ODY2NDgyOTEKKworU2ltcGxpZmllZCB0aGUgdmJzIHBsdWdpbiBy ZWdhcmRpbmcgZGV0ZWN0aW9uIG9mIGluc3RhbGxlZCBBViBjbGllbnQuCisKK0Z1bGxzY2Fu IHN0YXRlIGlzIG5vdyBvcHRpb25hbCBpbiBvcmRlciB0byBiZSBtb3JlIGNvbXBhdGlibGUg dG8gc3RhdHVzIEthc3BlcnNreSBMYWJzIHJlcG9ydHMuCmRpZmYgLS1naXQgYS9DaGFuZ2VM b2cgYi9DaGFuZ2VMb2cKaW5kZXggZDNkY2Y4My4uMmQ3MDk1ZSAxMDA2NDQKLS0tIGEvQ2hh bmdlTG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMTA2LDYgKzEwNiw3IEBACiAgICAgKiA0MjE2 IEZJWDogY21jaWlpLnBoYXNlOiBGaXggd3Jvbmcgc2NhbGluZyBvZiBwb3dlciBhbmQgZW5l cmd5IHZhbHVlcwogICAgICogNDM0NSBGSVg6IGhwX3Byb2xpYW50X3RlbXA6IElnbm9yZSBk ZXZpY2UgbGV2ZWxzIG9mIDAKICAgICAqIDQzNTYgRklYOiBicm9jYWRlX2ZjcG9ydDogc2lu Y2UgRlcgOC4wLiogdHgvcnh3b3JkcyBhcmUgbm8gbG9uZ2VyIGF2YWlsYWJsZSwgdXNlIHZh bHVlcyBmcm9tIEZDTUdNVC1NSUIgaW5zdGVhZAorICAgICogNDEyNSBGSVg6IGthc3BlcnNr eV9hdl9jbGllbnQ6IG1hZGUgZnVsbHNjYW4gc3RhdGUgb3B0aW9uYWwsIHNpbXBsaWZpZWQg cGx1Z2luLi4uCiAKICAgICBNdWx0aXNpdGU6CiAgICAgKiA0MTY5IFZpZXcgYWN0aW9uOiBE ZWZhdWx0IHZhbHVlcyBvZiBzdGlja3ksIG5vdGlmaWNhdGlvbiBhbmQgcGVyc2lzdGVudCBv cHRpb25zIGNhbiBub3cgYmUgY29uZmlndXJlZCB2aWEgZ2xvYmFsIHNldHRpbmdzLi4uLgpk aWZmIC0tZ2l0IGEvYWdlbnRzL3dpbmRvd3MvcGx1Z2lucy9rYXNwZXJza3lfYXZfY2xpZW50 LnZicyBiL2FnZW50cy93aW5kb3dzL3BsdWdpbnMva2FzcGVyc2t5X2F2X2NsaWVudC52YnMK aW5kZXggODM5NzNmNS4uN2E0OGM5NCAxMDA2NDQKLS0tIGEvYWdlbnRzL3dpbmRvd3MvcGx1 Z2lucy9rYXNwZXJza3lfYXZfY2xpZW50LnZicworKysgYi9hZ2VudHMvd2luZG93cy9wbHVn aW5zL2thc3BlcnNreV9hdl9jbGllbnQudmJzCkBAIC0xLDE0ICsxLDE0IEBACiAnIC0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tDQogJyBDaGVja19NSyB3aW5kb3dzIGFnZW50IHBsdWdpbiB0 byBnYXRoZXIgaW5mb3JtYXRpb24gYWJvdW50IGZ1bGxzY2FuIGFnZSBhbmQNCi0nIHNpZ25h dHVyZSBkYXRlIG9mIEthc3BlcnNreSBBbnRpLVZpcnVzIHNvZnR3YXJlLg0KKycgc2lnbmF0 dXJlIGRhdGUgYW5kIGNvbm5lY3Rpb24gZGF0ZSB0byBLYXNwZXJza3kgTWFuYWdlbWVudCBT ZXJ2ZXIgb2YNCisnIEthc3BlcnNreSBBbnRpLVZpcnVzIENsaWVudC4NCisnIEFsbCBLZXlz IGluIGZvcm1hdCBkZC1tbS15eXl5IGhoLW1tLXNzDQogJyAtLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLQ0KIA0KIE9wdGlvbiBFeHBsaWNpdA0KLWRpbSBzdHJSZWdMb2MsIHN0clN0YXRpc3Rp Y3NMb2MsIHN0clNpZ25EYXRlTG9jLCBzdHJLYXNVcGRhdGVMb2MsIHN0ckthc0Z1bGxzY2Fu TG9jLCBzdHJLYXNGdWxsc2NhblN0YXRlTG9jLCBzdHJLYXNSZXMNCi1kaW0gb2JqU2hlbGws IG9ialN0ZE91dA0KK2RpbSBzdHJTdGF0aXN0aWNzTG9jLCBzdHJQcm90ZWN0aW9uX0Jhc2Vz RGF0ZSwgc3RyUHJvdGVjdGlvbl9MYXN0RnNjYW4sIHN0clByb3RlY3Rpb25fTGFzdENvbm5l Y3RlZCANCiBkaW0gc3RyQklBU0xvYywgc3RyQklBUw0KLWRpbSB2YWx1ZQ0KLQ0KK2RpbSBv YmpTaGVsbA0KIA0KIFNldCBvYmpTaGVsbCA9IENyZWF0ZU9iamVjdCgiV1NjcmlwdC5TaGVs bCIpDQogDQpAQCAtMjMsMzUgKzIzLDQwIEBAIEZ1bmN0aW9uIEthc3AyV2luKFRpbWVTdGFt cCkKIEVuZCBGdW5jdGlvbg0KIA0KIHN0ckJJQVNMb2MgPSAiSEtFWV9MT0NBTF9NQUNISU5F XFNZU1RFTVxDdXJyZW50Q29udHJvbFNldFxDb250cm9sXFRpbWVab25lSW5mb3JtYXRpb25c QWN0aXZlVGltZUJpYXMiDQorc3RyQklBUyA9IC1vYmpTaGVsbC5SZWdSZWFkKHN0ckJJQVNM b2MpDQogc3RyU3RhdGlzdGljc0xvYyA9ICJIS0VZX0xPQ0FMX01BQ0hJTkVcU09GVFdBUkVc V293NjQzMk5vZGVcS2FzcGVyc2t5TGFiXENvbXBvbmVudHNcMzRcMTEwM1wxLjAuMC4wXFN0 YXRpc3RpY3NcQVZTdGF0ZVwiDQotc3RyU2lnbkRhdGVMb2MgPSBzdHJTdGF0aXN0aWNzTG9j ICYgIlByb3RlY3Rpb25fQmFzZXNEYXRlIg0KIA0KKydQcm90ZWN0aW9uX0xhc3RDb25uZWN0 ZWQga2V5IHNldCB3aXRoIGRhdGUgb2YgbGFzdCBjb25uZWN0aW9uIHRvIG1hbmFnZW1lbnQg c2VydmVyDQorc3RyUHJvdGVjdGlvbl9MYXN0Q29ubmVjdGVkID0gc3RyU3RhdGlzdGljc0xv YyAmICJQcm90ZWN0aW9uX0xhc3RDb25uZWN0ZWQiDQogb24gZXJyb3IgcmVzdW1lIG5leHQN Ci12YWx1ZSA9IG9ialNoZWxsLnJlZ3JlYWQgKCAiSEtMTVxTT0ZUV0FSRVxXb3c2NDMyTm9k ZVxLYXNwZXJza3lMYWJccHJvdGVjdGVkXEFWUDgwXERhdGFcTGFzdFN1Y2Nlc3NmdWxGdWxs U2NhbiIgKQ0KK3N0clByb3RlY3Rpb25fTGFzdENvbm5lY3RlZCA9IG9ialNoZWxsLlJlZ1Jl YWQoc3RyUHJvdGVjdGlvbl9MYXN0Q29ubmVjdGVkKQ0KKw0KKydJZiB0aGUgc3RyUHJvdGVj dGlvbl9MYXN0Q29ubmVjdGVkIGtleSBjYW4gYmUgcmVhZCBLYXNwZXJza3kgQVYgaXMgYXNz dW1lZCB0byBiZSBpbnN0YWxsZWQNCiBpZiBlcnIubnVtYmVyID0gMCB0aGVuDQotCXN0clJl Z0xvYyA9ICJIS0xNXFNPRlRXQVJFXFdvdzY0MzJOb2RlXEthc3BlcnNreUxhYlxwcm90ZWN0 ZWRcQVZQODBcRGF0YVwiDQotZWxzZQ0KLQllcnIubnVtYmVyID0gMA0KLQl2YWx1ZSA9IG9i alNoZWxsLnJlZ3JlYWQgKCAiSEtMTVxTT0ZUV0FSRVxXb3c2NDMyTm9kZVxLYXNwZXJza3lM YWJccHJvdGVjdGVkXEtFUzhcRGF0YVxMYXN0U3VjY2Vzc2Z1bEZ1bGxTY2FuIiApDQotCWlm IGVyci5udW1iZXIgPSAwIHRoZW4NCi0JCXN0clJlZ0xvYyA9ICJIS0xNXFNPRlRXQVJFXFdv dzY0MzJOb2RlXEthc3BlcnNreUxhYlxwcm90ZWN0ZWRcS0VTOFxEYXRhXCINCisJV1Njcmlw dC5FY2hvKCI8PDxrYXNwZXJza3lfYXZfY2xpZW50Pj4+IikNCisNCisJJ1Byb3RlY3Rpb25f QmFzZXNEYXRlIGtleSBpcyBzZXQgd2l0aCBvbGQgc2lnbmF0dXJlcyBmcm9tIGluc3RhbGxl cg0KKwlzdHJQcm90ZWN0aW9uX0Jhc2VzRGF0ZSA9IHN0clN0YXRpc3RpY3NMb2MgJiAiUHJv dGVjdGlvbl9CYXNlc0RhdGUiDQorCXN0clByb3RlY3Rpb25fQmFzZXNEYXRlID0gb2JqU2hl bGwuUmVnUmVhZChzdHJQcm90ZWN0aW9uX0Jhc2VzRGF0ZSkNCisJaWYgc3RyUHJvdGVjdGlv bl9CYXNlc0RhdGUgPSAiIiB0aGVuDQorCQlXU2NyaXB0LkVjaG8oIlNpZ25hdHVyZXMgTWlz c2luZyIpDQogCWVsc2UNCi0JCVNldCBmc28gPSBDcmVhdGVPYmplY3QgKCJTY3JpcHRpbmcu RmlsZVN5c3RlbU9iamVjdCIpDQotCQlTZXQgc3RkZXJyID0gZnNvLkdldFN0YW5kYXJkU3Ry ZWFtICgyKQ0KLQkJc3RkZXJyLldyaXRlTGluZSAiS2FzcGVyc2t5IHZlcnNpb24gbm90IGNv bXBhdGlibGUgd2l0aCB0aGlzIHBsdWdpbiwgY2hlY2sgcmVnaXN0cnkgcGF0aC4iDQorCQlX U2NyaXB0LkVjaG8oIlNpZ25hdHVyZXMgIiAmIFVUQzJMb2NhbChLYXNwMldpbihzdHJQcm90 ZWN0aW9uX0Jhc2VzRGF0ZSkpKQ0KIAllbmQgaWYNCiANCi1lbmQgaWYNCi0NCi0nVGhlIGZv bGxvd2luZyByZWdpc3RyeSBrZXkganVzdCBjb250YWlucyB0aGUgaW5mb3JtYXRpb24gd2hl biB0aGUgc2lnbmF0dXJlcyB3ZXJlIHN5bmNlZCBmcm9tIHRoZSBhZG1pbiBzZXJ2ZXI6DQot J3N0ckthc1VwZGF0ZUxvYyA9IHN0clJlZ0xvYyAmICJMYXN0U3VjY2Vzc2Z1bFVwZGF0ZSIN Ci1zdHJLYXNGdWxsc2NhbkxvYyA9IHN0clJlZ0xvYyAmICJMYXN0U3VjY2Vzc2Z1bEZ1bGxT Y2FuIg0KLXN0ckthc0Z1bGxzY2FuU3RhdGVMb2MgPSBzdHJSZWdMb2MgJiAiTGFzdEZ1bGxT Y2FuU3RhdGUiDQorCSdQcm90ZWN0aW9uX0xhc3RGc2NhbiBrZXkgZGVwbG95ZWQgZW1wdHkg b24gaW5zdGFsbGF0aW9uDQorCXN0clByb3RlY3Rpb25fTGFzdEZzY2FuID0gc3RyU3RhdGlz dGljc0xvYyAmICJQcm90ZWN0aW9uX0xhc3RGc2NhbiINCisJc3RyUHJvdGVjdGlvbl9MYXN0 RnNjYW4gPSBvYmpTaGVsbC5SZWdSZWFkKHN0clByb3RlY3Rpb25fTGFzdEZzY2FuKQ0KKwlp ZiBzdHJQcm90ZWN0aW9uX0xhc3RGc2NhbiA9ICIiIE9SIGVyci5udW1iZXIgPD4gMCB0aGVu DQorCQlXU2NyaXB0LkVjaG8oIkZ1bGxzY2FuIE1pc3NpbmciKQ0KKwllbHNlDQorCQlXU2Ny aXB0LkVjaG8oIkZ1bGxzY2FuICIgJiBVVEMyTG9jYWwoS2FzcDJXaW4oc3RyUHJvdGVjdGlv bl9MYXN0RnNjYW4pKSkNCisJZW5kIGlmDQogDQorJ2Vsc2UNCisJJ1dTY3JpcHQuRWNobygi PDw8a2FzcGVyc2t5X2F2X2NsaWVudD4+PiIpDQorCSdXU2NyaXB0LkVjaG8oIlNpZ25hdHVy ZXMgTWlzc2luZyIpDQorCSdXU2NyaXB0LkVjaG8oIkZ1bGxzY2FuIE1pc3NpbmciKQ0KKwkn V1NjcmlwdC5FY2hvKCJNaXNzaW5nIEthc3BlcnNreSBDbGllbnQiKQ0KK2VuZCBpZg0KIA0K LXN0ckJJQVMgPSAtb2JqU2hlbGwuUmVnUmVhZChzdHJCSUFTTG9jKQ0KLXN0ckthc1JlcyA9 IG9ialNoZWxsLlJlZ1JlYWQoc3RyU2lnbkRhdGVMb2MpDQotV1NjcmlwdC5FY2hvKCI8PDxr YXNwZXJza3lfYXZfY2xpZW50Pj4+IikNCi1XU2NyaXB0LkVjaG8oIlNpZ25hdHVyZXMgIiAm IFVUQzJMb2NhbChLYXNwMldpbihzdHJLYXNSZXMpKSkNCi1zdHJLYXNSZXMgPSBvYmpTaGVs bC5SZWdSZWFkKHN0ckthc0Z1bGxzY2FuTG9jKQ0KLVdTY3JpcHQuRWNobygiRnVsbHNjYW4g IiAmIFVUQzJMb2NhbChVbml4MldpbihzdHJLYXNSZXMpKSAmICIgIiAmIG9ialNoZWxsLlJl Z1JlYWQoc3RyS2FzRnVsbHNjYW5TdGF0ZUxvYykpDQpkaWZmIC0tZ2l0IGEvY2hlY2tzL2th c3BlcnNreV9hdl9jbGllbnQgYi9jaGVja3Mva2FzcGVyc2t5X2F2X2NsaWVudAppbmRleCBl ODJjMDgxLi5lMDQ5ODRiIDEwMDY0NAotLS0gYS9jaGVja3Mva2FzcGVyc2t5X2F2X2NsaWVu dAorKysgYi9jaGVja3Mva2FzcGVyc2t5X2F2X2NsaWVudApAQCAtNDIsNyArNDIsMTEgQEAg ZmFjdG9yeV9zZXR0aW5nc1sna2FzcGVyc2t5X2F2X2NsaWVudF9kZWZhdWx0X2xldmVscydd ID0gewogZGVmIHBhcnNlX2thc3BlcnNreV9hdl9jbGllbnQoaW5mbyk6CiAgICAgbm93ID0g dGltZS50aW1lKCkKICAgICBwYXJzZWQgPSB7fQorCiAgICAgZm9yIGxpbmUgaW4gaW5mbzoK KyAgICAgICAgaWYgbGluZVsxXSA9PSAnTWlzc2luZyc6CisgICAgICAgICAgICBjb250aW51 ZQorCiAgICAgICAgIHRpbWVzdGFtcF90ZXh0ID0gbGluZVsxXSArICIgIiArIGxpbmVbMl0K ICAgICAgICAgIyBXZSBhc3N1bWUgdGhhdCB0aGUgdGltZXN0YW1wIGlzIHRvIGJlIGludGVy cHJldGVkIGluIHRoZSB0aW1lem9uZSBvZgogICAgICAgICAjIHRoZSBDaGVja19NSyBzZXJ2 ZXIuIFRoaXMgbWlnaHQgYmUgYSBwcm9ibGVtLCBpZiBlLmcuIHRoZSBhZ2VudCBpcyBsb2Nh dGVkCkBAIC01NCw3ICs1OCwxMCBAQCBkZWYgcGFyc2Vfa2FzcGVyc2t5X2F2X2NsaWVudChp bmZvKToKIAogICAgICAgICBlbGlmIGxpbmVbMF0gPT0gIkZ1bGxzY2FuIjoKICAgICAgICAg ICAgIHBhcnNlZFsnZnVsbHNjYW5fYWdlJ10gPSBhZ2UKLSAgICAgICAgICAgIHBhcnNlZFsn ZnVsbHNjYW5fZmFpbGVkJ10gPSBsaW5lWzNdICE9ICIwIgorCisgICAgICAgICAgICAjIGhh bmRsZSBzdGF0ZSBvZiBsYXN0IGZ1bGxzY2FuIGlmIHByb3ZpZGVkCisgICAgICAgICAgICBp ZiBsZW4obGluZSkgPT0gNDoKKyAgICAgICAgICAgICAgICBwYXJzZWRbJ2Z1bGxzY2FuX2Zh aWxlZCddID0gbGluZVszXSAhPSAiMCIKIAogICAgIHJldHVybiBwYXJzZWQKIAoK

7 years, 7 months

4356 FIX brocade_fcport: since FW 8.0.* tx/rxwords are no longer available , use values from FCMGMT-MIB instead

by Simon Betz

Module: check_mk Branch: master Commit: d3ba0b9cd5706ab35f5356dafcf2c46b7d79da86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3ba0b9cd5706a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Feb 9 14:32:09 2017 +0100 4356 FIX brocade_fcport: since FW 8.0.* tx/rxwords are no longer available, use values from FCMGMT-MIB instead Change-Id: I5f59986b451146d4cea530e7062e5d48599f9bf8 --- .werks/4356 | 10 ++++++++++ ChangeLog | 2 ++ checks/brocade_fcport | 44 ++++++++++++++++++++++++++++++++------------ 3 files changed, 44 insertions(+), 12 deletions(-) diff --git a/.werks/4356 b/.werks/4356 new file mode 100644 index 0000000..1769526 --- /dev/null +++ b/.werks/4356 @@ -0,0 +1,10 @@ +Title: brocade_fcport: since FW 8.0.* tx/rxwords are no longer available, use values from FCMGMT-MIB instead +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1486646748 + + diff --git a/ChangeLog b/ChangeLog index 1cf52eb..d3dcf83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,6 +95,7 @@ * 4335 FIX: perle check and inventory plugins: some updates and improvements... NOTE: Please refer to the migration notes! * 4123 FIX: active check check_sql: changed handling of query results and fixed hostname parameter... + * 4190 FIX: mssql_blocked_sessions: Fixed unknown states if only one session is blocked... * 4325 FIX: check_cpu_peaks: Make the check working with current Check_MK APi * 4339 FIX: fixed AtrributeError in oracle sessions ruleset * 4191 FIX: esx_vsphere_hostsystem.cpu_usage: Fixed wrong total GHz... @@ -104,6 +105,7 @@ * 4342 FIX: hp_proliant: fixed empty status handling * 4216 FIX: cmciii.phase: Fix wrong scaling of power and energy values * 4345 FIX: hp_proliant_temp: Ignore device levels of 0 + * 4356 FIX: brocade_fcport: since FW 8.0.* tx/rxwords are no longer available, use values from FCMGMT-MIB instead Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/checks/brocade_fcport b/checks/brocade_fcport index cb205b4..ee2399b 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -159,11 +159,31 @@ def inventory_brocade_fcport(info): def check_brocade_fcport(item, params, info): + if_info, link_info, speed_info, if64_info = info + # Accept item, even if port name or ISL state has changed - item_index = int(item.split()[0]) - portinfo = [ line for line in info[0] if int(line[0]) == item_index + 1] + item_index = int(item.split()[0]) + portinfo = [ line for line in if_info if int(line[0]) == item_index + 1] + + # Since FW v8.0.1b [rx/tx]words are no longer available + fcmgmt_portstats = [] + if portinfo[0][4] == "" or portinfo[0][5] == "": + for oidend, tx_elements, rx_elements, bbcredits in if64_info: + if item_index + 1 == int(oidend.split(".")[-1]): + fcmgmt_portstats = [ binstring_to_int(tx_elements), + binstring_to_int(rx_elements), + binstring_to_int(bbcredits) ] + break + if fcmgmt_portstats: + portinfo[0][4] = fcmgmt_portstats[0] + portinfo[0][5] = fcmgmt_portstats[1] + else: + portinfo[0][4] = 0 + portinfo[0][5] = 0 + index, phystate, opstate, admstate, txwords, rxwords, txframes, rxframes, \ notxcredits, rxcrcs, rxencinframes, rxencoutframes, c3discards = map(int, portinfo[0][:-2]) + speed = saveint(portinfo[0][-2]) summarystate = 0 @@ -173,7 +193,7 @@ def check_brocade_fcport(item, params, info): # Lookup port speed in ISL table for ISL ports (older switches do not provide this # information in the normal table) - isl_ports = dict(info[1]) + isl_ports = dict(link_info) if str(index) in isl_ports: gbit = isl_speed.get( isl_ports.get( str(index) ) ) speedmsg = ("ISL at %.0fGbit/s" % gbit) @@ -188,7 +208,7 @@ def check_brocade_fcport(item, params, info): # and assume that the sequence number of the FC port here is the same # as the sequence number in the borcade MIB (pindex = item_index) pindex = -1 - for vals in info[2]: + for vals in speed_info: port_type, actual_speed = map(saveint, vals) if port_type == 56: pindex += 1 @@ -355,15 +375,14 @@ 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) ) + if fcmgmt_portstats and fcmgmt_portstats[2]: + bbcredit_rate = get_rate("brocade_fcport.bbcredit.%s" % (item), + this_time, fcmgmt_portstats[2]) + perfdata.append( ("fc_bbcredit_zero", bbcredit_rate) ) return (summarystate, ', '.join(output), perfdata) + check_info["brocade_fcport"] = { 'check_function': check_brocade_fcport, 'inventory_function': inventory_brocade_fcport, @@ -393,7 +412,6 @@ check_info["brocade_fcport"] = { 2, # swNbMyPort 5, # swNbBaudRate ]), - # new way to get port speed supported by Brocade ( ".1.3.6.1.2.1", [ "2.2.1.3", # ifType, needed to extract fibre channel ifs only (type 56) @@ -402,7 +420,9 @@ check_info["brocade_fcport"] = { # Not every device supports that (".1.3.6.1.3.94.4.5.1", [ OID_END, - "8", # FCMGMT-MIB::connUnitPortStatCountBBCreditZero + "6", # FCMGMT-MIB::connUnitPortStatCountTxElements + "7", # FCMGMT-MIB::connUnitPortStatCountRxElements + "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") \

7 years, 7 months

Do not show source code of Windows agent sections in agent download

by Mathias Kettner

Module: check_mk Branch: master Commit: 39eb06205c64c3b95c48d7feebf6aecbbc3f551c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39eb06205c64c3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 9 13:31:42 2017 +0100 Do not show source code of Windows agent sections in agent download The source code makes no sense here. Also the sources of the actual agent itself is also missing We should not ship the sources in the binary package in the first place... Change-Id: I91200138eea0da147ad4d3ef8825ce6cd0d506c2 --- web/htdocs/wato.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 17f76a8..bcaf35b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15757,6 +15757,7 @@ def mode_download_agents(phase): '/special', '/windows/msibuild', '/windows/msibuild/patches', + '/windows/sections', ] file_titles = {}

7 years, 7 months

← Newer
1
...
24
25
26
27
28
29
30
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017