Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

4450 FIX quicksearch: fixed exception when using special characters

by Andreas Boesl

Module: check_mk Branch: master Commit: cb0782f056c222f9ecf4adc3966d94e900ecb5b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb0782f056c222… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 28 15:17:58 2017 +0100 4450 FIX quicksearch: fixed exception when using special characters Change-Id: Ia4fb94ecaf245cd139efb931b206ffaaae35256f --- .werks/4450 | 10 ++++++++++ web/htdocs/sidebar.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4450 b/.werks/4450 new file mode 100644 index 0000000..32dde24 --- /dev/null +++ b/.werks/4450 @@ -0,0 +1,10 @@ +Title: quicksearch: fixed exception when using special characters +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1488291410 +Class: fix + + diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index a5b997d..e520939 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -712,7 +712,7 @@ def to_regex(s): def ajax_search(): - q = html.var('q').strip() + q = html.var_utf8('q').strip() if not q: return

7 years, 7 months

Fixed integration tests

by Roland Halbig

Module: check_mk Branch: master Commit: cb0e0c773039f7922fe0571a04e003511accb657 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb0e0c773039f7… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Feb 28 14:44:00 2017 +0100 Fixed integration tests Change-Id: Ibad31a522942efecb6c08b13176991752b913f76 --- tests/web/test_generator.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/web/test_generator.py b/tests/web/test_generator.py index ccc10ae..63f88b4 100644 --- a/tests/web/test_generator.py +++ b/tests/web/test_generator.py @@ -40,7 +40,6 @@ def test_HTMLGenerator(): assert tools.compare_html(html.drain(), "<table><tr><td>1</td><td>2</td></tr></table>") a = u"\u2665" - print a with html.plugged(): assert html.render_a("test", href="www.test.case") html.render_a(u"test", href="www.test.case")

7 years, 7 months

Heavy cleanup of RRD-related file name handling.

by Sven Panne

Module: check_mk Branch: master Commit: bf9a37e13e388c262f35ab3e00c0aad1cdd6142e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf9a37e13e388c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 28 10:20:06 2017 +0100 Heavy cleanup of RRD-related file name handling. * Use std::filesystem::path instead of std::string where appropriate. * Centralize path calculations. * Only create a directory when necessary, fixing gitbug #2818. Change-Id: Ie7e541849be6cadc73886b197b696f2fd78b4497 --- .bugs/2818 | 6 ++++-- livestatus/src/pnp4nagios.cc | 7 +++---- livestatus/src/pnp4nagios.h | 7 +++++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.bugs/2818 b/.bugs/2818 index 65dbf4f..af50522 100644 --- a/.bugs/2818 +++ b/.bugs/2818 @@ -1,9 +1,9 @@ Title: Old host rrd directory is created even when using new one Component: core -State: open +Class: bug +State: done Date: 2016-04-05 17:04:56 Targetversion: 1.4.0 -Class: bug Unsure where the issue is located, but what happens is: @@ -19,3 +19,5 @@ for storing the RRD files. This is done by Perfdatabase::getPNPBase() which class makeDirectory(base). TODO(sp): Please investigate and clean this up. + +2017-02-28 14:39:53: changed state open -> done diff --git a/livestatus/src/pnp4nagios.cc b/livestatus/src/pnp4nagios.cc index 5f89127..c90d6c1 100644 --- a/livestatus/src/pnp4nagios.cc +++ b/livestatus/src/pnp4nagios.cc @@ -26,8 +26,7 @@ #include <cstddef> #ifdef CMC #include <sys/stat.h> -#endif -#ifndef CMC +#else #include <unistd.h> #endif @@ -69,8 +68,8 @@ int pnpgraph_present(const string& host, const string& service) { #endif #ifdef CMC -string rrd_path(const string& host, const string& service, - const string& varname) { +fs::path rrd_path(const string& host, const string& service, + const string& varname) { string pnp_path(g_pnp_path); if (pnp_path.empty()) { return ""; diff --git a/livestatus/src/pnp4nagios.h b/livestatus/src/pnp4nagios.h index a322ffd..5cfc496 100644 --- a/livestatus/src/pnp4nagios.h +++ b/livestatus/src/pnp4nagios.h @@ -27,6 +27,9 @@ #include "config.h" // IWYU pragma: keep #include <string> +#ifdef CMC +#include "FileSystem.h" +#endif std::string pnp_cleanup(const std::string& name); @@ -39,8 +42,8 @@ int pnpgraph_present(const std::string& host, // Determines if a RRD database exists and returns its path name. Returns an // empty string otherwise. This assumes paths created in the PNP4Nagios style // with storage type MULTIPLE. -std::string rrd_path(const std::string& host, const std::string& service, - const std::string& varname); +fs::path rrd_path(const std::string& host, const std::string& service, + const std::string& varname); #endif #endif // pnp4nagios_h

