Checkmk git commits November 2016

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

Distributed monitoring: Fixed issue with automation secret containing an " &" sign

by Lars Michelsen

Module: check_mk Branch: master Commit: 4a9515d9af52d47412bacf411c206188a16c5107 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a9515d9af52d4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 23 16:44:25 2016 +0100 Distributed monitoring: Fixed issue with automation secret containing an "&" sign --- web/htdocs/wato.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e42770f..1746766 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9560,7 +9560,8 @@ def page_automation_login(): # using the credentials of the administrator. The login is done be exchanging # a login secret. If such a secret is not yet present it is created on # the fly. - html.write_text(repr(get_login_secret(True))) + html.set_output_format("python") + html.write_html(repr(get_login_secret(True))) def page_automation():

7 years, 10 months

4068 FIX Fixed possible exception in case of wrong automation secrets between multiple sites

by Lars Michelsen

Module: check_mk Branch: master Commit: e02b2ea2fad77d62068332db33f1c8231bce1f67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e02b2ea2fad77d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 23 16:36:47 2016 +0100 4068 FIX Fixed possible exception in case of wrong automation secrets between multiple sites When having a distributed WATO setup and a site secret is changed, the error message could not be displayed correctly when using a localized GUI. --- .werks/4068 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/index.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/4068 b/.werks/4068 new file mode 100644 index 0000000..83bd585 --- /dev/null +++ b/.werks/4068 @@ -0,0 +1,11 @@ +Title: Fixed possible exception in case of wrong automation secrets between multiple sites +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1479915339 + +When having a distributed WATO setup and a site secret is changed, the error message +could not be displayed correctly when using a localized GUI. diff --git a/ChangeLog b/ChangeLog index 5258b68..a186e1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ * 3977 FIX: Fixed poping up changes button in sidebar snapin after a change * 3982 FIX: Some MKPs created with WATO could not be uploaded to the Check_MK Exchange * 4045 FIX: Tactical Overview: do not count OK events as problems + * 4068 FIX: Fixed possible exception in case of wrong automation secrets between multiple sites... Notifications: * 4042 FIX: Fix missing From address in synchronous SMTP notifications... diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 5d2240f..012b67c 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -70,7 +70,7 @@ def handler(mod_python_req, fields = None, is_profiling = False): try: handler() except Exception, e: - html.write(str(e)) + html.write("%s" % e) if config.debug: html.write(html.attrencode(traceback.format_exc())) raise FinalizeRequest()

7 years, 10 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 44dda56486e5912877f8aafcd96272acf3abbd28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44dda56486e591… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Nov 23 14:43:33 2016 +0100 Fetched livestatus from downstream. --- livestatus/src/DoublePointerColumn.h | 6 +- livestatus/src/GlobalCountersColumn.cc | 37 ----------- livestatus/src/GlobalCountersColumn.h | 57 ----------------- livestatus/src/IntPointerColumn.h | 6 +- livestatus/src/Makefile.am | 1 - livestatus/src/NullColumn.h | 5 +- livestatus/src/StringPointerColumn.h | 6 +- livestatus/src/TableStatus.cc | 111 +++++++++------------------------ livestatus/src/TableStatus.h | 4 ++ livestatus/src/TimePointerColumn.h | 6 +- livestatus/src/global_counters.cc | 35 +++++------ livestatus/src/global_counters.h | 4 +- livestatus/src/module.cc | 1 - 13 files changed, 58 insertions(+), 221 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=44dda56486…

7 years, 10 months

Fixed port conflicts with EC during tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 8db96a676162c90b28bf3af6e270bfa2a1c4b044 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8db96a676162c9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 23 15:58:58 2016 +0100 Fixed port conflicts with EC during tests --- tests/testlib/__init__.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 496f8ab..be63e83 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -375,18 +375,21 @@ class Site(object): if self.reuse and self.exists(): port = int(self.get_config("LIVESTATUS_TCP_PORT")) else: - port = 9123 - print "Trying port %d" % port - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - while sock.connect_ex(('127.0.0.1', port)) == 0: - print "Port %d is already used, trying next" % port - port += 1 - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - print "Using port %d" % port + port = self.get_free_port_from(9123) self._livestatus_port = port + def get_free_port_from(self, port): + print "Trying port %d" % port + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + while sock.connect_ex(('127.0.0.1', port)) == 0: + print "Port %d is already used, trying next" % port + port += 1 + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + print "Using port %d" % port + return port + # Problem: The group change only affects new sessions of the test_user #def add_test_user_to_site_group(self): # test_user = pwd.getpwuid(os.getuid())[0] @@ -779,7 +782,7 @@ class CMKEventConsole(CMKWebSession): if self.site.reuse and self.site.exists() and "remote_status" in config: port = config["remote_status"][0] else: - port = self.site.livestatus_port + 1 + port = self.site.get_free_port_from(self.site.livestatus_port + 1) self.status_port = port

7 years, 10 months

EC status table tests: Enabled testing with different cores

by Lars Michelsen

