Checkmk git commits October 2017

checkmk-commits@lists.checkmk.com

10 participants
288 discussions

cmk_base caching: test_populated - added test for clearing of caches

by Lars Michelsen

Module: check_mk Branch: master Commit: b07fdd5f394749750093d9f65f7cd0bbddecab9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b07fdd5f394749… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 10 14:47:14 2017 +0200 cmk_base caching: test_populated - added test for clearing of caches Change-Id: I1be157834f42394bf6a922dad97366a9e9e30bcd --- tests/cmk_base/test_caching.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/cmk_base/test_caching.py b/tests/cmk_base/test_caching.py index 26deb00..78ca4ed 100644 --- a/tests/cmk_base/test_caching.py +++ b/tests/cmk_base/test_caching.py @@ -79,13 +79,19 @@ def test_populated(): assert not cache.is_populated() cache.set_populated() assert cache.is_populated() + cache.clear() + assert not cache.is_populated() cache = mgr.get_dict("test2") assert not cache.is_populated() cache.set_populated() assert cache.is_populated() + cache.clear() + assert not cache.is_populated() cache = mgr.get_list("test3") assert not cache.is_populated() cache.set_populated() assert cache.is_populated() + cache.clear() + assert not cache.is_populated()

6 years, 11 months

Fixed recently introduced issue with non working WATO rules

by Andreas Boesl

Module: check_mk Branch: master Commit: 5a701dcafc3bdbced99077ff2fe8c76f747a1909 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a701dcafc3bdb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Oct 10 13:06:55 2017 +0200 Fixed recently introduced issue with non working WATO rules Change-Id: I460b6c60610d2259298da559a173ba2e06d125bb --- .werks/5234 | 14 ++++++++++++++ cmk_base/caching.py | 16 +++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/.werks/5234 b/.werks/5234 new file mode 100644 index 0000000..5b8f81e --- /dev/null +++ b/.werks/5234 @@ -0,0 +1,14 @@ +Title: Fixed recently introduced issue with non working WATO rules +Level: 2 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1507633099 + +In 1.4.0p14 an internal caching mechanism was changed. +This broke some caches and caused unexpected behaviours, +because most configurable rules were considered as empty. + diff --git a/cmk_base/caching.py b/cmk_base/caching.py index 28227b2..5de4ff7 100644 --- a/cmk_base/caching.py +++ b/cmk_base/caching.py @@ -94,6 +94,10 @@ class Cache(object): self._populated = True + def set_not_populated(self): + self._populated = False + + # Just a small wrapper round a dict to get some caching specific functionality # for analysis etc. @@ -129,10 +133,20 @@ class DictCache(dict, Cache): } + def clear(self): + super(DictCache, self).clear() + self.set_not_populated() + + + class SetCache(set, Cache): - pass + def clear(self): + super(SetCache, self).clear() + self.set_not_populated() + class ListCache(list, Cache): def clear(self): del self[:] # Clear the list in place + self.set_not_populated()

6 years, 11 months

Adapted states

by Simon Betz

Module: check_mk Branch: master Commit: dff8bcea6932a24ee384f0ad7649482f2f16d98d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dff8bcea6932a2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Oct 10 13:00:45 2017 +0200 Adapted states Change-Id: I13aff37e2acd474b140b0ed40de708699417da16 --- checkman/informix_status | 6 +++--- checks/informix_status | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/checkman/informix_status b/checkman/informix_status index 06279b1..142deda 100644 --- a/checkman/informix_status +++ b/checkman/informix_status @@ -8,9 +8,9 @@ description: Informix Database application. The check is OK if the instance status is in state - initialization, quiescent, recovery, backup, shutdown, - online, abort, single user. - It goes CRIT if the state is offline. + initialization or online. It is WARN if the state is + quiescent, recovery, backup, abort or single user and + it goes CRIT if the state is shutdown or offline. item: Instance name. diff --git a/checks/informix_status b/checks/informix_status index 547a930..7c4eb46 100644 --- a/checks/informix_status +++ b/checks/informix_status @@ -48,13 +48,13 @@ def inventory_informix_status(parsed): def check_informix_status(item, params, parsed): map_states = { "0": (0, "initialization"), - "1": (0, "quiescent"), - "2": (0, "recovery"), - "3": (0, "backup"), - "4": (0, "shutdown"), + "1": (1, "quiescent"), + "2": (1, "recovery"), + "3": (1, "backup"), + "4": (2, "shutdown"), "5": (0, "online"), - "6": (0, "abort"), - "7": (0, "single user"), + "6": (1, "abort"), + "7": (1, "single user"), "-1": (2, "offline"), "255": (2, "offline"), }

6 years, 11 months

4580 informix_dbspaces, informix_locks, informix_logusage,

