Checkmk git commits September 2013

checkmk-commits@lists.checkmk.com

6 participants
227 discussions

Check_MK Git: check_mk: Updated bug entries #1052

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: fbad61f4b76710718d0c3a28330f0c0eb011c9e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fbad61f4b76710… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Sep 30 18:32:34 2013 +0200 Updated bug entries #1052 --- .bugs/1052 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/1052 b/.bugs/1052 index e89f6e8..f42ceb3 100644 --- a/.bugs/1052 +++ b/.bugs/1052 @@ -1,9 +1,9 @@ Title: CUPS print queue monitoring: Default Printer is not checked / inventorized Component: checks -State: open +Class: bug +State: done Date: 2013-09-16 08:52:34 Targetversion: 1.2.3i2 -Class: bug after a change in the linux agent, all printers are monitored / inventorized except the default printer, having a @@ -14,3 +14,6 @@ execution time optimization can be done within the change: lpstat -a command should not be executed twice, but only once (whereas the lpstat -p and lpstat -o commands can be done once per printer) + +2013-09-30 18:32:21: changed state open -> done +fixed with commit 7575f6df5402533d19a8c31e8000a4673905b419

10 years, 9 months

Check_MK Git: check_mk: fixing bug #1052: cups default printer is now monitored again with linux agent

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 7575f6df5402533d19a8c31e8000a4673905b419 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7575f6df540253… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Sep 30 18:30:58 2013 +0200 fixing bug #1052: cups default printer is now monitored again with linux agent --- ChangeLog | 1 + agents/check_mk_agent.linux | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3b6c09..304d8c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Checks & Agents: * windows_agent: increased maximum plugin output buffer size to 2MB * FIX: windows_agent: fixed bug in cleanup of open thread handles + * FIX: cups default printer is now monitored again in linux agent Multisite: * FIX: ldap attribute plugins: fixed crash when parameters are None diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index cdf452f..e76e27c 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -363,13 +363,14 @@ if type lpstat > /dev/null 2>&1; then echo '<<<cups_queues>>>' WAITMAX="waitmax 3" CPRINTCONF=/etc/cups/printers.conf + PRINTERS=$(lpstat -a | awk '{print $1}') if [ -r "$CPRINTCONF" ] ; then - for PQ in $(lpstat -a | awk '{print $1}') ; do - grep -q -x -F "<Printer $PQ>" $CPRINTCONF && $WAITMAX lpstat -p $PQ + for PQ in $PRINTERS ; do + grep -q -x -E "<(Default)?Printer $PQ>" $CPRINTCONF && $WAITMAX lpstat -p $PQ done echo '---' - for PQ in $(lpstat -a | awk '{print $1}') ; do - grep -q -x -F "<Printer $PQ>" $CPRINTCONF && $WAITMAX lpstat -o $PQ + for PQ in $PRINTERS ; do + grep -q -x -E "<(Default)?Printer $PQ>" $CPRINTCONF && $WAITMAX lpstat -o $PQ done else $WAITMAX lpstat -p ; echo '---' ; $WAITMAX lpstat -o | sort

10 years, 9 months

Check_MK Git: check_mk: FIX: add missing service icons to view " All Services with this descr..."

by Mathias Kettner

