Checkmk git commits March 2018

checkmk-commits@lists.checkmk.com

10 participants
326 discussions

Dramatically improved execution check unit tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 7fd62d5152d86636c3fb74e17f059550d5d2e895 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fd62d5152d866… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 22 21:25:32 2018 +0100 Dramatically improved execution check unit tests The CheckManager fixture is now not pre loading all checks anymore. The check is now loaded on demand by it's get_check() method. Change-Id: I81576badb44d8feb79dd4709df19e0143fa82acf --- tests/checks/conftest.py | 4 +--- tests/testlib/__init__.py | 14 +++++++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/tests/checks/conftest.py b/tests/checks/conftest.py index 95445e6..73b8e6c 100644 --- a/tests/checks/conftest.py +++ b/tests/checks/conftest.py @@ -6,9 +6,7 @@ import testlib @pytest.fixture(scope="module") def check_manager(): - manager = testlib.CheckManager() - manager.load() - return manager + return testlib.CheckManager() # Automatically refresh caches for each test diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 2a75d08..0a3c924 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -1611,12 +1611,20 @@ def ec(site, web): # '----------------------------------------------------------------------' class CheckManager(object): - # TODO: Make load only needed checks - def load(self): + def load(self, file_names=None): + """Load either all check plugins or the given file_names""" import cmk_base.checks as checks - checks.load() + import cmk.paths + + if file_names is None: + checks.load() # loads all checks + else: + checks._initialize_data_structures() + checks.load_checks(map(lambda f: os.path.join(cmk.paths.checks_dir, f), file_names)) + def get_check(self, name): + self.load([name.split(".", 1)[0]]) return Check(name)

6 years, 3 months

Use UTF-8 src encoding for Win-agent integration tests

by Jukka Aro

