Checkmk git commits June 2012

checkmk-commits@lists.checkmk.com

2 participants
296 discussions

Check_MK Git: check_mk: 3ware_units: Following states now lead to WARNING state instead of CRITICAL: " VERIFY-PAUSED", "VERIFYING", "REBUILDING"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: eca96f9dc3312431e11f20ebe39adba29ba2b3dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eca96f9dc33124… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 8 10:16:50 2012 +0200 3ware_units: Following states now lead to WARNING state instead of CRITICAL: "VERIFY-PAUSED", "VERIFYING", "REBUILDING" --- ChangeLog | 2 ++ checks/3ware_units | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 03d0f44..52e22dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ Checks & Agents: * FIX: diskstat: handle output 'No Devices Found' - avoiding exception + * 3ware_units: Following states now lead to WARNING state instead of + CRITICAL: "VERIFY-PAUSED", "VERIFYING", "REBUILDING" Multisite: * FIX: fix severe exception in all views on older Python versions diff --git a/checks/3ware_units b/checks/3ware_units index 8284343..d700101 100644 --- a/checks/3ware_units +++ b/checks/3ware_units @@ -68,7 +68,7 @@ def check_3ware_units(item, _no_params, info): if status == "OK": return (0, "OK - unit status is " + infotext) - elif status == "INITIALIZING": + elif status in [ "INITIALIZING", "VERIFY-PAUSED", "VERIFYING", "REBUILDING" ]: return (1, "WARN - unit status is " + infotext) else: return (2, "CRIT - unit status is " + infotext)

12 years, 3 months

Check_MK Git: check_mk: Switched version to 1.2.0p1

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ba257e7f81ab54cbcdc87113fab7c62b0f6dd56e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba257e7f81ab54… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 7 12:15:54 2012 +0200 Switched version to 1.2.0p1 --- Makefile | 2 +- agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.hpux | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.macosx | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 102912 -> 102912 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 124954 -> 124977 bytes agents/windows/installer.nsi | 2 +- debian/files | 2 +- livestatus/configure.ac | 2 +- scripts/setup.sh | 2 +- 15 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index ea46675..47eb0b5 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.2.0 +VERSION = 1.2.0p1 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 1554bac..7a61677 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -38,7 +38,7 @@ LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.2.0 +echo Version: 1.2.0p1 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 6da8a43..14ae440 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -66,7 +66,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.0 +echo Version: 1.2.0p1 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 2016c12..e6a81ca 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -41,7 +41,7 @@ LOCALDIR=$MK_LIBDIR/local exec <&- 2>/dev/null echo '<<<check_mk>>>' -echo Version: 1.2.0 +echo Version: 1.2.0p1 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 4b7cf9e..cb06a3f 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -53,7 +53,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.0 +echo Version: 1.2.0p1 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index 68b09f3..17938f0 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -34,7 +34,7 @@ export MK_LIBDIR="/to/be/changed" export MK_CONFDIR="/to/be/changed" echo '<<<check_mk>>>' -echo Version: 1.2.0 +echo Version: 1.2.0p1 echo AgentOS: macosx osver="$(uname -r)" diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 76c1bf3..0402214 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -42,7 +42,7 @@ PLUGINSDIR=$MK_LIBDIR/plugins LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.2.0 +echo Version: 1.2.0p1 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 420d660..5ba203c 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -73,7 +73,7 @@ // | Declarations of macrosk, structs and function prototypes | // '----------------------------------------------------------------------' -#define CHECK_MK_VERSION "1.2.0" +#define CHECK_MK_VERSION "1.2.0p1" #define CHECK_MK_AGENT_PORT 6556 #define SERVICE_NAME "Check_MK_Agent" #define KiloByte 1024 diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index df377ba..e91f830 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 5805f3d..ad729a3 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index b716308..28bb720 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/installer.nsi b/agents/windows/installer.nsi index 92c6c16..6d54162 100644 --- a/agents/windows/installer.nsi +++ b/agents/windows/installer.nsi @@ -4,7 +4,7 @@ ; Useful sources: ; http://nsis.sourceforge.net/Reusable_installer_script -!define CHECK_MK_VERSION "1.2.0" +!define CHECK_MK_VERSION "1.2.0p1" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/debian/files b/debian/files index f5c1ba1..702250b 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.2.0-1_all.deb net optional +check-mk_1.2.0p1-1_all.deb net optional diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 7e36ce8..d13e8fc 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.2.0], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.2.0p1], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/scripts/setup.sh b/scripts/setup.sh index 45d5fae..131b9d6 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.2.0 +VERSION=1.2.0p1 NAME=check_mk LANG= LC_ALL=

12 years, 3 months