Module: check_mk Branch: master Commit: 5c1407e381777192622b63ac257c2da81c2f8079 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c1407e3817771… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 23 14:52:04 2016 +0100 EC status table tests: Enabled testing with different cores --- tests/mkeventd/test_mkeventd_status.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tests/mkeventd/test_mkeventd_status.py b/tests/mkeventd/test_mkeventd_status.py index 0d2fa5d..3a23ae7 100644 --- a/tests/mkeventd/test_mkeventd_status.py +++ b/tests/mkeventd/test_mkeventd_status.py @@ -16,10 +16,10 @@ def ensure_core_and_get_connection(site, ec, core): return live -# TODO: Enable this once the livestatus columns have been added for status_event_limit_* -# @pytest.mark.parametrize(("core"), [ "nagios", "cmc" ]) -(a)pytest.mark.parametrize(("core"), [ "cmc" ]) +(a)pytest.mark.parametrize(("core"), [ "nagios", "cmc" ]) def test_command_reload(site, ec, core): + print "Checking core: %s" % core + live = ensure_core_and_get_connection(site, ec, core) old_t = live.query_value("GET eventconsolestatus\nColumns: status_config_load_time\n") @@ -36,13 +36,16 @@ def test_command_reload(site, ec, core): # core == None means direct query to status socket -# TODO: Enable this once the livestatus columns have been added for status_event_limit_* -# @pytest.mark.parametrize(("core"), [ None, "nagios", "cmc" ]) -(a)pytest.mark.parametrize(("core"), [ None ]) +(a)pytest.mark.parametrize(("core"), [ None, "nagios", "cmc" ]) def test_status_table_via_core(site, ec, core): + print "Checking core: %s" % core + live = ensure_core_and_get_connection(site, ec, core) + if core == None: + result = live.query_table_assoc("GET status\n") + else: + result = live.query_table_assoc("GET eventconsolestatus\n") - result = live.query_table_assoc("GET status\n") assert len(result) == 1 status = result[0]

7 years, 10 months

Enforce english lanugage in GUI during integration tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 57799410620ccd08483b4c465d3b6444bd0c8199 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57799410620ccd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 23 14:45:27 2016 +0100 Enforce english lanugage in GUI during integration tests --- tests/testlib/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 2cfe8a0..496f8ab 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -323,6 +323,7 @@ class Site(object): def init_wato(self): web = CMKWebSession(self) web.login() + web.set_language("en") # Call WATO once for creating the default WATO configuration response = web.get("wato.py").text

7 years, 10 months

4091 FIX oracle_tablespace: Werk 3907 broke the detection of UNDO- and TEMP-Tablespaces

by Simon Betz

Module: check_mk Branch: master Commit: d47f91065530020a7b199487af04d65a2ec0cf81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d47f9106553002… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Nov 23 14:49:52 2016 +0100 4091 FIX oracle_tablespace: Werk 3907 broke the detection of UNDO- and TEMP-Tablespaces --- .werks/4091 | 10 ++++++++++ ChangeLog | 1 + checks/oracle_tablespaces | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4091 b/.werks/4091 new file mode 100644 index 0000000..eafa5a3 --- /dev/null +++ b/.werks/4091 @@ -0,0 +1,10 @@ +Title: oracle_tablespace: Werk 3907 broke the detection of UNDO- and TEMP-Tablespaces +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1479908955 + + diff --git a/ChangeLog b/ChangeLog index 4f6e55a..5258b68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 3751 FIX: jolokia_metrics: Discovery no longer crashes in case of error querying instance * 4088 FIX: ntp: fixed incomplete data handling * 4090 FIX: apc_rackpdu_power, apc_symmetra, apc_symmetra_input, apc_symmetra_output: some fixes... + * 4091 FIX: oracle_tablespace: Werk 3907 broke the detection of UNDO- and TEMP-Tablespaces Multisite: * 3974 FIX: Sorting comments in hover menu of comments icon by time now diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index 2985125..db179a1 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -109,7 +109,7 @@ def parse_oracle_tablespaces(info): db_version = 0 - if len(line) == 14: + if len(line) >= 14: ts_type = line[13] else: # old behaivor is all Tablespaces are treated as PERMANENT

7 years, 10 months

compressed ipv6 notation in example ini

by Marcel Arentz

Module: check_mk Branch: master Commit: b765a0cc873fd7e93d2e3157a08ee055066eb9ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b765a0cc873fd7… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Nov 23 14:40:24 2016 +0100 compressed ipv6 notation in example ini --- agents/windows/check_mk.example.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/check_mk.example.ini b/agents/windows/check_mk.example.ini index 8d6709c..eec9a51 100644 --- a/agents/windows/check_mk.example.ini +++ b/agents/windows/check_mk.example.ini @@ -3,7 +3,7 @@ # Restrict access to certain IP addresses # If ipv6 is enabled, all listed ipv4 adresses are also accepted as # source adresses in their ipv6-mapped form. I.e. if - # 192.168.56.0/24 is listed, connections from 0:0:0:0:0:ffff:c0a8:3800/120 + # 192.168.56.0/24 is listed, connections from ::ffff:c0a8:3800/120 # are also possible # only_from = 127.0.0.1 192.168.56.0/24 ::1

