Checkmk git commits June 2015

checkmk-commits@lists.checkmk.com

8 participants
227 discussions

Check_MK Git: check_mk: #2306 FIX: windows agent: made 32 bit version working again (used old 32 bit crosscompiler)

by Andreas Boesl

Module: check_mk Branch: master Commit: 35dd83b34429319d1096555b6392e1e6dac48963 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35dd83b3442931… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jun 9 09:25:43 2015 +0200 #2306 FIX: windows agent: made 32 bit version working again (used old 32 bit crosscompiler) --- ChangeLog | 1 + agents/windows/Makefile | 4 ++-- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 301568 -> 301568 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 301568 -> 301568 bytes agents/windows/check_mk_agent.exe | Bin 216064 -> 183808 bytes agents/windows/check_mk_agent.msi | Bin 766464 -> 734208 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 216064 -> 183808 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent-64.exe | Bin 178937 -> 178941 bytes agents/windows/install_agent.exe | Bin 166095 -> 159862 bytes agents/windows/nowin.exe | Bin 22511 -> 22511 bytes 12 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b28d9be..38e0e59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ * 2118 FIX: aix_sap_processlist: agent plugin now is more general to deal with various AIX versions... * 1253 FIX: printer_io,printer_supply: prevent discovery on not supported devices * 2217 FIX: md: Fix handling of found and expected disks + * 2306 FIX: windows agent: made 32 bit version working again (used old 32 bit crosscompiler)... Multisite: * 2260 Improved load time of Check_MK GUI... diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 68c2cfa..3c16182 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -26,11 +26,11 @@ SHELL = /bin/bash VERSION = 1.2.7i2 VERSION_DUMMY = @@@@@CHECK_MK_VERSION@@@@@ -WINDRES = i686-w64-mingw32-windres +WINDRES = i586-mingw32msvc-windres COPTIONS = -s -O2 -Wall -Werror -static -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' ifeq ($(shell uname),Linux) - CXX = echo -e "\n\nWARNING: MinGW under Linux is broken! Use at your own risk!\n\n" ; i686-w64-mingw32-g++ + CXX = echo -e "\n\nWARNING: MinGW under Linux is broken! Use at your own risk!\n\n" ; i586-mingw32msvc-g++ CXX_64 = x86_64-w64-mingw32-g++ WINDRES_64 = x86_64-w64-mingw32-windres else diff --git a/agents/windows/build_version b/agents/windows/build_version index 9e42f3e..b34c321 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -165 +171 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 770eb0b..3e7f98b 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 02db491..95e2381 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 960aef6..3435213 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 ed06d6f..117e44c 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 b9a1485..358a053 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 e31db71..de363b2 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 3d4fe55..53bd16c 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 67ec1f7..7d7a4a0 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 ce16891..1762fbf 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ

9 years, 3 months

Check_MK Git: check_mk: Fixed small typo in description text

by Mathias Kettner

Module: check_mk Branch: master Commit: daedb46d08f265af3fbf28dc14e2de4eeadfc3e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=daedb46d08f265… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 8 17:42:45 2015 +0200 Fixed small typo in description text --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d23529e..bbaa02c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8533,7 +8533,7 @@ def vs_notification_rule(userid = None): ( 'ud', _("UNREACHABLE") + u" ➤ " + _("DOWN")), ( 'ur', _("UNREACHABLE") + u" ➤ " + _("UP")), ( 'f', _("Start or end of flapping state")), - ( 's', _("Start or end of a scheduled downtime ")), + ( 's', _("Start or end of a scheduled downtime")), ( 'x', _("Acknowledgement of host problem")), ], default_value = [ 'rd', 'dr', 'f', 's', 'x' ],

9 years, 3 months

Check_MK Git: check_mk: #2219 hr_cpu: Reworked check to use WATO rule allowing averaging and predictive levels

by Konstantin Büttner

