Checkmk git commits December 2016

checkmk-commits@lists.checkmk.com

10 participants
391 discussions

4122 FIX ibm_svc_enclosure: added support for firmware >= 7.8

by Marcel Schulte

Module: check_mk Branch: master Commit: 9497d5556b83376d3a5eda4c643d2901ad9ca27a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9497d5556b8337… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Thu Dec 29 11:04:15 2016 +0100 4122 FIX ibm_svc_enclosure: added support for firmware >= 7.8 SVC firmware >= 7.8 provides more output than former firmware versions. The additional data shows information about total and online secondary expander modules. The check has been customized to support the additional data. Change-Id: I744d210171e3d0224d2592dd352d3865cbb03757 --- .werks/4122 | 11 +++++++++++ ChangeLog | 1 + checks/ibm_svc_enclosure | 23 ++++++++++++++++++++--- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/.werks/4122 b/.werks/4122 new file mode 100644 index 0000000..5bab180 --- /dev/null +++ b/.werks/4122 @@ -0,0 +1,11 @@ +Title: ibm_svc_enclosure: added support for firmware >= 7.8 +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1483005691 + +SVC firmware >= 7.8 provides more output than former firmware versions. The additional data shows information about total and online secondary expander modules. +The check has been customized to support the additional data. diff --git a/ChangeLog b/ChangeLog index 3e02495..9ff9e1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ * 4209 FIX: mk_jolokia: Setting a default product now works... * 4120 FIX: fixed checks mysql and mysql.sessions for multiple MySQL instances... * 4121 FIX: mk_mysql: fixed handling of multiple instances + * 4122 FIX: ibm_svc_enclosure: added support for firmware >= 7.8... Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/checks/ibm_svc_enclosure b/checks/ibm_svc_enclosure index 3a25051..d79d938 100644 --- a/checks/ibm_svc_enclosure +++ b/checks/ibm_svc_enclosure @@ -37,8 +37,14 @@ # 3:online:expansion:yes:0:io_grp0:2072-24E:7804326:2:2:2:2:24:0:0 # 4:online:expansion:yes:0:io_grp0:2072-24E:7804352:2:2:2:2:24:0:0 +# FW >= 7.8 +# 1:online:control:yes:0:io_grp0:2072-24C:7804037:2:2:2:2:24:0:0:0:0 +# 2:online:expansion:yes:0:io_grp0:2072-24E:7804306:2:2:2:2:24:0:0:0:0 +# 3:online:expansion:yes:0:io_grp0:2072-24E:7804326:2:2:2:2:24:0:0:0:0 +# 4:online:expansion:yes:0:io_grp0:2072-24E:7804352:2:2:2:2:24:0:0:0:0 + # The names of the columns are: -# id:status:type:managed:IO_group_id:IO_group_name:product_MTM:serial_number:total_canisters:online_canisters:total_PSUs:online_PSUs:drive_slots:total_fan_modules:online_fan_modules +# id:status:type:managed:IO_group_id:IO_group_name:product_MTM:serial_number:total_canisters:online_canisters:total_PSUs:online_PSUs:drive_slots:total_fan_modules:online_fan_modules:total_sems:online_sems def inventory_ibm_svc_enclosure(info): @@ -51,12 +57,15 @@ def inventory_ibm_svc_enclosure(info): def check_ibm_svc_enclosure(item, _no_params, info): for line in info: if line[0] == item: - if len(line) < 15: # old format + if len(line) < 15: # old(est) format + line = line + ["0", "0", "0", "0"] # do not modify line! + if len(line) < 17: # old format line = line + ["0", "0"] # do not modify line! enclosure_id, enclosure_status, enclosure_type, managed, IO_group_id, \ IO_group_name, product_MTM, serial_number, total_canisters, online_canisters, \ - total_PSUs, online_PSUs, drive_slots, total_fan_modules, online_fan_modules = line + total_PSUs, online_PSUs, drive_slots, total_fan_modules, online_fan_modules, \ + total_secondary_expander_modules, online_secondary_expander_modules = line # Check status message = "Enclosure %s is %s" % (enclosure_id, enclosure_status) @@ -88,6 +97,14 @@ def check_ibm_svc_enclosure(item, _no_params, info): status = 2 message += ", only %s of %s fan modules are online(!!)" % (online_fan_modules, total_fan_modules) + # Check SEMs (only firmware >= 7.8) + if online_secondary_expander_modules == total_secondary_expander_modules: + if total_secondary_expander_modules != "0": + message += ", all %s secondary expander modules are online" % total_secondary_expander_modules + else: + status = 2 + message += ", only %s of %s secondary expander modules are online(!!)" % (online_secondary_expander_modules, total_secondary_expander_modules) + return status, message return 3, "Enclosure %s not found in agent output" % item