Module: check_mk Branch: master Commit: cd957c5aa7472a77522c5dba3282c368d45c35b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd957c5aa7472a… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Mar 22 15:02:35 2018 +0100 Use UTF-8 src encoding for Win-agent integration tests --- agents/windows/it/conftest.py | 2 ++ agents/windows/it/lock.py | 2 ++ agents/windows/it/remote.py | 2 ++ agents/windows/it/test_agent_start_parameters.py | 2 ++ agents/windows/it/test_section_check_mk.py | 2 ++ agents/windows/it/test_section_df.py | 2 ++ agents/windows/it/test_section_dotnet_clrmemory.py | 2 ++ agents/windows/it/test_section_eventlog.py | 2 ++ agents/windows/it/test_section_fileinfo.py | 2 ++ agents/windows/it/test_section_logfiles.py | 2 ++ agents/windows/it/test_section_mem.py | 2 ++ agents/windows/it/test_section_mrpe.py | 2 ++ agents/windows/it/test_section_openhardwaremonitor.py | 2 ++ agents/windows/it/test_section_plugin_group.py | 2 ++ agents/windows/it/test_section_ps.py | 2 ++ agents/windows/it/test_section_services.py | 2 ++ agents/windows/it/test_section_spool.py | 2 ++ agents/windows/it/test_section_systemtime.py | 2 ++ agents/windows/it/test_section_uptime.py | 2 ++ agents/windows/it/test_section_winperf.py | 2 ++ agents/windows/it/test_section_wmi_cpuload.py | 2 ++ agents/windows/it/test_section_wmi_webservices.py | 2 ++ 22 files changed, 44 insertions(+) diff --git a/agents/windows/it/conftest.py b/agents/windows/it/conftest.py index 0abb067..ce9bb08 100644 --- a/agents/windows/it/conftest.py +++ b/agents/windows/it/conftest.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8; py-indent-offset: 4 -*- import glob import os import pytest diff --git a/agents/windows/it/lock.py b/agents/windows/it/lock.py index de033cf..743b21d 100644 --- a/agents/windows/it/lock.py +++ b/agents/windows/it/lock.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8; py-indent-offset: 4 -*- # Implement file based locking on Windows. # Simply exit with 1 if lock file exists (no retry). diff --git a/agents/windows/it/remote.py b/agents/windows/it/remote.py index f11a9f2..8e06b60 100644 --- a/agents/windows/it/remote.py +++ b/agents/windows/it/remote.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8; py-indent-offset: 4 -*- import ConfigParser import contextlib import os diff --git a/agents/windows/it/test_agent_start_parameters.py b/agents/windows/it/test_agent_start_parameters.py index 837c6fa..84c01cf 100644 --- a/agents/windows/it/test_agent_start_parameters.py +++ b/agents/windows/it/test_agent_start_parameters.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8; py-indent-offset: 4 -*- try: # Use iter version of filter from future_builtins import filter diff --git a/agents/windows/it/test_section_check_mk.py b/agents/windows/it/test_section_check_mk.py index 06a3c42..72b6b42 100644 --- a/agents/windows/it/test_section_check_mk.py +++ b/agents/windows/it/test_section_check_mk.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8; py-indent-offset: 4 -*- import os import platform import pytest diff --git a/agents/windows/it/test_section_df.py b/agents/windows/it/test_section_df.py index 8aeb2fb..36e652b 100644 --- a/agents/windows/it/test_section_df.py +++ b/agents/windows/it/test_section_df.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8; py-indent-offset: 4 -*- import os import pytest import re diff --git a/agents/windows/it/test_section_dotnet_clrmemory.py b/agents/windows/it/test_section_dotnet_clrmemory.py index e4c6245..d1ebbf4 100644 --- a/agents/windows/it/test_section_dotnet_clrmemory.py +++ b/agents/windows/it/test_section_dotnet_clrmemory.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8; py-indent-offset: 4 -*- from itertools import chain, repeat import os import pytest diff --git a/agents/windows/it/test_section_eventlog.py b/agents/windows/it/test_section_eventlog.py index c3466b5..ccebfcb 100644 --- a/agents/windows/it/test_section_eventlog.py +++ b/agents/windows/it/test_section_eventlog.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8; py-indent-offset: 4 -*- import contextlib from itertools import chain, repeat import math diff --git a/agents/windows/it/test_section_fileinfo.py b/agents/windows/it/test_section_fileinfo.py index c2f59e8..0c4a03c 100644 --- a/agents/windows/it/test_section_fileinfo.py +++ b/agents/windows/it/test_section_fileinfo.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8; py-indent-offset: 4 -*- import os import platform import pytest diff --git a/agents/windows/it/test_section_logfiles.py b/agents/windows/it/test_section_logfiles.py index 617f729..a17fd8c 100644 --- a/agents/windows/it/test_section_logfiles.py +++ b/agents/windows/it/test_section_logfiles.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8; py-indent-offset: 4 -*- import io import os import platform diff --git a/agents/windows/it/test_section_mem.py b/agents/windows/it/test_section_mem.py index 816c43e..62ceb79 100644 --- a/agents/windows/it/test_section_mem.py +++ b/agents/windows/it/test_section_mem.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8; py-indent-offset: 4 -*- import os import pytest from remote import actual_output, config, remotetest, wait_agent, write_config diff --git a/agents/windows/it/test_section_mrpe.py b/agents/windows/it/test_section_mrpe.py index e71643d..c254c3c 100644 --- a/agents/windows/it/test_section_mrpe.py +++ b/agents/windows/it/test_section_mrpe.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8; py-indent-offset: 4 -*- import os import platform import pytest diff --git a/agents/windows/it/test_section_openhardwaremonitor.py b/agents/windows/it/test_section_openhardwaremonitor.py index 4bb2768..2d3f603 100644 --- a/agents/windows/it/test_section_openhardwaremonitor.py +++ b/agents/windows/it/test_section_openhardwaremonitor.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8; py-indent-offset: 4 -*- from itertools import chain, repeat import os import platform diff --git a/agents/windows/it/test_section_plugin_group.py b/agents/windows/it/test_section_plugin_group.py index c2745f1..1feca47 100644 --- a/agents/windows/it/test_section_plugin_group.py +++ b/agents/windows/it/test_section_plugin_group.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8; py-indent-offset: 4 -*- from itertools import chain, repeat import os import platform diff --git a/agents/windows/it/test_section_ps.py b/agents/windows/it/test_section_ps.py index 0cf4446..ab4dc56 100644 --- a/agents/windows/it/test_section_ps.py +++ b/agents/windows/it/test_section_ps.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8; py-indent-offset: 4 -*- from itertools import chain, repeat import os import pytest diff --git a/agents/windows/it/test_section_services.py b/agents/windows/it/test_section_services.py index d5517e8..db232d7 100644 --- a/agents/windows/it/test_section_services.py +++ b/agents/windows/it/test_section_services.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8; py-indent-offset: 4 -*- from itertools import chain, repeat import os import pytest diff --git a/agents/windows/it/test_section_spool.py b/agents/windows/it/test_section_spool.py index 1ff6308..f5f16f4 100644 --- a/agents/windows/it/test_section_spool.py +++ b/agents/windows/it/test_section_spool.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8; py-indent-offset: 4 -*- import os import platform import pytest diff --git a/agents/windows/it/test_section_systemtime.py b/agents/windows/it/test_section_systemtime.py index 98ca162..6e8fe43 100644 --- a/agents/windows/it/test_section_systemtime.py +++ b/agents/windows/it/test_section_systemtime.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8; py-indent-offset: 4 -*- import os import pytest from remote import actual_output, config, remotetest, wait_agent, write_config diff --git a/agents/windows/it/test_section_uptime.py b/agents/windows/it/test_section_uptime.py index 28d7f30..864f214 100644 --- a/agents/windows/it/test_section_uptime.py +++ b/agents/windows/it/test_section_uptime.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8; py-indent-offset: 4 -*- import os import pytest from remote import actual_output, config, remotetest, wait_agent, write_config diff --git a/agents/windows/it/test_section_winperf.py b/agents/windows/it/test_section_winperf.py index b8afff5..31cf0ff 100644 --- a/agents/windows/it/test_section_winperf.py +++ b/agents/windows/it/test_section_winperf.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8; py-indent-offset: 4 -*- from itertools import repeat import os import pytest diff --git a/agents/windows/it/test_section_wmi_cpuload.py b/agents/windows/it/test_section_wmi_cpuload.py index 4703d3f..eda4f63 100644 --- a/agents/windows/it/test_section_wmi_cpuload.py +++ b/agents/windows/it/test_section_wmi_cpuload.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8; py-indent-offset: 4 -*- import os import pytest import re diff --git a/agents/windows/it/test_section_wmi_webservices.py b/agents/windows/it/test_section_wmi_webservices.py index 9478249..eae4b85 100644 --- a/agents/windows/it/test_section_wmi_webservices.py +++ b/agents/windows/it/test_section_wmi_webservices.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8; py-indent-offset: 4 -*- from itertools import chain, repeat import os import pytest