by Simon Betz

informix_sessions, informix_status, informix_tabextents: New checks for IBM Informix DBs Message-ID: <59dc9ac8.2CfLybise8P/thit%si(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: b1d3d8ea0a7e50a7c6e5f0134294276d9185cad4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1d3d8ea0a7e50… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 4 10:09:39 2017 +0200 4580 informix_dbspaces, informix_locks, informix_logusage, informix_sessions, informix_status, informix_tabextents: New checks for IBM Informix DBs In order to use these checks you have to install the related agent plugin {{mk_informix}} and state a configuration file informix.cfg. TODO CONF-FILE Change-Id: Id6fcf379fedb3362a8ffa47dcd8c5a12b6fc9d0c --- .werks/4580 | 25 ++++ agents/plugins/mk_informix | 296 +++++++++++++++++++++++++++++++++++++++++++ checkman/informix_dbspaces | 17 +++ checkman/informix_locks | 17 +++ checkman/informix_logusage | 17 +++ checkman/informix_sessions | 16 +++ checkman/informix_status | 19 +++ checkman/informix_tabextents | 18 +++ checks/informix_dbspaces | 110 ++++++++++++++++ checks/informix_locks | 74 +++++++++++ checks/informix_logusage | 116 +++++++++++++++++ checks/informix_sessions | 75 +++++++++++ checks/informix_status | 78 ++++++++++++ checks/informix_tabextents | 88 +++++++++++++ 14 files changed, 966 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b1d3d8ea0a…

6 years, 11 months

5119 BI rules: 'Call a rule' in 'Child Node Generation' shows separated pack and rule title

by Simon Betz

Module: check_mk Branch: master Commit: 2b1a933a8cff293b6e4f2e43b8950b4c2af524fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b1a933a8cff29… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 14 14:13:02 2017 +0200 5119 BI rules: 'Call a rule' in 'Child Node Generation' shows separated pack and rule title Change-Id: Ia078fa75c5c4cc9ab4d38a1ef24e7bffe636624b --- .werks/5119 | 12 ++++++++++++ web/plugins/wato/bi.py | 30 ++++++++++++++++++++++-------- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/.werks/5119 b/.werks/5119 new file mode 100644 index 0000000..1418e5d --- /dev/null +++ b/.werks/5119 @@ -0,0 +1,12 @@ +Title: BI rules: 'Call a rule' in 'Child Node Generation' shows separated pack and rule title +Level: 1 +Component: bi +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1503597775 +Class: feature + +Previously within the above mentioned choices rule ID, +pack title and rule title were merged into one. +Separated them for better overview. diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index 9118c91..b2e1f60 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -66,7 +66,6 @@ class ModeBI(WatoMode): self._user_contactgroups = userdb.contactgroups_of_user(config.user.id) else: self._user_contactgroups = None # meaning I am admin - self._create_valuespecs() # Most modes need a pack as context if html.has_var("pack"): @@ -78,6 +77,8 @@ class ModeBI(WatoMode): self._pack_id = None self._pack = None + self._create_valuespecs() + def title(self): title = _("Business Intelligence") @@ -390,10 +391,10 @@ class ModeBI(WatoMode): def _allowed_rule_choices(self): choices = [] - for pack_id, pack in sorted(self._packs.items()): + for pack_id, pack in sorted(self._packs.iteritems()): if self.may_use_rules_in_pack(pack): - for rule_id, rule in sorted(pack["rules"].items()): - choices.append((rule_id, "%s - %s/%s" % (rule_id, pack["title"], rule["title"]))) + pack_choices = [(rule_id, rule["title"]) for rule_id, rule in pack["rules"].iteritems()] + choices.append((pack_id, pack["title"], DropdownChoice(choices=sorted(pack_choices)))) return choices @@ -437,10 +438,14 @@ class ModeBI(WatoMode): def _get_vs_call_rule(self): return Tuple( elements = [ - DropdownChoice( - title = _("Rule:"), - choices = self._allowed_rule_choices(), - sorted = True, + Transform(CascadingDropdown( + title=_("Rule:"), + orientation="horizontal", + choices=self._allowed_rule_choices(), + sorted=True, + ), + back=self._transform_back_vs_call_rule, + forth=self._transform_forth_vs_call_rule, ), ListOfStrings( orientation = "horizontal", @@ -452,6 +457,15 @@ class ModeBI(WatoMode): ) + def _transform_back_vs_call_rule(self, choice): + return choice[1] + + + def _transform_forth_vs_call_rule(self, choice): + pack = self.pack_containing_rule(choice) + return (pack['id'], choice) + + def _get_vs_host_re(self): host_re_help = _("Either an exact host name or a regular expression exactly matching the host " "name. Example: <tt>srv.*p</tt> will match <tt>srv4711p</tt> but not <tt>xsrv4711p2</tt>. ")

6 years, 11 months

5118 Added bulk moving and deletion operations for BI aggregations

by Simon Betz

Module: check_mk Branch: master Commit: 7a6031a652d78297b38f71de914672a10ed9f72e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a6031a652d782… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 14 14:10:08 2017 +0200 5118 Added bulk moving and deletion operations for BI aggregations Change-Id: I7872a816a98cb4400105e1f0188e593ef86eb6bd --- .werks/5118 | 10 ++ web/plugins/wato/bi.py | 264 ++++++++++++++++++++++++++++++++----------------- 2 files changed, 182 insertions(+), 92 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7a6031a652…

6 years, 11 months

5288 FIX BI packs: Fixed permission of target pack for bulk moving operation of rules

by Simon Betz

Module: check_mk Branch: master Commit: 1c5aff2aab571fb1c609411ae3f1f0a6633b1d94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c5aff2aab571f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Sep 18 14:02:45 2017 +0200 5288 FIX BI packs: Fixed permission of target pack for bulk moving operation of rules Change-Id: Ia6bd790b9acd85d5180a7e411167337839551967 --- .werks/5288 | 10 ++++++++++ web/plugins/wato/bi.py | 11 ++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.werks/5288 b/.werks/5288 new file mode 100644 index 0000000..23ad300 --- /dev/null +++ b/.werks/5288 @@ -0,0 +1,10 @@ +Title: BI packs: Fixed permission of target pack for bulk moving operation of rules +Level: 1 +Component: bi +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1505736108 +Class: fix + + diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index e2e046b..34dec4b 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -414,9 +414,13 @@ class ModeBI(WatoMode): return False - def must_be_contact_for_pack(self): - if not self.is_contact_for_pack(): - raise MKAuthException(_("You have no permission for changes in this BI pack.")) + def must_be_contact_for_pack(self, pack=None): + if not self.is_contact_for_pack(pack=pack): + if pack is None: + pack_title = self._pack["title"] + else: + pack_title = pack["title"] + raise MKAuthException(_("You have no permission for changes in this BI pack %s.") % pack_title) def _validate_rule_call(self, value, varprefix): @@ -1177,6 +1181,7 @@ class ModeBIRules(ModeBI): target_pack = None if target in self._packs: target_pack = self._packs[target] + self.must_be_contact_for_pack(target_pack) selected_rules = self._get_selected_rules() if selected_rules and target_pack is not None:

6 years, 11 months

Moved final offset into Column base class, part 5.

by Sven Panne

Module: check_mk Branch: master Commit: f12f3130a129a95e9dcb7184ca5c1c14dc4980d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f12f3130a129a9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Oct 9 13:55:09 2017 +0200 Moved final offset into Column base class, part 5. Change-Id: I31d945ff1805f1852625bafd7013be8401a0430e --- livestatus/src/OffsetTimeColumn.cc | 5 +- livestatus/src/OffsetTimeColumn.h | 10 +- livestatus/src/Table.cc | 28 ++- livestatus/src/TableColumns.cc | 30 ++- livestatus/src/TableCommands.cc | 14 +- livestatus/src/TableComments.cc | 39 ++-- livestatus/src/TableContactGroups.cc | 15 +- livestatus/src/TableContacts.cc | 48 ++-- livestatus/src/TableDowntimes.cc | 45 ++-- livestatus/src/TableEventConsole.h | 2 +- livestatus/src/TableEventConsoleEvents.cc | 61 +++-- livestatus/src/TableEventConsoleHistory.cc | 19 +- livestatus/src/TableEventConsoleReplication.cc | 9 +- livestatus/src/TableEventConsoleRules.cc | 13 +- livestatus/src/TableEventConsoleStatus.cc | 103 ++++---- livestatus/src/TableHostGroups.cc | 61 +++-- livestatus/src/TableHosts.cc | 311 ++++++++++++------------- livestatus/src/TableHostsByGroup.cc | 8 +- livestatus/src/TableLog.cc | 50 ++-- livestatus/src/TableServiceGroups.cc | 47 ++-- livestatus/src/TableServices.cc | 235 +++++++++---------- livestatus/src/TableServicesByGroup.cc | 8 +- livestatus/src/TableServicesByHostGroup.cc | 10 +- livestatus/src/TableStateHistory.cc | 119 +++++----- livestatus/src/TableStatus.cc | 86 ++++--- livestatus/src/TableTimeperiods.cc | 13 +- livestatus/src/TimeColumn.h | 5 +- livestatus/src/TimePointerColumn.h | 2 +- 28 files changed, 657 insertions(+), 739 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f12f3130a1…

6 years, 11 months

Fix wmitest to use refactored WinApi

by Jukka Aro

Module: check_mk Branch: master Commit: 20fb7c75464df1a1d7241eda4af0ea9ee9acf859 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20fb7c75464df1… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Oct 9 16:33:52 2017 +0200 Fix wmitest to use refactored WinApi wmitest was broken through the refactoring done in d0e60a30a20ed75349ea192a6200fc0c7501dc1a. Change-Id: Id97205ff5ae13aa8f3889571d59ea0cc83909646 --- agents/windows/CONTENTS | 1 + agents/windows/Makefile | 4 ++-- agents/windows/wmitest.cc | 11 ++++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/agents/windows/CONTENTS b/agents/windows/CONTENTS index 3326f14..2fa0aae 100644 --- a/agents/windows/CONTENTS +++ b/agents/windows/CONTENTS @@ -71,3 +71,4 @@ win_error.h (hide) wmiHelper.cc (hide) wmiHelper.h (hide) wmitest.cc (hide) +wmitest.exe (hide) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 5efcb04..74ba3e9 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -82,8 +82,8 @@ fix_linebreaks: -include wmitest.d -include stringutil.d -include wmiHelper.d -wmitest.exe: wmitest.o stringutil.o wmiHelper.o - $(CXX) $(COMMON_OPTS) $^ -o $@ -lwsock32 -lole32 -loleaut32 -lwbemuuid +wmitest.exe: wmitest.o stringutil.o WinApi.o wmiHelper.o + $(CXX) $(COMMON_OPTS) $^ -o $@ -lwsock32 -lws2_32 -lole32 -loleaut32 -lwbemuuid -lpsapi -lshlwapi -limagehlp -lntdll # ----------------------------------------------------------------------------- # 1. Create ressource files with version and product information. Note: That file diff --git a/agents/windows/wmitest.cc b/agents/windows/wmitest.cc index f35751b..1492d89 100644 --- a/agents/windows/wmitest.cc +++ b/agents/windows/wmitest.cc @@ -1,8 +1,13 @@ #include <algorithm> #include <string> #include "stringutil.h" +#include "WinApi.h" #include "wmiHelper.h" +namespace { +WinApi winapi; +} + void print_usage(const char *exe_name) { printf( "Usage: %s action [action specific parameters]" @@ -13,7 +18,7 @@ void print_usage(const char *exe_name) { } void print_namespace(const std::wstring &path, int depth = 0) { - wmi::Helper helper(path.c_str()); + wmi::Helper helper(winapi, path.c_str()); std::string offset = std::string(depth * 2, ' '); { @@ -43,7 +48,7 @@ void print_namespace(const std::wstring &path, int depth = 0) { } void print_table(const std::string &ns, const std::string &pattern) { - wmi::Helper helper(to_utf16(ns.c_str()).c_str()); + wmi::Helper helper(winapi, to_utf16(ns.c_str(), winapi).c_str()); wmi::Result result = helper.query(L"SELECT * FROM meta_class"); bool more = result.valid(); @@ -98,7 +103,7 @@ int main(int argc, char **argv) { if (argc < 3) { print_namespace(L"Root"); } else { - print_namespace(to_utf16(argv[2]).c_str()); + print_namespace(to_utf16(argv[2], winapi).c_str()); } }

6 years, 11 months

5391 FIX Removed CEE specific broken link from host edit page (CRE)

by Lars Michelsen

Module: check_mk Branch: master Commit: 46e4245ea4b63a683a864b9ce1ecdd8b03520b94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46e4245ea4b63a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 9 14:38:32 2017 +0200 5391 FIX Removed CEE specific broken link from host edit page (CRE) Change-Id: Ib19eab784875d9f37ac98c532bb66a54f84f9178 --- .werks/5391 | 10 ++++++++++ web/htdocs/wato.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/5391 b/.werks/5391 new file mode 100644 index 0000000..eef9f92 --- /dev/null +++ b/.werks/5391 @@ -0,0 +1,10 @@ +Title: Removed CEE specific broken link from host edit page (CRE) +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1507552702 +Class: fix + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 90f19a9..fda2f9c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1289,7 +1289,7 @@ def mode_edit_host(phase, new, is_cluster): html.context_button(_("Services"), folder_preserving_link([("mode", "inventory"), ("host", hostname)]), "services") - if config.user.may('wato.download_agents'): + if has_agent_bakery() and config.user.may('wato.download_agents'): html.context_button(_("Monitoring Agent"), folder_preserving_link([("mode", "agent_of_host"), ("host", hostname)]), "agents") if config.user.may('wato.rulesets'):

6 years, 11 months

← Newer
1
...
17
18
19
20
21
22
23
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2017