7 years, 6 months

Add missing manpages

by Konstantin Büttner

Module: check_mk Branch: master Commit: d9d48d3bd450c06d330542090181e9e6651aee92 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9d48d3bd450c0… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Dec 28 17:59:51 2016 +0100 Add missing manpages Change-Id: Ib28362333f083b42b2bcddbc643f7122994d3af3 --- checkman/jolokia_generic | 15 +++++++++++++++ checkman/jolokia_generic.rate | 15 +++++++++++++++ checkman/jolokia_generic.string | 15 +++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/checkman/jolokia_generic b/checkman/jolokia_generic new file mode 100644 index 0000000..fd0f662 --- /dev/null +++ b/checkman/jolokia_generic @@ -0,0 +1,15 @@ +title: Jolokia: Generic numeric MBean value +agents: linux +catalog: app/java +license: GPL +distribution: check_mk +description: + This check outputs a generic numeric value from the java virtual machine. + This check can go WARN or CRIT when the value is below or above certain + configurable levels. + + To use this plugin, Jolokia and the agent plugin need to be installed + on the monitored server. + +inventory: + One check is created for each numeric MBean value sent by the agent. diff --git a/checkman/jolokia_generic.rate b/checkman/jolokia_generic.rate new file mode 100644 index 0000000..87a45b9 --- /dev/null +++ b/checkman/jolokia_generic.rate @@ -0,0 +1,15 @@ +title: Jolokia: Generic numeric MBean rate +agents: linux +catalog: app/java +license: GPL +distribution: check_mk +description: + This check outputs the rate of a generic numeric value from the java virtual machine. + This check can go WARN or CRIT when the rate is below or above certain + configurable levels. + + To use this plugin, Jolokia and the agent plugin need to be installed + on the monitored server. + +inventory: + One check is created for each numeric MBean rate value sent by the agent. diff --git a/checkman/jolokia_generic.string b/checkman/jolokia_generic.string new file mode 100644 index 0000000..393c52c --- /dev/null +++ b/checkman/jolokia_generic.string @@ -0,0 +1,15 @@ +title: Jolokia: Generic MBean string value +agents: linux +catalog: app/java +license: GPL +distribution: check_mk +description: + This check outputs a generic string value from the java virtual machine. + This check can go WARN or CRIT depending on whether it matches a configurable + list of search strings. + + To use this plugin, Jolokia and the agent plugin need to be installed + on the monitored server. + +inventory: + One check is created for each MBean string value sent by the agent.