7 years, 7 months

4405 FIX Fixed setting custom times for timeperiod iCal import

by Lars Michelsen

Module: check_mk Branch: master Commit: 2d01d48123444e1e7e8430f064196008fd9a0a0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d01d48123444e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 28 13:48:23 2017 +0100 4405 FIX Fixed setting custom times for timeperiod iCal import Change-Id: I541fab59631d19a34e89049d42b7c61e140f5082 --- .werks/4405 | 11 +++++++++++ web/htdocs/wato.py | 10 +++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.werks/4405 b/.werks/4405 new file mode 100644 index 0000000..416a0d2 --- /dev/null +++ b/.werks/4405 @@ -0,0 +1,11 @@ +Title: Fixed setting custom times for timeperiod iCal import +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1488286064 + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 916c730..ca876f9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8786,11 +8786,11 @@ def mode_timeperiod_import_ical(phase): index += 1 html.set_var('except_%d_0' % index, event['date']) html.set_var('except_indexof_%d' % index, "%d" % index) - if ical['times']: - for n in range(3): - if ical['times'][n]: - html.set_var('except_%d_1_%d_from' % (index, n+1), ical['times'][n][0]) - html.set_var('except_%d_1_%d_until' % (index, n+1), ical['times'][n][1]) + for n, time_spec in enumerate(ical["times"]): + start_time = ":".join(map(str, time_spec[0])) + end_time = ":".join(map(str, time_spec[1])) + html.set_var('except_%d_1_%d_from' % (index, n), start_time) + html.set_var('except_%d_1_%d_until' % (index, n), end_time) return "edit_timeperiod" return

7 years, 7 months

New test for html generation.

by Roland Halbig

Module: check_mk Branch: master Commit: b33602277d38030b108a04298c34ce1c41b1042d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b33602277d3803… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Feb 28 13:42:19 2017 +0100 New test for html generation. Change-Id: I15f5472e4c8fbc4ce36c9068a36ddea66a850bb0 --- tests/web/test_generator.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tests/web/test_generator.py b/tests/web/test_generator.py index 553b990..ccc10ae 100644 --- a/tests/web/test_generator.py +++ b/tests/web/test_generator.py @@ -1,9 +1,11 @@ #!/usr/bin/python +# -*- coding: utf-8 -*- # call using # > py.test -s -k test_HTML_generator.py # external imports import re +import traceback # internal imports from htmllib import HTML, HTMLGenerator @@ -37,10 +39,22 @@ def test_HTMLGenerator(): html.close_table() assert tools.compare_html(html.drain(), "<table><tr><td>1</td><td>2</td></tr></table>") + a = u"\u2665" + print a + with html.plugged(): + assert html.render_a("test", href="www.test.case") + html.render_a(u"test", href="www.test.case") + html.render_a("test", href=u"www.test.case") + html.render_a(u"test", href=u"www.test.case") + try: + assert html.render_a(u"test", href=unicode("www.test.case"), id_=unicode("something"), class_=unicode("test_%s") % a) + except Exception, e: + print traceback.print_exc() + print e + def test_exception_handling(): html = HTMLGenerator() - html.plug() try: raise Exception("Test") except Exception, e:

7 years, 7 months

4403 FIX Fixed problem on diagnose page for distributed hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: c7cf2fa7c666541468238f34fa2f2bbda9a02dbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7cf2fa7c66654… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 28 11:41:16 2017 +0100 4403 FIX Fixed problem on diagnose page for distributed hosts An error "KeyError: '_state' could be shown in the "Ping" state container of the host diagnose page. Change-Id: Ibd81abf324391863812ae45975346e9cf8315a71 --- .werks/4403 | 11 +++++++++++ web/htdocs/watolib.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4403 b/.werks/4403 new file mode 100644 index 0000000..f6141e8 --- /dev/null +++ b/.werks/4403 @@ -0,0 +1,11 @@ +Title: Fixed problem on diagnose page for distributed hosts +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1488278389 +Class: fix + +An error "KeyError: '_state' could be shown in the "Ping" state container +of the host diagnose page. diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 16f5a59..06ae353 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -3533,7 +3533,7 @@ def sync_changes_before_remote_automation(site_id): timeout -= 0.5 state = manager.get_site_state(site_id) - if state["_state"] != "success": + if state and state["_state"] != "success": logger.error(_("Remote automation tried to sync pending changes but failed: %s") % state.get("_status_details"))

7 years, 7 months

Fixed logwatch "problematic logfile" list really skipping empty logfiles

by Lars Michelsen

Module: check_mk Branch: master Commit: 193555cb08b1708a582eb927f263340c0159fa3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=193555cb08b170… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 28 12:14:55 2017 +0100 Fixed logwatch "problematic logfile" list really skipping empty logfiles Change-Id: I1fb75e981f726fc39d4bce571718a8df6f12c704 --- web/htdocs/logwatch.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index b4975c9..7b91205 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -80,6 +80,8 @@ def show_log_list(): html.end_context_buttons() for site, host_name, logs in all_logs(): + if not logs: + continue html.h2(html.render_a(host_name, href=html.makeuri([('site', site), ('host', host_name)]))) list_logs(site, host_name, logs) html.footer()

7 years, 7 months

8751 netapp_api_systemtime: new check which monitors the age of Netapp devices

by Simon Betz

