Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 28fb71ed69fee3177df9248b10f040ab9d9b415a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28fb71ed69fee3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 23 10:54:18 2017 +0100 Renamed Config to GlobalConfig. The trigger for this renaming was a quite questionable change in clang-format, see https://reviews.llvm.org/D33932. With that change, header matching is always case-insensitive now, and there is no flag or option to get the old behavior back. Due to this, our "config.h" and "Config.h" headers were considered the same during formatting, which is wrong. :-/ Instead of fighting against an extremely useful tool, we simply rename the class and files in question to the arguably better name "GlobalConfig". Change-Id: I737a67c560a30a06c7d0bcea1cf82c439fcadc3a --- livestatus/src/Store.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/Store.h b/livestatus/src/Store.h index 9789470..4bf2881 100644 --- a/livestatus/src/Store.h +++ b/livestatus/src/Store.h @@ -64,7 +64,7 @@ class Table; #ifdef CMC #include <cstdint> #include "TableCachedStatehist.h" -class Config; +class GlobalConfig; class Object; #else #include <mutex> @@ -147,7 +147,7 @@ private: void addTable(Table *table); Table *findTable(const std::string &name); #ifdef CMC - const Config *config() const; + const GlobalConfig *config() const; uint32_t horizon() const; #else void logRequest(const std::string &line,

6 years, 7 months

5549 FIX mk_oracle.ps1: Fixed scattered information for configuration

by Marcel Arentz

Module: check_mk Branch: master Commit: f8cb078bcd612b08f69199db8c9a6f94bdb73156 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8cb078bcd612b… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Nov 23 11:47:50 2017 +0100 5549 FIX mk_oracle.ps1: Fixed scattered information for configuration Information about the correct configuration of the oracle plugin for windows has been scattered around serveral places in Check_MK. As for now all needed information is available in the script itself. Change-Id: I9f10b91b6028da5b35704fdd20235b2b126ff914 --- .werks/5549 | 12 ++++++++++++ agents/windows/plugins/mk_oracle.ps1 | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/.werks/5549 b/.werks/5549 new file mode 100644 index 0000000..aa5c97c --- /dev/null +++ b/.werks/5549 @@ -0,0 +1,12 @@ +Title: mk_oracle.ps1: Fixed scattered information for configuration +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1511433928 +Class: fix + +Information about the correct configuration of the oracle plugin for windows +has been scattered around serveral places in Check_MK. As for now all needed +information is available in the script itself. diff --git a/agents/windows/plugins/mk_oracle.ps1 b/agents/windows/plugins/mk_oracle.ps1 index 2fa230f..078e643 100644 --- a/agents/windows/plugins/mk_oracle.ps1 +++ b/agents/windows/plugins/mk_oracle.ps1 @@ -55,6 +55,18 @@ # | The user can override and set variables in mk_oracle_cfg.ps1 | # '----------------------------------------------------------------------' +# Example configuration for ORACLE plugin for Windows +# Set the ORACLE_HOME if we have more than one oracle home on the server +# then we can generate the PATH based on that. Note that the tnsnames.ora +# must then be in %ORACLE_HOME%\network\admin, or use the the environment +# variable %TBS_ADMIN% to set to another directory. +# $ORACLE_HOME="C:\oracle\product\12.1.0.1" + +# $DBUSER=@("sys", "Secret12", "SYSDBA", "localhost", "1521") +# $DBUSER_tst=@("sys", "Secret12", "SYSDBA", "localhost", "1521") +# $DBUSER_orcl=@("sys", "Secret12", "SYSDBA", "localhost", "1521") +# $DBUSER_orcl=@("sys", "Secret12", "SYSDBA", "localhost", "1521") +# $ASMUSER=@("user", "password", "SYSDBA/SYSASM", "hostname", "port") # what should happen when an error occurs? SilentlyContinue, Continue, Stop, and Inquire

6 years, 7 months

Fixed issue with new check

by Lars Michelsen