Module: check_mk Branch: master Commit: 0e632d999de493739b4ddc2f467e5c0f8bed5a46 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e632d999de493… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jun 8 17:33:46 2015 +0200 #2219 hr_cpu: Reworked check to use WATO rule allowing averaging and predictive levels hr_cpu now uses a different WATO rule, so old rules for this check type will no longer apply. --- .werks/2219 | 10 ++++++++++ ChangeLog | 2 ++ checks/cpu_util.include | 6 +++--- checks/hr_cpu | 17 +++++------------ web/plugins/wato/check_parameters.py | 5 +++-- 5 files changed, 23 insertions(+), 17 deletions(-) diff --git a/.werks/2219 b/.werks/2219 new file mode 100644 index 0000000..83e5cf3 --- /dev/null +++ b/.werks/2219 @@ -0,0 +1,10 @@ +Title: hr_cpu: Reworked check to use WATO rule allowing averaging and predictive levels +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i2 +Date: 1433777551 +Class: feature + +hr_cpu now uses a different WATO rule, so old rules for this check type will no longer +apply. diff --git a/ChangeLog b/ChangeLog index 9b49e30..576dd0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,8 @@ * 2325 oracle_tablespaces: correctly handle case where check runs in clustered mode... * 2216 raritan_pdu_ocprot: New check to monitor overcurrent protectors of Raritan PDUs... * 2119 omd_status: check can now work in a cluster environment + * 2219 hr_cpu: Reworked check to use WATO rule allowing averaging and predictive levels... + NOTE: Please refer to the migration notes! * 2323 FIX: df: Fix new graphs for all filesystem checks in case of existing inode information * 2305 FIX: agent_vsphere, esx_vsphere_sensors: now able to handle sensor names with semicolon... * 2118 FIX: aix_sap_processlist: agent plugin now is more general to deal with various AIX versions... diff --git a/checks/cpu_util.include b/checks/cpu_util.include index 5aa4f98..30f5cca 100644 --- a/checks/cpu_util.include +++ b/checks/cpu_util.include @@ -53,11 +53,11 @@ def check_cpu_util(util, params, this_time = None): if "average" in params: util_avg = get_average("cpu_utilization.avg", this_time, util, params["average"]) check_against = util_avg - counter = "avg" + perfvar = "avg" infotext += ", %dmin average: %.1f %%" % (params["average"], util_avg) else: check_against = util - counter = "util" + perfvar = "util" levels = params.get("levels") @@ -66,7 +66,7 @@ def check_cpu_util(util, params, this_time = None): else: warn, crit = None, None - state, extrainfo, extraperf = check_levels(check_against, counter, levels) + state, extrainfo, extraperf = check_levels(check_against, perfvar, levels) if extrainfo: infotext += ", " + extrainfo diff --git a/checks/hr_cpu b/checks/hr_cpu index 30fa1f1..a3bc6a5 100644 --- a/checks/hr_cpu +++ b/checks/hr_cpu @@ -29,24 +29,16 @@ def inventory_hr_cpu(info): if len(info) >= 1: return [(None, "hr_cpu_default_levels")] -def check_hr_cpu(item, params, info): +def check_hr_cpu(_no_item, params, info): num_cpus = 0 util = 0 for line in info: util += int(line[0]) num_cpus += 1 if num_cpus == 0: - return (3, "no data found in SNMP output") + return 3, "No data found in SNMP output" util = float(util) / num_cpus - infotext = "%2.1f%% utilization at %d CPUs" % (util, num_cpus) - warn, crit = params - perfdata = [("util", util, warn, crit, 0, 100)] - if util >= crit: - return (2, infotext + " (critical at %d%%)" % crit, perfdata) - elif util >= warn: - return (1, infotext + " (warning at %d%%)" % warn, perfdata) - else: - return (0, infotext, perfdata) + return check_cpu_util(util, params) # HOST-RESOURCES-MIB::hrSystemUptime.0 @@ -61,5 +53,6 @@ check_info["hr_cpu"] = { not not oid('.1.3.6.1.2.1.25.1.1.0') and not \ ("linux" in oid(".1.3.6.1.2.1.1.1.0").lower() and oid(".1.3.6.1.4.1.2021.10.1.6.1")), - 'group': 'cpu_utilization', + 'group': 'cpu_utilization_os', + 'includes': [ 'cpu_util.include' ], } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index df7cc4a..244dad2 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3885,10 +3885,11 @@ register_check_parameters( register_check_parameters( subgroup_os, "cpu_utilization_os", - _("CPU utilization for Windows and ESX Hosts"), + _("CPU utilization for simple devices"), Dictionary( help = _("This rule configures levels for the CPU utilization (not load) for " - "the operating systems Windows and VMWare ESX host systems. The utilization " + "the operating systems Windows and VMWare ESX host systems, as well as devices " + "implementing the Host Resources MIB. The utilization " "ranges from 0 to 100 - regardless of the number of CPUs."), elements = [ ( "levels",

9 years, 3 months

Check_MK Git: check_mk: #1254 The target address for crash reports can now be configured in wato global settings

