Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

by Andreas Boesl

Module: check_mk Branch: master Commit: 5ef7cf805cf67970488b5f2e9caab862ada742ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ef7cf805cf679… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 4 16:07:06 2019 +0200 fixed lynter error Change-Id: Ie6c53b9928a7654e89d5bd34bc0330d73cb57339 --- cmk_base/snmp_scan.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk_base/snmp_scan.py b/cmk_base/snmp_scan.py index 659da17..45fe57f 100644 --- a/cmk_base/snmp_scan.py +++ b/cmk_base/snmp_scan.py @@ -101,7 +101,7 @@ def _snmp_scan(host_config, default_found = [] for check_plugin_name, _unused_check in items: - if config.service_ignored(hostname, check_plugin_name, None): + if config.service_ignored(host_config.hostname, check_plugin_name, None): continue else: if for_inv and not inventory_plugins.is_snmp_plugin(check_plugin_name):

5 years, 6 months

mk_mongodb: refactor

by Moritz Kiemer

Module: check_mk Branch: master Commit: 0057997c40d093ea09044287ce9c380be0e43a7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0057997c40d093… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Apr 4 12:52:09 2019 +0200 mk_mongodb: refactor Change-Id: I771005d096e36ca11bd8db4b9779d70a7de2699f --- agents/plugins/mk_mongodb | 57 +++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/agents/plugins/mk_mongodb b/agents/plugins/mk_mongodb index b93d5ad..1817253 100755 --- a/agents/plugins/mk_mongodb +++ b/agents/plugins/mk_mongodb @@ -16,6 +16,7 @@ import pprint import sys import time from contextlib import contextmanager + import pymongo # pylint: disable=import-error @@ -31,6 +32,23 @@ def piggyback(info): sys.stdout.write("<<<<>>>>\n") +def get_database_info(client): + try: + db_names = client.list_database_names() + except AttributeError: # pymongo < 3.6 + db_names = client.database_names() + + databases = {n: {} for n in db_names} + for name in db_names: + database = client[name] + databases[name]["collections"] = database.collection_names() + databases[name]["stats"] = database.command("dbstats") + databases[name]["collstats"] = {} + for collection in databases[name]["collections"]: + databases[name]["collstats"][collection] = database.command("collstats", collection) + return databases + + def section_instance(server_status): sys.stdout.write("<<<mongodb_instance:sep(9)>>>\n") sys.stdout.write("version\t%s\n" % server_status["version"]) @@ -60,6 +78,19 @@ def section_flushing(server_status): sys.stdout.write("flushed %s\n" % flushing_info["flushes"]) +def sections_replica(client, server_status): + repl_info = server_status.get("repl") + if not repl_info: + return + sys.stdout.write("<<<mongodb_replica:sep(9)>>>\n") + sys.stdout.write("primary\t%s\n" % repl_info.get("primary")) + sys.stdout.write("hosts\t%s\n" % " ".join(repl_info.get("hosts"))) + sys.stdout.write("arbiters\t%s\n" % " ".join(repl_info.get("arbiters"))) + + sys.stdout.write("<<<mongodb_replstatus>>>\n") + sys.stdout.write(pprint.pformat(client.admin.command("replSetGetStatus"))) + + def main(): # might be implemented in the future.. host = None @@ -82,19 +113,12 @@ def main(): return with piggyback(repl_info): - potentially_piggybacked_sections(client, server_status, repl_info) + potentially_piggybacked_sections(client, server_status) -def potentially_piggybacked_sections(client, server_status, repl_info): +def potentially_piggybacked_sections(client, server_status): # pylint: disable=too-many-branches,too-many-locals - if repl_info: - sys.stdout.write("<<<mongodb_replica:sep(9)>>>\n") - sys.stdout.write("primary\t%s\n" % repl_info.get("primary")) - sys.stdout.write("hosts\t%s\n" % " ".join(repl_info.get("hosts"))) - sys.stdout.write("arbiters\t%s\n" % " ".join(repl_info.get("arbiters"))) - - sys.stdout.write("<<<mongodb_replstatus>>>\n") - sys.stdout.write(pprint.pformat(client.admin.command("replSetGetStatus"))) + sections_replica(client, server_status) sys.stdout.write("<<<mongodb_asserts>>>\n") for key, value in server_status.get("asserts", {}).items(): @@ -103,18 +127,7 @@ def potentially_piggybacked_sections(client, server_status, repl_info): sys.stdout.write("<<<mongodb_connections>>>\n") sys.stdout.write("%s\n" % "\n".join("%s %s" % x for x in server_status["connections"].items())) - try: - databases = {x: {} for x in client.list_database_names()} - except AttributeError: # pymongo < 3.6 - databases = {x: {} for x in client.database_names()} - - for name in databases: - database = client[name] - databases[name]["collections"] = database.collection_names() - databases[name]["stats"] = database.command("dbstats") - databases[name]["collstats"] = {} - for collection in databases[name]["collections"]: - databases[name]["collstats"][collection] = database.command("collstats", collection) + databases = get_database_info(client) sys.stdout.write("<<<mongodb_chunks>>>\n") col = client.config.chunks

5 years, 6 months

Fixed broken test which should find left over debug code

by Lars Michelsen

Module: check_mk Branch: master Commit: 25be559f26593b57d81b04100d6765bc22213733 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25be559f26593b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 4 15:32:40 2019 +0200 Fixed broken test which should find left over debug code Change-Id: Ie3db511a4dd471821fe70886ef62e7069aa75cf4 --- tests/git/test_find_debug_print.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/git/test_find_debug_print.py b/tests/git/test_find_debug_print.py index 733bda6..3dcc45b 100644 --- a/tests/git/test_find_debug_print.py +++ b/tests/git/test_find_debug_print.py @@ -38,7 +38,7 @@ def test_find_debug_code(): scanned += 1 for filename in filenames: file_path = "%s/%s" % (dirpath, filename) - if [folder in file_path for folder in exclude_folders]: + if [folder for folder in exclude_folders if folder in file_path]: continue for nr, line in enumerate(open(file_path)):

5 years, 6 months

mk_mongodb: refactor on

by Moritz Kiemer

Module: check_mk Branch: master Commit: 7488345f133b95b9edf72fa7462bbe3fc8b4d6ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7488345f133b95… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Apr 4 12:58:47 2019 +0200 mk_mongodb: refactor on Change-Id: I9fc365208d7c8772eefb74023123ce4d1bc642e0 --- agents/plugins/mk_mongodb | 47 ++++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/agents/plugins/mk_mongodb b/agents/plugins/mk_mongodb index 1817253..dda31e9 100755 --- a/agents/plugins/mk_mongodb +++ b/agents/plugins/mk_mongodb @@ -91,6 +91,30 @@ def sections_replica(client, server_status): sys.stdout.write(pprint.pformat(client.admin.command("replSetGetStatus"))) +def section_chunks(client, databases): + sys.stdout.write("<<<mongodb_chunks>>>\n") + col = client.config.chunks + for db_name, db_data in databases.items(): + shards = col.distinct("shard") + sys.stdout.write("shardcount %d\n" % len(shards)) + for collection in db_data.get("collections"): + nsfilter = "%s.%s" % (db_name, collection) + sys.stdout.write("nscount %s %s\n" % (nsfilter, col.find({"ns": nsfilter}).count())) + for shard in shards: + matches = col.find({"ns": nsfilter, "shard": shard}).count() + sys.stdout.write("shardmatches %s#%s %s\n" % (nsfilter, shard, matches)) + + +def section_locks(server_status): + sys.stdout.write("<<<mongodb_locks>>>\n") + global_lock_info = server_status.get("globalLock") + if global_lock_info: + for what in ["activeClients", "currentQueue"]: + if what in global_lock_info: + for key, value in global_lock_info[what].items(): + sys.stdout.write("%s %s %s\n" % (what, key, value)) + + def main(): # might be implemented in the future.. host = None @@ -129,28 +153,9 @@ def potentially_piggybacked_sections(client, server_status): databases = get_database_info(client) - sys.stdout.write("<<<mongodb_chunks>>>\n") - col = client.config.chunks - for db_name, db_data in databases.items(): - shards = col.distinct("shard") - sys.stdout.write("shardcount %d\n" % len(shards)) - for collection in db_data.get("collections"): - nsfilter = "%s.%s" % (db_name, collection) - sys.stdout.write("nscount %s %s\n" % (nsfilter, col.find({"ns": nsfilter}).count())) - for shard in shards: - sys.stdout.write("shardmatches %s#%s %s\n" % (nsfilter, shard, - col.find({ - "ns": nsfilter, - "shard": shard - }).count())) + section_chunks(client, databases) - sys.stdout.write("<<<mongodb_locks>>>\n") - global_lock_info = server_status.get("globalLock") - if global_lock_info: - for what in ["activeClients", "currentQueue"]: - if what in global_lock_info: - for key, value in global_lock_info[what].items(): - sys.stdout.write("%s %s %s\n" % (what, key, value)) + section_locks(server_status) section_flushing(server_status)

5 years, 6 months

mk_mongodb: refactor on and on

by Moritz Kiemer

Module: check_mk Branch: master Commit: a2f11ef0e693b9d72e00ec44ce9ec1ad2d1b4def URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2f11ef0e693b9… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Apr 4 13:11:20 2019 +0200 mk_mongodb: refactor on and on Change-Id: If8b7b25a40aa0d05262b05d2820fecceb24b81f2 --- agents/plugins/mk_mongodb | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/agents/plugins/mk_mongodb b/agents/plugins/mk_mongodb index dda31e9..f4c7fd1 100755 --- a/agents/plugins/mk_mongodb +++ b/agents/plugins/mk_mongodb @@ -115,6 +115,14 @@ def section_locks(server_status): sys.stdout.write("%s %s %s\n" % (what, key, value)) +def section_by_keys(section_name, keys, server_status, output_key=False): + sys.stdout.write("<<<mongodb_%s>>>\n" % section_name) + for key in keys: + fmt = ("%s " % key if output_key else "") + "%s %s\n" + for item in server_status.get(key, {}).items(): + sys.stdout.write(fmt % item) + + def main(): # might be implemented in the future.. host = None @@ -141,15 +149,11 @@ def main(): def potentially_piggybacked_sections(client, server_status): - # pylint: disable=too-many-branches,too-many-locals sections_replica(client, server_status) - sys.stdout.write("<<<mongodb_asserts>>>\n") - for key, value in server_status.get("asserts", {}).items(): - sys.stdout.write("%s %s\n" % (key, value)) + section_by_keys("asserts", ("asserts",), server_status) - sys.stdout.write("<<<mongodb_connections>>>\n") - sys.stdout.write("%s\n" % "\n".join("%s %s" % x for x in server_status["connections"].items())) + section_by_keys("connections", ("connections",), server_status) databases = get_database_info(client) @@ -172,16 +176,9 @@ def potentially_piggybacked_sections(client, server_status): #except: # pass - sys.stdout.write("<<<mongodb_mem>>>\n") - for key, value in server_status["mem"].items(): - sys.stdout.write("%s %s\n" % (key, value)) - for key, value in server_status["extra_info"].items(): - sys.stdout.write("%s %s\n" % (key, value)) + section_by_keys("mem", ("mem", "extra_info"), server_status) - sys.stdout.write("<<<mongodb_counters>>>\n") - for what in ["opcounters", "opcountersRepl"]: - for key, value in server_status.get(what, {}).items(): - sys.stdout.write("%s %s %s\n" % (what, key, value)) + section_by_keys("counters", ("opcounters", "opcountersRepl"), server_status, output_key=True) sys.stdout.write("<<<mongodb_collections:sep(9)>>>\n") for dbname, dbdata in databases.items(): @@ -237,8 +234,8 @@ def potentially_piggybacked_sections(client, server_status): # update state file if startup_warnings["log"]: - file(state_file, - "w").write("%d" % get_timestamp(startup_warnings["log"][-1].split(".")[0])) + timestamp = get_timestamp(startup_warnings["log"][-1].split(".")[0]) + file(state_file, "w").write("%d" % timestamp) if __name__ == "__main__":

5 years, 6 months

added WK7253: No longer query data for disabled snmp checks

by Andreas Boesl

Module: check_mk Branch: master Commit: a4e56c2ec6f2ad50a33527d28913e7cf53f2e3f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4e56c2ec6f2ad… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 4 15:28:16 2019 +0200 added WK7253: No longer query data for disabled snmp checks Change-Id: Iae2ae8131b32ec13b1e4b15dc36eccf3694f67a5 --- .werks/7253 | 13 +++++++++++++ cmk_base/snmp_scan.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/7253 b/.werks/7253 new file mode 100644 index 0000000..04cb81f --- /dev/null +++ b/.werks/7253 @@ -0,0 +1,13 @@ +Title: Service Discovery: No longer query data for disabled snmp checks +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1553769555 + +Even if a snmp check type was disabled, its relevant data was still queried from the host and discarded shortly after. +This has been fixed. + diff --git a/cmk_base/snmp_scan.py b/cmk_base/snmp_scan.py index 6a2495e..659da17 100644 --- a/cmk_base/snmp_scan.py +++ b/cmk_base/snmp_scan.py @@ -101,7 +101,7 @@ def _snmp_scan(host_config, default_found = [] for check_plugin_name, _unused_check in items: - if check_plugin_name in config.ignored_checktypes: + if config.service_ignored(hostname, check_plugin_name, None): continue else: if for_inv and not inventory_plugins.is_snmp_plugin(check_plugin_name):

5 years, 6 months

[CMK-1791] - async plugins stopped also in standalone mode(adhoc)

by Sergey Kipnis

Module: check_mk Branch: master Commit: 795756da9233d53fc0ce540dc8575978d562911f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=795756da9233d5… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Thu Mar 28 16:31:21 2019 +0100 [CMK-1791] - async plugins stopped also in standalone mode(adhoc) - light refactoring(ctors moved to .cpp from .h and log output) - removed excessive ctor Change-Id: Ib258c809cd2cfc72e8ad6585cd3a1385bcc74079 --- agents/wnx/src/common/wtools.cpp | 14 ++++++++++++++ agents/wnx/src/common/wtools.h | 27 +++++++++------------------ agents/wnx/src/engine/windows_service_api.cpp | 18 +++++++++++++----- agents/wnx/watest/test-service.cpp | 18 +++++++++--------- 4 files changed, 45 insertions(+), 32 deletions(-) diff --git a/agents/wnx/src/common/wtools.cpp b/agents/wnx/src/common/wtools.cpp index 27b3016..5b104a2 100644 --- a/agents/wnx/src/common/wtools.cpp +++ b/agents/wnx/src/common/wtools.cpp @@ -76,6 +76,20 @@ uint32_t AppRunner::goExec(std::wstring CommandLine, bool Wait, std::mutex ServiceController::s_lock_; ServiceController* ServiceController::s_controller_ = nullptr; +// normal API +ServiceController::ServiceController( + std::unique_ptr<wtools::BaseServiceProcessor> Processor) { + if (nullptr == Processor) { + XLOG::l.crit("Processor is nullptr unique"); + return; + } + std::lock_guard lk(s_lock_); + if (processor_ == nullptr && s_controller_ == nullptr) { + processor_ = std::move(Processor); + s_controller_ = this; + } +} + void WINAPI ServiceController::ServiceMain(DWORD Argc, wchar_t** Argv) { // Register the handler function for the service XLOG::l.i("Service Main"); diff --git a/agents/wnx/src/common/wtools.h b/agents/wnx/src/common/wtools.h index d480cc8..dd2bd95 100644 --- a/agents/wnx/src/common/wtools.h +++ b/agents/wnx/src/common/wtools.h @@ -261,15 +261,15 @@ public: if (KillTreeToo) { if (job_handle_) { - // this is normal case but with job + // this is normal case but with job TerminateJobObject(job_handle_, 0); - - // job: - CloseHandle(job_handle_); + + // job: + CloseHandle(job_handle_); job_handle_ = nullptr; - - // process: - CloseHandle(process_handle_); // must + + // process: + CloseHandle(process_handle_); // must process_handle_ = nullptr; } else { KillProcessTree(proc_id); @@ -325,17 +325,8 @@ private: // ptr, but this is clear overkill public: - // owns Processor - ServiceController(BaseServiceProcessor* Processor) { - assert(Processor); // #TODO replace with own crash and log - if (!Processor) return; - - std::lock_guard lk(s_lock_); - if (!processor_ && s_controller_ == nullptr) { - processor_.reset(Processor); - s_controller_ = this; - } - } + // normal API, used in production + ServiceController(std::unique_ptr<wtools::BaseServiceProcessor> Processor); // no copy! ServiceController(const ServiceController& Rhs) = delete; diff --git a/agents/wnx/src/engine/windows_service_api.cpp b/agents/wnx/src/engine/windows_service_api.cpp index f5a1fa1..3b511e4 100644 --- a/agents/wnx/src/engine/windows_service_api.cpp +++ b/agents/wnx/src/engine/windows_service_api.cpp @@ -375,14 +375,20 @@ int ExecMainService(bool DuplicateOn) { using namespace cma::install; milliseconds Delay = 1000ms; - auto processor = new ServiceProcessor(Delay, [](const void* Processor) { + auto processor = + std::make_unique<ServiceProcessor>(Delay, [](const void* Processor) { + // default embedded callback for exec + // atm does nothing + // optional commands listed here + // ******** + // 1. Auto Update when msi file is located by specified address #if 0 // #TODO planned test CheckForUpdateFile(kDefaultMsiFileName, cma::cfg::GetUpdateDir(), UpdateType::kMsiExecQuiet, true); #endif - return true; - }); + return true; + }); processor->startService(); @@ -538,8 +544,10 @@ int ServiceAsService( // infinite loop to protect from exception while (1) { try { - auto processor = new ServiceProcessor(Delay, InternalCallback); - wtools::ServiceController service_controller(processor); + std::unique_ptr<wtools::BaseServiceProcessor> processor = + std::make_unique<ServiceProcessor>(Delay, InternalCallback); + + wtools::ServiceController service_controller(std::move(processor)); auto ret = service_controller.registerAndRun( cma::srv::kServiceName); // we will stay here till // service will be stopped diff --git a/agents/wnx/watest/test-service.cpp b/agents/wnx/watest/test-service.cpp index d4cd5ac..ed98aea 100644 --- a/agents/wnx/watest/test-service.cpp +++ b/agents/wnx/watest/test-service.cpp @@ -37,12 +37,12 @@ int TestProcessor::s_counter = 0; TEST(ServiceControllerTest, CreateDelete) { using namespace std::chrono; { - auto processor = new TestProcessor; - wtools::ServiceController controller(processor); + wtools::ServiceController controller(std::make_unique<TestProcessor>()); EXPECT_EQ(TestProcessor::s_counter, 1); - EXPECT_FALSE(processor->started_ || processor->continued_ || - processor->paused_ || processor->shutdowned_ || - processor->stopped_); + auto p = dynamic_cast<TestProcessor*>(controller.processor_.get()); + ASSERT_NE(nullptr, p); + EXPECT_FALSE(p->started_ || p->continued_ || p->paused_ || + p->shutdowned_ || p->stopped_); EXPECT_NE(controller.processor_, nullptr); EXPECT_EQ(controller.name_, nullptr); EXPECT_EQ(controller.can_stop_, false); @@ -75,13 +75,13 @@ TEST(ServiceControllerTest, StartStop) { using namespace cma::srv; using namespace std::chrono; int counter = 0; - auto processor = - new ServiceProcessor(100ms, [&counter](const void* Processor) { + + wtools::ServiceController controller(std::make_unique<ServiceProcessor>( + 100ms, [&counter](const void* Processor) { xlog::l("pip").print(); counter++; return true; - }); - wtools::ServiceController controller(processor); + })); EXPECT_NE(controller.processor_, nullptr); EXPECT_EQ(controller.name_, nullptr); EXPECT_EQ(controller.can_stop_, false);

5 years, 6 months

ucs_c_rack_server checkman format cleanup

by Florian Kromer

Module: check_mk Branch: master Commit: 171e31e42623800aa1e3af032c9618fa32c22b44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=171e31e4262380… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Wed Apr 3 16:59:05 2019 +0200 ucs_c_rack_server checkman format cleanup Change-Id: If060fd6a3f834500b22eed688db80a0d8ef044e0 --- checkman/ucs_c_rack_server_fans | 9 +++++++++ checkman/ucs_c_rack_server_health | 8 ++++++++ checkman/ucs_c_rack_server_power | 9 +++++++++ checkman/ucs_c_rack_server_psu | 9 +++++++++ checkman/ucs_c_rack_server_psu.voltage | 9 +++++++++ checkman/ucs_c_rack_server_temp | 10 ++++++++++ checkman/ucs_c_rack_server_topsystem | 6 ++++++ checkman/ucs_c_rack_server_util | 9 +++++++++ checkman/ucs_c_rack_server_util.cpu | 9 +++++++++ checkman/ucs_c_rack_server_util.mem | 9 +++++++++ checkman/ucs_c_rack_server_util.pci_io | 9 +++++++++ 11 files changed, 96 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=171e31e426…

5 years, 6 months

allow to freeze the time in generic dataset tests

by Florian Kromer

Module: check_mk Branch: master Commit: a73bb61628d32fab00dd8d6d897cdee055763758 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a73bb61628d32f… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Thu Apr 4 12:43:16 2019 +0200 allow to freeze the time in generic dataset tests Change-Id: I2e51c91ae36c6359e0998de71ce6c43eecba17cd --- tests/unit/checks/generictests/__init__.py | 5 +- .../unit/checks/generictests/datasets/uptime_1.py | 18 +++++- tests/unit/checks/generictests/regression.py | 2 + tests/unit/checks/generictests/run.py | 66 ++++++++++++++-------- 4 files changed, 65 insertions(+), 26 deletions(-) diff --git a/tests/unit/checks/generictests/__init__.py b/tests/unit/checks/generictests/__init__.py index d9873c2..8566940 100644 --- a/tests/unit/checks/generictests/__init__.py +++ b/tests/unit/checks/generictests/__init__.py @@ -8,7 +8,7 @@ or specified as explicit modules (as in the datasets subpackage). The minimal compliant dataset must have the attribute - * `checkname` (str) : The name of the (main) check. + * `checkname` : [str] The name of the (main) check. In order to actually do something, at least one of the following attributes must be present. They are optional (but you must provide some input for the @@ -37,6 +37,9 @@ check function(s)). In the following, 'sc-dict' refers to a dictionary with Some more advanced ones are + * `freeze_time` : [str] Mocked time. + If present, its value are passed to + `freezegun.freeze_time` * `extra_sections` : [sc-dict] Extra sections that are appended to the info / parsed variable. If present, its values are extra sections (the actual diff --git a/tests/unit/checks/generictests/datasets/uptime_1.py b/tests/unit/checks/generictests/datasets/uptime_1.py index a3fc269..17ca1e3 100644 --- a/tests/unit/checks/generictests/datasets/uptime_1.py +++ b/tests/unit/checks/generictests/datasets/uptime_1.py @@ -1,4 +1,20 @@ # yapf: disable + + checkname = 'uptime' -info = [['3707973.23', '271038018.98']] + +freeze_time = '1970-02-12 22:59:33' + + +info = [['3707973.23', '3707973.23']] + + +discovery = {'': [(None, {})]} + + +checks = {'': [(None, + {}, + [(0, + 'Up since Thu Jan 1 01:59:59 1970 (42d 21:59:33)', + [('uptime', 3707973.23, None, None, None, None)])])]} \ No newline at end of file diff --git a/tests/unit/checks/generictests/regression.py b/tests/unit/checks/generictests/regression.py index 5d05853..ce1d580 100644 --- a/tests/unit/checks/generictests/regression.py +++ b/tests/unit/checks/generictests/regression.py @@ -50,6 +50,7 @@ class WritableDataset(object): self.filename = filename self.writelist = ( 'checkname', + 'freeze_time', 'info', 'parsed', 'discovery', @@ -60,6 +61,7 @@ class WritableDataset(object): ) self.checkname = init_dict.get('checkname', None) self.info = init_dict.get('info', None) + self.freeze_time = init_dict.get('freeze_time', None) self.parsed = init_dict.get('parsed', None) self.discovery = init_dict.get('discovery', {}) self.checks = {} diff --git a/tests/unit/checks/generictests/run.py b/tests/unit/checks/generictests/run.py index 82be247..9d9bb8e 100644 --- a/tests/unit/checks/generictests/run.py +++ b/tests/unit/checks/generictests/run.py @@ -7,6 +7,8 @@ from checktestlib import DiscoveryResult, assertDiscoveryResultsEqual, \ Immutables, assertEqual from testlib import MissingCheckInfoError from generictests.checkhandler import checkhandler +from contextlib import contextmanager +import freezegun class DiscoveryParameterTypeError(AssertionError): @@ -163,6 +165,20 @@ def check_listed_result(check, list_entry, info_arg, immu): assertCheckResultsEqual(result, result_expected) +@contextmanager +def optional_freeze_time(dataset): + """Optionally freeze of the time in generic dataset tests + + If present and truish the datasets freeze_time attribute is passed to + freezegun.freeze_time. + """ + if getattr(dataset, 'freeze_time', None): + with freezegun.freeze_time(dataset.freeze_time): + yield + else: + yield + + def run(check_manager, dataset, write=False): """Run all possible tests on 'dataset'""" print("START: %r" % dataset) @@ -177,29 +193,31 @@ def run(check_manager, dataset, write=False): # get the expected check results, if present checks_expected = getattr(dataset, 'checks', {}) - # LOOP OVER ALL (SUB)CHECKS - for sname in checklist: - subcheck = (sname + '.').split('.')[1] - check = check_manager.get_check(sname) - - info_arg = get_info_argument(dataset, subcheck, parsed) - immu.test(' after get_info_argument ') - immu.register(info_arg, 'info_arg') - - mock_is, mock_hec = get_mock_values(dataset, subcheck) - - with MockItemState(mock_is), MockHostExtraConf(check, mock_hec): - # test discovery - d_result = discovery(check, subcheck, dataset, info_arg, immu) - if write: - dataset.discovery[subcheck] = [e.tuple for e in d_result] - # test checks - for dr in d_result: - cdr = check_discovered_result(check, dr, info_arg, immu) - if write and cdr: - dataset.checks.setdefault(subcheck, []).append(cdr) - if not write: - for entry in checks_expected.get(subcheck, []): - check_listed_result(check, entry, info_arg, immu) + with optional_freeze_time(dataset): + # LOOP OVER ALL (SUB)CHECKS + for sname in checklist: + subcheck = (sname + '.').split('.')[1] + check = check_manager.get_check(sname) + + info_arg = get_info_argument(dataset, subcheck, parsed) + immu.test(' after get_info_argument ') + immu.register(info_arg, 'info_arg') + + mock_is, mock_hec = get_mock_values(dataset, subcheck) + + with MockItemState(mock_is), MockHostExtraConf(check, mock_hec): + # test discovery + d_result = discovery(check, subcheck, dataset, info_arg, immu) + if write: + dataset.discovery[subcheck] = [e.tuple for e in d_result] + # test checks + for dr in d_result: + cdr = check_discovered_result(check, dr, info_arg, immu) + if write and cdr: + dataset.checks.setdefault(subcheck, []).append(cdr) + if not write: + for entry in checks_expected.get(subcheck, []): + + check_listed_result(check, entry, info_arg, immu) immu.test(' at end of subcheck loop %r ' % subcheck)

5 years, 6 months

make ibm svc rule names consistent

by Florian Kromer

Module: check_mk Branch: master Commit: 20abb6bf5c1201743ec803efd86230f36bf074be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20abb6bf5c1201… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Tue Apr 2 15:53:04 2019 +0200 make ibm svc rule names consistent Change-Id: If7d2d2124bdcdcc740787accc82bbcfc7eb7c2d4 --- cmk/gui/plugins/wato/check_parameters/ibm_svc_host.py | 2 +- cmk/gui/plugins/wato/check_parameters/ibm_svc_mdisk.py | 2 +- cmk/gui/plugins/wato/check_parameters/ibm_svc_total_latency.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmk/gui/plugins/wato/check_parameters/ibm_svc_host.py b/cmk/gui/plugins/wato/check_parameters/ibm_svc_host.py index 5daf34b..8c3cb23 100644 --- a/cmk/gui/plugins/wato/check_parameters/ibm_svc_host.py +++ b/cmk/gui/plugins/wato/check_parameters/ibm_svc_host.py @@ -65,7 +65,7 @@ class RulespecCheckgroupParametersIbmSvcHost(CheckParameterRulespecWithoutItem): @property def title(self): - return _("IBM SVC: Options for SVC Hosts Check") + return _("IBM SVC Hosts") @property def match_type(self): diff --git a/cmk/gui/plugins/wato/check_parameters/ibm_svc_mdisk.py b/cmk/gui/plugins/wato/check_parameters/ibm_svc_mdisk.py index c47f879..13fd12d 100644 --- a/cmk/gui/plugins/wato/check_parameters/ibm_svc_mdisk.py +++ b/cmk/gui/plugins/wato/check_parameters/ibm_svc_mdisk.py @@ -50,7 +50,7 @@ class RulespecCheckgroupParametersIbmSvcMdisk(CheckParameterRulespecWithItem): @property def title(self): - return _("IBM SVC: Options for SVC Disk Check") + return _("IBM SVC Disk") @property def match_type(self): diff --git a/cmk/gui/plugins/wato/check_parameters/ibm_svc_total_latency.py b/cmk/gui/plugins/wato/check_parameters/ibm_svc_total_latency.py index 7c4cb30..db68504 100644 --- a/cmk/gui/plugins/wato/check_parameters/ibm_svc_total_latency.py +++ b/cmk/gui/plugins/wato/check_parameters/ibm_svc_total_latency.py @@ -50,7 +50,7 @@ class RulespecCheckgroupParametersIbmSvcTotalLatency(CheckParameterRulespecWithI @property def title(self): - return _("IBM SVC: Levels for total disk latency") + return _("IBM SVC Total Disk Latency") @property def match_type(self):

5 years, 6 months

← Newer
1
...
43
44
45
46
47
48
49
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019