Module: check_mk Branch: master Commit: aa4228b6e543ba780b9d580f2563711ab82cd0f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa4228b6e543ba… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 24 16:31:47 2017 +0100 8751 netapp_api_systemtime: new check which monitors the age of Netapp devices Change-Id: I93739598be49d7c43780a65aeaed075e9ae8a185 --- .werks/8751 | 10 +++++ checkman/netapp_api_systemtime | 14 +++++++ checks/netapp_api_systemtime | 75 ++++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 22 +++++++++++ 4 files changed, 121 insertions(+) diff --git a/.werks/8751 b/.werks/8751 new file mode 100644 index 0000000..2fa4763 --- /dev/null +++ b/.werks/8751 @@ -0,0 +1,10 @@ +Title: netapp_api_system_time: new check which monitors the age of Netapp devices +Level: 1 +Component: checks +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1487835373 +Class: feature + + diff --git a/checkman/netapp_api_systemtime b/checkman/netapp_api_systemtime new file mode 100644 index 0000000..348f349 --- /dev/null +++ b/checkman/netapp_api_systemtime @@ -0,0 +1,14 @@ +title: NetApp Filer: Systemtime +agents: netapp +catalog: hw/storagehw/netapp +license: GPL +distribution: check_mk +description: + The check monitors the time difference between system and agent time for a NetApp filer. + There are no default levels set. You can configure upper levels for the time difference. + +item: + The node name. + +inventory: + One check is created for node. diff --git a/checks/netapp_api_systemtime b/checks/netapp_api_systemtime new file mode 100644 index 0000000..cafe43d --- /dev/null +++ b/checks/netapp_api_systemtime @@ -0,0 +1,75 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2017 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + + +# 7 mode +# <<<netapp_api_systemtime:sep(9)>>> +# name 76123 123 + +# Cluster mode +# <<<netapp_api_systemtime:sep(9)>>> +# node1 76123 123123 +# node2 7612311 123123 + + +def inventory_netapp_api_systemtime(info): + for line in info: + yield line[0], {} + + +def check_netapp_api_systemtime(item, params, info): + for line in info: + if line[0] == item: + agent_time = int(line[1]) + system_time = int(line[2]) + timediff = agent_time - system_time + warn, crit = params.get("levels", (None, None)) + + if crit is not None and timediff >= crit: + state = 2 + elif warn is not None and timediff >= warn: + state = 1 + else: + state = 0 + + infotext = "System time: %s, Time difference: %s" % \ + (get_timestamp_human_readable(system_time), + get_age_human_readable(timediff)) + + if state > 0: + infotext += " (warn/crit at %s/%s)" % ( + get_age_human_readable(warn), + get_age_human_readable(crit)) + + return state, infotext + + +check_info['netapp_api_systemtime'] = { + 'inventory_function' : inventory_netapp_api_systemtime, + 'check_function' : check_netapp_api_systemtime, + 'service_description' : 'Systemtime %s', + 'group' : 'netapp_systemtime' +} diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index a42d706..ba5a8bc 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3467,6 +3467,28 @@ register_check_parameters( ) register_check_parameters( + subgroup_applications, + "netapp_systemtime", + _("Netapp systemtime"), + Dictionary( + elements = [ + ( "levels", Tuple( + title = _("Set upper levels for the time difference"), + help = _("Here you can Set upper levels for the time difference " + "between agent and system time."), + elements = [ + Age(title = _("Warning if at")), + Age(title = _("Critical if at")), + ])), + ]), + TextAscii( + title = _("Name of the node"), + allow_empty = False, + ), + match_type = "dict", +) + +register_check_parameters( subgroup_applications, "jvm_sessions", _("JVM session count"),

7 years, 7 months

4402 FIX Fixed possible UnicodeEncodeError on service discovery page

by Lars Michelsen

Module: check_mk Branch: master Commit: 23fa74b3dddd0518022f2706e717c1c426f3b35e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23fa74b3dddd05… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 28 10:53:50 2017 +0100 4402 FIX Fixed possible UnicodeEncodeError on service discovery page Change-Id: If75e12c627fb3398781436332e5b6ce28bf59fb4 --- .werks/4402 | 10 ++++++++++ modules/automation.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4402 b/.werks/4402 new file mode 100644 index 0000000..785a095 --- /dev/null +++ b/.werks/4402 @@ -0,0 +1,10 @@ +Title: Fixed possible UnicodeEncodeError on service discovery page +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1488275610 +Class: fix + + diff --git a/modules/automation.py b/modules/automation.py index 27f3ca5..0380f0a 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -135,7 +135,7 @@ def do_automation(cmd, args): if cmk.debug.enabled(): raise else: - sys.stderr.write("%s\n" % e) + sys.stderr.write("%s\n" % make_utf8("%s" % e)) output_profile() sys.exit(2)

7 years, 7 months

4350 check_sql: Make database server to connect to configurable

by Konstantin Büttner

Module: check_mk Branch: master Commit: 44c24230ca021ce114fe908f85ff0a2b099e0bb2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44c24230ca021c… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Feb 28 10:42:33 2017 +0100 4350 check_sql: Make database server to connect to configurable Change-Id: I85d07742637a800db2a9064a8af856153dc9ede1 --- .werks/4350 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/4350 b/.werks/4350 new file mode 100644 index 0000000..87b6f2f --- /dev/null +++ b/.werks/4350 @@ -0,0 +1,10 @@ +Title: check_sql: Make database server to connect to configurable +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1488274925 +Class: feature + +

7 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017