Check_MK Git: check_mk: Added missing file headers

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ee39c00fbadde30e3888b520264631646f3679e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee39c00fbadde3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 7 12:17:05 2012 +0200 Added missing file headers --- agents/check_mk_agent.macosx | 4 ++-- checks/hwg_temp | 2 +- doc/treasures/wato_import.py | 26 ++++++++++++++++++++++++++ web/htdocs/help.py | 24 ++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 3 deletions(-) diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index 17938f0..58dabdd 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -6,7 +6,7 @@ # | | |___| | | | __/ (__| < | | | | . \ | # | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | # | | -# | Copyright Mathias Kettner 2010 mk(a)mathias-kettner.de | +# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | # +------------------------------------------------------------------+ # # This file is part of Check_MK. @@ -22,7 +22,7 @@ # 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. -# + # NOTE: This agent has beed adapted from the Check_MK linux agent. # Remove locale settings to eliminate localized outputs where possible diff --git a/checks/hwg_temp b/checks/hwg_temp index 3447ee4..7a779d3 100644 --- a/checks/hwg_temp +++ b/checks/hwg_temp @@ -7,7 +7,7 @@ # | | |___| | | | __/ (__| < | | | | . \ | # | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | # | | -# | Copyright Mathias Kettner 2010 mk(a)mathias-kettner.de | +# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | # +------------------------------------------------------------------+ # # This file is part of Check_MK. diff --git a/doc/treasures/wato_import.py b/doc/treasures/wato_import.py index 2305ced..33ac295 100755 --- a/doc/treasures/wato_import.py +++ b/doc/treasures/wato_import.py @@ -1,5 +1,31 @@ #!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. + #Author: Bastian Kuhn bk(a)mathias-kettner.de + import os import sys diff --git a/web/htdocs/help.py b/web/htdocs/help.py index 7d2ee74..4ae51f5 100644 --- a/web/htdocs/help.py +++ b/web/htdocs/help.py @@ -1,4 +1,28 @@ #!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. import config

12 years, 3 months

Check_MK Git: check_mk: Improve l10nability of command confirmation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 20c92f54f5de2d89382289a68cd10ee5bbb8c850 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20c92f54f5de2d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 7 11:57:27 2012 +0200 Improve l10nability of command confirmation --- web/htdocs/views.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 5c33613..6d92593 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2088,8 +2088,8 @@ def do_actions(view, what, action_rows, backurl): command = None title, executor = core_command(what, action_rows[0])[1:3] # just get the title and executor - if not html.confirm(_("Do you really want to %s the following %d %ss?") % - (title, len(action_rows), what)): + if not html.confirm(_("Do you really want to %(title)s the following %(count)d %(what)s?") % + { "title" : title, "count" : len(action_rows), "what" : _(what + "s"), }): return False count = 0

12 years, 3 months

Check_MK Git: check_mk: Remove duplicate "the following"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 483f904b2eb13a2650cc331314c8fbe4846114d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=483f904b2eb13a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 7 11:51:09 2012 +0200 Remove duplicate "the following" --- web/plugins/views/commands.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 1e088c4..f27d8c4 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -414,7 +414,7 @@ multisite_commands.append({ "action" : lambda cmdtag, spec, row: \ html.has_var("_remove_downtimes") and \ ( "DEL_%s_DOWNTIME;%d" % (cmdtag, spec), - _("remove the following")) + _("remove")) }) # REMOVE COMMENTS (table comments) @@ -427,5 +427,5 @@ multisite_commands.append({ "action" : lambda cmdtag, spec, row: \ html.has_var("_remove_comments") and \ ( "DEL_%s_COMMENT;%d" % (cmdtag, spec), - _("remove the following")) + _("remove")) })

12 years, 3 months

Check_MK Git: check_mk: Small i18n fix

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 918e7e3febbf19b9cccfc31f77b67bde0e88eb9a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=918e7e3febbf19… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 7 11:47:32 2012 +0200 Small i18n fix --- web/plugins/views/filters.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 45a7fc3..08f9d97 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -383,7 +383,7 @@ class FilterTime(Filter): return True def display(self): - choices = [ (str(sec), title + " ago") for sec, title in self.ranges ] + \ + choices = [ (str(sec), title + " " + _("ago")) for sec, title in self.ranges ] + \ [ ("abs", _("Date (YYYY-MM-DD)")) ] html.write("<table class=filtertime>")

12 years, 3 months

Check_MK Git: check_mk: FIX: fix order of rule execution:

by git＠mathias-kettner.de

subfolders now take precedence User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 4b771d9610a69f4bcd5d9e285ff633496a66ce8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b771d9610a69f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 7 11:37:29 2012 +0200 FIX: fix order of rule execution: subfolders now take precedence --- ChangeLog | 4 ++++ web/htdocs/wato.py | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ddbf849..03d0f44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,10 @@ * FIX: fix severe exception in all views on older Python versions (like RedHat 5.5). + WATO: + * FIX: fix order of rule execution: subfolders now take precedence + as they should. + 1.2.0: Setup: * FIX: fix building of RPM packages (due to mk_mysql, mk_postgres) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b30eea3..15c7162 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10203,15 +10203,16 @@ def save_rulesets(folder, rulesets): if ':' in varname: dictname, subkey = varname.split(':') + varname = '%s[%r]' % (dictname, subkey) out.write("\n%s.setdefault(%r, [])\n" % (dictname, subkey)) - out.write("%s[%r] += [\n" % (dictname, subkey)) else: if rulespec["optional"]: out.write("\nif %s == None:\n %s = []\n" % (varname, varname)) - out.write("\n%s += [\n" % varname) + + out.write("\n%s = [\n" % varname) for rule in ruleset: save_rule(out, folder, rulespec, rule) - out.write("]\n\n") + out.write("] + %s\n\n" % varname) def save_rule(out, folder, rulespec, rule): out.write(" ( ")

