Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

Use std::chrono more often, increasing type safety and convenience.

by Sven Panne

Module: check_mk Branch: master Commit: 7200dd0133d00abc4320db74d972b97f796b8dc4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7200dd0133d00a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 14 09:25:57 2017 +0100 Use std::chrono more often, increasing type safety and convenience. Change-Id: I8904a46ef63697045fe904632fd7bdcad3b9c066 --- livestatus/src/ChronoUtils.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/livestatus/src/ChronoUtils.h b/livestatus/src/ChronoUtils.h index 9b9b005..ea1dffb 100644 --- a/livestatus/src/ChronoUtils.h +++ b/livestatus/src/ChronoUtils.h @@ -47,6 +47,10 @@ inline tm to_tm(std::chrono::system_clock::time_point tp) { return ret; } +inline std::chrono::system_clock::time_point from_tm(tm tp) { + return std::chrono::system_clock::from_time_t(mktime(&tp)); +} + template <typename Rep, typename Period> inline timeval to_timeval(std::chrono::duration<Rep, Period> dur) { using namespace std::chrono;

7 years, 7 months

4193 FIX check_mail: Fixed bug with fetching mails

by Marcel Arentz

Module: check_mk Branch: master Commit: b6476a2e09c01909178d8ac7fe6bffc66c621a56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6476a2e09c019… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Feb 8 17:07:34 2017 +0100 4193 FIX check_mail: Fixed bug with fetching mails Previously the active check was not able to handle response messages containing more information than expected. Additionally the check was not closing the connection afterwards, so the messages never have been deleted. Change-Id: I92ace2716b15d31549d79f9160315fafade59dd0 --- .werks/4193 | 11 +++++++++++ active_checks/check_mail | 17 ++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.werks/4193 b/.werks/4193 new file mode 100644 index 0000000..511fa06 --- /dev/null +++ b/.werks/4193 @@ -0,0 +1,11 @@ +Title: check_mail: Fixed bug with fetching mails +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1486569909 +Class: fix + +Previously the active check was not able to handle response messages containing +more information than expected. Additionally the check was not closing the +connection afterwards, so the messages never have been deleted. diff --git a/active_checks/check_mail b/active_checks/check_mail index a07861c..44f2751 100755 --- a/active_checks/check_mail +++ b/active_checks/check_mail @@ -245,8 +245,8 @@ def cleanup_mailbox(): for index in g_forwarded: if fetch_proto == 'POP3': if cleanup_messages == 'delete': - response = g_M.dele(index) - if response != "+OK": + response = g_M.dele(index+1) + if not response.startswith("+OK"): raise Exception("Response from server: [%s]" % response) else: if cleanup_messages != 'delete': @@ -398,11 +398,14 @@ def main(): if opt_debug: imaplib.Debug = 4 - connect() - if forward_ec: - forward_to_ec(fetch_mails()) - else: - bail_out(0, 'Successfully logged in to mailbox') + try: + connect() + if forward_ec: + forward_to_ec(fetch_mails()) + else: + bail_out(0, 'Successfully logged in to mailbox') + finally: + close_mailbox() socket.setdefaulttimeout(conn_timeout)

7 years, 7 months

Saving crawl stats directly in result dir of workspace

by Lars Michelsen

Module: check_mk Branch: master Commit: c882757f4e202266463974493b5fc92a4b5e41a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c882757f4e2022… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 14 08:55:39 2017 +0100 Saving crawl stats directly in result dir of workspace Change-Id: I199cd2851fdd8f060b636c5da1983183b0b40924 --- tests/testlib/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 4d90736..81b4d4a 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -42,9 +42,9 @@ def var_dir(): if "WORKSPACE" in os.environ: base_dir = os.environ["WORKSPACE"] + "/results" else: - base_dir = repo_path() + "/tests" + base_dir = repo_path() + "/tests/var" - return base_dir + "/var" + return base_dir class APIError(Exception):

7 years, 7 months

4359 FIX mssql_counters: ignore invalid lines

by Simon Betz

Module: check_mk Branch: master Commit: b69d2b47b3a8c3873cb46aac6fbac543c4d601fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b69d2b47b3a8c3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Feb 13 16:30:19 2017 +0100 4359 FIX mssql_counters: ignore invalid lines Change-Id: I2a1f8a183f00576978e4cada953a6b23896766fd --- .werks/4359 | 10 ++++++++++ ChangeLog | 1 + checks/mssql_counters | 7 ++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/4359 b/.werks/4359 new file mode 100644 index 0000000..cb2a059 --- /dev/null +++ b/.werks/4359 @@ -0,0 +1,10 @@ +Title: mssql_counters: ignore invalid lines +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1486999784 + + diff --git a/ChangeLog b/ChangeLog index 5f8b5ca..b5f7c63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -110,6 +110,7 @@ * 4356 FIX: brocade_fcport: since FW 8.0.* tx/rxwords are no longer available, use values from FCMGMT-MIB instead * 4125 FIX: kaspersky_av_client: made fullscan state optional, simplified plugin... * 4358 FIX: wmi_cpuload: fixed exception handling + * 4359 FIX: mssql_counters: ignore invalid lines Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/checks/mssql_counters b/checks/mssql_counters index 2f82ba3..b6edd79 100644 --- a/checks/mssql_counters +++ b/checks/mssql_counters @@ -37,10 +37,14 @@ # MSSQL_SQLEXPRESS:Databases master Transactions/sec 13733 # MSSQL_SQLEXPRESS:Databases master Percent_Log_Used 57 # MSSQL_SQLEXPRESS:Databases master Log_File(s)_Size_(KB) +# FOOBAR 170 + def mssql_counters_item(line, add_counter_name): - obj, counter, instance = line[:3] + if len(line) < 3: + return None + obj, counter, instance = line[:3] if obj.endswith(':Databases'): obj = obj[:-10] @@ -49,6 +53,7 @@ def mssql_counters_item(line, add_counter_name): else: return obj + ' ' + instance + def inventory_mssql_counters(info, want_counters, perc_w_base, add_counter_name, dflt = None): inventory = [] for line in info:

7 years, 7 months

Failed notification check: Advance acknowledgement time when no issues have been found on any site

by Lars Michelsen

Module: check_mk Branch: master Commit: 1f98022545b03e2863bc5c4bfcbcecdee13778fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f98022545b03e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 13 16:25:30 2017 +0100 Failed notification check: Advance acknowledgement time when no issues have been found on any site Change-Id: I8e06ef4901de5f276bca0e23b6c7e3f87a4a05d5 --- web/htdocs/notifications.py | 12 +++++++++++- web/plugins/sidebar/shipped.py | 3 --- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/web/htdocs/notifications.py b/web/htdocs/notifications.py index 21fc2d9..3457238 100644 --- a/web/htdocs/notifications.py +++ b/web/htdocs/notifications.py @@ -123,7 +123,17 @@ def load_failed_notifications(before=None, after=None, stat_only=False, extra_he query += extra_headers if stat_only: - return sites.live().query_summed_stats(query) + result = sites.live().query_summed_stats(query) + if result is None: + result = [0] # Normalize the result when no site answered + + if result[0] == 0 and not sites.live().dead_sites(): + # In case there are no errors and all sites are reachable: + # advance the users acknowledgement time + acknowledge_failed_notifications(time.time()) + + return result + else: return sites.live().query(query) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index d325b8b..1b41fbb 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -634,9 +634,6 @@ def get_tactical_overview_data(extra_filter_headers): stat_only=True, extra_headers=extra_filter_headers) - if notdata is None: - notdata = [0] - try: event_data = sites.live().query_summed_stats(event_query) except livestatus.MKLivestatusNotFoundError:

7 years, 7 months

Fixed tests after HTML plug refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: d370827d8eb00920a831cb4288652334d7d65d52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d370827d8eb009… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 13 15:37:36 2017 +0100 Fixed tests after HTML plug refactoring Change-Id: If7b4d3c7aa2dbce759ac5c379120df7fb77db525 --- tests/web/classes.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/web/classes.py b/tests/web/classes.py index 32d7928..037e437 100644 --- a/tests/web/classes.py +++ b/tests/web/classes.py @@ -878,9 +878,13 @@ class HTMLTester(RequestHandlerTester): def drain(self): - t = self.plugged_text - self.plugged_text = '' - return t + t = self.plugged_text + self.plugged_text = '' + return t + + + def unplug(self): + self.plugged_text = "" def add_custom_style_sheet(self):

7 years, 7 months

check_sql: handling debug mode while connecting

by Lars Michelsen

Module: check_mk Branch: master Commit: 1bedd6418bbff75a51e8e036c2ff48e159f16e02 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1bedd6418bbff7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 13 15:26:36 2017 +0100 check_sql: handling debug mode while connecting Change-Id: I1d8a2691b08476b08103f5466c3d8900dfdc7588 --- active_checks/check_sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/active_checks/check_sql b/active_checks/check_sql index e98e7bd..65f4721 100755 --- a/active_checks/check_sql +++ b/active_checks/check_sql @@ -203,6 +203,8 @@ try: cursor = db_connection.cursor() except Exception, e: + if opt_debug: + raise if len(e.args) > 1: sys.stderr.write("UNKNOWN - Error while connecting to database: [%d] %s\n" % (e.args[0], e.args[1])) else:

7 years, 7 months

Feature in htmllib: Nested html plug context.

by Roland Halbig

Module: check_mk Branch: master Commit: a45b64de09dd0bbeb5477e192fb6388debe672e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a45b64de09dd0b… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Feb 7 13:39:12 2017 +0100 Feature in htmllib: Nested html plug context. Change-Id: I241a99d657d93cb349f50d8ccae959fcebec2ba4 --- tests/web/test_OutputFunnel.py | 116 +++++++++++++++++++++++++++++++++++++++++ web/htdocs/htmllib.py | 50 ++++++++++-------- 2 files changed, 143 insertions(+), 23 deletions(-) diff --git a/tests/web/test_OutputFunnel.py b/tests/web/test_OutputFunnel.py new file mode 100644 index 0000000..db6b6e9 --- /dev/null +++ b/tests/web/test_OutputFunnel.py @@ -0,0 +1,116 @@ +#!/usr/bin/python +# call using +# > py.test -s -k test_html_generator.py + + +import pytest + +# Override the global site fixture. Not wanted for git tests! +(a)pytest.fixture +def site(request): + pass + +# Mark all tests in this file to be executed in the git context +pytestmark = pytest.mark.html_gentest + +# external imports +from contextlib import contextmanager + + +# internal imports +from htmllib import HTML, OutputFunnel, plug +from classes import HTMLOrigTester, HTMLCheck_MKTester + + +class OutputFunnelTester(OutputFunnel): + + def __init__(self): + super(OutputFunnelTester, self).__init__() + self.written = "" + + + def lowlevel_write(self, text): + self.written += text + + +# @ofdecorate +# def write_test(self, text): +# self.write("<div>THISISATESTTEXT: %s</div>\n" % text) +# +# decorator for automatical test generation +# def ofdecorate(func): +# def func_wrapper(html, *args, **kwargs): +# with plug(html): +# func(html, *args, **kwargs) +# print "_" * 10 + " %s|%s|%s" % (args, kwargs, html.plug_text) +# return func_wrapper +# +#def test_decorator(): +# print "" +# html = OutputFunnelTester() +# html.write_test("HALLO WELT!") +# print html.written + + +def test_plug(): + html = OutputFunnelTester() + + html.write("A") + assert html.written == "A" + html.plug() + html.write("B") + assert html.plug_text == ["B"] + html.plug() + html.write("C") + assert html.plug_text == ["B", "C"] + html.unplug() + assert html.plug_text == ["BC"] + html.unplug() + assert html.written == "ABC" + + + +def test_context(): + html = OutputFunnelTester() + + html.write("A") + assert html.written == "A" + with plug(html): + html.write("B") + assert html.plug_text == ["B"] + with plug(html): + html.write("C") + assert html.plug_text == ["B", "C"] + assert html.plug_text == ["BC"] + assert html.written == "ABC" + + + +def test_drain(): + html = OutputFunnelTester() + + html.plug() + html.write("A") + text = html.drain() + assert text == "A" + html.write("B") + assert html.plug_text == ["B"] + html.unplug() + assert html.written == "B" + + +def test_flush(): + html = OutputFunnelTester() + + html.plug() + html.write("A") + html.plug_text == ["A"] + html.flush() + assert html.written == "A" + assert html.plug_text == [''] + html.unplug() + assert html.written == "A" + + + + diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 9ffdc8a..a994265 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -94,6 +94,15 @@ class RequestTimeout(MKException): pass +# TODO: is contextlib supported by older versions? +from contextlib import contextmanager + +# Plug context +@contextmanager +def plug(html): + html.plug() + yield + html.unplug() # # Encoding and escaping @@ -310,8 +319,8 @@ class OutputFunnel(object): def __init__(self): - self.plugged = False - self.plugged_text = "" + self.plug_level = -1 + self.plug_text = [] # Accepts str and unicode objects only! @@ -326,8 +335,8 @@ class OutputFunnel(object): if type(text) not in [str, unicode]: # also possible: type Exception! raise MKGeneralException(_('Type Error: html.write accepts str and unicode input objects only!')) - if self.plugged: - self.plugged_text += text + if self.is_plugged(): + self.plug_text[self.plug_level] += text else: # encode when really writing out the data. Not when writing plugged, # because the plugged code will be handled somehow by our code. We @@ -335,7 +344,6 @@ class OutputFunnel(object): if type(text) == unicode: text = text.encode("utf-8") self.lowlevel_write(text) - #TODO: return self def lowlevel_write(self, text): @@ -344,34 +352,29 @@ class OutputFunnel(object): # Put in a plug which stops the text stream and redirects it to a sink. def plug(self): - self.plugged = True - self.plugged_text = '' + self.plug_text += [''] + self.plug_level += 1 def is_plugged(self): - return self.plugged + return self.plug_level > -1 # Pull the plug for a moment to allow the sink content to pass through. def flush(self): - if self.plugged: - text = self.plugged_text - - # encode when really writing out the data. Not when writing plugged, - # because the plugged code will be handled somehow by our code. We - # only encode when leaving the pythonic world. - if type(text) == unicode: - text = text.encode("utf-8") - - self.lowlevel_write(text) - self.plugged_text = '' + if self.is_plugged(): + text = self.plug_text[self.plug_level] + self.plug_text[self.plug_level] = "" + self.plug_level -= 1 + self.write(text) + self.plug_level += 1 # Get the sink content in order to do something with it. def drain(self): - if self.plugged: - text = self.plugged_text - self.plugged_text = '' + if self.is_plugged(): + text = self.plug_text[self.plug_level] + self.plug_text[self.plug_level] = '' return text else: return '' @@ -379,7 +382,8 @@ class OutputFunnel(object): def unplug(self): self.flush() - self.plugged = False + self.plug_text.pop() + self.plug_level -= 1 #.

7 years, 7 months

Removed not working test function

by Lars Michelsen

Module: check_mk Branch: master Commit: 2d7073549dbdc847106a2e5817e24a2144cfff0c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d7073549dbdc8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 13 15:15:38 2017 +0100 Removed not working test function Change-Id: Ic187e54a95578e67efffc4419fd7992e3d51081c --- tests/web/test_integration.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/web/test_integration.py b/tests/web/test_integration.py index de36497..667d33c 100644 --- a/tests/web/test_integration.py +++ b/tests/web/test_integration.py @@ -12,8 +12,9 @@ def run_tests(function_name, tests=None): for test in tests: assert test.run(), "%s" % test -def test_generated_tests(): - run_all_generated_tests() +# TODO(rh): This does not work! +#def test_generated_tests(): +# run_all_generated_tests() def test_select(): run_tests("select")

7 years, 7 months

Cleaned up TODO

by Lars Michelsen

Module: check_mk Branch: master Commit: 7f0138cccf35da98eaaae38f49c1c9bf7cef77c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f0138cccf35da… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 13 15:11:55 2017 +0100 Cleaned up TODO Change-Id: Id4d6b40d5c3ae1268c84dd98f08b3e8f5ae1b6cd --- web/htdocs/htmllib.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index a994265..6c97fa9 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -94,7 +94,6 @@ class RequestTimeout(MKException): pass -# TODO: is contextlib supported by older versions? from contextlib import contextmanager # Plug context

7 years, 7 months

← Newer
1
...
21
22
23
24
25
26
27
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017