Checkmk git commits December 2017

checkmk-commits@lists.checkmk.com

10 participants
219 discussions

Fixed saving of owned views (that have no builtin view with equal name) - regression in #5529

by Lars Michelsen

Module: check_mk Branch: master Commit: c1b5ef01b63c707a4082273ccfcbf660c87f8c6d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1b5ef01b63c70… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 5 14:07:37 2017 +0100 Fixed saving of owned views (that have no builtin view with equal name) - regression in #5529 Change-Id: Ie44999e71a9ffff03f67e99ebb88a86445144e6e --- web/htdocs/visuals.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 93ac934..3ca54e2 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -854,7 +854,8 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, html.begin_form("visual", method = "POST") html.hidden_field("back", back_url) html.hidden_field("mode", mode) - html.hidden_field("load_user", html.var("load_user", "")) # safe old name in case user changes it + if html.has_var("load_user"): + html.hidden_field("load_user", html.var("load_user")) # safe old name in case user changes it html.hidden_field("load_name", oldname) # safe old name in case user changes it # FIXME: Hier werden die Flags aus visibility nicht korrekt geladen. Wäre es nicht besser,

6 years, 9 months

add WK 5250

by Andreas Boesl

Module: check_mk Branch: master Commit: 298902e146958d744767f63160bac2b727820f9e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=298902e146958d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Dec 5 13:24:22 2017 +0100 add WK 5250 Change-Id: I2e65abddca7d1aa4451e70ef68baadad8727d607 --- .werks/5250 | 13 +++++++++++++ web/htdocs/htmllib.py | 5 +++++ web/htdocs/watolib.py | 7 +++++++ 3 files changed, 25 insertions(+) diff --git a/.werks/5250 b/.werks/5250 new file mode 100644 index 0000000..dd54eb0 --- /dev/null +++ b/.werks/5250 @@ -0,0 +1,13 @@ +Title: Fixed tmpfs full issue: Activate Changes did not cleanup all temporary files +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i2 +Date: 1512476335 + +The WATO work directory <tt>~/tmp/check_mk/wato</tt> could grow in size, +whenever an unexpected exception happened during the activate changes process. + diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index f5f3cb1..65bcfdb 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1655,6 +1655,11 @@ class html(HTMLGenerator, RequestHandler): raise NotImplementedError() + def get_request_timeout(self): + return self._request_timeout + + + # # Messages # diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 0ae5eba..44ad842 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4901,6 +4901,13 @@ class ActivateChangesManager(ActivateChanges): for site_id in self._sites: site_state = state["sites"][site_id] + + # The site_state file may be missing/empty, if the operation has started recently. + # However, if the file is still missing after a considerable amount + # of time, we consider this site activation as dead + if site_state == {} and time.time() - self._time_started > html.get_request_timeout() - 10: + continue + if site_state == {} or site_state["_phase"] == PHASE_INITIALIZED: # Just been initialized. Treat as running as it has not been # started and could not lock the site stat file yet.

6 years, 9 months

Fixed string value restrictions for disjunctions.

by Sven Panne