Module: check_mk Branch: master Commit: fa0be13ed4488c97ab3ad40045062497202773b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa0be13ed4488c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 23 10:07:50 2017 +0100 Fixed issue with new check Change-Id: I2b540d742687178ed162bbf0971cc4f59607ce2c --- tests/cmk_base/test_modes.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cmk_base/test_modes.py b/tests/cmk_base/test_modes.py index 2425fc1..c72c745 100644 --- a/tests/cmk_base/test_modes.py +++ b/tests/cmk_base/test_modes.py @@ -667,8 +667,8 @@ def test_check_discovery(test_cfg, site): # '----------------------------------------------------------------------' def test_check(test_cfg, site): - for opt in [ "--check", "" ]: - p = site.execute(["cmk", opt, "modes-test-host"], stdout=subprocess.PIPE) + for opt in [ ["--check"], [] ]: + p = site.execute(["cmk" ] + opt + [ "modes-test-host"], stdout=subprocess.PIPE) assert p.wait() == 0 output = p.stdout.read() assert output.startswith("OK - Agent version")

6 years, 7 months

cmk --version is not loading all checks anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 00594b476c2f0c3a5bbcf26ff111fddfdebf0b2a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00594b476c2f0c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 23 08:50:55 2017 +0100 cmk --version is not loading all checks anymore Change-Id: Ie456b1e06ec64c871e81f10c8eef9ba74787e214 --- cmk_base/modes/check_mk.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cmk_base/modes/check_mk.py b/cmk_base/modes/check_mk.py index 2945449..5a455b2 100644 --- a/cmk_base/modes/check_mk.py +++ b/cmk_base/modes/check_mk.py @@ -1596,6 +1596,7 @@ modes.register(Mode( handler_function=mode_version, short_help="Print the version of Check_MK", needs_config=False, + needs_checks=False, ))

6 years, 7 months

cmk: Fixed exit code when showing the help text

by Lars Michelsen

Module: check_mk Branch: master Commit: 7d59667a7a83bdef1f38e35a26a98dead551052f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d59667a7a83bd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 23 08:50:06 2017 +0100 cmk: Fixed exit code when showing the help text Change-Id: I98ab9191398037b2751da53a799a015c67170c3a --- bin/check_mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/check_mk b/bin/check_mk index 94b6dc0..3591bd7 100755 --- a/bin/check_mk +++ b/bin/check_mk @@ -103,7 +103,7 @@ try: exit_status = modes.call("--check", None, opts, args) else: modes.get("help").handler_function() - exit_status = 1 + exit_status = 0 profiling.output_profile() sys.exit(exit_status)

6 years, 7 months

Added some more tests for modes; Cleaned up some rule tests

by Lars Michelsen