by Bastian Kuhn

Module: check_mk Branch: master Commit: f43f347927000efc625bacd7eb937fce351a29c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f43f347927000e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jun 8 15:26:54 2015 +0200 #1254 The target address for crash reports can now be configured in wato global settings --- .werks/1254 | 9 +++++++++ ChangeLog | 3 +++ web/plugins/wato/check_mk_configuration.py | 8 ++++++++ 3 files changed, 20 insertions(+) diff --git a/.werks/1254 b/.werks/1254 new file mode 100644 index 0000000..1e8f060 --- /dev/null +++ b/.werks/1254 @@ -0,0 +1,9 @@ +Title: The target address for crash reports can now be configured in wato global settings +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i2 +Date: 1433769983 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 0c21634..a78d180 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,9 @@ * 2338 FIX: Logging internal GUI exceptions to web.log instead of apache error_log... * 2340 FIX: Email validation: Top level domains can now have a maximum length of 24 characters + WATO: + * 1254 The target address for crash reports can now be configured in wato global settings + BI: * 2336 FIX: BI compilation diagnostics are now logged to the generic web.log... diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 0b514ec..d880bf9 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -231,6 +231,14 @@ register_configvar(group, default_value = True), domain = "multisite") +register_configvar(group, + "crash_report_target", + TextAscii(title = _("Mail Address for Crash reports"), + help = _("This Address will be used as default receiver address for crash reports"), + size = 80, + default_value = "feedback(a)check-mk.org", + attrencode = True), + domain = "multisite") register_configvar(group, "multisite_draw_ruleicon",

9 years, 3 months

Check_MK Git: check_mk: #2217 FIX md: Fix handling of found and expected disks

by Konstantin Büttner

Module: check_mk Branch: master Commit: 2d959ff23a15074d774db9dee9bb4d924b877a09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d959ff23a1507… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jun 8 15:18:18 2015 +0200 #2217 FIX md: Fix handling of found and expected disks --- .werks/2217 | 9 +++++++++ ChangeLog | 1 + checks/md | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/2217 b/.werks/2217 new file mode 100644 index 0000000..b96e204 --- /dev/null +++ b/.werks/2217 @@ -0,0 +1,9 @@ +Title: md: Fix handling of found and expected disks +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i2 +Date: 1433769443 + diff --git a/ChangeLog b/ChangeLog index 0c21634..9b49e30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ * 2305 FIX: agent_vsphere, esx_vsphere_sensors: now able to handle sensor names with semicolon... * 2118 FIX: aix_sap_processlist: agent plugin now is more general to deal with various AIX versions... * 1253 FIX: printer_io,printer_supply: prevent discovery on not supported devices + * 2217 FIX: md: Fix handling of found and expected disks Multisite: * 2260 Improved load time of Check_MK GUI... diff --git a/checks/md b/checks/md index c64313d..505941e 100644 --- a/checks/md +++ b/checks/md @@ -127,7 +127,7 @@ def check_md(item, _no_params, info): its_next = True elif its_next: disk_state_1 = line[-2] - (num_disks, expected_disks) = disk_state_1[1:-1].split('/') + (num_disks, expected_disks) = map(int,disk_state_1[1:-1].split('/')) disk_state_2 = line[-1] working_disks = disk_state_2.count('U') state_next = True

9 years, 3 months

Check_MK Git: check_mk: #1253 FIX printer_io, printer_supply:

by Bastian Kuhn

