Checkmk git commits December 2014

checkmk-commits@lists.checkmk.com

6 participants
519 discussions

Check_MK Git: check_mk: Added missing manpage

by Mathias Kettner

Module: check_mk Branch: master Commit: 29f142aaaa3530279fe4ebad7ff7dc06e5422a99 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29f142aaaa3530… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 3 17:05:43 2014 +0100 Added missing manpage --- checkman/f5_bigip_cluster_v11 | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/checkman/f5_bigip_cluster_v11 b/checkman/f5_bigip_cluster_v11 new file mode 100644 index 0000000..126336a --- /dev/null +++ b/checkman/f5_bigip_cluster_v11 @@ -0,0 +1,19 @@ +title: F5 Big-IP: Cluster state for firmware version >= 11 +agents: snmp +catalog: hw/network/f5 +license: GPL +distribution: check_mk +description: + The check queries the MIB tables of F5 BIG-IP loadbalancers (local traffic managers) to identify + if all system configs are in-sync when running a load balancing cluster. + It will issue a warning if one of the nodes is out of sync, or a critical on one of the two following conditions: + + - both nodes have differing configs + + - the node being checked has the status "unconfigured" + + It supports devices running the 11 and above releases of the F5 OS. + +inventory: + One service is defined for the cluster status unless the load balancer config sync is in a status of "unconfigured" +

9 years, 9 months

Check_MK Git: check_mk: #1568 f5_bigip_cluster_v11: new check for F5 cluster status for firmware version 11

by Mathias Kettner

Module: check_mk Branch: master Commit: 786429ca8849e8ea30e190087c1412a5c4fb6a45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=786429ca8849e8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 3 17:03:40 2014 +0100 #1568 f5_bigip_cluster_v11: new check for F5 cluster status for firmware version 11 --- .werks/1568 | 9 +++++ ChangeLog | 1 + checkman/f5_bigip_cluster | 4 +-- checks/f5_bigip_cluster | 3 +- checks/f5_bigip_cluster_v11 | 78 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 92 insertions(+), 3 deletions(-) diff --git a/.werks/1568 b/.werks/1568 new file mode 100644 index 0000000..b4fe0da --- /dev/null +++ b/.werks/1568 @@ -0,0 +1,9 @@ +Title: f5_bigip_cluster_v11: new check for F5 cluster status for firmware version 11 +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417622592 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 32f1c06..474a176 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ * 1565 mem.win: set default levels for page file to 80%/90% * 1608 zpool_status: Add an overall state check (thx to Craig Cook)... * 1567 postfix_mailq: speedup in Linux agent for large mail queues... + * 1568 f5_bigip_cluster_v11: new check for F5 cluster status for firmware version 11 * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices... diff --git a/checkman/f5_bigip_cluster b/checkman/f5_bigip_cluster index 7319fc9..a5b99e6 100644 --- a/checkman/f5_bigip_cluster +++ b/checkman/f5_bigip_cluster @@ -1,4 +1,4 @@ -title: F5 Big-IP: Cluster state +title: F5 Big-IP: Cluster state, up to firmware version 10 agents: snmp catalog: hw/network/f5 license: GPL @@ -10,7 +10,7 @@ description: - both nodes have differing configs - the node being checked has the status "unconfigured" - It supports devices running the 9.0 and above releases of the F5 OS. It's tested against 9.3 + It supports devices running the 9.0 and above releases of the F5 OS, but lower then 11. It's tested against 9.3 devices. inventory: diff --git a/checks/f5_bigip_cluster b/checks/f5_bigip_cluster index 6ff017b..ab66136 100644 --- a/checks/f5_bigip_cluster +++ b/checks/f5_bigip_cluster @@ -74,5 +74,6 @@ check_info["f5_bigip_cluster"] = { ]), 'snmp_scan_function': \ lambda oid: '.1.3.6.1.4.1.3375.2' in oid(".1.3.6.1.2.1.1.2.0") \ - and "big-ip" in oid(".1.3.6.1.4.1.3375.2.1.4.1.0").lower(), + and "big-ip" in oid(".1.3.6.1.4.1.3375.2.1.4.1.0").lower() \ + and int(oid(".1.3.6.1.4.1.3375.2.1.4.2.0").split('.')[0]) < 11, } diff --git a/checks/f5_bigip_cluster_v11 b/checks/f5_bigip_cluster_v11 new file mode 100644 index 0000000..8bce172 --- /dev/null +++ b/checks/f5_bigip_cluster_v11 @@ -0,0 +1,78 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + + +# Agent / MIB output +# see: .1.3.6.1.4.1.3375.2.1.14.1.1.0 +# .1.3.6.1.4.1.3375.2.1.14.1.2.0 +# F5-BIGIP-SYSTEM-MIB::sysCmSyncStatusId +# F5-BIGIP-SYSTEM-MIB::sysCmSyncStatusStatus + +# F5 nodes need to be ntp synced otherwise status reports might be wrong. + + +f5_bigip_cluster_v11_states = { + '0': ( "Unknown", 3), + '1': ( "Syncing", 0), + '2': ( "Need Manual Sync", 1), + '3': ( "In Sync", 0), + '4': ( "Sync Failed", 2), + '5': ( "Sync Disconnected", 2), + '6': ( "Standalone", 2), + '7': ( "Awaiting Initial Sync", 1), + '8': ( "Incompatible Version", 2), + '9': ( "Partial Sync", 2), +} + + +def inventory_f5_bigip_cluster_v11(info): + if len(info) == 1: + return [(None, None)] + + +def check_f5_bigip_cluster_v11(_no_item, _no_params, info): + statusid, statustxt = info[0] + statename, state = f5_bigip_cluster_v11_states[statusid] + infotext = statename + if statename != statustxt: + infotext += ' - ' + statustxt + return state, infotext + + +check_info["f5_bigip_cluster_v11"] = { + 'check_function': check_f5_bigip_cluster_v11, + 'inventory_function': inventory_f5_bigip_cluster_v11, + 'service_description': 'Config Sync Status', + 'snmp_info': ('.1.3.6.1.4.1.3375.2.1.14.1', [ + "1.0", # sysCmSyncStatusId + "2.0" # sysCmSyncStatusStatus + ]), + + 'snmp_scan_function': \ + lambda oid: '.1.3.6.1.4.1.3375.2' in oid(".1.3.6.1.2.1.1.2.0") \ + and "big-ip" in oid(".1.3.6.1.4.1.3375.2.1.4.1.0").lower() \ + and int(oid(".1.3.6.1.4.1.3375.2.1.4.2.0").split('.')[0]) >= 11, +}