6 years, 3 months

Win-agent: new test case for section fileinfo

by Jukka Aro

Module: check_mk Branch: master Commit: 2016a8996bd9afee99551cd393e724bde173c592 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2016a8996bd9af… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Mar 21 09:39:23 2018 +0100 Win-agent: new test case for section fileinfo Test recursive ('**') and non-recursive ('*' or '?') glob patterns separately. --- agents/windows/it/test_section_fileinfo.py | 74 ++++++++++++++++-------------- 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/agents/windows/it/test_section_fileinfo.py b/agents/windows/it/test_section_fileinfo.py index 0c4a03c..e90f434 100644 --- a/agents/windows/it/test_section_fileinfo.py +++ b/agents/windows/it/test_section_fileinfo.py @@ -8,13 +8,15 @@ from remote import (actual_output, config, remotedir, remotetest, wait_agent, write_config) import shutil -section = 'fileinfo' -tempdir1 = os.path.join(remotedir, 'testdir1') -tempdir2 = os.path.join(tempdir1, 'testdir2') -tempfile1 = os.path.join(tempdir1, "testfile1") -tempfile2 = os.path.join(tempdir1, "testfile2") -tempfile3 = os.path.join(tempdir2, "testfile3") -missingfile = os.path.join(tempdir1, 'foobar') + +class Globals: + section = 'fileinfo' + tempdir1 = os.path.join(remotedir, 'Testdir1') + tempdir2 = os.path.join(tempdir1, 'Testdir2') + tempfile1 = os.path.join(tempdir1, 'TestFile1') + tempfile2 = os.path.join(tempdir1, 'TestFile2') + tempfile3 = os.path.join(tempdir2, 'TestFile3') + missingfile = os.path.join(tempdir1, 'foobar') @pytest.fixture @@ -22,18 +24,25 @@ def testfile(request): return os.path.basename(__file__) -(a)pytest.fixture -def testconfig(config): +(a)pytest.fixture( + params=[ + os.path.join(Globals.tempdir1, '**'), + os.path.join(Globals.tempdir2, 'Te*') + ], + ids=['recursive_glob', 'simple_glob']) +def testconfig(request, config): if platform.system() == 'Windows': - config.set("global", "sections", section) - config.set("global", "crash_debug", "yes") - config.add_section(section) - config.set(section, "path", tempfile1) - config.set(section, "path", - os.path.join(tempdir1, - '?' + os.path.basename(tempfile2)[1:])) - config.set(section, "path", os.path.join(tempdir1, '*', '*')) - config.set(section, "path", missingfile) + config.set('global', 'sections', Globals.section) + config.set('global', 'crash_debug', 'yes') + config.add_section(Globals.section) + if request.param != os.path.join(Globals.tempdir1, '**'): + config.set(Globals.section, 'path', Globals.tempfile1) + config.set( + Globals.section, 'path', + os.path.join(Globals.tempdir1, + '?' + os.path.basename(Globals.tempfile2)[1:])) + config.set(Globals.section, 'path', request.param) + config.set(Globals.section, 'path', Globals.missingfile) return config @@ -42,37 +51,32 @@ def testconfig(config): def expected_output(): if platform.system() == 'Windows': return [ - re.escape(r'<<<%s:sep(124)>>>' % section), r'\d+', - re.escape(r'%s|' % tempfile1) + r'\d+\|\d+', - re.escape(r'%s|' % tempfile2) + r'\d+\|\d+', - re.escape(r'%s|' % tempfile3) + r'\d+\|\d+', - re.escape(r'%s|missing|' % missingfile) + r'\d+' + re.escape(r'<<<%s:sep(124)>>>' % Globals.section), r'\d+', + re.escape(r'%s|' % Globals.tempfile1) + r'\d+\|\d+', + re.escape(r'%s|' % Globals.tempfile2) + r'\d+\|\d+', + re.escape(r'%s|' % Globals.tempfile3) + r'\d+\|\d+', + re.escape(r'%s|missing|' % Globals.missingfile) + r'\d+' ] @pytest.fixture def use_testfiles(): if platform.system() == 'Windows': - tempdir1 = os.path.join(remotedir, 'testdir1') - tempdir2 = os.path.join(tempdir1, 'testdir2') - tempfile1 = os.path.join(tempdir1, "testfile1") - tempfile2 = os.path.join(tempdir1, "testfile2") - tempfile3 = os.path.join(tempdir2, "testfile3") - - for d in [tempdir1, tempdir2]: + for d in [Globals.tempdir1, Globals.tempdir2]: os.mkdir(d) - for f in [tempfile1, tempfile2, tempfile3]: + for f in [Globals.tempfile1, Globals.tempfile2, Globals.tempfile3]: with open(f, 'w') as handle: handle.write(f) yield if platform.system() == 'Windows': - for d in [tempdir2, tempdir1]: + for d in [Globals.tempdir2, Globals.tempdir1]: shutil.rmtree(d) -(a)pytest.mark.usefixtures("use_testfiles") -def test_section_fileinfo(testconfig, expected_output, actual_output, +(a)pytest.mark.usefixtures('use_testfiles') +def test_section_fileinfo(request, testconfig, expected_output, actual_output, testfile): - remotetest(expected_output, actual_output, testfile) + # request.node.name gives test name + remotetest(expected_output, actual_output, testfile, request.node.name)

6 years, 3 months

5920 FIX Windows: use standard file matching patterns for fileinfo

by Jukka Aro

Module: check_mk Branch: master Commit: 594db4e58cd46ae746f7bf052d1e44687a753375 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=594db4e58cd46a… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Mar 21 09:47:47 2018 +0100 5920 FIX Windows: use standard file matching patterns for fileinfo Until now, Windows agent was using a non-standard way of defining recursive wildcards. From now on, the supported wildcard patterns '*', '?' and '**' work in a standardized way. Recursive patterns can be defined with '**', matching all descendants of the path so far. Previous patterns with single '*'s on several directory levels will from now on work as non-recursive patterns conforming to the standard. --- .werks/5920 | 15 ++ agents/windows/WinApi.cc | 5 + agents/windows/WinApi.h | 2 + agents/windows/WinApiAdaptor.h | 2 + agents/windows/build_version | 2 +- agents/windows/check_mk.example.ini | 2 + agents/windows/sections/SectionFileinfo.cc | 344 +++++++++++++++++++++-------- agents/windows/sections/SectionFileinfo.h | 19 +- agents/windows/test/MockWinApi.h | 3 + agents/windows/types.cc | 6 + agents/windows/types.h | 12 +- 11 files changed, 301 insertions(+), 111 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=594db4e58c…

6 years, 3 months

Removed empty lines

by Simon Betz

Module: check_mk Branch: master Commit: b47db0ea11b945e6a3cfedd93b88678ed8c13d7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b47db0ea11b945… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 22 16:40:27 2018 +0100 Removed empty lines Change-Id: I0e02708173176ed2245fdbdb5d644ecf39062dd0 --- web/plugins/wato/check_parameters.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 2ef3561..7019231 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -447,8 +447,6 @@ register_check_parameters( default_value = None, ), ), - - ( "if_in_pkts", Levels( title = _("Incoming Packets Maximum"),

6 years, 3 months

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 07e6ca3f914fe2eaaf3f50f089fc253f0425ba5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07e6ca3f914fe2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 22 16:21:47 2018 +0100 Reserved 10 Werk IDS Change-Id: Icde3e0be3cab85f5a9bfd3ef2b889d7bc516f6a9 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index e3962e1..a7aff7a 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5929 +5939

6 years, 3 months

Added a TODO.

by Sven Panne

Module: check_mk Branch: master Commit: 12a5a9256c2f06c8db6592afcd76901db4fe485e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12a5a9256c2f06… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Mar 22 16:12:36 2018 +0100 Added a TODO. Change-Id: I4f31acc321936b36ac60c9eaa67b157e292bc7db --- livestatus/src/Filter.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/livestatus/src/Filter.h b/livestatus/src/Filter.h index 0253cb9..88f3f66 100644 --- a/livestatus/src/Filter.h +++ b/livestatus/src/Filter.h @@ -55,6 +55,12 @@ public: std::chrono::seconds timezone_offset) const = 0; virtual std::unique_ptr<Filter> partialFilter( std::function<bool(const Column &)> predicate) const = 0; + + // TODO(sp) We might be able to unify all the methods below if we make the + // underlying lattice structure explicit, i.e. provide a set type and + // corresponding meet/join operations. Perhaps we can even get rid of the + // std::optional by making the lattice bounded, i.e. by providing bottom/top + // values. virtual std::optional<std::string> stringValueRestrictionFor( const std::string &column_name) const; virtual std::optional<int32_t> greatestLowerBoundFor( @@ -66,6 +72,7 @@ public: virtual std::optional<std::bitset<32>> valueSetLeastUpperBoundFor( const std::string &column_name, std::chrono::seconds timezone_offset) const; + virtual std::unique_ptr<Filter> copy() const = 0; virtual std::unique_ptr<Filter> negate() const = 0;

6 years, 3 months

Added node_name to get_rate key

by Simon Betz

Module: check_mk Branch: master Commit: 1ba1a692e434370bda523a832983c3ed4dd651d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ba1a692e43437… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Mar 22 15:26:54 2018 +0100 Added node_name to get_rate key Change-Id: I70b3259548cf000aca1369e6414f32d01c0d8bbd --- checks/mssql_counters | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/checks/mssql_counters b/checks/mssql_counters index c13c27d..b4efa67 100644 --- a/checks/mssql_counters +++ b/checks/mssql_counters @@ -251,7 +251,7 @@ def check_mssql_counters_transactions(item, params, parsed): if value is None: continue - rate = get_rate("mssql_counters.transactions.%s.%s" % (item, counter_key), now, value) + rate = get_rate("mssql_counters.transactions.%s.%s.%s" % (node_name, item, counter_key), now, value) infotext = "%s%s: %.1f/s" % (node_info, title, rate) node_info = "" yield 0, infotext, [(counter_key, rate)] @@ -296,7 +296,7 @@ def check_mssql_counters_locks(item, params, parsed): if value is None: continue - rate = get_rate("mssql_counters.locks.%s.%s" % (item, counter_key), now, value) + rate = get_rate("mssql_counters.locks.%s.%s.%s" % (node_name, item, counter_key), now, value) infotext = "%s%s: %.1f/s" % (node_info, title, rate) node_info = "" @@ -352,7 +352,7 @@ def check_mssql_counters_sqlstats(item, params, parsed): if now is None: now = time.time() - rate = get_rate("mssql_counters.sqlstats.%s.%s" % (item, counter), now, value) + rate = get_rate("mssql_counters.sqlstats.%s.%s.%s" % (node_name, item, counter), now, value) node_info = "" if node_name: node_info = "[%s] " % node_name @@ -410,7 +410,7 @@ def check_mssql_counters_pageactivity(item, params, parsed): if value is None: continue - rate = get_rate("mssql_counters.pageactivity.%s.%s" % (item, counter_key), now, value) + rate = get_rate("mssql_counters.pageactivity.%s.%s.%s" % (node_name, item, counter_key), now, value) infotext = "%s%s: %.1f/s" % (node_info, title, rate) node_info = "" @@ -471,8 +471,8 @@ def check_mssql_counters_locks_per_batch(item, params, parsed): locks = data_locks["lock_requests/sec"] batches = data_stats["batch_requests/sec"] - lock_rate = get_rate("mssql_counters_locks_per_batch.%s.locks" % item, now, locks) - batch_rate = get_rate("mssql_counters_locks_per_batch.%s.batches" % item, now, batches) + lock_rate = get_rate("mssql_counters_locks_per_batch.%s.%s.locks" % (node_name, item), now, locks) + batch_rate = get_rate("mssql_counters_locks_per_batch.%s.%s.batches" % (node_name, item), now, batches) if batch_rate == 0: lock_per_batch = 0

6 years, 3 months

5767 f5_bigip_vserver: Status of VServer is configurable

by Simon Betz

Module: check_mk Branch: master Commit: ebe4c0f3033f54b7ffa4309a3ea95f3478bc5c60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebe4c0f3033f54… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Feb 22 12:41:54 2018 +0100 5767 f5_bigip_vserver: Status of VServer is configurable Change-Id: I9306cbb7434258839610f3ad1a52f391009ff8f5 --- .werks/5767 | 10 ++++++++++ checkman/f5_bigip_vserver | 6 ++++++ checks/f5_bigip_vserver | 12 +++++++----- web/plugins/wato/check_parameters.py | 26 +++++++++++++++++++++++--- 4 files changed, 46 insertions(+), 8 deletions(-) diff --git a/.werks/5767 b/.werks/5767 new file mode 100644 index 0000000..392ea39 --- /dev/null +++ b/.werks/5767 @@ -0,0 +1,10 @@ +Title: f5_bigip_vserver: Status of VServer is configurable +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1519299680 +Class: feature + + diff --git a/checkman/f5_bigip_vserver b/checkman/f5_bigip_vserver index befc11a..94f201a 100644 --- a/checkman/f5_bigip_vserver +++ b/checkman/f5_bigip_vserver @@ -12,6 +12,12 @@ description: There is one special handling in the check. If the vserver is not available and all its children pool members are down the check reports {OK}. + All states are configurable. Default values are + OK (is up and available, the children pool member(s) are down if VServer is not available), + WARN (is disabled, availability unknown), + CRIT (is currently not available, is not available), + UNKNOWN (is unlicensed). + inventory: Any virtual server that is found online will be added during inventory and checked for it's status. Virtual servers in the various "Warning" diff --git a/checks/f5_bigip_vserver b/checks/f5_bigip_vserver index 47eaf42..0f1120c 100644 --- a/checks/f5_bigip_vserver +++ b/checks/f5_bigip_vserver @@ -122,8 +122,9 @@ def check_f5_bigip_vserver(item, params, parsed): 4: (1, "availability is unknown"), 5: (3, "is unlicensed") } - state, status = map_server_status.get(vserver["status"][0],\ - (3, "Unhandled status (%d)" % vserver["status"][0])) + state, state_readable = map_server_status.get(vserver["status"][0], + (3, "Unhandled status (%d)" % vserver["status"][0])) + state = params.get('state', {}).get(state_readable.replace(' ', '_'), state) # vserver["enabled"] # 0 - none @@ -133,17 +134,16 @@ def check_f5_bigip_vserver(item, params, parsed): enabled = ["NONE", "enabled", "disabled", "disabled by parent"][vserver["enabled"][0]] output = "Virtual Server with IP %s is %s, State %s, Detail: %s" % (vserver["ip"][0],\ - enabled, status, vserver["detail"][0]) + enabled, state_readable, vserver["detail"][0]) # Special handling if vserver["status"][0] == 3: # not available # Statement from the network team, it's uncritical when the childrens are down if vserver["detail"][0].lower() == "The children pool member(s) are down".lower(): - state = 0 + state = params.get('state', {}).get("children_pool_members_down_if_not_available", 0) yield state, output - # Check configured limits map_paramvar_to_text = { "if_in_octets": "Incoming Bytes", @@ -156,6 +156,8 @@ def check_f5_bigip_vserver(item, params, parsed): summed_values["if_total_octets"] = summed_values["if_in_octets"] + summed_values["if_out_octets"] summed_values["if_total_pkts"] = summed_values["if_in_pkts"] + summed_values["if_out_pkts"] for param_var, levels in params.items(): + if param_var == "state": + continue if param_var.endswith("_lower") and type(levels) == tuple: levels = (None, None) + levels value = summed_values[param_var.rstrip("_lower")] diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index b87bc93..2ef3561 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -496,9 +496,29 @@ register_check_parameters( default_difference = (5, 8), default_value = None, ), - ) - ] - ), + ), + ("state", Dictionary( + title=_("Map states"), + elements=[ + ("is_disabled", + MonitoringState(title=_("Is disabled"), default_value=1)), + ("is_up_and_available", + MonitoringState(title=_("Is up and available"), default_value=0)), + ("is_currently_not_available", + MonitoringState(title=_("Is currently not available"), default_value=2)), + ("is_not_available", + MonitoringState(title=_("Is not available"), default_value=2)), + ("availability_is_unknown", + MonitoringState(title=_("Availability is unknown"), default_value=1)), + ("is_unlicensed", + MonitoringState(title=_("Is unlicensed"), default_value=3)), + ("children_pool_members_down_if_not_available", + # Special handling, see check plugin + MonitoringState(title=_("The children pool member(s) are down if VServer is not available"), default_value=0)), + ], + optional_keys=False, + )), + ]), TextAscii( title = _("VServer name"), allow_empty = False

6 years, 3 months

5912 FIX mk_jolokia: Fixed exception in Bakery rule if an instance is set

by Marcel Arentz

Module: check_mk Branch: master Commit: 9b569e9a6c784cf3955d64804ccab8d582c6d1ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b569e9a6c784c… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Mar 22 12:06:36 2018 +0100 5912 FIX mk_jolokia: Fixed exception in Bakery rule if an instance is set A typo prevented the bakery ruleset to work correctly and has been introduced in werk #5762. Change-Id: I3e0048115fdec34b4fa97e7717cb860d68dbe077 --- .werks/5912 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/5912 b/.werks/5912 new file mode 100644 index 0000000..253e547 --- /dev/null +++ b/.werks/5912 @@ -0,0 +1,11 @@ +Title: mk_jolokia: Fixed exception in Bakery rule if an instance is set +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1521716626 +Class: fix + +A typo prevented the bakery ruleset to work correctly and has been introduced +in werk #5762.

6 years, 3 months

← Newer
1
...
4
5
6
7
8
9
10
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2018