prevent discovery on not supported devices Message-ID: <55758f03./Kovj+c19LpPY3Oc%bk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 2047b7039a441756e5a7bb7e05f3b8023c97af10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2047b7039a4417… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jun 8 14:47:19 2015 +0200 #1253 FIX printer_io,printer_supply: prevent discovery on not supported devices --- .werks/1253 | 10 ++++++++++ ChangeLog | 1 + checks/printer_io.include | 2 ++ checks/printer_supply | 2 +- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/1253 b/.werks/1253 new file mode 100644 index 0000000..566abb7 --- /dev/null +++ b/.werks/1253 @@ -0,0 +1,10 @@ +Title: printer_io,printer_supply: prevent discovery on not supported devices +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i2 +Date: 1433767600 + + diff --git a/ChangeLog b/ChangeLog index fa36cee..0c21634 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * 2323 FIX: df: Fix new graphs for all filesystem checks in case of existing inode information * 2305 FIX: agent_vsphere, esx_vsphere_sensors: now able to handle sensor names with semicolon... * 2118 FIX: aix_sap_processlist: agent plugin now is more general to deal with various AIX versions... + * 1253 FIX: printer_io,printer_supply: prevent discovery on not supported devices Multisite: * 2260 Improved load time of Check_MK GUI... diff --git a/checks/printer_io.include b/checks/printer_io.include index af349a6..dce786b 100644 --- a/checks/printer_io.include +++ b/checks/printer_io.include @@ -70,6 +70,8 @@ factory_settings['printer_output_default_levels'] = { def inventory_printer_io(info): for line in info: index, name, descr, status = line[:4] + if descr == '': + continue ignore = False snmp_status = saveint(status) for state_val in sorted(printer_io_states,reverse=True): diff --git a/checks/printer_supply b/checks/printer_supply index ed206a5..88f8d6d 100644 --- a/checks/printer_supply +++ b/checks/printer_supply @@ -91,7 +91,7 @@ def inventory_printer_supply(info): # Also fix trailing zero bytes (seen on HP Jetdirect 143) return [ (line[0].rstrip('\0'), {}) for line in printer_supply_fix_infos(info) - if not (line[1] == '-2' and line[2] == '-2') and len(line[1]) > 0 ] # ignore useless devices + if not (line[1] == '-2' and line[2] == '-2') and line[2] and len(line[1]) > 0 ] # ignore useless devices def check_printer_supply(item, params, info): for line in printer_supply_fix_infos(info):

9 years, 3 months

Check_MK Git: check_mk: Revert "md: Converted expected and actual number of disks to int"

by Konstantin Büttner

Module: check_mk Branch: master Commit: b60c0e930217616eb54f029e6f58a2a701abbce0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b60c0e93021761… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jun 8 13:58:02 2015 +0200 Revert "md: Converted expected and actual number of disks to int" This reverts commit f16c8e009dde00f815238c2c6014fc0b1d217da6. --- checks/md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/md b/checks/md index 83e9ae7..c64313d 100644 --- a/checks/md +++ b/checks/md @@ -127,7 +127,7 @@ def check_md(item, _no_params, info): its_next = True elif its_next: disk_state_1 = line[-2] - num_disks, expected_disks = map(int, disk_state_1[1:-1].split('/')) + (num_disks, expected_disks) = disk_state_1[1:-1].split('/') disk_state_2 = line[-1] working_disks = disk_state_2.count('U') state_next = True

9 years, 3 months

Check_MK Git: check_mk: md: Converted expected and actual number of disks to int

by Konstantin Büttner

Module: check_mk Branch: master Commit: f16c8e009dde00f815238c2c6014fc0b1d217da6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f16c8e009dde00… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jun 8 13:56:21 2015 +0200 md: Converted expected and actual number of disks to int --- checks/md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/md b/checks/md index c64313d..83e9ae7 100644 --- a/checks/md +++ b/checks/md @@ -127,7 +127,7 @@ def check_md(item, _no_params, info): its_next = True elif its_next: disk_state_1 = line[-2] - (num_disks, expected_disks) = disk_state_1[1:-1].split('/') + num_disks, expected_disks = map(int, disk_state_1[1:-1].split('/')) disk_state_2 = line[-1] working_disks = disk_state_2.count('U') state_next = True

9 years, 3 months

Check_MK Git: check_mk: Fixed minor bug in inventory

by Bastian Kuhn

Module: check_mk Branch: master Commit: 69642d99866445e19d18bb0c9414feccff00705c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69642d99866445… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jun 8 10:21:46 2015 +0200 Fixed minor bug in inventory --- web/plugins/views/inventory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index be97d27..4ac6f3a 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -239,7 +239,7 @@ def render_inv_subtree_leaf_value(hostname, tree_id, invpath, node): text = node.decode("utf-8") except: text = node - html.write(html.attrencode(node)) + html.write(html.attrencode(text)) elif type(node) == unicode: html.write(html.attrencode(node)) elif type(node) == int:

9 years, 3 months

Check_MK Git: check_mk: #2119 omd_status: check can now work in a cluster environment

by Goetz Golla