9 years, 9 months

Check_MK Git: check_mk: #1611 mssql.vbs: Supporting SQL-Server 2014 now

by Lars Michelsen

Module: check_mk Branch: master Commit: 992107001415576b7cd346d8e82e7b88da38f5b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99210700141557… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 16:59:43 2014 +0100 #1611 mssql.vbs: Supporting SQL-Server 2014 now --- .werks/1611 | 9 +++++++++ ChangeLog | 1 + agents/windows/plugins/mssql.vbs | 29 +++++++++++++++-------------- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/.werks/1611 b/.werks/1611 new file mode 100644 index 0000000..d9343ef --- /dev/null +++ b/.werks/1611 @@ -0,0 +1,9 @@ +Title: mssql.vbs: Supporting SQL-Server 2014 now +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417622375 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 3b6c7bf..7ba5338 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ * 1565 mem.win: set default levels for page file to 80%/90% * 1608 zpool_status: Add an overall state check (thx to Craig Cook)... * 1567 postfix_mailq: speedup in Linux agent for large mail queues... + * 1611 mssql.vbs: Supporting SQL-Server 2014 now * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices... diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index 7f508ff..bf58824 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -17,8 +17,6 @@ ' ' This check has been developed with MSSQL Server 2008 R2. It should work with ' older versions starting from at least MSSQL Server 2005. -' -' 16.10.2013 Instanzen mit Unterstrich im Namen -- H.Schniggendiller ' ----------------------------------------------------------------------------- Option Explicit @@ -36,7 +34,6 @@ Sub addOutput(text) output = output & text & vbLf End Sub - ' Dummy empty output. ' Contains timeout error if this scripts runtime exceeds the timeout WScript.echo "<<<mssql_versions>>>" @@ -44,23 +41,27 @@ WScript.echo "<<<mssql_versions>>>" ' Loop all found local MSSQL server instances ' Try different trees to handle different versions of MSSQL On Error Resume Next -' MSSQL >= 10 -' try SQL Server 2012: -Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement11") +' try SQL Server 2014: +Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement12") If Err.Number <> 0 Then Err.Clear() - - ' try SQL Server 2008 - Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement10") + ' try SQL Server 2012: + Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement11") If Err.Number <> 0 Then Err.Clear() - - ' try MSSQL < 10 - Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement") + + ' try SQL Server 2008 + Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement10") If Err.Number <> 0 Then - addOutput( "Error: " & Err.Number & " " & Err.Description ) Err.Clear() - wscript.quit() + + ' try MSSQL < 10 + Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement") + If Err.Number <> 0 Then + addOutput( "Error: " & Err.Number & " " & Err.Description ) + Err.Clear() + wscript.quit() + End If End If End If End If