7 years, 6 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 8f2621fbeb50c24d157b8a1bf26b8990b8f75310 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f2621fbeb50c2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Dec 28 16:02:19 2016 +0100 Fetched livestatus from downstream. Change-Id: Ia2bc51bd28c17287f78f7be3e2a315248370685b --- livestatus/api/c++/Livestatus.cc | 5 +- livestatus/api/c++/Makefile | 8 +-- livestatus/api/c++/demo.cc | 20 ++++---- livestatus/src/ColumnsColumn.h | 18 +++---- livestatus/src/HostListStateColumn.cc | 43 ++++++++++------ livestatus/src/HostListStateColumn.h | 59 ++++++++++++--------- livestatus/src/HostSpecialDoubleColumn.cc | 2 +- livestatus/src/HostSpecialDoubleColumn.h | 11 ++-- livestatus/src/HostSpecialIntColumn.cc | 6 +-- livestatus/src/HostSpecialIntColumn.h | 13 +++-- livestatus/src/LogCache.cc | 9 ++-- livestatus/src/LogEntry.cc | 73 +++++++++++++------------- livestatus/src/LogEntry.h | 34 +++++++------ livestatus/src/Logfile.cc | 6 +-- livestatus/src/Query.cc | 2 +- livestatus/src/ServiceListStateColumn.cc | 17 ++++--- livestatus/src/ServiceListStateColumn.h | 42 +++++++-------- livestatus/src/ServiceSpecialDoubleColumn.cc | 2 +- livestatus/src/ServiceSpecialDoubleColumn.h | 11 ++-- livestatus/src/ServiceSpecialIntColumn.cc | 2 +- livestatus/src/ServiceSpecialIntColumn.h | 11 ++-- livestatus/src/StatusSpecialIntColumn.cc | 2 +- livestatus/src/StatusSpecialIntColumn.h | 8 +-- livestatus/src/TableColumns.cc | 23 +++++---- livestatus/src/TableColumns.h | 3 +- livestatus/src/TableHostGroups.cc | 76 ++++++++++++++-------------- livestatus/src/TableHosts.cc | 70 +++++++++++++++---------- livestatus/src/TableHostsByGroup.cc | 8 +-- livestatus/src/TableLog.cc | 14 +++-- livestatus/src/TableServiceGroups.cc | 44 +++++++++------- livestatus/src/TableServices.cc | 4 +- livestatus/src/TableServicesByGroup.cc | 8 +-- livestatus/src/TableStateHistory.cc | 14 +++-- livestatus/src/TableStateHistory.h | 2 - livestatus/src/TableStatus.cc | 2 +- livestatus/src/auth.cc | 6 ++- livestatus/src/auth.h | 11 ++-- livestatus/src/livestatus.h | 2 - livestatus/src/module.cc | 21 ++++---- 39 files changed, 385 insertions(+), 327 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8f2621fbeb…

7 years, 6 months

One more

by Konstantin Büttner

Module: check_mk Branch: master Commit: 3d2eaa32890443cfc5065866babf166d262b3dc9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d2eaa32890443… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Dec 28 17:20:39 2016 +0100 One more Change-Id: Ia8eea25a06aea08df9f5b1f551fc3b678bc94f2f --- agents/plugins/mk_jolokia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index 77b4725..f00f606 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -360,7 +360,7 @@ def query_instance(inst): for mbean_exp in paths: queries.append( (inst, "%s/%s" % (urllib2.quote(mbean_exp), path), path, - itemspec, inst_add=mbean_exp) ) + itemspec, mbean_exp) ) else: queries.append( (inst, mbean + "/" + path, title, itemspec) )

7 years, 6 months

Fix syntax error

by Konstantin Büttner

Module: check_mk Branch: master Commit: 0a4ad190b78523bce8c34bbe00c3eea7cd85f844 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a4ad190b78523… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Dec 28 17:17:23 2016 +0100 Fix syntax error Change-Id: I8d887ca48e43c57e95a06a660e4ba3619e326d13 --- agents/plugins/mk_jolokia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index 0c8af4c..77b4725 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -327,7 +327,7 @@ def query_instance(inst): for mbean_exp in paths: queries.append( (inst, "%s/%s" % (urllib2.quote(mbean_exp), path), path, - itemspec, inst_add=mbean_exp) ) + itemspec, mbean_exp) ) else: queries.append( (inst, mbean + "/" + path, title, itemspec) )

7 years, 6 months

mk_jolokia: Added section for future jolokia_generic check,

by Konstantin Büttner