Module: check_mk Branch: master Commit: 30d4a5ba7fc5ae7de00d96d3a381bf7d0e402660 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30d4a5ba7fc5ae… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Jun 5 18:14:15 2015 +0200 #2119 omd_status: check can now work in a cluster environment --- .werks/2119 | 9 ++++++ ChangeLog | 1 + checkman/omd_status | 5 +++ checks/omd_status | 86 +++++++++++++++++++++++++++++++++++++++------------ 4 files changed, 81 insertions(+), 20 deletions(-) diff --git a/.werks/2119 b/.werks/2119 new file mode 100644 index 0000000..df120d8 --- /dev/null +++ b/.werks/2119 @@ -0,0 +1,9 @@ +Title: omd_status: check can now work in a cluster environment +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i2 +Date: 1433520823 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 244c288..fa36cee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * 2117 postfix_mailq: agent and check now retrieve and monitor active queue data as well * 2325 oracle_tablespaces: correctly handle case where check runs in clustered mode... * 2216 raritan_pdu_ocprot: New check to monitor overcurrent protectors of Raritan PDUs... + * 2119 omd_status: check can now work in a cluster environment * 2323 FIX: df: Fix new graphs for all filesystem checks in case of existing inode information * 2305 FIX: agent_vsphere, esx_vsphere_sensors: now able to handle sensor names with semicolon... * 2118 FIX: aix_sap_processlist: agent plugin now is more general to deal with various AIX versions... diff --git a/checkman/omd_status b/checkman/omd_status index 362aad7..a51a9fb 100644 --- a/checkman/omd_status +++ b/checkman/omd_status @@ -10,6 +10,11 @@ description: otherwise. If the site is only partially running then the check output shows the names of the stopped services. + The check also works in a cluster environment, listing all node where the + sites are running on and their states. The total state of the service is + then only critical when one of the sites on a node is partially running, + or when all sites on the nodes are stopped. + item: The name of the site (string). diff --git a/checks/omd_status b/checks/omd_status index b3b56d0..4e47cf9 100644 --- a/checks/omd_status +++ b/checks/omd_status @@ -41,33 +41,79 @@ # OVERALL 2 def inventory_omd_status(info): - for line in info: - if line[0][0] == '[': - yield line[0][1:-1], None + for site in info.keys(): + yield site, None -def check_omd_status(item, _no_params, info): +def parse_omd_status(info): active = False + parsed = {} + for line in info: - if line[0] == '[' + item + ']': + if line[1][0] == '[': + item = line[1][1:-1] + # items may appear several times in clusters + # so dont overwrite the previous node result + if item not in parsed: + parsed[item] = {} + node = line[0] + parsed[item][node] = {} + parsed[item][node]["stopped"] = [] active = True stopped = [] - elif active: - if line[0] == 'OVERALL': - if line[1] == '0': - return (0, 'all services are running') - elif line[1] == '1': - return (2, 'site is stopped') - else: - return (2, 'partially running! stopped services: %s' % ", ".join(stopped)) - elif line[1] != '0': - stopped.append(line[0]) - return (3, "site not existing or AUTOSTART off") + elif active and line[1] == 'OVERALL': + if line[2] == '0': + parsed[item][node]["overall"] = "running" + elif line[2] == '1': + parsed[item][node]["overall"] = "stopped" + active = False + elif active and line[2] != '0': + parsed[item][node]["stopped"].append(line[1]) + parsed[item][node]["overall"] = "partially" + + return parsed + + +def check_omd_status(item, _no_params, info): + + parsed_site = info[item] + number_nodes = len(parsed_site) + stopped_nodes = 0 + + for node, services in parsed_site.iteritems(): + if services["overall"] == "stopped": + stopped_nodes += 1 + + # stopped sites are only CRIT when all are stopped + if stopped_nodes == number_nodes: + state = 2 + else: + state = 0 + for node, services in parsed_site.iteritems(): + if node: + node_text = " on %s" % node + else: + node_text = "" + if services["overall"] == "running": + infotext = "running%s" % node_text + # running sites are always OK + yield 0, infotext + elif services["overall"] == "stopped": + infotext = "stopped%s" % node_text + # stopped sites are only CRIT when all are stopped + yield state, infotext + else: + infotext = "partially running%s, stopped services: " % node_text + infotext += ", ".join(services["stopped"]) + # partially running sites are always CRIT + yield 2, infotext check_info["omd_status"] = { - 'check_function': check_omd_status, - 'inventory_function': inventory_omd_status, - 'service_description': 'OMD %s status', - 'group': 'omd_status', + 'check_function' : check_omd_status, + 'inventory_function' : inventory_omd_status, + 'parse_function' : parse_omd_status, + 'service_description' : 'OMD %s status', + 'group' : 'omd_status', + 'node_info' : True, }

9 years, 3 months

← Newer
1
...
14
15
16
17
18
19
20
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2015