9 years, 9 months

Check_MK Git: check_mk: Moved DOCSIS checks to "Generic check plugins" in check catalog

by Lars Michelsen

Module: check_mk Branch: master Commit: c82a71da07dc2d9aeae803cfab108975b080ca23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c82a71da07dc2d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 16:19:53 2014 +0100 Moved DOCSIS checks to "Generic check plugins" in check catalog --- checkman/docsis_channels_downstream | 2 +- checkman/docsis_cm_status | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checkman/docsis_channels_downstream b/checkman/docsis_channels_downstream index 95fed91..54734bc 100644 --- a/checkman/docsis_channels_downstream +++ b/checkman/docsis_channels_downstream @@ -1,6 +1,6 @@ title: DOCSIS: Downstream Channels agents: snmp -catalog: hw/network/arris +catalog: hw/network/docsis license: GPL distribution: description: diff --git a/checkman/docsis_cm_status b/checkman/docsis_cm_status index c7f7264..da83e83 100644 --- a/checkman/docsis_cm_status +++ b/checkman/docsis_cm_status @@ -1,6 +1,6 @@ title: DOCSIS Cable Modem Status agents: snmp -catalog: hw/network/docsis +catalog: hw/network/generic license: GPL distribution: description:

9 years, 9 months

Check_MK Git: check_mk: Updated bug entries #2210

by Lars Michelsen

Module: check_mk Branch: master Commit: fe981d9c975797b1cebb76d58702e666bda63d63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe981d9c975797… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 16:17:36 2014 +0100 Updated bug entries #2210 --- .bugs/2210 | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/.bugs/2210 b/.bugs/2210 new file mode 100644 index 0000000..6d26f13 --- /dev/null +++ b/.bugs/2210 @@ -0,0 +1,29 @@ +Title: Make painter options configurable as view defaults +Component: multisite +State: open +Date: 2014-12-03 15:57:40 +Targetversion: 1.2.5i1 +Class: feature + +The painter options can not be configured per view, for example in a view dashlet. These +are user related options. We should implement these options as defaults per view, while +the user can override them. + +---- +Mail from user: + + We used to have a view in the dashboard, with URL defined in the dashboard definition.py like so: + + "title" : _("Applications - errors"), + "title_url" : "view.py?view_name=aggr_dashboard_apps_all&po_aggr_onlyproblems=1", + "view" : "aggr_dashboard_apps_errs&po_aggr_onlyproblems=1", + + This allowed us to get a neat tree view of problems in the network, and showing only the problems - if list was empty, everything was great. Getting such a view does not seem possible with the new view format. + + While using a link (the title_url) to the actual view still works, such painter options are not stored as part of custom dashboard view configuration - only filters are stored. For other (non-dashlet) views, the chosen view options are of course stored in var/lib/user/viewoptions.mk, but this does not apply to view dashlets. + + What this means is that we are seeing *all* aggregation data, including items in OK state, on the dashboard. + + Could you make it possible to also include the painter options in the custom view dashlets? + + Right now our only workaround is to use a URL Iframe, and with that, we cannot hide the other elements of such an url (such as the action buttons at top of a page and so on). To us this represents a loss of functionality and clarity in dashboard.

9 years, 9 months

Check_MK Git: check_mk: #1610 FIX Hostname translation now also works for incoming SNMP traps

by Lars Michelsen

Module: check_mk Branch: master Commit: 3d80556c0d3aeca66ad0ab4e7f4adc826b3149dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d80556c0d3aec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 16:47:33 2014 +0100 #1610 FIX Hostname translation now also works for incoming SNMP traps --- .werks/1610 | 9 +++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 15 +++++++++------ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.werks/1610 b/.werks/1610 new file mode 100644 index 0000000..d22d031 --- /dev/null +++ b/.werks/1610 @@ -0,0 +1,9 @@ +Title: Hostname translation now also works for incoming SNMP traps +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.5i7 +Date: 1417621627 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 001a255..5ee9eae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -154,6 +154,7 @@ Event Console: * 1169 Added host state type filter to "recent event history" view * 1531 FIX: Fixed exception in event history view when displaying CHANGESTATE events + * 1610 FIX: Hostname translation now also works for incoming SNMP traps HW/SW-Inventory: * 1479 liveproxyd: new function for collecting remote inventory data... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index e1c294b..8e8a53c 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1172,6 +1172,7 @@ class EventServer: 'application' : application.replace('\n', ''), 'text' : text } + self.do_translate_hostname(event) self.process_event(event) def serve(self): @@ -2022,6 +2023,13 @@ class EventServer: return backedhost + def do_translate_hostname(self, event): + try: + event["host"] = self.translate_hostname(event["host"]) + except Exception, e: + if g_config["debug_rules"]: + log('Unable to parse host "%s" (%s)' % (event.get("host"), e)) + event["host"] = "" def parse_event(self, line, address): event = {} @@ -2130,12 +2138,7 @@ class EventServer: "time" : time.time(), } - try: - event["host"] = self.translate_hostname(event["host"]) - except Exception, e: - if g_config["debug_rules"]: - log('Unable to parse host "%s" (%s)' % (event.get("host"), e)) - event["host"] = "" + self.do_translate_hostname(event) if g_config["debug_rules"]: log('Parsed message:\n' +