allowing to check custom MBeans Message-ID: <5863e485.BULoVDSoiKy107K4%kb(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Module: check_mk Branch: master Commit: c5f67f46536a5344a320455e293da2b379eae400 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5f67f46536a53… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Dec 20 08:55:21 2016 +0100 mk_jolokia: Added section for future jolokia_generic check, allowing to check custom MBeans Change-Id: I95a3846a617de93c3a8916ae0d52b6e1bc66d8bc --- agents/plugins/mk_jolokia | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index a54a342..0c8af4c 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -345,6 +345,39 @@ def query_instance(inst): # Simply ignore exceptions. Need to be removed for debugging continue + if custom_vars: + sys.stdout.write('<<<jolokia_generic>>>\n') + for var in custom_vars: + mbean, path, title, itemspec, do_search, value_type = var + queries = [] + if do_search: + if mbean in mbean_search_results: + paths = mbean_search_results[mbean] + else: + paths = fetch_var(inst["protocol"], inst["server"], inst["port"], mbean, + inst["suburi"], "", None, None, None, function="search")[0][1] + mbean_search_results[mbean] = paths + + for mbean_exp in paths: + queries.append( (inst, "%s/%s" % (urllib2.quote(mbean_exp), path), path, + itemspec, inst_add=mbean_exp) ) + else: + queries.append( (inst, mbean + "/" + path, title, itemspec) ) + + for inst, mbean_path, title, itemspec in queries: + try: + for out_item, out_title, out_value in fetch_metric(inst, mbean_path, title, itemspec): + sys.stdout.write("%s %s %s %s\n" % (out_item, out_title, out_value, value_type) ) + except IOError: + return + except socket.timeout: + return + except: + if opt_debug: + raise + # Simply ignore exceptions. Need to be removed for debugging + continue + # Default configuration for all instances protocol = "http" @@ -438,6 +471,8 @@ specific_vars = { # the global configuration values can be overridden. instances = [{}] +custom_vars = [] + conffile = os.getenv("MK_CONFDIR", "/etc/check_mk") + "/jolokia.cfg" if os.path.exists(conffile):

7 years, 6 months

mk_jolokia: Move writing of non-error values to query_instance

by Konstantin Büttner

Module: check_mk Branch: master Commit: 4979a7f3dbd986f6585d2c733a9f150cbe108d87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4979a7f3dbd986… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Dec 19 19:02:29 2016 +0100 mk_jolokia: Move writing of non-error values to query_instance Change-Id: Idc81384d842ac1931e8b9a56796db007c9c28232 --- agents/plugins/mk_jolokia | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index 8338213..a54a342 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -251,7 +251,7 @@ def fetch_metric(inst, path, title, itemspec, inst_add=None): else: tit = subinstance[-1] - sys.stdout.write("%s %s %s\n" % (item.replace(" ", "_"), tit, value)) + yield (item.replace(" ", "_"), tit, value) def query_instance(inst): @@ -333,7 +333,8 @@ def query_instance(inst): for inst, mbean_path, title, itemspec in queries: try: - fetch_metric(inst, mbean_path, title, itemspec) + for out_item, out_title, out_value in fetch_metric(inst, mbean_path, title, itemspec): + sys.stdout.write("%s %s %s\n" % (out_item, out_title, out_value) ) except IOError: return except socket.timeout:

7 years, 6 months

mk_jolokia: Use auxiliary loop to remove duplicate exception handling

by Konstantin Büttner

Module: check_mk Branch: master Commit: d7c8ed3764a20570df528f101b0ef325ce9adcc6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7c8ed3764a205… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Dec 19 18:56:17 2016 +0100 mk_jolokia: Use auxiliary loop to remove duplicate exception handling Change-Id: I17cef0a2e8f383e0a63d07ba320a744916bd7fe8 --- agents/plugins/mk_jolokia | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index 8e25074..8338213 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -316,6 +316,7 @@ def query_instance(inst): else: mbean, path, title, itemspec, do_search = var + queries = [] if do_search: if mbean in mbean_search_results: paths = mbean_search_results[mbean] @@ -325,21 +326,14 @@ def query_instance(inst): mbean_search_results[mbean] = paths for mbean_exp in paths: - try: - fetch_metric(inst, "%s/%s" % (urllib2.quote(mbean_exp), path), path, - itemspec, inst_add=mbean_exp) - except IOError: - return - except socket.timeout: - return - except: - if opt_debug: - raise - # Simply ignore exceptions. Need to be removed for debugging - continue + queries.append( (inst, "%s/%s" % (urllib2.quote(mbean_exp), path), path, + itemspec, inst_add=mbean_exp) ) else: + queries.append( (inst, mbean + "/" + path, title, itemspec) ) + + for inst, mbean_path, title, itemspec in queries: try: - fetch_metric(inst, mbean + "/" + path, title, itemspec) + fetch_metric(inst, mbean_path, title, itemspec) except IOError: return except socket.timeout:

7 years, 6 months

mk_jolokia: Move exception handling one level higher

by Konstantin Büttner

Module: check_mk Branch: master Commit: bfa4d5b87e7e1a122ba69cd9391d40fa4a0dd5eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfa4d5b87e7e1a… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Dec 19 17:58:34 2016 +0100 mk_jolokia: Move exception handling one level higher This replaces returning a boolean error code with raising an exception, and moves the exception handling to where it is being used, namely to control the loop querying the instance. Change-Id: I4c5f6fc5e94e56fa5e4ef8970c57b11f9293ff45 --- agents/plugins/mk_jolokia | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index ae314ea..8e25074 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -225,21 +225,9 @@ def extract_item(key, itemspec): def fetch_metric(inst, path, title, itemspec, inst_add=None): - try: - values = fetch_var(inst["protocol"], inst["server"], inst["port"], path, - inst["suburi"], itemspec, - inst["service_url"], inst["service_user"], inst["service_password"]) - - # In case of network errors skip this server - except IOError: - return False - except socket.timeout: - return False - except: - if opt_debug: - raise - # Simply ignore exceptions. Need to be removed for debugging - return True + values = fetch_var(inst["protocol"], inst["server"], inst["port"], path, + inst["suburi"], itemspec, + inst["service_url"], inst["service_user"], inst["service_password"]) for subinstance, value in values: if not subinstance and not title: @@ -264,7 +252,6 @@ def fetch_metric(inst, path, title, itemspec, inst_add=None): tit = subinstance[-1] sys.stdout.write("%s %s %s\n" % (item.replace(" ", "_"), tit, value)) - return True def query_instance(inst): @@ -338,12 +325,30 @@ def query_instance(inst): mbean_search_results[mbean] = paths for mbean_exp in paths: - if not fetch_metric(inst, "%s/%s" % (urllib2.quote(mbean_exp), path), path, - itemspec, inst_add=mbean_exp): + try: + fetch_metric(inst, "%s/%s" % (urllib2.quote(mbean_exp), path), path, + itemspec, inst_add=mbean_exp) + except IOError: return + except socket.timeout: + return + except: + if opt_debug: + raise + # Simply ignore exceptions. Need to be removed for debugging + continue else: - if not fetch_metric(inst, mbean + "/" + path, title, itemspec): + try: + fetch_metric(inst, mbean + "/" + path, title, itemspec) + except IOError: + return + except socket.timeout: return + except: + if opt_debug: + raise + # Simply ignore exceptions. Need to be removed for debugging + continue # Default configuration for all instances

7 years, 6 months

jolokia_generic.{rate, number} now provide performance data

by Konstantin Büttner

Module: check_mk Branch: master Commit: 41c73fb56c4e0d32d32fc3edad73d5be6f313c52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41c73fb56c4e0d… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Dec 28 17:01:12 2016 +0100 jolokia_generic.{rate,number} now provide performance data Change-Id: Iae9dc0b6cd165f19bafb8519a7bf8625bc16f294 --- checks/jolokia_generic | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checks/jolokia_generic b/checks/jolokia_generic index 55224ed..81e0abf 100644 --- a/checks/jolokia_generic +++ b/checks/jolokia_generic @@ -138,6 +138,7 @@ check_info["jolokia_generic.rate"] = { "inventory_function" : inventory_jolokia_generic_rate, "check_function" : check_jolokia_generic_rate, "service_description" : "MBean %s", + "has_perfdata" : True, "group" : "generic_rate", } @@ -202,5 +203,6 @@ check_info["jolokia_generic"] = { "inventory_function" : inventory_jolokia_generic, "check_function" : check_jolokia_generic, "service_description" : "MBean %s", + "has_perfdata" : True, "group" : "generic_number", }

7 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2016