Checkmk git commits January 2017

checkmk-commits@lists.checkmk.com

10 participants
302 discussions

Bugfix: Fixed small bug in htmlling::text_input.

by Roland Halbig

Module: check_mk Branch: master Commit: 886eee4951dfffbe985aa602178edf8c14371b18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=886eee4951dfff… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Jan 26 16:48:20 2017 +0100 Bugfix: Fixed small bug in htmlling::text_input. Change-Id: I6ba6b537b8a3f57d65695527f00a26222cabfaf7 --- web/htdocs/htmllib.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index a5df3f2..4ce946d 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1914,6 +1914,8 @@ class html(DeprecationWrapper): for key, val in attrs.iteritems(): if key not in attributes and key not in ["name", "type", "type_"]: attributes[key] = val + elif key in attributes and attributes[key] is None: + attributes[key] = val if error: self.open_x(class_="inputerror")

7 years, 5 months

Fix wording in cmk --help: inventory -> discovery

by Mathias Kettner

Module: check_mk Branch: master Commit: 87f456a616de544a32d28e578fe9bde59f9c6b18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87f456a616de54… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 26 15:00:14 2017 +0100 Fix wording in cmk --help: inventory -> discovery Change-Id: I00cf6491beeb4bd4e8cc1ed58e9e491eb225d071 --- modules/check_mk.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index edb1c57..3e165ad 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3464,8 +3464,8 @@ Copyright (C) 2009 Mathias Kettner def usage(): sys.stdout.write("""WAYS TO CALL: cmk [-n] [-v] [-p] HOST [IPADDRESS] check all services on HOST - cmk -I [HOST ..] inventory - find new services - cmk -II ... renew inventory, drop old services + cmk -I [HOST ..] discovery - find new services + cmk -II ... renew discovery, drop old services cmk -N [HOSTS...] output Nagios configuration cmk -B create configuration for core cmk -C, --compile precompile host checks @@ -3526,7 +3526,7 @@ OPTIONS: is a TTY. This option forces interactive mode even if the output is directed into a pipe or file. --procs N start up to N processes in parallel during --scan-parents - --checks A,.. restrict checks/inventory to specified checks (tcp/snmp/check type) + --checks A,.. restrict checks/discovery to specified checks (tcp/snmp/check type) --keepalive used by Check_MK Mirco Core: run check and --notify in continous mode. Read data from stdin and from cmd line. --cmc-file=X relative filename for CMC config file (used by -B/-U) @@ -3563,7 +3563,7 @@ NOTES: real hosts. --check-discovery make check_mk behave as monitoring plugins that - checks if an inventory would find new or vanished services for the host. + checks if a discovery would find new or vanished services for the host. If configured to do so, this will queue those hosts for automatic discover-marked-hosts

7 years, 5 months

4305 FIX postgres_stat_database.size: fixed missing database size perfometer

by Simon Betz

Module: check_mk Branch: master Commit: c48d50b3758c86853c95711d00362ebe07277d3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c48d50b3758c86… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jan 26 14:02:59 2017 +0100 4305 FIX postgres_stat_database.size: fixed missing database size perfometer Change-Id: I4aa806918f9ae931e3cb49abb22bb6dba05f4d15 --- .werks/4305 | 10 ++++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/.werks/4305 b/.werks/4305 new file mode 100644 index 0000000..ea502f6 --- /dev/null +++ b/.werks/4305 @@ -0,0 +1,10 @@ +Title: postgres_stat_database.size: fixed missing database size perfometer +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1485435749 + + diff --git a/ChangeLog b/ChangeLog index 33a678a..74bf3eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,6 +73,7 @@ * 4303 FIX: sap_state: fixed error handling * 4214 FIX: jolokia_metrics.tp: Fix crash in case of partial thread information... * 4304 FIX: mk_inventory.linux: fixed missing redirection to null device in if statement + * 4305 FIX: postgres_stat_database.size: fixed missing database size perfometer Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index af87ff3..0c11283 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -4519,6 +4519,10 @@ check_metrics["check_mk-postgres_sessions"] = { "running": {"name": "running_sessions"} } +check_metrics["check_mk-postgres_stat_database.size"] = { + "size" : { "name" : "database_size"} +} + check_metrics["check_mk-oracle_sessions"] = { "sessions" : {"name": "running_sessions"} }

7 years, 5 months

4296 mssql_databases: new check which monitors the auto close and shrink state of MSSQL databases

by Simon Betz

Module: check_mk Branch: master Commit: b90f720df38df86921f2a4935383a89eecd5e9a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b90f720df38df8… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jan 24 12:36:22 2017 +0100 4296 mssql_databases: new check which monitors the auto close and shrink state of MSSQL databases Auto close and shrink states are configurable via WATO. Change-Id: I3ca9de33ad944c0dd8b0c8b95dfa4bcfebbb28a4 --- .werks/4296 | 9 +++++ ChangeLog | 1 + agents/windows/plugins/mssql.vbs | 21 +++++++++- checks/mssql_databases | 78 ++++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 30 ++++++++++++++ 5 files changed, 137 insertions(+), 2 deletions(-) diff --git a/.werks/4296 b/.werks/4296 new file mode 100644 index 0000000..84a9fd5 --- /dev/null +++ b/.werks/4296 @@ -0,0 +1,9 @@ +Title: mssql_databases: new check which monitors the auto close and shrink state of MSSQL databases +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1485257668 +Class: feature + +Auto close and shrink states are configurable via WATO. diff --git a/ChangeLog b/ChangeLog index b5bffcb..33a678a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * 4257 logwatch.groups: now allows regular expressions within include and exclude patterns each beginning with a tilde * 4013 Ruckus Spot / ruckus_spot_locations: new check to monitor the number of unqiue MACs addresses... * 4293 wut_webtherm: now detects devices which support WebGraphThermoBaro-MIB + * 4296 mssql_databases: new check which monitors the auto close and shrink state of MSSQL databases... * 4171 FIX: perle_psmu: fixed value error... * 4172 FIX: smart.temp: fixed discovery and check function... * 4173 FIX: if.include: ignore some more keys in 'Network interfaces and switch ports' rule which are only used for interface grouping diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index 6a4fdb5..cc7fc6a 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -102,6 +102,7 @@ End If Dim sections, section_id Set sections = CreateObject("Scripting.Dictionary") sections.add "instance", "<<<mssql_instance:sep(124)>>>" +sections.add "databases", "<<<mssql_databases>>>" sections.add "counters", "<<<mssql_counters>>>" sections.add "tablespaces", "<<<mssql_tablespaces>>>" sections.add "blocked_sessions", "<<<mssql_blocked_sessions>>>" @@ -185,7 +186,7 @@ For Each instance_id In instances.Keys: Do ' Continue trick ' Use either an instance specific config file named mssql_<instance-id>.ini ' or the default mysql.ini file. - cfg_file = cfg_dir & "\mssql_" & instance & ".ini" + cfg_file = cfg_dir & "\mssql_" & instance_id & ".ini" If Not FSO.FileExists(cfg_file) Then cfg_file = cfg_dir & "\mssql.ini" If Not FSO.FileExists(cfg_file) Then @@ -394,7 +395,23 @@ For Each instance_id In instances.Keys: Do ' Continue trick Loop RS.Close Next - + + ' Database properties, full list at https://msdn.microsoft.com/en-us/library/ms186823.aspx + addOutput(sections("databases")) + RS.Open "SELECT name, " & _ + "DATABASEPROPERTYEX(name, 'Status') AS Status, " & _ + "DATABASEPROPERTYEX(name, 'Recovery') AS Recovery, " & _ + "DATABASEPROPERTYEX(name, 'IsAutoClose') AS auto_close, " & _ + "DATABASEPROPERTYEX(name, 'IsAutoShrink') AS auto_shrink " & _ + "FROM master.dbo.sysdatabases", CONN + Do While Not RS.Eof + ' instance db_name status recovery auto_close auto_shrink + addOutput( instance_id & " " & Replace(Trim(RS("name")), " ", "_") & " " & Trim(RS("Status")) & _ + " " & Trim(RS("Recovery")) & " " & Trim(RS("auto_close")) & " " & Trim(RS("auto_shrink")) ) + RS.MoveNext + Loop + RS.Close + addOutput(sections("clusters")) Dim active_node, nodes For Each dbName in dbNames.Keys : Do diff --git a/checks/mssql_databases b/checks/mssql_databases new file mode 100644 index 0000000..1f65198 --- /dev/null +++ b/checks/mssql_databases @@ -0,0 +1,78 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2017 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- +# tails. 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. + + +# example output +# <<<mssql_databases>>>^M +# MSSQL_MSSQL46 CorreLog_Report_T ONLINE FULL 0 0^M +# MSSQL_MSSQL46 DASH_CONFIG_T ONLINE FULL 0 0^M +# MSSQL_MSSQL46 master ONLINE SIMPLE 0 0^M +# MSSQL_MSSQL46 model ONLINE FULL 0 0^M +# MSSQL_MSSQL46 msdb ONLINE SIMPLE 0 0^M +# MSSQL_MSSQL46 NOC_ALARM_T ONLINE FULL 0 1^M +# MSSQL_MSSQL46 NOC_CONFIG_T ONLINE FULL 0 0^M +# MSSQL_MSSQL46 tempdb ONLINE SIMPLE 0 0^M +# MSSQL_MSSQL46 test_autoclose ONLINE FULL 1 0^M + + +def parse_mssql_databases(info): + parsed = {} + headers = ['Instance', 'DBname', 'Status', + 'Recovery', 'auto_close', 'auto_shrink'] + + for line in info: + if len(line) == 6: + data = dict(zip(headers, line)) + parsed.setdefault("%s %s" % (data["Instance"], data["DBname"]), data) + + return parsed + + +def inventory_mssql_databases(parsed): + return [ (db_name, {}) for db_name in parsed ] + + +def check_mssql_databases(item, params, parsed): + map_states = {"1" : (2, "on"), + "0" : (0, "off"), } + + if item in parsed: + data = parsed[item] + yield 0, 'Status: %s, Recovery: %s' % (data["Status"], data["Recovery"]) + + for what in ["close", "shrink"]: + state, state_readable = map_states[data["auto_%s" % what]] + state = params.get("map_auto_%s_state" % what, {}).get(state_readable, state) + yield state, 'Auto %s: %s' % (what, state_readable) + + +check_info['mssql_databases'] = { + 'parse_function' : parse_mssql_databases, + 'inventory_function' : inventory_mssql_databases, + 'check_function' : check_mssql_databases, + 'service_description' : '%s Database', + 'group' : 'mssql_databases', +} diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index d659622..6b8cafb 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2260,6 +2260,36 @@ register_check_parameters( register_check_parameters( subgroup_applications, + "mssql_databases", + _("MSSQL Databases properties"), + Dictionary( + elements = [ + ("map_auto_close_state", Dictionary( + elements = [ + ( "on", MonitoringState(title=_("Auto close on")) ), + ( "off", MonitoringState(title=_("Auto close off")) ), + ], + title = _('Map auto close status'), + optional_keys = [], + )), + ("map_auto_shrink_state", Dictionary( + elements = [ + ( "on", MonitoringState(title=_("Auto shrink on")) ), + ( "off", MonitoringState(title=_("Auto shrink off")) ), + ], + title = _('Map auto shrink status'), + optional_keys = [], + )), + ] + ), + TextAscii( + title = _("Database identifier"), + ), + "dict", +) + +register_check_parameters( + subgroup_applications, "varnish_cache", _("Varnish Cache"), Dictionary(

7 years, 5 months

4015 FIX Multisite events page: Fixed slow page generation caused by the event delete icon

by Andreas Boesl

Module: check_mk Branch: master Commit: f6c3fb8ab894fa1963c9383e42bd78eab847f022 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6c3fb8ab894fa… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jan 26 10:04:22 2017 +0100 4015 FIX Multisite events page: Fixed slow page generation caused by the event delete icon The render function for the event delete icon has been improved. It now uses cache data. Change-Id: I2bddfe7554f77724ed5dc255a426ef493dfb7452 --- .werks/4015 | 11 +++++++++++ ChangeLog | 1 + web/plugins/views/mkeventd.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/4015 b/.werks/4015 new file mode 100644 index 0000000..5c66646 --- /dev/null +++ b/.werks/4015 @@ -0,0 +1,11 @@ +Title: Multisite events page: Fixed slow page generation caused by the event delete icon +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i4 +Date: 1485421223 +Class: fix + +The render function for the event delete icon has been improved. +It now uses cache data. + diff --git a/ChangeLog b/ChangeLog index ec16e63..b5bffcb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -89,6 +89,7 @@ * 4307 FIX: Fixed wrong filters in Eventviews linked by Tactical Overview * 4282 FIX: Fixed rendering of perfometers when no RRDs exist yet * 4285 FIX: Availability: Timeline tables can now not be sorted and searched anymore + * 4015 FIX: Multisite events page: Fixed slow page generation caused by the event delete icon... WATO: * 4142 New extended search dialog for rulesets and rules... diff --git a/web/plugins/views/mkeventd.py b/web/plugins/views/mkeventd.py index 3a03926..4a0b9d8 100644 --- a/web/plugins/views/mkeventd.py +++ b/web/plugins/views/mkeventd.py @@ -312,7 +312,7 @@ if mkeventd_enabled: urlvars += parse_qsl(url.query) else: # Regular view - view = get_view_by_name(html.var("view_name")) + view = permitted_views()[(html.var("view_name"))] target = None filename = None

7 years, 5 months

Filter pylint tests by pytest markers now (more flexible than -k filters)

by Lars Michelsen

Module: check_mk Branch: master Commit: bd51e51be8a809d5bf712bcd80ddb9cd26cf125f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd51e51be8a809… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 25 19:52:28 2017 +0100 Filter pylint tests by pytest markers now (more flexible than -k filters) Change-Id: Ic2cfd6adb8b398f17160a06cfcc1f68584a0f288 --- tests/Makefile | 4 ++-- tests/pylint/test_pylint_checks.py | 5 +++++ tests/pylint/test_pylint_misc.py | 4 ++++ tests/pylint/test_pylint_modules.py | 4 ++++ tests/pylint/test_pylint_web.py | 4 ++++ 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 6cdec5f..4ea7e68 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,7 +1,7 @@ SHELL=/bin/bash help: - @echo "test - Run all tests" + @echo "test - Run integration and git tests" @echo "test-pylint - Run pylint based tests" @echo "test-pylint-ci - Run pylint based tests within Jenkins" @echo "test-bandit - Run bandit (security) tests" @@ -13,7 +13,7 @@ test: test-pylint: - py.test -k pylint + py.test -m pylint test-pylint-ci: diff --git a/tests/pylint/test_pylint_checks.py b/tests/pylint/test_pylint_checks.py index 40031f7..4bd3238 100755 --- a/tests/pylint/test_pylint_checks.py +++ b/tests/pylint/test_pylint_checks.py @@ -3,9 +3,14 @@ import os import sys +import pytest + from testlib import repo_path import testlib.pylint_cmk as pylint_cmk +# Mark all tests in this file to be pylint checks +pytestmark = pytest.mark.pylint + def test_pylint_checks(): base_path = pylint_cmk.get_test_dir() diff --git a/tests/pylint/test_pylint_misc.py b/tests/pylint/test_pylint_misc.py index 642ab72..317e8ef 100755 --- a/tests/pylint/test_pylint_misc.py +++ b/tests/pylint/test_pylint_misc.py @@ -3,10 +3,14 @@ import os import sys +import pytest from testlib import repo_path import testlib.pylint_cmk as pylint_cmk +# Mark all tests in this file to be pylint checks +pytestmark = pytest.mark.pylint + def test_pylint_misc(): search_paths = [ "cmk_base", diff --git a/tests/pylint/test_pylint_modules.py b/tests/pylint/test_pylint_modules.py index ed09a2d..8fd7383 100755 --- a/tests/pylint/test_pylint_modules.py +++ b/tests/pylint/test_pylint_modules.py @@ -4,9 +4,13 @@ import os import sys import tempfile +import pytest import testlib.pylint_cmk as pylint_cmk +# Mark all tests in this file to be pylint checks +pytestmark = pytest.mark.pylint + def test_pylint_modules(): base_path = pylint_cmk.get_test_dir() diff --git a/tests/pylint/test_pylint_web.py b/tests/pylint/test_pylint_web.py index dfb4cab..99cc5e9 100755 --- a/tests/pylint/test_pylint_web.py +++ b/tests/pylint/test_pylint_web.py @@ -5,10 +5,14 @@ import os import sys import glob import tempfile +import pytest from testlib import cmk_path, cmc_path import testlib.pylint_cmk as pylint_cmk +# Mark all tests in this file to be pylint checks +pytestmark = pytest.mark.pylint + def get_web_plugin_dirs(): plugin_dirs = sorted(list(set(os.listdir(cmk_path() + "/web/plugins") + os.listdir(cmc_path() + "/web/plugins"))))

7 years, 5 months

Sort WATO rules for jolokia_metrics into the appropriate section

by Konstantin Büttner

Module: check_mk Branch: master Commit: 05dcd40b90401c316b08ccdaf6148873de50d5a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05dcd40b90401c… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jan 25 17:57:05 2017 +0100 Sort WATO rules for jolokia_metrics into the appropriate section Change-Id: Ic97b126ad29e1257fd2a5dd37003914132bfc37a --- web/plugins/wato/check_parameters.py | 450 +++++++++++++++++------------------ 1 file changed, 225 insertions(+), 225 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=05dcd40b90…

7 years, 5 months

4304 FIX mk_inventory.linux: fixed missing redirection to null device in if statement

by Simon Betz

Module: check_mk Branch: master Commit: 255f203c44d8869b889ecc373ad471c34e773f9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=255f203c44d886… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 25 16:10:09 2017 +0100 4304 FIX mk_inventory.linux: fixed missing redirection to null device in if statement Change-Id: I1f81dc934be99c15cdae7e9f3d44f97d1da89bfd --- .werks/4304 | 10 ++++++++++ ChangeLog | 1 + agents/plugins/mk_inventory.linux | 2 +- checks/blade_bx_powermod | 4 ++-- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/4304 b/.werks/4304 new file mode 100644 index 0000000..5fc5dd5 --- /dev/null +++ b/.werks/4304 @@ -0,0 +1,10 @@ +Title: mk_inventory.linux: fixed missing redirection to null device in if statement +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1485356915 + + diff --git a/ChangeLog b/ChangeLog index d4f8c43..ec16e63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -71,6 +71,7 @@ * 4213 FIX: fjdarye101_syscaps: Fix failing check when using Nagios core * 4303 FIX: sap_state: fixed error handling * 4214 FIX: jolokia_metrics.tp: Fix crash in case of partial thread information... + * 4304 FIX: mk_inventory.linux: fixed missing redirection to null device in if statement Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/agents/plugins/mk_inventory.linux b/agents/plugins/mk_inventory.linux index 11d5278..6c22dde 100755 --- a/agents/plugins/mk_inventory.linux +++ b/agents/plugins/mk_inventory.linux @@ -82,7 +82,7 @@ then fi # Some networking information - if type ip ; then + if type ip > /dev/null ; then echo "<<<lnx_ip_a:persist($UNTIL)>>>" ip a echo "<<<lnx_ip_r:persist($UNTIL)>>>" diff --git a/checks/blade_bx_powermod b/checks/blade_bx_powermod index 32c1dab..31aa186 100644 --- a/checks/blade_bx_powermod +++ b/checks/blade_bx_powermod @@ -32,8 +32,8 @@ def check_blade_bx_powermod(item, _no_param, info): 4 : "error", 5 : "critical", 6 : "off", - 7 : "dummy" - } + 7 : "dummy", + } for index, status, product_name in info: status = saveint(status)

7 years, 5 months

4214 FIX jolokia_metrics.tp: Fix crash in case of partial thread information

by Konstantin Büttner

Module: check_mk Branch: master Commit: c472123a0c5ac84ef2921656a35879ae9fb5f9a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c472123a0c5ac8… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jan 25 15:47:55 2017 +0100 4214 FIX jolokia_metrics.tp: Fix crash in case of partial thread information Previously, the check would crash if either currentThreadCount or currentThreadsBusy were missing in the agent output. Now, the check checks against what it can find. Change-Id: If427051994dd43c0d3b31f624fa77c09b56f8d0a --- .werks/4214 | 11 +++++++++++ ChangeLog | 1 + 2 files changed, 12 insertions(+) diff --git a/.werks/4214 b/.werks/4214 new file mode 100644 index 0000000..beff4f2 --- /dev/null +++ b/.werks/4214 @@ -0,0 +1,11 @@ +Title: jolokia_metrics.tp: Fix crash in case of partial thread information +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1485355590 + +Previously, the check would crash if either currentThreadCount or currentThreadsBusy +were missing in the agent output. Now, the check checks against what it can find. diff --git a/ChangeLog b/ChangeLog index 164d337..d4f8c43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,7 @@ * 4302 FIX: win_wmi_software: fixed invalid data handling * 4213 FIX: fjdarye101_syscaps: Fix failing check when using Nagios core * 4303 FIX: sap_state: fixed error handling + * 4214 FIX: jolokia_metrics.tp: Fix crash in case of partial thread information... Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings....

7 years, 5 months

jolokia_metrics.tp: Decouple subresults for current and busy threads#

by Konstantin Büttner

Module: check_mk Branch: master Commit: ed121630437f744b3afecef8fb0df2f135906fe0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed121630437f74… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jan 25 15:44:08 2017 +0100 jolokia_metrics.tp: Decouple subresults for current and busy threads# Change-Id: I0a9be42aef76f09228012fff0ef8c1fa2bd75161 --- checks/jolokia_metrics | 86 +++++++++++++++++--------------------------------- 1 file changed, 29 insertions(+), 57 deletions(-) diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 4c2e23d..0bc9144 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -467,71 +467,43 @@ def inventory_jolokia_metrics_tp(info): def check_jolokia_metrics_tp(item, params, info): - tp = jolokia_metrics_tp(info, item.split()) - if tp == None: - return(3,"data not found in agent output") - - if params != None: - if 'currentThreadsBusy' in params: - bwarn, bcrit = params['currentThreadsBusy'] - if bwarn: - bwarn = (int(tp["maxThreads"]) * bwarn) / 100 - if bcrit: - bcrit = (int(tp["maxThreads"]) * bcrit) / 100 - else: - bwarn, bcrit = (None, None) - - if 'currentThreadCount' in params: - cwarn, ccrit = params['currentThreadCount'] - if cwarn: - cwarn = (int(tp["maxThreads"]) * cwarn) / 100 - if ccrit: - ccrit = (int(tp["maxThreads"]) * ccrit) / 100 - else: - cwarn, ccrit = (None, None) - status = 0 - perf = [] + if params == None: + params = {} - btext = "" - ctext = "" + tp = jolokia_metrics_tp(info, item.split()) - busy = int(tp["currentThreadsBusy"]) - count = int(tp["currentThreadCount"]) - max = int(tp["maxThreads"]) + if tp == None or "maxThreads" not in tp: + return - if params != None: - if cwarn != None and ccrit != None: - if count >= ccrit: - status = 2 - ctext = "((!!) Level %s) " % ccrit - elif count >= cwarn: - if status != 2: - status = 1 - ctext = "((!) Level %s) " % cwarn + max_threads = float(tp["maxThreads"]) - perf.append(('currentThreadCount', count, cwarn, ccrit, 0, max)) - else: - perf.append(('currentThreadCount', count, "", "", 0, max)) + def check_thread_levels(what): + threads_abs = int(tp[what]) + threads_rel = threads_abs / max_threads + infotext = "%s: %d (%.1f%%)" % (what, threads_abs, threads_rel) + status = 0 - if bwarn != None and bcrit != None: - if busy >= bcrit: + _params = params.get(what) + if _params and _params[0] != None and _params[1] != None: + warn, crit = params[what] + levelstext = " (warn/crit at %d/%d%%)" % (warn, crit) + if threads_rel >= crit: status = 2 - btext = "((!!) Level %s) " % bcrit - elif busy >= bwarn: - if status != 2: - status = 1 - btext = "((!) Level %s) " % bwarn - - perf.append(('currentThreadsBusy', busy, bwarn, bcrit, 0, max)) + infotext += levelstext + elif threads_rel >= warn: + status = 1 + infotext += levelstext else: - perf.append(('currentThreadsBusy', busy, "", "", 0, max)) - else: - perf = [('currentThreadCount', count, "", "", 0, max), ('currentThreadsBusy', busy, "", "", 0, max)] - - output = "%s currentThreadCount %sand %s currentThreadsBusy %s (maxThreads: %s)" % (count, \ - ctext, busy, btext, max) - return (status, output, perf) + warn, crit = ("", "") + perfdata = [ (what, threads_abs, warn, crit, 0, max_threads) ] + return status, infotext, perfdata + + if 'currentThreadsBusy' in tp: + yield check_thread_levels('currentThreadsBusy') + if 'currentThreadCount' in tp: + yield check_thread_levels('currentThreadCount') + yield 0, "Maximum threads: %d" % max_threads check_info["jolokia_metrics.tp"] = {

7 years, 5 months

← Newer
1
2
3
4
5
6
7
8
9
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2017