9 years, 9 months

Check_MK Git: check_mk: #1567 postfix_mailq: speedup in Linux agent for large mail queues

by Mathias Kettner

Module: check_mk Branch: master Commit: 1324eafed9e40230d0f9e3ea29fd53b11289eb75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1324eafed9e402… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 3 16:25:22 2014 +0100 #1567 postfix_mailq: speedup in Linux agent for large mail queues Instead of the <tt>mailq</tt> command we now use <tt>du</tt> and <tt>wc</tt> in order to count the number and size o requests. This is substantially faster, since <tt>mailq</tt> needs to open every single mail file. Thanks to Max Matslovfa. --- .werks/1567 | 11 +++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 4 +++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/1567 b/.werks/1567 new file mode 100644 index 0000000..a4f8424 --- /dev/null +++ b/.werks/1567 @@ -0,0 +1,11 @@ +Title: postfix_mailq: speedup in Linux agent for large mail queues +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417620214 +Class: feature + +Instead of the <tt>mailq</tt> command we now use <tt>du</tt> and <tt>wc</tt> in order to count +the number and size o requests. This is substantially faster, since <tt>mailq</tt> needs +to open every single mail file. Thanks to Max Matslovfa. diff --git a/ChangeLog b/ChangeLog index 916c011..cf6f8d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,7 @@ NOTE: Please refer to the migration notes! * 1592 AIX: New Plugin to monitor errpt in logwatch style... * 1565 mem.win: set default levels for page file to 80%/90% + * 1567 postfix_mailq: speedup in Linux agent for large mail queues... * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index c734bb1..51b425b 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -503,7 +503,9 @@ fi # but it could be used to get the timestamp of the last message. if type mailq >/dev/null 2>&1 && [ -x /usr/sbin/postfix ] && getent passwd postfix >/dev/null 2>&1; then echo '<<<postfix_mailq>>>' - mailq | tail -n 6 + echo -- \ + $(du -kd0 $(postconf -h queue_directory)/deferred | awk '{print $1 }') Kbytes in \ + $(find $(postconf -h queue_directory)/deferred/. ! -name '?' -print | wc -l) Requests. elif [ -x /usr/sbin/ssmtp ] ; then echo '<<<postfix_mailq>>>' mailq 2>&1 | sed 's/^[^:]*: $.*$/\1/' | tail -n 6

9 years, 9 months

Check_MK Git: check_mk: Slightly improved shortly applied zpool_status patch

by Lars Michelsen

Module: check_mk Branch: master Commit: 6d19146baae84c0fb81fbba801b959c239738674 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d19146baae84c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 15:42:23 2014 +0100 Slightly improved shortly applied zpool_status patch --- checks/zpool_status | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/checks/zpool_status b/checks/zpool_status index 3a4737f..f3cc162 100644 --- a/checks/zpool_status +++ b/checks/zpool_status @@ -116,15 +116,7 @@ def check_zpool_status(_no_item, _no_params, info): pool_messages[last_pool] = msg continue - if line[0] == "spares": - start_pool = False - continue - - if line[0] == "logs": - start_pool = False - continue - - if line[0] == "cache": + if line[0] in ["spares", "logs", "cache"]: start_pool = False continue

9 years, 9 months

Check_MK Git: check_mk: #1609 FIX zpool_status: fix problem when the zpool has a separate log or cache device

by Lars Michelsen