7 years, 10 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 675e9ca03233ac9897158cded74332da87a16688 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=675e9ca03233ac… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Nov 23 10:49:46 2016 +0100 Fetched livestatus from downstream. --- livestatus/src/CustomVarsColumn.cc | 6 -- livestatus/src/CustomVarsColumn.h | 4 -- livestatus/src/CustomVarsDictColumn.cc | 7 ++ livestatus/src/CustomVarsDictColumn.h | 4 ++ ...CustomVarsFilter.cc => CustomVarsDictFilter.cc} | 77 +++++++--------------- .../{CustomVarsFilter.h => CustomVarsDictFilter.h} | 14 ++-- livestatus/src/CustomVarsListFilter.cc | 64 ++++++++++++++++++ livestatus/src/CustomVarsListFilter.h | 53 +++++++++++++++ livestatus/src/CustomVarsNamesColumn.cc | 7 ++ livestatus/src/CustomVarsNamesColumn.h | 4 ++ livestatus/src/CustomVarsValuesColumn.cc | 7 ++ livestatus/src/CustomVarsValuesColumn.h | 4 ++ livestatus/src/Makefile.am | 3 +- 13 files changed, 182 insertions(+), 72 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=675e9ca032…

7 years, 10 months

4090 FIX apc_rackpdu_power, apc_symmetra, apc_symmetra_input,

by Simon Betz

apc_symmetra_output: some fixes Message-ID: <58356aa5.nMzu/jdUzLNelIWy%si(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 8d9c190ed476901f2f0f694685e1f83ffad74179 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d9c190ed47690… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Nov 23 11:07:46 2016 +0100 4090 FIX apc_rackpdu_power, apc_symmetra, apc_symmetra_input, apc_symmetra_output: some fixes apc_rackpdu_power: fixed empty levels handling apc_symmetra, apc_symmetra_input, apc_symmetra_output: fixed no data handling --- .werks/4090 | 11 +++++++++++ ChangeLog | 1 + checks/apc_rackpdu_power | 4 ++-- checks/apc_symmetra | 2 ++ checks/apc_symmetra_input | 2 ++ checks/apc_symmetra_output | 2 ++ 6 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.werks/4090 b/.werks/4090 new file mode 100644 index 0000000..5f64d1a --- /dev/null +++ b/.werks/4090 @@ -0,0 +1,11 @@ +Title: apc_rackpdu_power, apc_symmetra, apc_symmetra_input, apc_symmetra_output: some fixes +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1479895471 + +apc_rackpdu_power: fixed empty levels handling +apc_symmetra, apc_symmetra_input, apc_symmetra_output: fixed no data handling diff --git a/ChangeLog b/ChangeLog index eac296b..4f6e55a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ * 4043 FIX: Add missing metric definition for 15 minute CPU load prediction' * 3751 FIX: jolokia_metrics: Discovery no longer crashes in case of error querying instance * 4088 FIX: ntp: fixed incomplete data handling + * 4090 FIX: apc_rackpdu_power, apc_symmetra, apc_symmetra_input, apc_symmetra_output: some fixes... Multisite: * 3974 FIX: Sorting comments in hover menu of comments icon by time now diff --git a/checks/apc_rackpdu_power b/checks/apc_rackpdu_power index 8eeb397..bfce1c7 100644 --- a/checks/apc_rackpdu_power +++ b/checks/apc_rackpdu_power @@ -37,9 +37,9 @@ def parse_apc_rackpdu_power(info): for host, amperage_str, warn, crit in info: amperage = float(amperage_str) / 10 - if amperage >= int(crit): + if crit != "" and amperage >= int(crit): status_info = (amperage, (2, "crit exceeded")) - elif amperage >= int(warn): + elif warn != "" and amperage >= int(warn): status_info = (amperage, (1, "warn exceeded")) else: status_info = amperage diff --git a/checks/apc_symmetra b/checks/apc_symmetra index 1e63112..8c86b17 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -63,6 +63,8 @@ def parse_apc_symmetra(info): parsed = {} + if not info: + return parsed # some numeric fields may be empty battery_status, output_status, state_output_state, battery_capacity, \ diff --git a/checks/apc_symmetra_input b/checks/apc_symmetra_input index 5fca28a..dd2ae9c 100644 --- a/checks/apc_symmetra_input +++ b/checks/apc_symmetra_input @@ -29,6 +29,8 @@ def parse_apc_symmetra_input(info): + if not info: + return {} return { "Input" : { "voltage" : float(info[0][0]), }} diff --git a/checks/apc_symmetra_output b/checks/apc_symmetra_output index d7ca950..05a3e41 100644 --- a/checks/apc_symmetra_output +++ b/checks/apc_symmetra_output @@ -36,6 +36,8 @@ factory_settings["apc_symmetra_output_default_levels"] = { def parse_apc_symmetra_output(info): + if not info: + return {} voltage, current, load = map(float, info[0]) return { "Output" : { "voltage" : voltage,

7 years, 10 months

← Newer
1
...
6
7
8
9
10
11
12
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2016