12 years, 3 months

Check_MK Git: check_mk: Added notification time infos to notification macros

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 58e2c94cc3f39163bc7ca986ad2555896880bbef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58e2c94cc3f391… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 7 11:00:08 2012 +0200 Added notification time infos to notification macros --- ChangeLog | 4 ++++ check_mk_templates.cfg | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d251f1..ddbf849 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ 1.2.0p1: + Core: + * Added macros $DATE$, $SHORTDATETIME$ and $LONGDATETIME$' to + notification macros + Checks & Agents: * FIX: diskstat: handle output 'No Devices Found' - avoiding exception diff --git a/check_mk_templates.cfg b/check_mk_templates.cfg index bd96561..b1879b3 100644 --- a/check_mk_templates.cfg +++ b/check_mk_templates.cfg @@ -326,6 +326,9 @@ define command { NOTIFY_LONGSERVICEOUTPUT='$LONGSERVICEOUTPUT$' \ NOTIFY_SERVICEPERFDATA='$SERVICEPERFDATA$' \ NOTIFY_SERVICECHECKCOMMAND='$SERVICECHECKCOMMAND$' \ + NOTIFY_DATE='$DATE$' \ + NOTIFY_SHORTDATETIME='$SHORTDATETIME$' \ + NOTIFY_LONGDATETIME='$LONGDATETIME$' \ @BINDIR@/check_mk --notify }

12 years, 3 months

Check_MK Git: check_mk: FIX: fix empty views on older Python versions

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3c2ec8eb6955a5e22eb8aeebb532240d195275f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c2ec8eb6955a5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 7 10:48:34 2012 +0200 FIX: fix empty views on older Python versions --- ChangeLog | 6 +++++- web/htdocs/forms.py | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 698e216..6d251f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ 1.2.0p1: Checks & Agents: - * diskstat: handle output 'No Devices Found' - avoiding exception + * FIX: diskstat: handle output 'No Devices Found' - avoiding exception + + Multisite: + * FIX: fix severe exception in all views on older Python versions + (like RedHat 5.5). 1.2.0: Setup: diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 99f3efa..677dc05 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -97,6 +97,7 @@ def edit_dictionary(entries, value, focus=None, hover_help=True, validate=None, # New functions for painting forms +twofivesix = "".join(map(chr, range(0,256))) def strip_bad_chars(x): s = "".join([c for c in x if c > ' ' and c < 'z']) @@ -110,7 +111,7 @@ def strip_bad_chars(x): ord(u"\""): None, }) else: - return s.translate(None, "'&;<>\"") + return s.translate(twofivesix, "'&;<>\"") def header(title, isopen = True, table_id = "", narrow = False): global g_header_open

12 years, 3 months

Check_MK Git: check_mk: diskstat: handle output 'No Devices Found' - avoiding exception

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 75b83c34b060a160b86f8a0bba21a92dfeebe58b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75b83c34b060a1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 7 10:47:45 2012 +0200 diskstat: handle output 'No Devices Found' - avoiding exception --- ChangeLog | 4 ++++ checks/diskstat | 15 +++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd259bc..698e216 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1.2.0p1: + Checks & Agents: + * diskstat: handle output 'No Devices Found' - avoiding exception + 1.2.0: Setup: * FIX: fix building of RPM packages (due to mk_mysql, mk_postgres) diff --git a/checks/diskstat b/checks/diskstat index e6ba75e..a0f1972 100644 --- a/checks/diskstat +++ b/checks/diskstat @@ -90,12 +90,15 @@ def diskstat_parse_info(info): if phase == 'info': info_plain.append(line) elif phase == 'dmsetup_info': - majmin = tuple(map(int, line[1].split(':'))) - if len(line) == 4: - name = "LVM %s" % line[0] - else: - name = "DM %s" % line[0] - nameinfo[majmin] = name + try: + majmin = tuple(map(int, line[1].split(':'))) + if len(line) == 4: + name = "LVM %s" % line[0] + else: + name = "DM %s" % line[0] + nameinfo[majmin] = name + except: + pass # ignore such crap as "No Devices Found" elif phase == 'vx_dsk': maj = int(line[0], 16) min = int(line[1], 16)

12 years, 3 months

← Newer
1
...
16
17
18
19
20
21
22
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2012