Module: check_mk Branch: master Commit: ddf54dabc0a1b529710e245e4489dd5c331292e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ddf54dabc0a1b5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 15:37:57 2014 +0100 #1609 FIX zpool_status: fix problem when the zpool has a separate log or cache device Thanks to Craig Cook for the patch (http://lists.mathias-kettner.de/pipermail/checkmk-en/2014-May/012173.html) --- .werks/1609 | 10 ++++++++++ ChangeLog | 1 + checks/zpool_status | 8 ++++++++ 3 files changed, 19 insertions(+) diff --git a/.werks/1609 b/.werks/1609 new file mode 100644 index 0000000..57bde9b --- /dev/null +++ b/.werks/1609 @@ -0,0 +1,10 @@ +Title: zpool_status: fix problem when the zpool has a separate log or cache device +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417617431 +Class: fix + +Thanks to Craig Cook for the patch (http://lists.mathias-kettner.de/pipermail/checkmk-en/2014-May/012173.html) + diff --git a/ChangeLog b/ChangeLog index 4d9f8be..f287f06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ * 1563 FIX: Reworked configuration of process monitoring... NOTE: Please refer to the migration notes! * 1564 FIX: check_mk_agent.linux: fix situation where async plugin is not executed after crash... + * 1609 FIX: zpool_status: fix problem when the zpool has a separate log or cache device... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/zpool_status b/checks/zpool_status index f84b651..3a4737f 100644 --- a/checks/zpool_status +++ b/checks/zpool_status @@ -120,6 +120,14 @@ def check_zpool_status(_no_item, _no_params, info): start_pool = False continue + if line[0] == "logs": + start_pool = False + continue + + if line[0] == "cache": + start_pool = False + continue + if start_pool == True: if line[1] != "ONLINE": error_pools[line[0]] = tuple(line[1:])

9 years, 9 months

Check_MK Git: check_mk: #1608 zpool_status: Add an overall state check ( thx to Craig Cook)

by Lars Michelsen

Module: check_mk Branch: master Commit: 7635f2357570ff4a6c2cc8fbb6cd90ac50e5898a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7635f2357570ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 3 15:36:46 2014 +0100 #1608 zpool_status: Add an overall state check (thx to Craig Cook) This change adds a check on the reported overall state. Patch can be found here http://lists.mathias-kettner.de/pipermail/checkmk-en/2014-May/012174.html --- .werks/1608 | 11 +++++++++++ ChangeLog | 1 + checks/zpool_status | 27 ++++++++++++++++++++++++++- 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/.werks/1608 b/.werks/1608 new file mode 100644 index 0000000..ff9ac9b --- /dev/null +++ b/.werks/1608 @@ -0,0 +1,11 @@ +Title: zpool_status: Add an overall state check (thx to Craig Cook) +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417617359 +Class: feature + +This change adds a check on the reported overall state. Patch can +be found here http://lists.mathias-kettner.de/pipermail/checkmk-en/2014-May/012174.html + diff --git a/ChangeLog b/ChangeLog index f35b1ec..4d9f8be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ * 1518 raritan_pdu_inlet, raritan_pdu_inlet_summary: Modified existing check to give one item per phase and support setting levels.... NOTE: Please refer to the migration notes! * 1592 AIX: New Plugin to monitor errpt in logwatch style... + * 1608 zpool_status: Add an overall state check (thx to Craig Cook)... * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices... diff --git a/checks/zpool_status b/checks/zpool_status index fa75269..f84b651 100644 --- a/checks/zpool_status +++ b/checks/zpool_status @@ -77,10 +77,34 @@ def check_zpool_status(_no_item, _no_params, info): warning_pools = {} pool_messages = {} state = 0 + message = [] + for line in info: if line[0] == "pool:": last_pool = line[1] + if line[0] == "state:": + if line[1] == "ONLINE": + state = 0 + elif line[1] == "DEGRADED": + state = 1 + message.append("DEGRADED State") + elif line[1] == "FAULTED": + state = 2 + message.append("FAULTED State") + elif line[1] == "UNAVIL": + state = 2 + message.append("UNAVIL State") + elif line[1] == "REMOVED": + state = 2 + message.append("REMOVED State") + elif line[1] == "OFFLINE": + state = 0 + else: + message.append("Unknown State") + state = 1 + continue + if line[0] == "NAME": start_pool = True continue @@ -103,7 +127,7 @@ def check_zpool_status(_no_item, _no_params, info): if saveint(line[4]) != 0: warning_pools[line[0]] = tuple(line[1:]) - message = [] + for pool in pool_messages.keys(): state = 1 message.append("%s: %s" % (pool, pool_messages[pool])) @@ -115,6 +139,7 @@ def check_zpool_status(_no_item, _no_params, info): for pool in error_pools.keys(): state = 2 message.append("%s State:%s(!!)" % (pool, error_pools[pool][0])) + if len(message) == 0: message = ['No critical errors'] return (state, ", ".join(message))

9 years, 9 months

← Newer
1
...
40
41
42
43
44
45
46
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2014