Module: check_mk Branch: master Commit: 8bd333233606dac8aacca3063819b0e927b99499 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8bd333233606da… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 30 17:50:49 2013 +0200 FIX: add missing service icons to view "All Services with this descr..." --- ChangeLog | 1 + web/plugins/views/builtin.py | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index b3b6c09..e5dc896 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * FIX: windows_agent: fixed bug in cleanup of open thread handles Multisite: + * FIX: add missing service icons to view "All Services with this descr..." * FIX: ldap attribute plugins: fixed crash when parameters are None 1.2.3i2: diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 853dc5b..88ec523 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1190,6 +1190,7 @@ multisite_builtin_views.update({ 'num_columns': 2, 'owner': '', 'painters': [('service_state', None), + ('service_icons', None), ('host', 'host'), ('svc_plugin_output', None), ('perfometer', None)],

10 years, 9 months

Check_MK Git: check_mk: Availability: avoid duplicate fetch of log_output

by Mathias Kettner

Module: check_mk Branch: master Commit: 37208dcb7c7b006947d79e08242af32fef1e82a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37208dcb7c7b00… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 30 17:21:02 2013 +0200 Availability: avoid duplicate fetch of log_output --- web/plugins/views/availability.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index fcaff93..bf56ba2 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -479,8 +479,7 @@ def get_availability_data(datasource, filterheaders, range, only_sites, limit, t # Columns for availability columns += [ "duration", "from", "until", "state", "host_down", "in_downtime", - "in_host_downtime", "in_notification_period", "is_flapping", - "log_output" ] + "in_host_downtime", "in_notification_period", "is_flapping", ] if timeline: columns.append("log_output")

10 years, 9 months

Check_MK Git: check_mk: Availability: better tolerate invalid states

by Mathias Kettner

Module: check_mk Branch: master Commit: 22aa9e290e652500f4a556fcc2dfd14e2832af48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22aa9e290e6525… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 30 17:19:26 2013 +0200 Availability: better tolerate invalid states --- web/plugins/views/availability.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 41bbb27..fcaff93 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -575,9 +575,9 @@ def do_render_availability(rows, what, avoptions, timeline, timewarpcode): s = "flapping" else: if what in [ "service", "bi" ]: - s = { 0: "ok", 1:"warn", 2:"crit", 3:"unknown", -1: "unmonitored", -2: "unmonitored" }[state] + s = { 0: "ok", 1:"warn", 2:"crit", 3:"unknown" }.get(state, "unmonitored") else: - s = { 0: "up", 1:"down", 2:"unreach", -1: "unmonitored", -2: "unmonitored" }[state] + s = { 0: "up", 1:"down", 2:"unreach" }.get(state, "unmonitored") if s == "warn": s = avoptions["state_grouping"]["warn"] elif s == "unknown":

10 years, 9 months

Check_MK Git: check_mk: Began WATOization of check_sql

by Mathias Kettner

Module: check_mk Branch: master Commit: 7b469142248e95111b762f41665b74d8df28b910 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b469142248e95… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 30 16:06:13 2013 +0200 Began WATOization of check_sql --- checks/check_sql | 57 ++++++++++++++++++++++++ doc/treasures/active_checks/check_sql | 22 +++++----- web/plugins/wato/active_checks.py | 77 ++++++++++++++++++++------------- 3 files changed, 115 insertions(+), 41 deletions(-) diff --git a/checks/check_sql b/checks/check_sql new file mode 100644 index 0000000..d391c78 --- /dev/null +++ b/checks/check_sql @@ -0,0 +1,57 @@ +#!/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. + +def check_sql_arguments(params): + args = " -H '$HOSTNAME$'" + args += " --dbms %s" % quote_shell_string(params["dbms"]) + args += " --name %s" % quote_shell_string(params["name"]) + + if "levels" in params: + upper = params["levels"] + else: + upper = "", "" + + if "levels_low" in params: + lower = params["levels_low"] + else: + lower = "", "" + + if "levels" in params or "levels_low" in params: + args += " -w %s:%s" % (lower[0], upper[0]) + args += " -c %s:%s" % (lower[1], upper[1]) + + args += " %s" % quote_shell_string(params["sql"]) + + return args + + +active_check_info['sql'] = { + "command_line" : '$USER1$/check_sql $ARG1$', + "argument_function" : check_sql_arguments, + "service_description" : lambda args: args["description"], + "has_perfdata" : True, +} + diff --git a/doc/treasures/active_checks/check_sql b/doc/treasures/active_checks/check_sql index 47a7212..4b9954e 100755 --- a/doc/treasures/active_checks/check_sql +++ b/doc/treasures/active_checks/check_sql @@ -30,8 +30,8 @@ import sys, getopt def usage(): sys.stderr.write("""Check_MK SQL Test -USAGE: check-sql [OPTIONS] SQL-Statement - check-sql -h +USAGE: check_sql [OPTIONS] SQL-Statement + check_sql -h ARGUMENTS: SQL-Statement Valid SQL-Statement for the selected database @@ -40,17 +40,17 @@ ARGUMENTS: OPTIONS: -h, --help Show this help message and exit - -u USER, --user USER Username for database access - -p PASS, --password PASS Password for database access - -d DBMS, --dbms DBMS Name of the database management system. + -u USER, --user USER Username for database access + -p PASS, --password PASS Password for database access + -d DBMS, --dbms DBMS Name of the database management system. Default is 'postgres', other valid values are 'mysql' and 'oracle' - -H HOST , --hostname HOST Hostname or IP-Address where the database lives. Default is '127.0.0.1' - -n NAME, --name NAME Name of the database on the DBMS - -w RANGE, --warning RANGE lower and upper level for the warning state - -c RANGE, --critical RANGE lower and upper level for the critical state + -H HOST, --hostname HOST Hostname or IP-Address where the database lives. Default is '127.0.0.1' + -n NAME, --name NAME Name of the database on the DBMS + -w RANGE, --warning RANGE lower and upper level for the warning state, separated by a colon + -c RANGE, --critical RANGE lower and upper level for the critical state, separated by a colon --debug Debug mode: let Python exceptions come through - -v, --verbose Verbose mode: print sql statement and levels + -v, --verbose Verbose mode: print SQL statement and levels """) @@ -116,7 +116,7 @@ try: if args: opt_sql = ' '.join(map(str,args)) else: - print "UNKNOWN - no sql statement given" + print "UNKNOWN - no SQL statement given" sys.exit(3) except Exception, e: diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 1ca1dae..1ee64a0 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -89,41 +89,58 @@ register_rule(group, register_rule(group, "active_checks:sql", - Tuple( - title = _("Check SQL DB"), - help = _("This check connects to the specified database, sends a custom sql-statement " + Dictionary( + title = _("Check SQL Database"), + help = _("This check connects to the specified database, sends a custom SQL-statement " "and checks that the result has a defined format containing three columns, a " "number, a text, and performance data. Upper or lower levels may be defined " "here. If they are not defined the number is taken as the state of the check." "This check uses the active check <tt>check_sql</tt>."), + optional_keys = [ "levels", "levels_low", "perfdata" ], elements = [ - TextAscii(title = _("Hostname"), allow_empty = False, - help = _('The hostname or address you want to query')), - TextAscii(title = _("DBMS"), allow_empty = False, - help = _('The database management system you want to query')), - TextAscii(title = _("DB-Name"), allow_empty = False, - help = _('The name of the database on the DBMS')), - TextAscii(title = _("SQL-Statement"), allow_empty = False, - help = _('The SQL-Statement which is sent to the DBMS')), - Dictionary( - title = _("Optional parameters"), - elements = [ - ( "upperlevels", - Tuple( - title = _("Upper levels for first output item"), - elements = [ - Float( title = _("Warning if above")), - Float( title = _("Critical if above")) - ]) - ), - ( "lowerlevels", - Tuple( - title = _("Lower levels for first output item"), - elements = [ - Float( title = _("Warning if below")), - Float( title = _("Critical if below")) - ])), - ]), + ( "description", + TextUnicode(title = _("Service Description"), + help = _("The name of this active service to be displayed."), + allow_empty = False, + )), + ( "dbms", + DropdownChoice( + title = _("Type of Database"), + choices = [ + ( "mysql", _("MySQL") ), + ( "postgres", _("PostgreSQL") ), + ( "oracle", _("Oracle") ), + ], + default_value = "mysql", + ), + ), + ( "name", + TextAscii(title = _("Database Name"), allow_empty = False, + help = _('The name of the database on the DBMS')) + ), + ( "sql", + TextAscii(title = _("SQL-Statement"), allow_empty = False, + help = _('The SQL-Statement which is sent to the DBMS')) + ), + ( "levels", + Tuple( + title = _("Upper levels for first output item"), + elements = [ + Float( title = _("Warning if above")), + Float( title = _("Critical if above")) + ]) + ), + ( "levels_low", + Tuple( + title = _("Lower levels for first output item"), + elements = [ + Float( title = _("Warning if below")), + Float( title = _("Critical if below")) + ]) + ), + ( "perfdata", + FixedValue(True, totext=_("Store output value into RRD database"), title = _("Performance Data"), ), + ) ] ), match = 'all')

10 years, 9 months

Check_MK Git: check_mk: optimizing layout and grouping of check manpages

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 57b7e5e5ae32b6b9a5037cda5b1f53419358c5ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57b7e5e5ae32b6… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Sep 30 15:57:16 2013 +0200 optimizing layout and grouping of check manpages --- checkman/apc_symmetra_test | 5 +++-- checkman/etherbox.humidity | 1 + checkman/etherbox.smoke | 1 + checkman/etherbox.switch | 1 + checkman/etherbox.temp | 1 + checkman/ups_test | 11 ++++++----- checkman/win_printers | 4 ++-- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/checkman/apc_symmetra_test b/checkman/apc_symmetra_test index 9bfef24..bac876b 100644 --- a/checkman/apc_symmetra_test +++ b/checkman/apc_symmetra_test @@ -20,8 +20,9 @@ inventory: [parameters] parameters(tuple): parameters is a tuple of two values - warn (int): The warning level in days - crit (int): The critical level in days + {warn}: (int) The warning level in days + + {crit}: (int) The critical level in days [configuration] ups_test_default (tuple): This variable is preset to { (0,0) } diff --git a/checkman/etherbox.humidity b/checkman/etherbox.humidity index 5a719a0..a394a7e 100644 --- a/checkman/etherbox.humidity +++ b/checkman/etherbox.humidity @@ -8,6 +8,7 @@ description: item: The port number of the sensor followed by the sensor type + Example: "2.3" A humidity sensor(type 3) on port 2 perfdata: diff --git a/checkman/etherbox.smoke b/checkman/etherbox.smoke index c9fe94d..9b8036b 100644 --- a/checkman/etherbox.smoke +++ b/checkman/etherbox.smoke @@ -8,6 +8,7 @@ description: item: The port number of the sensor followed by the sensor type + Example: "2.6" A smoke sensor(type 6) on port 2 perfdata: diff --git a/checkman/etherbox.switch b/checkman/etherbox.switch index 97cb0fd..00d228f 100644 --- a/checkman/etherbox.switch +++ b/checkman/etherbox.switch @@ -11,6 +11,7 @@ description: item: The port number of the sensor followed by the sensor type + Example: "2.4" A switch contact sensor(type 4) on port 2 perfdata: diff --git a/checkman/etherbox.temp b/checkman/etherbox.temp index 2a0f09a..8504078 100644 --- a/checkman/etherbox.temp +++ b/checkman/etherbox.temp @@ -8,6 +8,7 @@ description: item: The port number of the sensor followed by the sensor type + Example: "2.1" A temperature sensor(type 1) on port 2 perfdata: diff --git a/checkman/ups_test b/checkman/ups_test index 0bc4d22..9d1ef53 100644 --- a/checkman/ups_test +++ b/checkman/ups_test @@ -5,9 +5,9 @@ license: GPL distribution: check_mk description: This check monitors parameters related to the self test of UPS devices: The result of the - last self test and the last date of the self test run. The check becomes critical if the test - result is {"doneError"} or {"aborted"}, and warning if the result is {"doneWarning"} or - {"noTestsInitiated"}. It also has a warning or critical state if the date of the last self + last self test and the last date of the self test run. The check becomes {CRIT} if the test + result is {"doneError"} or {"aborted"}, and {WARN} if the result is {"doneWarning"} or + {"noTestsInitiated"}. It also has a {WARN} or {CRIT} state if the date of the last self test is more than the warning or critical level ago. examples: @@ -21,8 +21,9 @@ inventory: [parameters] parameters(tuple): parameters is a tuple of two values - warn (int): The warning level in days - crit (int): The critical level in days + {warn}: (int) The warning level in days + + {crit}: (int) The critical level in days [configuration] ups_test_default (tuple): This variable is preset to { (0,0) } diff --git a/checkman/win_printers b/checkman/win_printers index 983542b..2df6d88 100644 --- a/checkman/win_printers +++ b/checkman/win_printers @@ -1,12 +1,12 @@ title: Windows Printers: Queue and printer states agents: windows -catalog: os/misc +catalog: os/services license: GPL distribution: check_mk description: This check needs the agent pluing win_printers.ps1 from our plugin directory. After copying to the agent plugin directory, Check_MK will find all connected printers. - Then its possible to set warning and critical levels for the number of jobs in the queue. + Then its possible to set {WARN} and {CRIT} levels for the number of jobs in the queue. Error and operational states from the print will be automaticly detected and displayed. item:

10 years, 9 months

Check_MK Git: check_mk: ldap attribute plugins: fixed crash when params are None

by Andreas Boesl

Module: check_mk Branch: master Commit: 319bedf92684216fb38845c64d21bf5b53dbe804 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=319bedf9268421… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 30 15:55:09 2013 +0200 ldap attribute plugins: fixed crash when params are None --- ChangeLog | 2 ++ web/plugins/userdb/ldap.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 55dc03d..b3b6c09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ * windows_agent: increased maximum plugin output buffer size to 2MB * FIX: windows_agent: fixed bug in cleanup of open thread handles + Multisite: + * FIX: ldap attribute plugins: fixed crash when parameters are None 1.2.3i2: Core: diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 10fe2eb..4aa68d3 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -595,7 +595,7 @@ def ldap_needed_attributes(): for key, params in config.ldap_active_plugins.items(): plugin = ldap_attribute_plugins[key] if 'needed_attributes' in plugin: - attrs.update(plugin['needed_attributes'](params)) + attrs.update(plugin['needed_attributes'](params or {})) return list(attrs) def ldap_convert_simple(user_id, ldap_user, user, user_attr, attr): @@ -882,7 +882,7 @@ def ldap_sync(add_to_changelog, only_username): # Gather config from convert functions of plugins for key, params in config.ldap_active_plugins.items(): - user.update(ldap_attribute_plugins[key]['convert'](params, user_id, ldap_user, user)) + user.update(ldap_attribute_plugins[key]['convert'](params or {}, user_id, ldap_user, user)) if not mode_create and user == users[user_id]: continue # no modification. Skip this user.

10 years, 9 months

Check_MK Git: check_mk: wato integration of check_sql

by Götz Golla

Module: check_mk Branch: master Commit: aa1337e130b9057165ae2caf1cbbaf6deebefcd7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa1337e130b905… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Sep 30 15:32:54 2013 +0200 wato integration of check_sql --- web/plugins/wato/active_checks.py | 45 +++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index a8473f8..1ca1dae 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -33,7 +33,7 @@ register_rule(group, "active_checks:dns", Tuple( title = _("Check DNS service"), - help = _("Check the resultion of a hostname into an IP address by a DNS server. " + help = _("Check the resolution of a hostname into an IP address by a DNS server. " "This check uses <tt>check_dns</tt> from the standard Nagios plugins."), elements = [ TextAscii(title = _("Hostname"), allow_empty = False, @@ -88,10 +88,51 @@ register_rule(group, match = 'all') register_rule(group, + "active_checks:sql", + Tuple( + title = _("Check SQL DB"), + help = _("This check connects to the specified database, sends a custom sql-statement " + "and checks that the result has a defined format containing three columns, a " + "number, a text, and performance data. Upper or lower levels may be defined " + "here. If they are not defined the number is taken as the state of the check." + "This check uses the active check <tt>check_sql</tt>."), + elements = [ + TextAscii(title = _("Hostname"), allow_empty = False, + help = _('The hostname or address you want to query')), + TextAscii(title = _("DBMS"), allow_empty = False, + help = _('The database management system you want to query')), + TextAscii(title = _("DB-Name"), allow_empty = False, + help = _('The name of the database on the DBMS')), + TextAscii(title = _("SQL-Statement"), allow_empty = False, + help = _('The SQL-Statement which is sent to the DBMS')), + Dictionary( + title = _("Optional parameters"), + elements = [ + ( "upperlevels", + Tuple( + title = _("Upper levels for first output item"), + elements = [ + Float( title = _("Warning if above")), + Float( title = _("Critical if above")) + ]) + ), + ( "lowerlevels", + Tuple( + title = _("Lower levels for first output item"), + elements = [ + Float( title = _("Warning if below")), + Float( title = _("Critical if below")) + ])), + ]), + ] + ), + match = 'all') + +register_rule(group, "active_checks:tcp", Tuple( title = _("Check connecting to a TCP port"), - help = _("This check test the connection to a TCP port. It uses " + help = _("This check tests the connection to a TCP port. It uses " "<tt>check_tcp</tt> from the standard Nagios plugins."), elements = [ Integer(title = _("TCP Port"), minvalue=1, maxvalue=65535),

10 years, 10 months

Check_MK Git: check_mk: FIX: windows_agent: fixed bug in cleanup of open thread handles

by Andreas Boesl

Module: check_mk Branch: master Commit: 7fa36bfe1f1841dbde86f6133e0a2c0bf80127a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fa36bfe1f1841… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 30 14:47:28 2013 +0200 FIX: windows_agent: fixed bug in cleanup of open thread handles --- ChangeLog | 1 + agents/windows/check_mk_agent-64.exe | Bin 179200 -> 179200 bytes agents/windows/check_mk_agent.cc | 5 +++++ agents/windows/check_mk_agent.exe | Bin 151040 -> 151040 bytes agents/windows/install_agent-64.exe | Bin 149246 -> 149297 bytes agents/windows/install_agent.exe | Bin 146741 -> 146756 bytes 6 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6ca185d..55dc03d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.3i3: Checks & Agents: * windows_agent: increased maximum plugin output buffer size to 2MB + * FIX: windows_agent: fixed bug in cleanup of open thread handles 1.2.3i2: diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 3ca08ee..3ae686b 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.cc b/agents/windows/check_mk_agent.cc index 8c785f0..bc6d7b6 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2422,6 +2422,9 @@ void run_external_programs(char *dirname, script_type type, bool dry_run = false cont->buffer_time = time(0); cont->status = SCRIPT_COLLECT; crash_log("Thread start: %s", cont->path); + + if (cont->worker_thread != INVALID_HANDLE_VALUE) + CloseHandle(cont->worker_thread); cont->worker_thread = CreateThread( NULL, // default security attributes 0, // use default stack size @@ -3745,6 +3748,8 @@ void start_external_data_collection() } } + if (g_collection_thread != INVALID_HANDLE_VALUE) + CloseHandle(g_collection_thread); crash_log("Start thread for collecting local/plugin data"); g_collection_thread = CreateThread(NULL, // default security attributes 0, // use default stack size diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 9ebfcc3..e9cd4f4 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 8457418..b13071d 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 c0a5cab..956f445 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

10 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2013