Checkmk git commits September 2016

checkmk-commits@lists.checkmk.com

9 participants
301 discussions

3739 FIX: Fix exception in displaying check parameter of grouped interfaces

by Mathias Kettner

Module: check_mk Branch: master Commit: 9f24496d138761872b9c7f4736518d195295e804 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f24496d138761… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 29 17:21:18 2016 +0200 3739 FIX: Fix exception in displaying check parameter of grouped interfaces --- .werks/3739 | 12 ++++++++++++ ChangeLog | 1 + web/plugins/wato/check_parameters.py | 1 + 3 files changed, 14 insertions(+) diff --git a/.werks/3739 b/.werks/3739 new file mode 100644 index 0000000..96cb02f --- /dev/null +++ b/.werks/3739 @@ -0,0 +1,12 @@ +Title: Fix exception in displaying check parameter of grouped interfaces +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1475162057 + +In the list of services WATO would show an exception about an invalid +key <tt>aggr_item_member</tt>. This has been fixed and the parameter +is now correctly being displayed. diff --git a/ChangeLog b/ChangeLog index 8f999ab..d830312 100644 --- a/ChangeLog +++ b/ChangeLog @@ -650,6 +650,7 @@ * 3845 FIX: Added missing validation of host attribute values to WATO Web API calls * 3881 FIX: fixed automation call 'delete piggyback host' * 3738 FIX: Fixed sporadic pending changes due to (not) changed contact groups... + * 3739 FIX: Fix exception in displaying check parameter of grouped interfaces... Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index bd1da6e..65469a7 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -5543,6 +5543,7 @@ register_check_parameters( # Transform old traffic related levels which used "traffic" and "traffic_minimum" # keys where each was configured with an Alternative valuespec Transform(Dictionary( + ignored_keys = [ "aggr_member_item", "aggregate" ], # Created by discovery when using interface grouping elements = [ ( "errors", Alternative(

7 years, 11 months

Revert "3738 FIX Fixed sporadic pending changes due to (not)

by Mathias Kettner

changed contact groups" Message-ID: <57ed310f.CuSEjoMqTxO2ObRh%mk(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: f23f9b4006ebf755908b8b4506b973a7e5d3ddb8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f23f9b4006ebf7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 29 17:19:36 2016 +0200 Revert "3738 FIX Fixed sporadic pending changes due to (not) changed contact groups" This reverts commit cfb3ec965fa1c14f0bdbd8c409df37d88d684c07. --- ChangeLog | 552 -------------------------------------------------------------- 1 file changed, 552 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f23f9b4006…

7 years, 11 months

3738 FIX Fixed sporadic pending changes due to (not) changed contact groups

by Mathias Kettner

Module: check_mk Branch: master Commit: cfb3ec965fa1c14f0bdbd8c409df37d88d684c07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfb3ec965fa1c1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 29 17:18:35 2016 +0200 3738 FIX Fixed sporadic pending changes due to (not) changed contact groups The LDAP connector sometimes creates pending changes because of changed contact groups. But the groups have not really changed. Just the order of the groups in the answer from the LDAP server has changed. This has been fixed. Conflicts: .werks/3738 ChangeLog --- ChangeLog | 552 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 552 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cfb3ec965f…

7 years, 11 months

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: fae8af15238a4a4fb67e3d0cea046502de7176b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fae8af15238a4a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Sep 29 14:04:10 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/LogEntry.cc | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 3a69685..f2741ac 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -300,9 +300,13 @@ bool LogEntry::classifyLogMessage() { void LogEntry::applyWorkarounds() { if (_logclass == LOGCLASS_NOTIFICATION) { - // in notification messages the state is derived from the "state type". - // CUSTOM and DOWNTIME notifications have a different column order. This - // is as a bug, but we need to parse that anyway. + // The NotifyHelper class has a long, tragic history: Through a long + // series of commits, it suffered from spelling mistakes like + // "HOST_NOTIFICATION" or "HOST NOTIFICATION" (without a colon), + // parameter lists not matching the corresponding format strings, and + // last but not least wrong ordering of fields. The net result of this + // tragedy is that due to legacy reasons, we have to support parsing an + // incorrect ordering of "state type" and "command name" fields. :-P _state = (_svc_desc == nullptr) ? hostStateToInt(_state_type) : serviceStateToInt(_state_type); @@ -357,11 +361,14 @@ int LogEntry::serviceStateToInt(const char *s) { } const char *last = s + strlen(s) - 1; + // Ugly: Depending on where we're called, the actual state can be in + // parentheses at the end, e.g. "ALERTHANDLER (OK)". if (*last == ')') { last--; } - // WARNING, CRITICAL, OK, UNKNOWN, RECOVERY + // normal states: OK, WARNING, CRITICAL, UNKNOWN + // states from "... ALERT"/"... NOTIFICATION": RECOVERY switch (*last) { case 'K': return 0; @@ -384,12 +391,15 @@ int LogEntry::hostStateToInt(const char *s) { } const char *last = s + strlen(s) - 1; - if (*last == ')') { // handle CUSTOM (UP) and DOWNTIMESTOPPED (DOWN) and - // ALERTHANDLER (OK) + // Ugly: Depending on where we're called, the actual state can be in + // parentheses at the end, e.g. "ALERTHANDLER (OK)". + if (*last == ')') { last--; } - // UP, DOWN, UNREACHABLE, RECOVERY, OK, WARN, CRITICAL, UNKNOWN + // normal states: UP, DOWN, UNREACHABLE + // states from "... ALERT"/"... NOTIFICATION": RECOVERY + // states from "... ALERT HANDLER STOPPED": OK, WARNING, CRITICAL, UNKNOWN switch (*last) { case 'P': return 0;

7 years, 11 months

move agent bakery Web-API to cmc git

by Andreas Boesl

Module: check_mk Branch: master Commit: b2a75d460e8e085bd80823d0d847d1f8ca75ad8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2a75d460e8e08… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 29 13:47:24 2016 +0200 move agent bakery Web-API to cmc git --- web/plugins/webapi/webapi.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index 6ac6240..652020e 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -26,8 +26,6 @@ # TODO CLEANUP: Replace MKUserError by MKAPIError or something like that -import cmk - def validate_request_keys(request, valid_keys): for key in request.keys(): if key not in valid_keys: @@ -342,17 +340,3 @@ api_actions["activate_changes"] = { "locking" : True, } -def action_bake_agents(request): - try: - check_mk_local_automation('bake-agents') - last_bake_file = var_dir + "last_bake.mk" - file(last_bake_file, 'w').write('%s\n' % cmk.__version__) - return _("Successfully baked agents") - except Exception, e: - raise e - -api_actions["bake_agents"] = { - "handler" : action_bake_agents, - "locking" : True, -} -

7 years, 11 months

Trying to fix timing issue during testing

by Lars Michelsen

Module: check_mk Branch: master Commit: c21a2db2fb91331933c1ab2cf761d66f0ec9654e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c21a2db2fb9133… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 29 13:45:37 2016 +0200 Trying to fix timing issue during testing --- tests/mkeventd/test_mkeventd_status.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/mkeventd/test_mkeventd_status.py b/tests/mkeventd/test_mkeventd_status.py index efa1c12..824657b 100644 --- a/tests/mkeventd/test_mkeventd_status.py +++ b/tests/mkeventd/test_mkeventd_status.py @@ -27,6 +27,7 @@ def test_command_reload(site, ec, core): time.sleep(1) # needed to have at least one second after EC start live.command("[%d] EC_RELOAD" % (int(time.time()))) + time.sleep(1) # needed to have at least one second after EC reload new_t = live.query_value("GET eventconsolestatus\nColumns: status_config_load_time\n") assert new_t > old_t

7 years, 11 months

Fixed windows agent file test

by Lars Michelsen

Module: check_mk Branch: master Commit: 1c8ba8043fdd8f461f26b8f5d61ef96332eda923 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c8ba8043fdd8f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 29 13:13:54 2016 +0200 Fixed windows agent file test --- tests/agents/windows/test_precompiled_age.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/agents/windows/test_precompiled_age.py b/tests/agents/windows/test_precompiled_age.py index 12af334..04ac4ba 100644 --- a/tests/agents/windows/test_precompiled_age.py +++ b/tests/agents/windows/test_precompiled_age.py @@ -28,7 +28,7 @@ def test_precompiled_file_ages(): for filename in precompiled_files: path = "%s/agents/windows/%s" % (cmk_path(), filename) commit_time = last_commit_time(path) - assert commit_time > newest_source_time, \ + assert commit_time >= newest_source_time, \ "%s is older than source code file %s" % (path, newest_source_file)

7 years, 11 months

3816 FIX WATO-Web API: fixed bug in API request validation

by Andreas Boesl

Module: check_mk Branch: master Commit: f5bf7532d48692c6dccef7197c6fcad93089577b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5bf7532d48692… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 29 13:04:27 2016 +0200 3816 FIX WATO-Web API: fixed bug in API request validation Recent code changes did not consider that only the keys of the request object itself got validated. The validiation function now got feeded with some additional keys, e.g effective_attributes, didn't accept these keys and returned an "Invalid request" as result. This has been fixed. --- .werks/3816 | 14 ++++++++++++++ ChangeLog | 1 + web/plugins/webapi/webapi.py | 8 +++++--- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.werks/3816 b/.werks/3816 new file mode 100644 index 0000000..e351c21 --- /dev/null +++ b/.werks/3816 @@ -0,0 +1,14 @@ +Title: WATO-Web API: fixed bug in API request validation +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1475146794 +Class: fix + +Recent code changes did not consider that only the keys of the request +object itself got validated. The validiation function now got feeded with +some additional keys, e.g effective_attributes, didn't accept these keys +and returned an "Invalid request" as result. + +This has been fixed. diff --git a/ChangeLog b/ChangeLog index 4755c6b..8f999ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -417,6 +417,7 @@ * 3814 FIX: win_netstat: fixed unicode warning while parsing data * 3880 FIX: check_sql: fixed missing number in check details * 3815 FIX: windows_agent: fixed incorrect parsing of only_from parameter... + * 3816 FIX: WATO-Web API: fixed bug in API request validation... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index 1233b20..6ac6240 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -78,7 +78,7 @@ def validate_host_attributes(attributes): def action_add_host(request): - validate_request_keys(request, ["hostname", "folder", "attributes", "nodes"]) + validate_request_keys(request, ["hostname", "folder", "attributes", "nodes", "create_folders"]) if html.var("create_folders"): create_folders = bool(int(html.var("create_folders"))) @@ -175,7 +175,7 @@ api_actions["edit_host"] = { ############### def action_get_host(request): - validate_request_keys(request, ["hostname"]) + validate_request_keys(request, ["hostname", "effective_attributes"]) hostname = request.get("hostname") if not hostname: @@ -203,6 +203,8 @@ api_actions["get_host"] = { ############### def action_get_all_hosts(request): + validate_request_keys(request, ["effective_attributes"]) + if html.var("effective_attributes"): effective_attributes = bool(int(html.var("effective_attributes"))) else: @@ -295,7 +297,7 @@ api_actions["discover_services"] = { ############### def action_activate_changes(request): - validate_request_keys(request, ["sites"]) + validate_request_keys(request, ["modes", "sites"]) mode = html.var("mode") and html.var("mode") or "dirty" if html.var("allow_foreign_changes"):

7 years, 11 months

3815 FIX windows_agent: fixed incorrect parsing of only_from parameter

by Andreas Boesl

Module: check_mk Branch: master Commit: 96bbc5fa2fc051753a728a7001336fb6a12ac987 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96bbc5fa2fc051… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 29 12:22:42 2016 +0200 3815 FIX windows_agent: fixed incorrect parsing of only_from parameter only_from needs to be configured like this: only_from = 127.0.0.1 191.15.12.23 10.1.1.139 --- .werks/3815 | 11 +++++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1323008 -> 1324544 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15346336 -> 15365686 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1323008 -> 1324544 bytes agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 1297408 -> 1299456 bytes agents/windows/check_mk_agent.msi | Bin 2890240 -> 2893824 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13270746 -> 13295415 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1297408 -> 1299456 bytes agents/windows/install_agent-64.exe | Bin 584188 -> 584735 bytes agents/windows/install_agent.exe | Bin 580926 -> 581433 bytes agents/windows/sections/SectionCheckMK.h | 2 +- 14 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/3815 b/.werks/3815 new file mode 100644 index 0000000..85af9b0 --- /dev/null +++ b/.werks/3815 @@ -0,0 +1,11 @@ +Title: windows_agent: fixed incorrect parsing of only_from parameter +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1475144502 +Class: fix + +only_from needs to be configured like this: + +only_from = 127.0.0.1 191.15.12.23 10.1.1.139 diff --git a/ChangeLog b/ChangeLog index 58adf3b..4755c6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -416,6 +416,7 @@ * 3890 FIX: check_mk_agent.openbsd: Fixed broken MRPE checks * 3814 FIX: win_netstat: fixed unicode warning while parsing data * 3880 FIX: check_sql: fixed missing number in check details + * 3815 FIX: windows_agent: fixed incorrect parsing of only_from parameter... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/windows/build_version b/agents/windows/build_version index cf7d7d1..6fce670 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2087 +2103 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 9c7f963..aec1135 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index bea4148..9d5ab34 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 529be0c..aa8daf5 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 68f7710..119bff1 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -160,7 +160,7 @@ struct GlobalConfig { Configurable<bool> encrypted_rt; Configurable<bool> support_ipv6; Configurable<std::string> passphrase; - ListConfigurable<only_from_t, BlockMode::FileExclusive<only_from_t>> + SplittingListConfigurable<only_from_t, BlockMode::FileExclusive<only_from_t>> only_from; GlobalConfig(const Environment &env) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 7b6af7b..5e20dcf 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 93699a4..48608e1 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index 32c613b..14507a0 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 4344e08..2b73072 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index b1002c8..484b236 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index d671fa7..ac7994f 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/sections/SectionCheckMK.h b/agents/windows/sections/SectionCheckMK.h index 457d39d..b55dca2 100644 --- a/agents/windows/sections/SectionCheckMK.h +++ b/agents/windows/sections/SectionCheckMK.h @@ -32,7 +32,7 @@ class Environment; class SectionCheckMK : public Section { Configurable<bool> _crash_debug; - ListConfigurable<only_from_t, BlockMode::FileExclusive<only_from_t>> + SplittingListConfigurable<only_from_t, BlockMode::FileExclusive<only_from_t>> _only_from; typedef std::pair<const char *, std::string> KVPair;

7 years, 11 months

Another small failed notification styling cleanup

by Lars Michelsen

Module: check_mk Branch: master Commit: 0765ce70cb06022694832cc790b934e2694db469 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0765ce70cb0602… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 29 12:15:54 2016 +0200 Another small failed notification styling cleanup --- web/htdocs/notifications.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/notifications.py b/web/htdocs/notifications.py index a84fedd..7147ae3 100644 --- a/web/htdocs/notifications.py +++ b/web/htdocs/notifications.py @@ -124,9 +124,9 @@ def render_notification_table(failed_notifications): table.end() +# TODO: We should really recode this to use the view and a normal view command / action def render_page_confirm(acktime, prev_url, failed_notifications): - html.set_render_headfoot(False) - html.header(_("Confirm"), javascripts=[], stylesheets=[ "pages", "check_mk" ]) + html.header(_("Confirm failed notifications"), javascripts=[], stylesheets=[ "pages", "check_mk" ]) html.write('<div class="really">\n') html.write(_("Do you really want to acknowledge all failed notifications up to %s?") %\ lib.datetime_human_readable(acktime)) @@ -140,6 +140,7 @@ def render_page_confirm(acktime, prev_url, failed_notifications): html.footer() +# TODO: We should really recode this to use the view and a normal view command / action def render_page_done(): html.set_render_headfoot(False) html.header(_("Confirm"), javascripts=[], stylesheets=[ "pages", "check_mk" ])

7 years, 11 months

← Newer
1
2
3
4
5
6
7
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2016