Module: check_mk Branch: master Commit: c6ae82b46f8bf34f45fa3416fa922ec9c7571eae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6ae82b46f8bf3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 23 08:51:20 2017 +0100 Added some more tests for modes; Cleaned up some rule tests Change-Id: I7fb9c65371a690e24d96a7f6ccbebcff66ba3851 --- tests/cmk_base/test_modes.py | 56 ++++++++++++++++++++++++++++++++++++++--- tests/cmk_base/test_rulesets.py | 23 ++++++++--------- 2 files changed, 63 insertions(+), 16 deletions(-) diff --git a/tests/cmk_base/test_modes.py b/tests/cmk_base/test_modes.py index 3bb231b..2425fc1 100644 --- a/tests/cmk_base/test_modes.py +++ b/tests/cmk_base/test_modes.py @@ -366,6 +366,8 @@ def test_restore(request, test_cfg, site): # '----------------------------------------------------------------------' # TODO +# TODO: --cleanup-piggyback + #. # .--scan-parents--------------------------------------------------------. @@ -663,7 +665,31 @@ def test_check_discovery(test_cfg, site): # | \___|_| |_|\___|\___|_|\_\ | # | | # '----------------------------------------------------------------------' -# TODO + +def test_check(test_cfg, site): + for opt in [ "--check", "" ]: + p = site.execute(["cmk", opt, "modes-test-host"], stdout=subprocess.PIPE) + assert p.wait() == 0 + output = p.stdout.read() + assert output.startswith("OK - Agent version") + + +def test_check_verbose_perfdata(test_cfg, site): + p = site.execute(["cmk", "-v", "-p", "modes-test-host"], stdout=subprocess.PIPE) + assert p.wait() == 0 + output = p.stdout.read() + assert "Temperature Zone 0" in output + assert "temp=32.4;" in output + assert "OK - Agent version" in output + + +def test_check_verbose_only_check(test_cfg, site): + p = site.execute(["cmk", "-v", "--checks=lnx_if", "modes-test-host"], stdout=subprocess.PIPE) + assert p.wait() == 0 + output = p.stdout.read() + assert "Temperature Zone 0" not in output + assert "Interface 2" in output + assert "OK - Agent version" in output #. # .--version-------------------------------------------------------------. @@ -674,7 +700,15 @@ def test_check_discovery(test_cfg, site): # | \_/ \___|_| |___/_|\___/|_| |_| | # | | # '----------------------------------------------------------------------' -# TODO + +def test_version(test_cfg, site): + import cmk + p = site.execute(["cmk", "--version"], + stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout, stderr = p.communicate() + assert p.wait() == 0 + assert stderr == "" + assert "This is Check_MK" in stdout #. # .--help----------------------------------------------------------------. @@ -685,5 +719,21 @@ def test_check_discovery(test_cfg, site): # | |_| |_|\___|_| .__/ | # | |_| | # '----------------------------------------------------------------------' -# TODO +def test_help(test_cfg, site): + p = site.execute(["cmk", "--help"], + stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout, stderr = p.communicate() + assert p.wait() == 0 + assert stderr == "" + assert stdout.startswith("WAYS TO CALL:") + assert "--snmpwalk" in stdout + + +def test_help_without_args(test_cfg, site): + p = site.execute(["cmk"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout, stderr = p.communicate() + assert p.wait() == 0 + assert stderr == "" + assert stdout.startswith("WAYS TO CALL:") + assert "--snmpwalk" in stdout diff --git a/tests/cmk_base/test_rulesets.py b/tests/cmk_base/test_rulesets.py index 4806d3e..ec0d9cd 100644 --- a/tests/cmk_base/test_rulesets.py +++ b/tests/cmk_base/test_rulesets.py @@ -10,6 +10,7 @@ def fake_version(monkeypatch): monkeypatch.setattr(cmk, "omd_version", lambda: "1.4.0i1.cee") +# Automatically refresh caches for each test @pytest.fixture(autouse=True, scope="function") def clear_config_caches(monkeypatch): import cmk_base @@ -19,12 +20,12 @@ def clear_config_caches(monkeypatch): # TODO: Test the negations -def test_service_extra_conf(): - # TODO: monkeypatch this! +def test_service_extra_conf(monkeypatch): import cmk_base.config as config - config.all_hosts = ["host1|tag1|tag2", "host2|tag1"] - config.clusters = {} + monkeypatch.setattr(config, "all_hosts", ["host1|tag1|tag2", "host2|tag1"]) + monkeypatch.setattr(config, "clusters", {}) config.collect_hosttags() + ruleset = [ ("1", [], rulesets.ALL_HOSTS, rulesets.ALL_SERVICES, {}), ("2", [], rulesets.ALL_HOSTS, rulesets.ALL_SERVICES, {}), @@ -59,17 +60,13 @@ def test_service_extra_conf(): # TODO: host_extra_conf_merged -def test_all_matching_hosts(): - # TODO: monkeypatch this! - import cmk_base - #reload(cmk_base) - +def test_all_matching_hosts(monkeypatch): import cmk_base.config as config - #reload(config) - config.distributed_wato_site = "site1" - config.all_hosts = ["host1|tag1|tag2", "host2|tag1", "host3|tag1|site:site2"] - config.clusters = {} + monkeypatch.setattr(config, "distributed_wato_site", "site1") + monkeypatch.setattr(config, "all_hosts", + ["host1|tag1|tag2", "host2|tag1", "host3|tag1|site:site2"]) + monkeypatch.setattr(config, "clusters", {}) config.collect_hosttags() assert rulesets.all_matching_hosts(["tag1"], rulesets.ALL_HOSTS, with_foreign_hosts=False) == \

