Checkmk git commits March 2017

checkmk-commits@lists.checkmk.com

11 participants
379 discussions

8627 FIX apt: Fix Ubuntu "NOTE: This is only a simulation!"

by Konstantin Büttner

warning being output in check Message-ID: <58d8e548.5eODaOhIgdChHKvr%kb(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Module: check_mk Branch: master Commit: 02405ad8547f1dbbf18e83de83ee6840dd4cb53a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02405ad8547f1d… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Mar 27 12:04:11 2017 +0200 8627 FIX apt: Fix Ubuntu "NOTE: This is only a simulation!" warning being output in check When running the Check_MK agent as a non-root user, the apt-get command used in the mk_apt plugin would output a note that would then appear in the update check. The agent plugin no longer outputs this message. To fix the problem, you will need to deploy the updated version of the mk_apt plugin. Thanks to Barnaby Shearer for the fix! Change-Id: Ic702a3d474da8d3e57c52d6f7b6ca0bd66d1c0ea --- .werks/8627 | 16 ++++++++++++++++ agents/plugins/mk_apt | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/8627 b/.werks/8627 new file mode 100644 index 0000000..3744eb5 --- /dev/null +++ b/.werks/8627 @@ -0,0 +1,16 @@ +Title: apt: Fix Ubuntu "NOTE: This is only a simulation!" warning being output in check +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1490608751 + +When running the Check_MK agent as a non-root user, the apt-get command used in the +mk_apt plugin would output a note that would then appear in the update check. +The agent plugin no longer outputs this message. To fix the problem, you will need +to deploy the updated version of the mk_apt plugin. + +Thanks to Barnaby Shearer for the fix! diff --git a/agents/plugins/mk_apt b/agents/plugins/mk_apt index c4ded2d..31f930b 100755 --- a/agents/plugins/mk_apt +++ b/agents/plugins/mk_apt @@ -50,7 +50,7 @@ function check_apt_update { # 1397BC53640DB551 apt-get update -qq 2> /dev/null fi - apt-get -o 'Debug::NoLocking=true' -s -qq "$UPGRADE" | grep -v '^Conf' + apt-get -o 'Debug::NoLocking=true' -o 'APT::Get::Show-User-Simulation-Note=false' -s -qq "$UPGRADE" | grep -v '^Conf' }

7 years, 3 months

Crawl test: Only copy web.log when it exists

by Lars Michelsen

Module: check_mk Branch: master Commit: 908e722884125f2d1f3d64f1aa25b337be86bb9b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=908e722884125f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 27 11:51:17 2017 +0200 Crawl test: Only copy web.log when it exists Change-Id: Ib320bb2b4284641ee28492cb9a7b9a1668a9057b --- tests/web/test_crawl.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/web/test_crawl.py b/tests/web/test_crawl.py index f3ee934..58c78bd 100644 --- a/tests/web/test_crawl.py +++ b/tests/web/test_crawl.py @@ -385,7 +385,8 @@ class TestCrawler(object): os.rename(self.report_file()+".tmp", self.report_file()) # Save the web.log for later diagnose - shutil.copyfile(self.site.read_file("var/log/web.log"), self.web_log_file()) + if self.site.file_exists("var/log/web.log"): + shutil.copyfile(self.site.read_file("var/log/web.log"), self.web_log_file()) if self.errors: pytest.fail("Crawled %d URLs in %d seconds. Failures:\n%s" %

7 years, 3 months

4513 FIX Agent Updater: Fixed broken state persisting on windows ( regression since #4499)

by Lars Michelsen

Module: check_mk Branch: master Commit: 4a3f4e4b9415ccd9229bcf3b013ebccce23b8263 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a3f4e4b9415cc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 27 11:02:10 2017 +0200 4513 FIX Agent Updater: Fixed broken state persisting on windows (regression since #4499) The following exception could occur with Check_MK version shipping werk #4499 (1.2.8p19, 1.4.0b4): Traceback (most recent call last): File "cmk-update-agent.py", line 1230, in File "cmk-update-agent.py", line 255, in main_update File "cmk-update-agent.py", line 271, in do_update_as_command File "cmk-update-agent.py", line 319, in do_update_agent File "cmk-update-agent.py", line 939, in update_deployment_state File "cmk-update-agent.py", line 925, in write_state_file WindowsError: [Error 183] Cannot create a file when that file already exists This issue occured during update and trying to save the new deployment state. It should be enough to apply the update on the Check_MK server and rebuild the agents. Change-Id: I3a86f4a24eb595a12cc58f0a5eb173a221185510 --- .werks/4513 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.werks/4513 b/.werks/4513 new file mode 100644 index 0000000..3f74dfd --- /dev/null +++ b/.werks/4513 @@ -0,0 +1,23 @@ +Title: Agent Updater: Fixed broken state persisting on windows (regression since #4499) +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1490604948 + +The following exception could occur with Check_MK version shipping werk #4499 (1.2.8p19, 1.4.0b4): + +Traceback (most recent call last): +File "cmk-update-agent.py", line 1230, in +File "cmk-update-agent.py", line 255, in main_update +File "cmk-update-agent.py", line 271, in do_update_as_command +File "cmk-update-agent.py", line 319, in do_update_agent +File "cmk-update-agent.py", line 939, in update_deployment_state +File "cmk-update-agent.py", line 925, in write_state_file +WindowsError: [Error 183] Cannot create a file when that file already exists + +This issue occured during update and trying to save the new deployment state. It +should be enough to apply the update on the Check_MK server and rebuild the agents.

7 years, 3 months

4528 FIX datapower_mem, hp_procurve_mem, ucd_mem: Improved graph readability

by Simon Betz

Module: check_mk Branch: master Commit: e03cabc56640c2b0961de1ae29ab5b9294428445 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e03cabc56640c2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 27 10:12:14 2017 +0200 4528 FIX datapower_mem, hp_procurve_mem, ucd_mem: Improved graph readability Change-Id: I0d87e9967c8e7e38a4f1daad99e64b207a8e14f3 --- .werks/4528 | 11 +++++++++++ web/plugins/metrics/check_mk.py | 12 ++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.werks/4528 b/.werks/4528 new file mode 100644 index 0000000..ffd27cd --- /dev/null +++ b/.werks/4528 @@ -0,0 +1,11 @@ +Title: datapower_mem, hp_procurve_mem, ucd_mem: Improved graph readability +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.4.0b5 +Date: 1490601892 + +Previously scientific notation was used. diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 47b4790..7e62e8d 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -3960,10 +3960,18 @@ check_metrics["check_mk-ibm_svc_nodestats.diskio"] = { "write" : { "name" : "disk_write_throughput" } } -check_metrics["check_mk-netscaler_mem"] = { - "mem" : { "name" : "mem_used" } +check_metrics["check_mk-hp_procurve_mem"] = { + "memory_used" : { "name" : "mem_used" } } +memory_simple_translation = { + "memory_used" : { "name" : "mem_used" } +} + +check_metrics["check_mk-datapower_mem"] = memory_simple_translation +check_metrics["check_mk-ucd_mem"] = memory_simple_translation +check_metrics["check_mk-netscaler_mem"] = memory_simple_translation + ram_used_swap_translation = { "ramused" : { "name" : "mem_used", "scale" : MB }, "swapused" : { "name" : "swap_used", "scale" : MB },

7 years, 3 months

4466 FIX liveproxyd: fixed needless connection timeouts (site dead) when changing the site configuration

by Andreas Boesl

Module: check_mk Branch: master Commit: 1d930c9888f03a257ea72f93fd2ffe585f8b8dfb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d930c9888f03a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Sat Mar 25 17:09:18 2017 +0100 4466 FIX liveproxyd: fixed needless connection timeouts (site dead) when changing the site configuration Upon startup, the liveproxyd waited one heartbeat interval before making any attempts to contact the remote sites. This has been fixed. Changes in the distributed monitoring configuration should no longer result in longer fake "site dead" messages. Change-Id: I5c088c654d152967d1340ed58d22905aa1ac65d2 Note: This also improves the stability of BI aggregation checks which rely on a stable connection to the remote sites. --- .werks/4466 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.werks/4466 b/.werks/4466 new file mode 100644 index 0000000..e1bf9d3 --- /dev/null +++ b/.werks/4466 @@ -0,0 +1,14 @@ +Title: liveproxyd: fixed needless connection timeouts (site dead) when changing the site configuration +Level: 1 +Component: liveproxy +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1490457827 +Class: fix + +Upon startup, the liveproxyd waited one heartbeat interval before making any attempts +to contact the remote sites. This has been fixed. Changes in the distributed monitoring +configuration should no longer result in longer fake "site dead" messages. + +Note: This also improves the stability of BI aggregation checks which rely on a stable connection to the remote sites.

7 years, 3 months

updated werk text

by Andreas Boesl

Module: check_mk Branch: master Commit: bbdb741ea4dd94a47e2a889023ea6d85714bc50f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbdb741ea4dd94… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Sat Mar 25 15:32:31 2017 +0100 updated werk text Change-Id: I73dc99fd4bbde791068659e1a7b5efea275f21b9 --- .werks/4465 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/4465 b/.werks/4465 index 2b027f1..fa37dd6 100644 --- a/.werks/4465 +++ b/.werks/4465 @@ -1,4 +1,4 @@ -Title: Fixed raise condition when mulitple Check_MK helpers updated the ipaddresses.cache file +Title: Fixed race condition when mulitple Check_MK helpers updated the ipaddresses.cache file Level: 1 Component: checks Compatible: compat @@ -9,6 +9,6 @@ Class: fix Check helpers now lock the ipaddresses.cache file when they want to update an ip address. The locked file is read, updated with the new content and written afterwards. -The raise condition happened when multiple check helpers tried to update the file +The race condition happened when multiple check helpers tried to update the file at the same time, hereby removing some recently looked up ip addresses.

7 years, 3 months

4465 FIX Fixed raise condition when mulitple Check_MK helpers updated the ipaddresses.cache file

by Andreas Boesl

Module: check_mk Branch: master Commit: 83bec89089310072eadf97e9a59d6bf56e42a472 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83bec890893100… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Sat Mar 25 15:23:15 2017 +0100 4465 FIX Fixed raise condition when mulitple Check_MK helpers updated the ipaddresses.cache file Check helpers now lock the ipaddresses.cache file when they want to update an ip address. The locked file is read, updated with the new content and written afterwards. The raise condition happened when multiple check helpers tried to update the file at the same time, hereby removing some recently looked up ip addresses. Change-Id: Ic68fcf342b8dc92a2b7d7a28f45f3d9b9b06e5aa --- .werks/4465 | 14 ++++++++++++++ modules/check_mk.py | 19 ++++++++++++++----- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/.werks/4465 b/.werks/4465 new file mode 100644 index 0000000..2b027f1 --- /dev/null +++ b/.werks/4465 @@ -0,0 +1,14 @@ +Title: Fixed raise condition when mulitple Check_MK helpers updated the ipaddresses.cache file +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1490451474 +Class: fix + +Check helpers now lock the ipaddresses.cache file when they want to update an ip address. +The locked file is read, updated with the new content and written afterwards. +The raise condition happened when multiple check helpers tried to update the file +at the same time, hereby removing some recently looked up ip addresses. + diff --git a/modules/check_mk.py b/modules/check_mk.py index ec24602..0e2f2df 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2268,7 +2268,8 @@ def initialize_ip_lookup_cache(): ip_lookup_cache = cmk_base.config_cache.get_dict("ip_lookup") try: - ip_lookup_cache.update(eval(file(cmk.paths.var_dir + '/ipaddresses.cache').read())) + data_from_file = cmk.store.load_data_from_file(cmk.paths.var_dir + '/ipaddresses.cache', {}) + ip_lookup_cache.update(data_from_file) # be compatible to old caches which were created by Check_MK without IPv6 support if ip_lookup_cache and type(ip_lookup_cache.keys()[0]) != tuple: @@ -2286,10 +2287,18 @@ def initialize_ip_lookup_cache(): def write_ip_lookup_cache(): ip_lookup_cache = cmk_base.config_cache.get_dict("ip_lookup") - # TODO: Write using cmk.store - suffix = "." + str(os.getpid()) - file(cmk.paths.var_dir + '/ipaddresses.cache' + suffix, 'w').write(repr(ip_lookup_cache)) - os.rename(cmk.paths.var_dir + '/ipaddresses.cache' + suffix, cmk.paths.var_dir + '/ipaddresses.cache') + + cache_path = cmk.paths.var_dir + '/ipaddresses.cache' + # Read already known data + data_from_file = cmk.store.load_data_from_file(cache_path, + default={}, + lock=True) + ip_lookup_cache.update(data_from_file) + # The lock from the previous call is released in the following function + # (I don't like this) + # TODO: this file always grows... there should be a cleanup mechanism + # maybe on "cmk --update-dns-cache" + cmk.store.save_data_to_file(cache_path, ip_lookup_cache) def do_update_dns_cache():

7 years, 3 months

4464 FIX RRD Helper Process: No longer uses default RRD templates after a core reload

by Andreas Boesl

Module: check_mk Branch: master Commit: 6e2bcdcf206e7c85f3b5716c375a83af9ca54b32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e2bcdcf206e7c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Sat Mar 25 14:34:34 2017 +0100 4464 FIX RRD Helper Process: No longer uses default RRD templates after a core reload The rrd helper lost its entire configuration on a core reload. As a result, new rrds for host and services used the default rrd configuration and not any configurations specified in the corresponding WATO rules. Change-Id: Id9dabb25b218c9bb1eb4c689802ad0e52560537a --- .werks/4464 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/4464 b/.werks/4464 new file mode 100644 index 0000000..f2c9b00 --- /dev/null +++ b/.werks/4464 @@ -0,0 +1,11 @@ +Title: RRD Helper Process: No longer uses default RRD templates after a core reload +Level: 2 +Component: core +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1490447132 +Class: fix + +The rrd helper lost its entire configuration on a core reload. As a result, new rrds for host and services +used the default rrd configuration and not any configurations specified in the corresponding WATO rules.

7 years, 3 months

4463 FIX f5_bigip_cluster_status: fixed invalid evaluation of node states when this check runs on a cluster

by Andreas Boesl

Module: check_mk Branch: master Commit: f4d850a7577686eacabef0e2e94163cb39a18fb1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4d850a7577686… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 24 11:28:52 2017 +0100 4463 FIX f5_bigip_cluster_status: fixed invalid evaluation of node states when this check runs on a cluster Change-Id: Ib07fd38ee581f149918217fdc8780d6858945f1d --- .werks/4463 | 10 ++++++++++ checks/f5_bigip_cluster_status | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/4463 b/.werks/4463 new file mode 100644 index 0000000..e32fc54 --- /dev/null +++ b/.werks/4463 @@ -0,0 +1,10 @@ +Title: f5_bigip_cluster_status: fixed invalid evaluation of node states when this check runs on a cluster +Level: 1 +Component: checks +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1490351215 +Class: fix + + diff --git a/checks/f5_bigip_cluster_status b/checks/f5_bigip_cluster_status index 1d7d83f..d857c76 100644 --- a/checks/f5_bigip_cluster_status +++ b/checks/f5_bigip_cluster_status @@ -63,10 +63,10 @@ def inventory_f5_bigip_cluster_status(parsed): def check_f5_bigip_cluster_status(_no_item, params, parsed, is_v11_2 = False): if is_v11_2: node_states = ["unknown", "offline", "forced offline", "standby", "active"] - active_value = 4 + active_value = "4" else: node_states = ["standby", "active 1", "active 2", "active"] - active_value = 3 + active_value = "3" if params["type"] == "active_standby" and parsed.values().count(active_value) > 1: yield 2, "More than 1 node is active: "

7 years, 3 months

Refactoring javascript: Unifying node access functions.

by Roland Halbig

Module: check_mk Branch: master Commit: 6e6d9480d9f6b8f7e7ef5449920f823c36b5d26d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e6d9480d9f6b8… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Mar 7 17:42:16 2017 +0100 Refactoring javascript: Unifying node access functions. Change-Id: I9970d8aff8be1389f42d52a8355addc434aaf39f --- web/htdocs/js/checkmk.js | 118 +++++++++++++++++++++++++---------------------- 1 file changed, 63 insertions(+), 55 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6e6d9480d9…

7 years, 3 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2017