Checkmk git commits May 2017

checkmk-commits@lists.checkmk.com

12 participants
254 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 440e71f04cb9bc3afd7e1f2daa4348d7abac8f4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=440e71f04cb9bc… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue May 9 12:12:41 2017 +0200 Make clang-tidy happy again. Change-Id: I0a0caa9598a2083dd0f60957ce1a29e81823e467 --- livestatus/src/TableHostGroups.cc | 15 +++++++-------- livestatus/src/TableServiceGroups.cc | 15 +++++++-------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/livestatus/src/TableHostGroups.cc b/livestatus/src/TableHostGroups.cc index 8ec8fe5..9c96e6a 100644 --- a/livestatus/src/TableHostGroups.cc +++ b/livestatus/src/TableHostGroups.cc @@ -202,14 +202,13 @@ bool TableHostGroups::isAuthorized(Row row, contact *ctc) { } } return false; - } else { - // TODO(sp) Need an iterator here, "strict" means "all_of" - for (hostsmember *mem = rowData<hostgroup>(row)->members; - mem != nullptr; mem = mem->next) { - if (!has_contact(mem)) { - return false; - } + } + // TODO(sp) Need an iterator here, "strict" means "all_of" + for (hostsmember *mem = rowData<hostgroup>(row)->members; mem != nullptr; + mem = mem->next) { + if (!has_contact(mem)) { + return false; } - return true; } + return true; } diff --git a/livestatus/src/TableServiceGroups.cc b/livestatus/src/TableServiceGroups.cc index b4598fc..9c5211e 100644 --- a/livestatus/src/TableServiceGroups.cc +++ b/livestatus/src/TableServiceGroups.cc @@ -165,14 +165,13 @@ bool TableServiceGroups::isAuthorized(Row row, contact *ctc) { } } return false; - } else { - // TODO(sp) Need an iterator here, "strict" means "all_of" - for (servicesmember *mem = rowData<servicegroup>(row)->members; - mem != nullptr; mem = mem->next) { - if (!has_contact(mem)) { - return false; - } + } + // TODO(sp) Need an iterator here, "strict" means "all_of" + for (servicesmember *mem = rowData<servicegroup>(row)->members; + mem != nullptr; mem = mem->next) { + if (!has_contact(mem)) { + return false; } - return true; } + return true; }

7 years, 4 months

4475 FIX Windows Agent: Agent shutdown no longer stalls while plugin is running

by Andreas Boesl

Module: check_mk Branch: master Commit: 61a69fa84c7cb7db6cfe8abb7d8214b2992280cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61a69fa84c7cb7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue May 9 11:30:38 2017 +0200 4475 FIX Windows Agent: Agent shutdown no longer stalls while plugin is running The agent did not stop any running plugins when the shutdown command was issued and waited for their completion. A "net stop check_mk_agent" could fail because of this behaviour. The agent updater suffered from this too, because the MSI installer failed to stop the service in time. Change-Id: I3ad284ccf9fb6ad9c7dd676b3efa919df60d7fa6 --- .werks/4475 | 12 ++++++++++++ agents/windows/OutputProxy.cc | 1 - agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1339392 -> 1339392 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15811066 -> 15811578 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1339392 -> 1339392 bytes agents/windows/check_mk_agent.cc | 4 +++- agents/windows/check_mk_agent.exe | Bin 1316864 -> 1316864 bytes agents/windows/check_mk_agent.msi | Bin 2926080 -> 2926080 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13671970 -> 13671970 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1316864 -> 1316864 bytes agents/windows/crash.exe | Bin 101624 -> 101624 bytes agents/windows/install_agent-64.exe | Bin 591608 -> 591609 bytes agents/windows/install_agent.exe | Bin 589024 -> 589028 bytes agents/windows/nowin.exe | Bin 103760 -> 103760 bytes agents/windows/plugins/mk_logwatch.exe | Bin 4555413 -> 4563948 bytes 16 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.werks/4475 b/.werks/4475 new file mode 100644 index 0000000..366b20e --- /dev/null +++ b/.werks/4475 @@ -0,0 +1,12 @@ +Title: Windows Agent: Agent shutdown no longer stalls while plugin is running +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1494321863 +Class: fix + +The agent did not stop any running plugins when the shutdown command was issued +and waited for their completion. A "net stop check_mk_agent" could fail because of this behaviour. +The agent updater suffered from this too, because the MSI installer failed to stop the service in time. diff --git a/agents/windows/OutputProxy.cc b/agents/windows/OutputProxy.cc index 8317943..38287ce 100644 --- a/agents/windows/OutputProxy.cc +++ b/agents/windows/OutputProxy.cc @@ -76,7 +76,6 @@ void BufferedSocketProxy::output(const char *format, ...) { _length += written_len; } - void BufferedSocketProxy::writeBinary(const char *buffer, size_t size) { size_t target_size = _length + size + 1; if (_buffer.size() < target_size) { diff --git a/agents/windows/build_version b/agents/windows/build_version index fd5e1fa..4633262 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2659 +2663 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index be87804..d3a9573 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 177b4a9..0891779 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 59030a6..0a9551c 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 b56b7be..5654756 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -239,6 +239,7 @@ void foreach_enabled_section(bool realtime, TCHAR *gszServiceName = (TCHAR *)TEXT(SERVICE_NAME); SERVICE_STATUS serviceStatus; SERVICE_STATUS_HANDLE serviceStatusHandle = 0; +void stop_threads(); void WINAPI ServiceControlHandler(DWORD controlCode) { switch (controlCode) { @@ -248,6 +249,7 @@ void WINAPI ServiceControlHandler(DWORD controlCode) { case SERVICE_CONTROL_SHUTDOWN: case SERVICE_CONTROL_STOP: g_should_terminate = true; + stop_threads(); serviceStatus.dwCurrentState = SERVICE_STOP_PENDING; SetServiceStatus(serviceStatusHandle, &serviceStatus); return; @@ -429,7 +431,7 @@ void stop_threads() { // just check the script_container status foreach_enabled_section(false, [&thread_handles](Section *section) { std::vector<HANDLE> temp = section->stopAsync(); - thread_handles.insert(temp.begin(), temp.end(), thread_handles.end()); + thread_handles.insert(thread_handles.end(), temp.begin(), temp.end()); }); WaitForMultipleObjects(thread_handles.size(), &thread_handles[0], TRUE, diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index cc0a487..1f699ac 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 2435328..a7a3f27 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 bf42672..b0da6dc 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 bfd2bdb..10251ff 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/crash.exe b/agents/windows/crash.exe index 8892763..c40e5e5 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 3a9fa82..41eb2d7 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 7967a77..030b11e 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 5932127..7d41981 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ diff --git a/agents/windows/plugins/mk_logwatch.exe b/agents/windows/plugins/mk_logwatch.exe index 1f18d82..8d1119b 100755 Binary files a/agents/windows/plugins/mk_logwatch.exe and b/agents/windows/plugins/mk_logwatch.exe differ

7 years, 4 months

4686 FIX FIX Fixed "loose" authorization for hostgroups/

by Sven Panne

servicegroups tables in NEB Message-ID: <591180ba.OCHVwdkyTvWRbebu%sp(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: df707d7cdff5915d49f32ae691228c9da64b7391 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df707d7cdff591… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue May 9 10:34:26 2017 +0200 4686 FIX FIX Fixed "loose" authorization for hostgroups/servicegroups tables in NEB The "loose" authorization mode for hostgroups/servicegroups tables was effectively non-existent: It always authorized all contacts. This has been fixed, so you see only the intended rows now. Note that this only affected the NEB, not the Check_MK Micro Core. Change-Id: I51cea655c5851478624cabeea3b39666ddc52fa8 --- .werks/4686 | 13 +++++++++++++ livestatus/src/TableHostGroups.cc | 28 +++++++++++++++++++--------- livestatus/src/TableServiceGroups.cc | 27 +++++++++++++++++++-------- 3 files changed, 51 insertions(+), 17 deletions(-) diff --git a/.werks/4686 b/.werks/4686 new file mode 100644 index 0000000..7c314df --- /dev/null +++ b/.werks/4686 @@ -0,0 +1,13 @@ +Title: FIX Fixed "loose" authorization for hostgroups/servicegroups tables in NEB +Level: 1 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1494318466 +Class: fix + +The "loose" authorization mode for hostgroups/servicegroups tables was +effectively non-existent: It always authorized all contacts. This has been +fixed, so you see only the intended rows now. Note that this only affected +the NEB, not the Check_MK Micro Core. diff --git a/livestatus/src/TableHostGroups.cc b/livestatus/src/TableHostGroups.cc index f6786ac..8ec8fe5 100644 --- a/livestatus/src/TableHostGroups.cc +++ b/livestatus/src/TableHostGroups.cc @@ -190,16 +190,26 @@ bool TableHostGroups::isAuthorized(Row row, contact *ctc) { return false; } - auto hg = rowData<hostgroup>(row); - for (hostsmember *mem = hg->members; mem != nullptr; mem = mem->next) { - host *hst = mem->host_ptr; - bool is = is_authorized_for(ctc, hst, nullptr); - if (is && g_group_authorization == AuthorizationKind::loose) { - return true; + auto has_contact = [=](hostsmember *mem) { + return is_authorized_for(ctc, mem->host_ptr, nullptr); + }; + if (g_group_authorization == AuthorizationKind::loose) { + // TODO(sp) Need an iterator here, "loose" means "any_of" + for (hostsmember *mem = rowData<hostgroup>(row)->members; + mem != nullptr; mem = mem->next) { + if (has_contact(mem)) { + return true; + } } - if (!is && g_group_authorization == AuthorizationKind::strict) { - return false; + return false; + } else { + // TODO(sp) Need an iterator here, "strict" means "all_of" + for (hostsmember *mem = rowData<hostgroup>(row)->members; + mem != nullptr; mem = mem->next) { + if (!has_contact(mem)) { + return false; + } } + return true; } - return true; } diff --git a/livestatus/src/TableServiceGroups.cc b/livestatus/src/TableServiceGroups.cc index 8392319..b4598fc 100644 --- a/livestatus/src/TableServiceGroups.cc +++ b/livestatus/src/TableServiceGroups.cc @@ -152,16 +152,27 @@ bool TableServiceGroups::isAuthorized(Row row, contact *ctc) { return false; } - auto sg = rowData<servicegroup>(row); - for (servicesmember *mem = sg->members; mem != nullptr; mem = mem->next) { + auto has_contact = [=](servicesmember *mem) { service *svc = mem->service_ptr; - bool is = is_authorized_for(ctc, svc->host_ptr, svc); - if (is && g_group_authorization == AuthorizationKind::loose) { - return true; + return is_authorized_for(ctc, svc->host_ptr, svc); + }; + if (g_group_authorization == AuthorizationKind::loose) { + // TODO(sp) Need an iterator here, "loose" means "any_of" + for (servicesmember *mem = rowData<servicegroup>(row)->members; + mem != nullptr; mem = mem->next) { + if (has_contact(mem)) { + return true; + } } - if (!is && g_group_authorization == AuthorizationKind::strict) { - return false; + return false; + } else { + // TODO(sp) Need an iterator here, "strict" means "all_of" + for (servicesmember *mem = rowData<servicegroup>(row)->members; + mem != nullptr; mem = mem->next) { + if (!has_contact(mem)) { + return false; + } } + return true; } - return true; }

7 years, 4 months

Re: [checkmk-commits] (no subject)

by Jennifer Lankford

Hi , Get your low interest loans today. with interest rate as low as 8% per annum we're hard to beat bad credit score? no problem! we have a solution for everyone. just send us an email to: jennylan388(a)gmail.com for more information.

7 years, 4 months

Reserved 10 Werk IDS

by Sven Panne

Module: check_mk Branch: master Commit: 27b7e4d438bfa00c8b90791420cfa3cab0dbbd95 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27b7e4d438bfa0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue May 9 10:24:10 2017 +0200 Reserved 10 Werk IDS Change-Id: Ib6156db56ab55b6b7ac1dda52ddd5d9c680727f5 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 9621386..74e2914 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4686 +4696

7 years, 4 months

IWYU fixes, 2nd attempt.

by Sven Panne

Module: check_mk Branch: master Commit: 095855b821a3aacd8419f79992321a5db4f7918c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=095855b821a3aa… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue May 9 09:06:24 2017 +0200 IWYU fixes, 2nd attempt. Change-Id: I3ed036066bb2117359bd4be6a586d13e0134ab26 --- livestatus/src/TableStateHistory.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 92197af..ea4edcf 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -25,6 +25,7 @@ #include "TableStateHistory.h" #include <cstdlib> #include <cstring> +#include <ctime> #include <deque> #include <memory> #include <mutex>

7 years, 4 months

4666 FIX Fixed ineffective rulesets page showing empty rulesets

by Lars Michelsen

Module: check_mk Branch: master Commit: 76cfaab71492eac7f3cfc30c7aa90794500ef1c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76cfaab71492ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 8 17:10:37 2017 +0200 4666 FIX Fixed ineffective rulesets page showing empty rulesets Change-Id: If51629457ef2fa64e1a96c7a154d0679f3d74f7c --- .werks/4666 | 10 ++++++++++ web/htdocs/watolib.py | 12 +++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.werks/4666 b/.werks/4666 new file mode 100644 index 0000000..f96dd8f --- /dev/null +++ b/.werks/4666 @@ -0,0 +1,10 @@ +Title: Fixed ineffective rulesets page showing empty rulesets +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1494256201 +Class: fix + + diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index ec684c9..db5e09a 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -6665,11 +6665,17 @@ class Ruleset(object): if rule.matches_search(search_options): self.search_matching_rules.append(rule) - if not self.search_matching_rules: - return self.matches_fulltext_search(search_options) - else: + # Show all rulesets where at least one rule matched + if self.search_matching_rules: return True + # e.g. in case ineffective rules are searched and no fulltext + # search is filled in: Then don't show empty rulesets. + if not search_options.get("fulltext"): + return False + + return self.matches_fulltext_search(search_options) + def has_rule_search_options(self, search_options): return bool([ k for k in search_options.keys() if k == "fulltext" or k.startswith("rule_") ])

7 years, 4 months

4474 FIX graphs for fileinfo checks: the size value was displayed without unit information

by Andreas Boesl

Module: check_mk Branch: master Commit: 70c70691f3ca3be9f8423e570a9f7195ec0bccd6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70c70691f3ca3b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon May 8 17:11:50 2017 +0200 4474 FIX graphs for fileinfo checks: the size value was displayed without unit information Change-Id: Ia67620f903d5582e10580341882edbff355b12cf --- .werks/4474 | 10 ++++++++++ web/plugins/metrics/check_mk.py | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/.werks/4474 b/.werks/4474 new file mode 100644 index 0000000..dc07287 --- /dev/null +++ b/.werks/4474 @@ -0,0 +1,10 @@ +Title: graphs for fileinfo checks: the size value was displayed without unit information +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1494256217 +Class: fix + + diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index fae8c2c..cfc24a0 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -429,6 +429,12 @@ metric_info["zfs_l2_size"] = { "color" : "31/a", } +metric_info["file_size"] = { + "title" : _("File size"), + "unit" : "bytes", + "color" : "16/a", +} + # database, tablespace metric_info["database_size"] = { @@ -4572,6 +4578,10 @@ check_metrics["check_mk-postgres_sessions"] = { "running": {"name": "running_sessions"} } +check_metrics["check_mk-fileinfo"] = { + "size" : { "name" : "file_size" } +} + check_metrics["check_mk-postgres_stat_database.size"] = { "size" : { "name" : "database_size"} }

7 years, 4 months

Fixed broken html.debug

by Lars Michelsen

Module: check_mk Branch: master Commit: 062b34a00295db7b143494828437c5c6d8e8de6e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=062b34a00295db… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 8 16:31:19 2017 +0200 Fixed broken html.debug Change-Id: I2a9e6de1d44f2d8cd403c33682623a41897e65c0 --- web/htdocs/htmllib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 244c921..d33bf8b 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1689,7 +1689,7 @@ class html(HTMLGenerator, RequestHandler): formatted = pprint.pformat(element) except UnicodeDecodeError: formatted = repr(element) - self.lowlevel_write(self.render_pre(formatted)) + self.lowlevel_write("%s" % self.render_pre(formatted)) def log(self, *args):

7 years, 4 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: ba671fe4db44668bfdff95c6d03a49d0a165cfe8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba671fe4db4466… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 8 17:09:51 2017 +0200 Reserved 20 Werk IDS Change-Id: If9cfcd45aa08075b58d16c2e495e94987cb961a1 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index e8f0acd..9621386 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4666 +4686

7 years, 4 months

← Newer
1
...
19
20
21
22
23
24
25
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2017