6 years, 7 months

5088 postgres_stats: Age for never checked tables is now configurable

by Simon Betz

Module: check_mk Branch: master Commit: bd93aeab2461f24d5853cf00212dcad4cc9e4ba5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd93aeab2461f2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Aug 4 16:24:03 2017 +0200 5088 postgres_stats: Age for never checked tables is now configurable Change-Id: Ib22842498df8ee81c5b7b407b86eb0bb91794d4a --- .werks/5088 | 10 +++++++++ checks/postgres_stats | 42 ++++++++++++++++++++++++++++-------- web/plugins/wato/check_parameters.py | 12 +++++++---- 3 files changed, 51 insertions(+), 13 deletions(-) diff --git a/.werks/5088 b/.werks/5088 new file mode 100644 index 0000000..ecdb7ab --- /dev/null +++ b/.werks/5088 @@ -0,0 +1,10 @@ +Title: postgres_stats: Age for never checked tables is now configurable +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1501856598 +Class: feature + + diff --git a/checks/postgres_stats b/checks/postgres_stats index fc49efe..c4b5593 100644 --- a/checks/postgres_stats +++ b/checks/postgres_stats @@ -75,12 +75,12 @@ def check_postgres_stats(item, params, parsed): if not oldest_element or last_time < oldest_element[stats_field]: oldest_element = line + now = time.time() if oldest_element: oldest_time = int(oldest_element[stats_field]) warn, crit = params.get("last_%s" % paramskey, (None, None)) yield 0, "Table: %s" % oldest_element["tname"] - now = time.time() state = 0 if crit and now - crit > oldest_time: state = 2 @@ -92,13 +92,37 @@ def check_postgres_stats(item, params, parsed): extra_info = " (warn/crit at %s/%s)" % (get_age_human_readable(warn), get_age_human_readable(crit)) yield state, "Time since last vacuum %s%s" % (get_age_human_readable(now - oldest_time), extra_info) - elif not never_checked: - yield 0, "Contains no tables" - - if never_checked: - yield 1, "%d tables were never %s: %s%s" % \ - (len(never_checked), text, "/".join(never_checked[:5]), - (len(never_checked) > 5 and " (first %d shown)" % min(5, len(never_checked)) or "")) + key = "postgres_stats.%s" % item + if not never_checked: + set_item_state(key, now) + yield 0, "No never checked tables" + + elif never_checked: + infotext = "%d tables were never %s: %s%s" % \ + (len(never_checked), text, "/".join(never_checked[:5]), + len(never_checked) > 5 and " (first %d shown)" % min(5, len(never_checked)) or "") + + if "never_analyze_vacuum" in params: + last_ts = get_item_state(key) + if last_ts is None: + set_item_state(key, now) + yield 0, infotext + + age = now - last_ts + warn, crit = params["never_analyze_vacuum"] + state = 0 + if age >= crit: + state = 2 + elif age >= warn: + state = 1 + if state: + infotext += " (warn/crit at %s/%s)" % \ + (get_age_human_readable(warn), + get_age_human_readable(crit),) + yield state, infotext + + else: + yield 1, infotext check_info['postgres_stats'] = { @@ -107,6 +131,6 @@ check_info['postgres_stats'] = { "inventory_function" : inventory_postgres_stats, "service_description" : "PostgreSQL %s", "group" : "postgres_maintenance", - "includes" : [ "postgres.include" ], + "includes" : ["postgres.include"], } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index f939444..bb6562d 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -10691,15 +10691,19 @@ register_check_parameters( elements = [ Age(title = _("Warning if older than"), default_value = 86400 * 7), Age(title = _("Critical if older than"), default_value = 86400 * 14) - ]) - ), + ])), ("last_analyze", Tuple( title = _("Time since the last ANALYZE"), elements = [ Age(title = _("Warning if older than"), default_value = 86400 * 7), Age(title = _("Critical if older than"), default_value = 86400 * 14) - ]) - ), + ])), + ("never_analyze_vacuum", Tuple( + title = _("Age of never analyzed/vacuumed tables"), + elements = [ + Age(title = _("Warning if older than"), default_value = 86400 * 7), + Age(title = _("Critical if older than"), default_value = 86400 * 14) + ])), ] ), TextAscii(

6 years, 7 months

5327 cisco_temperature.dom: New check which monitors digital optical monitoring sensors of CISCO devices

by Simon Betz

Module: check_mk Branch: master Commit: c164e9a7ede5864968ba89a8911c4bc2b8fee387 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c164e9a7ede586… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Nov 2 16:24:57 2017 +0100 5327 cisco_temperature.dom: New check which monitors digital optical monitoring sensors of CISCO devices Change-Id: Ic806454a7e75cec90f3ec7febc716bac39069851 --- .werks/5327 | 10 ++ checkman/cisco_temperature.dom | 20 ++++ checks/cisco_temperature | 237 ++++++++++++++++++++++++----------------- 3 files changed, 172 insertions(+), 95 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c164e9a7ed…

6 years, 7 months

5538 Improved performance when processing a large amount of piggyback data

by Lars Michelsen

Module: check_mk Branch: master Commit: 50dbfd5d08f38bed159a001480c2c9b9c3ed83fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50dbfd5d08f38b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 22 15:56:27 2017 +0100 5538 Improved performance when processing a large amount of piggyback data When Check_MK needs to handle a large amount of piggyback data (a lot of piggbacked hosts from a lot of piggyback source hosts, several hundreds to thousands), the performance of Check_MK could decrease during regular monitoring. This was caused by some too expensive house keeping logic that was executed too often. The mechanism has now been changed to work like this: <ul> <li>During regular monitoring now piggyback data is removed anymore from the disk.</li> <li>New piggyback data is written to disk when communicating with the source host.</li> <li>When monitoring piggybacked hosts, the outdated piggyback data available on the disk is filtered.</li> <li>There is a dedicated housekeeping cron job executed sites crontab daily at 00:10 which removes outdated piggyback data. This job is mostly used to free up some tmpfs space, the outated stored data is not read by monitoring anymore.</li> </ul> Change-Id: I22d9610a00e9200ffc69cfb8c9edf4292d613581 --- .werks/5538 | 25 +++ cmk_base/data_sources/__init__.py | 2 +- cmk_base/data_sources/abstract.py | 8 +- cmk_base/data_sources/host_sections.py | 20 +- cmk_base/modes/check_mk.py | 24 ++- cmk_base/piggyback.py | 208 ++++++++++++++++----- .../check_mk/skel/etc/cron.d/cmk_cleanup_piggyback | 2 + 7 files changed, 230 insertions(+), 59 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=50dbfd5d08…

6 years, 7 months

Fixed lnx_if inventory plugin

by Simon Betz

Module: check_mk Branch: master Commit: 9158edfd7a90518d024a14624f43987a13cb7ea5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9158edfd7a9051… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Nov 22 16:02:51 2017 +0100 Fixed lnx_if inventory plugin Change-Id: Ibdb03fdbc7cd18e622366a78a2bc2179295e852d --- inventory/lnx_if | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/lnx_if b/inventory/lnx_if index 7ca731f..be1b8de 100644 --- a/inventory/lnx_if +++ b/inventory/lnx_if @@ -37,7 +37,7 @@ def inv_lnx_if(parsed, params): total_ethernet_ports = 0 available_ethernet_ports = 0 - for if_index, if_descr, if_type, if_speed, if_oper_status, \ + for node_info, if_index, if_descr, if_type, if_speed, if_oper_status, \ if_in_octets, inucast, inmcast, inbcast, if_in_discards, \ if_in_errors, if_out_octets, outucast, outmcast, outbcast, \ if_out_discards, if_out_errors, if_out_qlen, if_alias, if_phys_address in parsed:

6 years, 7 months

← Newer
1
...
8
9
10
11
12
13
14
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2017