Module: check_mk Branch: master Commit: 0a0265a98e5e432e345f369b2c3355c0d058e7be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a0265a98e5e43… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Dec 4 13:23:58 2017 +0100 Fixed string value restrictions for disjunctions. Change-Id: I232117d7f354935e4608651c77fabfb19cd53f8f --- livestatus/src/OringFilter.cc | 17 +++++++++++++++++ livestatus/src/OringFilter.h | 2 ++ 2 files changed, 19 insertions(+) diff --git a/livestatus/src/OringFilter.cc b/livestatus/src/OringFilter.cc index 3223f73..275540c 100644 --- a/livestatus/src/OringFilter.cc +++ b/livestatus/src/OringFilter.cc @@ -42,6 +42,23 @@ bool OringFilter::accepts(Row row, const contact *auth_user, return false; } +const std::string *OringFilter::stringValueRestrictionFor( + const std::string &column_name) const { + const std::string *restriction = nullptr; + for (const auto &filter : _subfilters) { + if (auto current = filter->stringValueRestrictionFor(column_name)) { + if (restriction == nullptr) { + restriction = current; // First restriction? Take it. + } else if (*restriction != *current) { + return nullptr; // Different restrictions? Give up. + } + } else { + return nullptr; // No restriction for subfilter? Give up. + } + } + return restriction; +} + void OringFilter::findIntLimits(const std::string &colum_nname, int *lower, int *upper, std::chrono::seconds timezone_offset) const { diff --git a/livestatus/src/OringFilter.h b/livestatus/src/OringFilter.h index 2641e7b..52d1696 100644 --- a/livestatus/src/OringFilter.h +++ b/livestatus/src/OringFilter.h @@ -44,6 +44,8 @@ public: void accept(FilterVisitor &v) const override; bool accepts(Row row, const contact *auth_user, std::chrono::seconds timezone_offset) const override; + const std::string *stringValueRestrictionFor( + const std::string &column_name) const override; void findIntLimits(const std::string &colum_nname, int *lower, int *upper, std::chrono::seconds timezone_offset) const override; bool optimizeBitmask(const std::string &column_name, uint32_t *mask,

6 years, 9 months

Improved logging.

by Sven Panne

Module: check_mk Branch: master Commit: b475243e07e4e7de011351d1a28e335ad642d3ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b475243e07e4e7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Dec 4 13:59:35 2017 +0100 Improved logging. Change-Id: Id707c7eda9c45be90d88ed971e41cef2d54b32fb --- livestatus/src/TableHosts.cc | 4 ++++ livestatus/src/TableServices.cc | 15 +++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index 245376d..d49d519 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -24,6 +24,7 @@ #include "TableHosts.h" #include <memory> +#include <ostream> #include "AttributeListAsIntColumn.h" #include "AttributeListColumn.h" #include "Column.h" @@ -43,6 +44,7 @@ #include "HostListColumn.h" #include "HostSpecialDoubleColumn.h" #include "HostSpecialIntColumn.h" +#include "Logger.h" #include "LogwatchListColumn.h" #include "MetricsColumn.h" #include "MonitoringCore.h" @@ -643,6 +645,7 @@ void TableHosts::addColumns(Table *table, const std::string &prefix, void TableHosts::answerQuery(Query *query) { // do we know the host group? if (const std::string *value = query->stringValueRestrictionFor("groups")) { + Debug(logger()) << "using host group index with '" << *value << "'"; if (hostgroup *hg = find_hostgroup(const_cast<char *>(value->c_str()))) { for (hostsmember *mem = hg->members; mem != nullptr; @@ -656,6 +659,7 @@ void TableHosts::answerQuery(Query *query) { } // no index -> linear search over all hosts + Debug(logger()) << "using full table scan"; for (host *hst = host_list; hst != nullptr; hst = hst->next) { if (!query->processDataset(Row(hst))) { break; diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index 3245a92..2558747 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -24,6 +24,7 @@ #include "TableServices.h" #include <memory> +#include <ostream> #include <utility> #include "AttributeListAsIntColumn.h" #include "AttributeListColumn.h" @@ -37,6 +38,7 @@ #include "CustomVarsValuesColumn.h" #include "DowntimeColumn.h" #include "FixedIntColumn.h" +#include "Logger.h" #include "MetricsColumn.h" #include "OffsetDoubleColumn.h" #include "OffsetIntColumn.h" @@ -468,6 +470,7 @@ void TableServices::answerQuery(Query *query) { // do we know the host? if (const std::string *value = query->stringValueRestrictionFor("host_name")) { + Debug(logger()) << "using host name index with '" << *value << "'"; // Older Nagios headers are not const-correct... :-P if (host *host = find_host(const_cast<char *>(value->c_str()))) { for (servicesmember *m = host->services; m != nullptr; @@ -481,9 +484,10 @@ void TableServices::answerQuery(Query *query) { } // do we know the service group? - if (const std::string *name = query->stringValueRestrictionFor("groups")) { + if (const std::string *value = query->stringValueRestrictionFor("groups")) { + Debug(logger()) << "using service group index with '" << *value << "'"; if (servicegroup *sg = - find_servicegroup(const_cast<char *>(name->c_str()))) { + find_servicegroup(const_cast<char *>(value->c_str()))) { for (servicesmember *m = sg->members; m != nullptr; m = m->next) { if (!query->processDataset(Row(m->service_ptr))) { break; @@ -494,9 +498,11 @@ void TableServices::answerQuery(Query *query) { } // do we know the host group? - if (const std::string *name = + if (const std::string *value = query->stringValueRestrictionFor("host_groups")) { - if (hostgroup *hg = find_hostgroup(const_cast<char *>(name->c_str()))) { + Debug(logger()) << "using host group index with '" << *value << "'"; + if (hostgroup *hg = + find_hostgroup(const_cast<char *>(value->c_str()))) { for (hostsmember *m = hg->members; m != nullptr; m = m->next) { for (servicesmember *smem = m->host_ptr->services; smem != nullptr; smem = smem->next) { @@ -510,6 +516,7 @@ void TableServices::answerQuery(Query *query) { } // no index -> iterator over *all* services + Debug(logger()) << "using full table scan"; for (service *svc = service_list; svc != nullptr; svc = svc->next) { if (!query->processDataset(Row(svc))) { break;

6 years, 9 months

5468 FIX Fixed indexing with disjunctions.

by Sven Panne

Module: check_mk Branch: master Commit: 5dea33978d77ad4fac287a457ccf6ae7197454cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5dea33978d77ad… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Dec 4 14:15:30 2017 +0100 5468 FIX Fixed indexing with disjunctions. To speed things up, livestatus tries to use an index when accessing the 'hosts' and 'services' tables, but there was a bug when a disjunction ('Or:') was used in filters, leading to too few results. This has been fixed. Change-Id: I056e6003a65773463d276a131423b34ace75e3ed --- .werks/5468 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/5468 b/.werks/5468 new file mode 100644 index 0000000..7f1f0b8 --- /dev/null +++ b/.werks/5468 @@ -0,0 +1,13 @@ +Title: Fixed indexing with disjunctions. +Level: 1 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1512393115 +Class: fix + +To speed things up, livestatus tries to use an index when accessing the +'hosts' and 'services' tables, but there was a bug when a disjunction +('Or:') was used in filters, leading to too few results. This has been +fixed.

6 years, 9 months

Reordered methods according to super class.

by Sven Panne

Module: check_mk Branch: master Commit: 403cbca94ff2d41219c035c0eb709d4bec6f281f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=403cbca94ff2d4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Dec 4 13:23:23 2017 +0100 Reordered methods according to super class. Change-Id: I930d21b625d0e2bda3448781949831c87d29ade0 --- livestatus/src/AndingFilter.cc | 20 ++++++++++---------- livestatus/src/AndingFilter.h | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/livestatus/src/AndingFilter.cc b/livestatus/src/AndingFilter.cc index 6a1a515..30c8e54 100644 --- a/livestatus/src/AndingFilter.cc +++ b/livestatus/src/AndingFilter.cc @@ -42,6 +42,16 @@ bool AndingFilter::accepts(Row row, const contact *auth_user, return true; } +const std::string *AndingFilter::stringValueRestrictionFor( + const std::string &column_name) const { + for (const auto &filter : _subfilters) { + if (auto value = filter->stringValueRestrictionFor(column_name)) { + return value; + } + } + return nullptr; +} + void AndingFilter::findIntLimits(const std::string &colum_nname, int *lower, int *upper, std::chrono::seconds timezone_offset) const { @@ -77,13 +87,3 @@ std::unique_ptr<Filter> AndingFilter::negate() const { [](const auto &filter) { return filter->negate(); }); return std::make_unique<OringFilter>(std::move(filters)); } - -const std::string *AndingFilter::stringValueRestrictionFor( - const std::string &column_name) const { - for (const auto &filter : _subfilters) { - if (auto value = filter->stringValueRestrictionFor(column_name)) { - return value; - } - } - return nullptr; -} diff --git a/livestatus/src/AndingFilter.h b/livestatus/src/AndingFilter.h index f75d299..dd229d4 100644 --- a/livestatus/src/AndingFilter.h +++ b/livestatus/src/AndingFilter.h @@ -44,14 +44,14 @@ public: void accept(FilterVisitor &v) const override; bool accepts(Row row, const contact *auth_user, std::chrono::seconds timezone_offset) const override; + const std::string *stringValueRestrictionFor( + const std::string &column_name) const override; void findIntLimits(const std::string &colum_nname, int *lower, int *upper, std::chrono::seconds timezone_offset) const override; bool optimizeBitmask(const std::string &column_name, uint32_t *mask, std::chrono::seconds timezone_offset) const override; std::unique_ptr<Filter> copy() const override; std::unique_ptr<Filter> negate() const override; - const std::string *stringValueRestrictionFor( - const std::string &column_name) const override; auto begin() const { return _subfilters.begin(); } auto end() const { return _subfilters.end(); }

6 years, 9 months

Removed obsolete TODO

by Konstantin Büttner

Module: check_mk Branch: master Commit: 5bee05ecfec6427726e42f17dba1bc15459cf264 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5bee05ecfec642… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Dec 4 13:27:30 2017 +0100 Removed obsolete TODO Change-Id: I1e06d7e097659819ffe7157ea08ae20631357283 --- tests/checks/test_df_check.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/checks/test_df_check.py b/tests/checks/test_df_check.py index bb5ac44..b2cf847 100644 --- a/tests/checks/test_df_check.py +++ b/tests/checks/test_df_check.py @@ -240,7 +240,6 @@ def test_df_discovery_with_parse(check_manager, monkeypatch, info, expected_resu assert check.run_discovery(check.run_parse(info)) == expected_result -# TODO: Make this work by finding a way to get a check's default levels in this context. @pytest.mark.parametrize("item,params,info,expected_result", [ (u"/", "default", info_df_lnx, {}), (u'/dev/sda4 /', "default", info_df_lnx, {}),

6 years, 9 months

Fixed broken link in apache test

by Lars Michelsen

Module: check_mk Branch: master Commit: bc7c4ce8f7685e9ddc8f203633c50d488237b401 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc7c4ce8f7685e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 4 13:00:44 2017 +0100 Fixed broken link in apache test Change-Id: I02ef189289c0e871ec9f2f9ac82ca149ea47fd4a --- web/plugins/wato/ac_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/ac_tests.py b/web/plugins/wato/ac_tests.py index bc5d7a9..16b00c7 100644 --- a/web/plugins/wato/ac_tests.py +++ b/web/plugins/wato/ac_tests.py @@ -370,7 +370,7 @@ class ACTestApacheNumberOfProcesses(ACTest, BPApacheTest): "<p>Please note that this value is only a rough estimation, because the memory " "usage of the apache processes may vary with the requests being processed.</p>" "<p>Possible actions:<ul>" - "<li>Change the <a href=\"wato.py?mode=edit_configvar&varname=process_tuning\">number of apache processes</a></li>" + "<li>Change the <a href=\"wato.py?mode=edit_configvar&varname=apache_process_tuning\">number of apache processes</a></li>" "</ul>" "</p>")

6 years, 9 months

Test for statgrab_cpu check function

by Konstantin Büttner

Module: check_mk Branch: master Commit: 6c55ec516f2f3b3240666316c846ba3e44fd5531 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c55ec516f2f3b… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Dec 1 09:39:00 2017 +0100 Test for statgrab_cpu check function This is a rudimentary test without any assertions as to the check result. Change-Id: I2c29473c896ca5d0e58ae5601e2e68afaba442c7 --- tests/checks/test_statgrab_cpu_check.py | 34 +++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tests/checks/test_statgrab_cpu_check.py b/tests/checks/test_statgrab_cpu_check.py new file mode 100644 index 0000000..fe3ea1a --- /dev/null +++ b/tests/checks/test_statgrab_cpu_check.py @@ -0,0 +1,34 @@ +import pytest +import pprint +from cmk_base.check_api import MKCounterWrapped + +pytestmark = pytest.mark.checks + + +(a)pytest.mark.parametrize("timepoints,time_to_info,params,expected_results", [ +([60],lambda t: [[u'ctxsw', u'%d' % int(t*50)], + [u'idle', int(t*50)], + [u'intrs',int(t*50)], + [u'iowait',int(t*50)], + [u'kernel',int(t*50)], + [u'nice',int(t*50)], + [u'nvctxsw',int(t*50)], + [u'softintrs',int(t*50)], + [u'swap',int(t*50)], + [u'syscalls',int(t*50)], + [u'systime',int(t*50)], + [u'total',int(t*50)], + [u'user',int(t*50)], + [u'vctxsw',int(t*50)]], + {}, None), +]) +def test_statgrab_cpu_check(check_manager, monkeypatch, timepoints, time_to_info, params, expected_results): + import time + check = check_manager.get_check("statgrab_cpu") + try: + result = list(check.run_check(None, params, time_to_info(0))) + except MKCounterWrapped: + pass + for t in timepoints: + monkeypatch.setattr("time.time", lambda: t) + result = list(check.run_check(None, params, time_to_info(t)))

6 years, 9 months

5565 FIX WATO rules: Breadcrumb navigation is now consistent with rule search

by Lars Michelsen

Module: check_mk Branch: master Commit: 4a753d0ef2e9ca379b46352dca39bcc5a9e9d5ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a753d0ef2e9ca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 4 11:37:47 2017 +0100 5565 FIX WATO rules: Breadcrumb navigation is now consistent with rule search The interaction of the rule search and the folder breadcrumb was not working correctly. The breadcrumb navigation is now updating the search filters, just like it's done for the quick search filter. Change-Id: I2b52d08fde1650c65998ae5beafd845ff657caa5 --- .werks/5565 | 12 ++++++++++++ web/htdocs/wato.py | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.werks/5565 b/.werks/5565 new file mode 100644 index 0000000..70bf82a --- /dev/null +++ b/.werks/5565 @@ -0,0 +1,12 @@ +Title: WATO rules: Breadcrumb navigation is now consistent with rule search +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1512383794 +Class: fix + +The interaction of the rule search and the folder breadcrumb was not working +correctly. The breadcrumb navigation is now updating the search filters, just +like it's done for the quick search filter. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index abcd1f7..3649b90 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12668,6 +12668,12 @@ class ModeRulesets(WatoMode): html.set_var("search_p_fulltext_USE", "on") html.del_var("search") + # Transform the folder argumen (from URL or bradcrumb) to the "rule search arguments + if html.var("folder"): + html.set_var("search_p_rule_folder_0", DropdownChoice.option_id(html.var("folder"))) + html.set_var("search_p_rule_folder_1", DropdownChoice.option_id(True)) + html.set_var("search_p_rule_folder_USE", "on") + self._search_options = ModeRuleSearch().search_options self._only_host = html.var("host") @@ -13009,7 +13015,7 @@ class ModeEditRuleset(WatoMode): def page(self): if not self._hostname: - watolib.Folder.current().show_breadcrump(keepvarnames = ["mode", "varname"]) + watolib.Folder.current().show_breadcrump(keepvarnames=True) # = ["mode", "varname"]) if not config.wato_hide_varnames: display_varname = '%s["%s"]' % tuple(self._name.split(":")) \

6 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2017