Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

Create piggyback directories during mount of sites tmpfs

by Lars Michelsen

Module: check_mk Branch: master Commit: f0256b51bf31903c92fa975b03ec1517ddb8ed90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0256b51bf3190… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 22 13:25:27 2017 +0100 Create piggyback directories during mount of sites tmpfs Change-Id: I677b223968482ba98a24d019556e964c73ffd2ad --- omd/packages/check_mk/skel/tmp/check_mk/piggyback/.gitignore | 0 omd/packages/check_mk/skel/tmp/check_mk/piggyback_sources/.gitignore | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/omd/packages/check_mk/skel/tmp/check_mk/piggyback/.gitignore b/omd/packages/check_mk/skel/tmp/check_mk/piggyback/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/omd/packages/check_mk/skel/tmp/check_mk/piggyback_sources/.gitignore b/omd/packages/check_mk/skel/tmp/check_mk/piggyback_sources/.gitignore new file mode 100644 index 0000000..e69de29

6 years, 7 months

5319 lnx_if: Now this check is cluster-aware

by Simon Betz

Module: check_mk Branch: master Commit: e6d63fc694c11d7563aa1b62330aec4eebed613b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6d63fc694c11d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Oct 11 16:56:14 2017 +0200 5319 lnx_if: Now this check is cluster-aware Change-Id: I17a361783600ed34901d8117c6d665885d230340 --- .werks/5319 | 10 ++++ checks/lnx_if | 182 +++++++++++++++++++++++++++++++--------------------------- 2 files changed, 106 insertions(+), 86 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e6d63fc694…

6 years, 7 months

ceph_status, ceph_status.pgs, ceph_status.osds, ceph_df: new checks for Ceph Storage

by Simon Betz

Module: check_mk Branch: master Commit: 3a5078612562642bec48b722be07c1ce04f41c15 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a507861256264… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Apr 11 10:39:11 2017 +0200 ceph_status, ceph_status.pgs, ceph_status.osds, ceph_df: new checks for Ceph Storage Change-Id: I0d0efee3a0270b4242e0f8dc14daba552778cbe1 --- agents/plugins/mk_ceph | 44 ++++++ checkman/ceph_df | 17 +++ checkman/ceph_status | 18 +++ checkman/ceph_status.mgrs | 13 ++ checkman/ceph_status.osds | 20 +++ checkman/ceph_status.pgs | 20 +++ checks/ceph_df | 113 +++++++++++++++ checks/ceph_status | 269 +++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 56 ++++++++ 9 files changed, 570 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3a50786125…

6 years, 7 months

5446 ceph_status, ceph_status.pgs, ceph_status.osds, ceph_status.mgrs, ceph_df: new checks for Ceph Storage

by Simon Betz

Module: check_mk Branch: master Commit: fb20cdb61461029605e088d7b3538d81cf0f3db4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb20cdb6146102… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Nov 22 12:44:50 2017 +0100 5446 ceph_status, ceph_status.pgs, ceph_status.osds, ceph_status.mgrs, ceph_df: new checks for Ceph Storage Change-Id: Icdb269a7a4f3d1144d4b721fd2fd4119ee621a41 --- .werks/5446 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/5446 b/.werks/5446 new file mode 100644 index 0000000..dbdec96 --- /dev/null +++ b/.werks/5446 @@ -0,0 +1,10 @@ +Title: ceph_status, ceph_status.pgs, ceph_status.osds, ceph_status.mgrs, ceph_df: new checks for Ceph Storage +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1511351063 +Class: feature + +

6 years, 7 months

Fixed permissions

by Simon Betz

Module: check_mk Branch: master Commit: 8b6120bf83b4962c9f95fe7bd4b719641a9093c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b6120bf83b496… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Nov 22 12:46:05 2017 +0100 Fixed permissions Change-Id: I9b295e34f6c212b7903a049346b926c71025b828 --- agents/plugins/mk_ceph | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/plugins/mk_ceph b/agents/plugins/mk_ceph old mode 100644 new mode 100755

6 years, 7 months

Windows agent: unit tests for wmi::Result::next

by Jukka Aro

Module: check_mk Branch: master Commit: 244b6991038af2bdc4aac084148564aa202da60f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=244b6991038af2… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Oct 25 11:35:56 2017 +0200 Windows agent: unit tests for wmi::Result::next Change-Id: Ied44f66eb2500e4eccd649a8e46497222a0283dc --- agents/windows/Makefile.am | 6 +- agents/windows/test/EnvironmentTest.cc | 2 +- agents/windows/test/MockLogger.cc | 6 +- agents/windows/test/MockLogger.h | 4 +- agents/windows/test/MockWbem.h | 88 ++++++++++++++++++++++++++ agents/windows/test/MockWinApi.cc | 6 +- agents/windows/test/MockWinApi.h | 2 +- agents/windows/test/RotatingFileHandlerTest.cc | 15 ++--- agents/windows/test/gtest_main.cc | 6 +- agents/windows/test/wmiHelperTest.cc | 62 ++++++++++++++++++ 10 files changed, 174 insertions(+), 23 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=244b699103…

6 years, 7 months

5411 FIX Windows agent: handle WMI timeouts

by Jukka Aro

Module: check_mk Branch: master Commit: d672f3898694778f678e906945a20601bdbce6f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d672f389869477… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Nov 22 12:06:59 2017 +0100 5411 FIX Windows agent: handle WMI timeouts All sections depending on WMI (Windows Management Instrumentation) queries have been suffering from periodic freezing, the time interval between subsequent freezes being typically 18...20 minutes. At those moments, the Windows agent has not been delivering any output for some of its WMI-dependent sections (e. g., ps, uptime, dotnet_clrmemory, wmi_cpuload, msexch and wmi_webservices). The corresponding checks have issued error messages of type "Missing agent sections...". Various strategies have been previously used attempting to cope with the periodic problems with WMI. Werk #4008 introduced a timeout of 10s in order to prevent the agent from completely blocking if a WMI query freezes. However, this led to the described problem of missing agent output totally when no response was given to a WMI query within 10s. Moreover, multiple WMI queries waiting for 10s after another led to periodic long execution times of the Windows agent. This Werk introduces a new strategy for coping with the periodic freezing of WMI queries. The timeout of the queries is reduced to 2.5s instead of 10s per query, reducing the total execution time of the Windows agent by approximately 75% when the problem occurs. Upon a WMI timeout, the Windows agent issues it in its output so, that the affected checks can tolerate it by setting their state to UNKNOWN. In normal cases, the check should get back to OK when the agent is contacted the next time and the WMI freeze is most likely gone. There seems to be a connection of the WMI freezes to the Windows service WMI Performance Adapter. https://lokna.no/?p=1430 suggests that the startup type of this service be set to automatic, ensuring the service is running. Without this, the WMI Performance Adapter seems to get started periodically when WMI is queried. Testing with WMI Performance Adapter service running has showed clear signs of improvement, reducing the frequency of freezing WMI queries even if not completely ending them. Change-Id: I83024d93ee41e47853fde1fbdd59680ad3dd07cd --- .werks/5411 | 41 ++++++++++++++++++++++++ agents/windows/build_version | 2 +- agents/windows/sections/SectionWMI.cc | 60 ++++++++++++++++++++++------------- agents/windows/wmiHelper.cc | 41 +++++++++++++----------- agents/windows/wmiHelper.h | 5 +++ checks/wmi.include | 6 ++++ 6 files changed, 113 insertions(+), 42 deletions(-) diff --git a/.werks/5411 b/.werks/5411 new file mode 100644 index 0000000..c155fe9 --- /dev/null +++ b/.werks/5411 @@ -0,0 +1,41 @@ +Title: Windows agent: handle WMI timeouts +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1511347136 +Class: fix + +All sections depending on WMI (Windows Management Instrumentation) +queries have been suffering from periodic freezing, the time interval +between subsequent freezes being typically 18...20 minutes. At those +moments, the Windows agent has not been delivering any output for some +of its WMI-dependent sections (e. g., ps, uptime, dotnet_clrmemory, +wmi_cpuload, msexch and wmi_webservices). The corresponding checks have +issued error messages of type "Missing agent sections...". Various +strategies have been previously used attempting to cope with the +periodic problems with WMI. Werk #4008 introduced a timeout of 10s in +order to prevent the agent from completely blocking if a WMI query +freezes. However, this led to the described problem of missing agent +output totally when no response was given to a WMI query within 10s. +Moreover, multiple WMI queries waiting for 10s after another led to +periodic long execution times of the Windows agent. + +This Werk introduces a new strategy for coping with the periodic +freezing of WMI queries. The timeout of the queries is reduced to 2.5s +instead of 10s per query, reducing the total execution time of the +Windows agent by approximately 75% when the problem occurs. Upon a WMI +timeout, the Windows agent issues it in its output so, that the affected +checks can tolerate it by setting their state to UNKNOWN. In normal +cases, the check should get back to OK when the agent is contacted the +next time and the WMI freeze is most likely gone. + +There seems to be a connection of the WMI freezes to the Windows service +WMI Performance Adapter. https://lokna.no/?p=1430 suggests that the +startup type of this service be set to automatic, ensuring the service +is running. Without this, the WMI Performance Adapter seems to get +started periodically when WMI is queried. Testing with WMI Performance +Adapter service running has showed clear signs of improvement, reducing +the frequency of freezing WMI queries even if not completely ending +them. diff --git a/agents/windows/build_version b/agents/windows/build_version index 13de30f..830a203 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3000 +3002 diff --git a/agents/windows/sections/SectionWMI.cc b/agents/windows/sections/SectionWMI.cc index 5b8678f..57956fa 100644 --- a/agents/windows/sections/SectionWMI.cc +++ b/agents/windows/sections/SectionWMI.cc @@ -65,7 +65,10 @@ void SectionWMI::outputTable(std::ostream &out, wmi::Result &data) { if (!data.valid()) { return; } - out << Utf8(join(data.names(), L",")) << "\n"; + + // First use a local stream buffer... + std::stringstream localStream; + localStream << Utf8(join(data.names(), L",")) << "\n"; // output data bool more = true; @@ -76,13 +79,17 @@ void SectionWMI::outputTable(std::ostream &out, wmi::Result &data) { [&data](const std::wstring &name) { return data.get<std::wstring>(name.c_str()); }); - out << Utf8(join(values, L",")); + localStream << Utf8(join(values, L",")); more = data.next(); + if (more) { - out << "\n"; + localStream << "\n"; } } + + // ...and output local stream buffer only when no WMI timeout was thrown. + out << localStream.rdbuf(); } void SectionWMI::suspend(int duration) { @@ -94,31 +101,40 @@ bool SectionWMI::produceOutputInner(std::ostream &out) { return false; } - if (_helper.get() == nullptr) { - _helper.reset(new wmi::Helper(_winapi, _namespace.c_str())); - } + bool success = true; + + try { + if (_helper.get() == nullptr) { + _helper.reset(new wmi::Helper(_winapi, _namespace.c_str())); + } wmi::Result result(_winapi); - if (_columns.empty()) { - // no columns set, return everything - result = _helper->getClass(_object.c_str()); - } else { - std::wstringstream query; - query << L"SELECT " << join(_columns, L",") << L" FROM " << _object; - result = _helper->query(query.str().c_str()); - } + if (_columns.empty()) { + // no columns set, return everything + result = _helper->getClass(_object.c_str()); + } else { + std::wstringstream query; + query << L"SELECT " << join(_columns, L",") << L" FROM " << _object; + result = _helper->query(query.str().c_str()); + } - bool success = result.valid() || SUCCEEDED(result.last_error()); + success = result.valid() || SUCCEEDED(result.last_error()); - if (_toggle_if_missing && !success) { - // in the past, wmi tables were toggled permanently if they were - // missing, - // but testing occasionally shouldn't hurt. - suspend(3600); - } + if (_toggle_if_missing && !success) { + // in the past, wmi tables were toggled permanently if they were + // missing, + // but testing occasionally shouldn't hurt. + suspend(3600); + } - outputTable(out, result); + outputTable(out, result); + } catch (const wmi::Timeout &t) { + // Output WMI timeout so that the check in question knows to handle it. + out << t.what() << std::endl; + Debug(_logger) << "SectionWMI::produceOutputInner caught " << t.what(); + success = true; + } return success; } diff --git a/agents/windows/wmiHelper.cc b/agents/windows/wmiHelper.cc index 903f700..09484d7 100644 --- a/agents/windows/wmiHelper.cc +++ b/agents/windows/wmiHelper.cc @@ -193,27 +193,30 @@ bool Result::next() { return false; } - IWbemClassObject *obj; - ULONG numReturned; + IWbemClassObject *obj = nullptr; + ULONG numReturned = 0; // always retrieve only one element - HRESULT res = _enumerator->Next(10000, 1, &obj, &numReturned); - - if (FAILED(res)) { - // in this case the "current" object isn't changed to guarantee that the - // Result remains valid - // throw ComException("Failed to retrieve element", res, _winapi); - _last_error = res; - return false; - } - - if (numReturned == 0) { - // no more values. the current object remains at the last element so - // that a call to get continues to work - return false; + HRESULT res = _enumerator->Next(2500, 1, &obj, &numReturned); + + switch (res) { + case WBEM_NO_ERROR: + _current.reset(obj, releaseInterface); + return true; + case WBEM_S_FALSE: + // No more values. The current object remains at the last element so + // that a call to get continues to work. + return false; + case WBEM_S_TIMEDOUT: + // A timeout occurred before getting the object. + throw Timeout("WMItimeout"); + default: + // Any of the four possible errors: WBEM_E_INVALID_PARAMETER, + // WBEM_E_OUT_OF_MEMORY, WBEM_E_UNEXPECTED or + // WBEM_E_TRANSPORT_FAILURE. In this case the "current" object isn't + // changed to guarantee that the Result remains valid. + _last_error = res; + return false; } - - _current.reset(obj, releaseInterface); - return true; } template <> diff --git a/agents/windows/wmiHelper.h b/agents/windows/wmiHelper.h index 736cfb5..67fd503 100644 --- a/agents/windows/wmiHelper.h +++ b/agents/windows/wmiHelper.h @@ -55,6 +55,11 @@ struct ComTypeException : public std::runtime_error { ComTypeException(const std::string &message); }; +class Timeout : public std::runtime_error { +public: + explicit Timeout(const std::string &msg) : std::runtime_error(msg) {} +}; + class Variant { VARIANT _value; const WinApiAdaptor &_winapi; diff --git a/checks/wmi.include b/checks/wmi.include index ae744cf..5d88176 100644 --- a/checks/wmi.include +++ b/checks/wmi.include @@ -147,6 +147,9 @@ def parse_wmi_table(info, key="Name"): timestamp = int(line[1]) frequency = int(line[2]) line = info_iter.next() + elif line[0] == "WMItimeout": + # main section got WMI timeout + raise MKCounterWrapped("WMI query timed out") while line is not None: current = None if len(line) == 1 and line[0].startswith("["): @@ -155,6 +158,9 @@ def parse_wmi_table(info, key="Name"): res = {} tablename = regex("\[(.*)\]").search(line[0]).group(1) line = info_iter.next() + if line[0] == "WMItimeout": + # subsection got WMI timeout + raise MKCounterWrapped("WMI query timed out") if tablename in res: # known table, append to it current = res[tablename]

6 years, 7 months

Windows agent: add debug log entries

by Jukka Aro

Module: check_mk Branch: master Commit: 3e44d65bddf50fc011e5f3589e59de5c88b55783 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e44d65bddf50f… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Sep 11 16:21:38 2017 +0200 Windows agent: add debug log entries Add debug log entries for various sections and especially for wmiHelper. Change-Id: Iec06b56f77879ba710f4f78a1df59854013f1ba1 --- agents/windows/build_version | 2 +- agents/windows/sections/SectionCheckMK.cc | 1 + agents/windows/sections/SectionDF.cc | 2 ++ agents/windows/sections/SectionEventlog.cc | 1 + agents/windows/sections/SectionFileinfo.cc | 2 ++ agents/windows/sections/SectionGroup.cc | 2 ++ agents/windows/sections/SectionLogwatch.cc | 1 + agents/windows/sections/SectionMRPE.cc | 1 + agents/windows/sections/SectionMem.cc | 2 ++ agents/windows/sections/SectionOHM.cc | 3 +- agents/windows/sections/SectionPS.cc | 15 +++++--- agents/windows/sections/SectionPerfcounter.cc | 1 + agents/windows/sections/SectionPluginGroup.cc | 1 + agents/windows/sections/SectionServices.cc | 3 +- agents/windows/sections/SectionSkype.cc | 1 + agents/windows/sections/SectionSpool.cc | 1 + agents/windows/sections/SectionSystemtime.cc | 2 ++ agents/windows/sections/SectionUptime.cc | 4 ++- agents/windows/sections/SectionWMI.cc | 7 ++-- agents/windows/sections/SectionWinperf.cc | 1 + agents/windows/test/wmiHelperTest.cc | 12 ++++--- agents/windows/wmiHelper.cc | 51 +++++++++++++++++---------- agents/windows/wmiHelper.h | 24 ++++++++----- 23 files changed, 96 insertions(+), 44 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3e44d65bdd…

6 years, 7 months

Refactored SNMP walk cache file IO to use standard store methods

by Lars Michelsen

Module: check_mk Branch: master Commit: c96503d8a5e08fa4210ace688af66f368453937c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c96503d8a5e08f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 22 11:03:15 2017 +0100 Refactored SNMP walk cache file IO to use standard store methods Change-Id: I2822cc4ffd74e4d05e65ad8f0895fa4c2b9c9465 --- cmk_base/automations/check_mk.py | 7 ++++--- cmk_base/snmp.py | 25 ++++++++++++++----------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index be553ab..bccaa61 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -24,6 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +import ast import glob import os import subprocess @@ -159,7 +160,7 @@ class AutomationSetAutochecks(DiscoveryAutomation): # from python source code to actual values. def execute(self, args): hostname = args[0] - new_items = eval(sys.stdin.read()) + new_items = ast.literal_eval(sys.stdin.read()) discovery.set_autochecks_of(hostname, new_items) self._trigger_discovery_check(hostname) return None @@ -196,7 +197,7 @@ class AutomationRenameHosts(Automation): # Python pair-list from stdin: # [("old1", "new1"), ("old2", "new2")]) def execute(self, args): - renamings = eval(sys.stdin.read()) + renamings = ast.literal_eval(sys.stdin.read()) actions = [] @@ -813,7 +814,7 @@ class AutomationGetConfiguration(Automation): # We read the list of variable names from stdin since # that could be too much for the command line - variable_names = eval(sys.stdin.read()) + variable_names = ast.literal_eval(sys.stdin.read()) missing_variables = [ v for v in variable_names if not hasattr(config, v) ] diff --git a/cmk_base/snmp.py b/cmk_base/snmp.py index 3ea05ec..dcf10e6 100644 --- a/cmk_base/snmp.py +++ b/cmk_base/snmp.py @@ -558,26 +558,29 @@ def _is_snmpwalk_cachable(column): def _get_cached_snmpwalk(hostname, fetchoid): - path = "%s/snmp_cache/%s/%s" % (cmk.paths.var_dir, hostname, fetchoid) + path = _snmpwalk_cache_path(hostname, fetchoid) try: console.vverbose(" Loading %s from walk cache %s\n" % (fetchoid, path)) - # TODO: Use store.load_data_from_file() - return eval(file(path).read()) - except IOError: - return None # don't print error when not cached yet + return store.load_data_from_file(path) except: if cmk.debug.enabled(): raise - console.verbose("Failed to read cached SNMP walk from %s, ignoring.\n" % path) + console.verbose(" Failed loading walk cache. Continue without it.\n" % path) return None def _save_snmpwalk_cache(hostname, fetchoid, rowinfo): - base_dir = "%s/snmp_cache/%s/" % (cmk.paths.var_dir, hostname) - if not os.path.exists(base_dir): - os.makedirs(base_dir) - console.vverbose(" Caching walk of %s\n" % fetchoid) - file(base_dir + fetchoid, "w").write("%r\n" % rowinfo) + path = _snmpwalk_cache_path(hostname, fetchoid) + + if not os.path.exists(os.path.dirname(path)): + os.makedirs(os.path.dirname(path)) + + console.vverbose(" Saving walk of %s to walk cache %s\n" % (fetchoid, path)) + store.save_data_to_file(path, rowinfo, pretty=False) + + +def _snmpwalk_cache_path(hostname, fetchoid): + return os.path.join(cmk.paths.var_dir, hostname, fetchoid) def _get_stored_snmpwalk(hostname, oid):

6 years, 7 months

Fixed categories() call sites (Method does not return a dict)

by Lars Michelsen

Module: check_mk Branch: master Commit: 2ba253fdfcac16db0ac4d2b894ca55fbe7cbafcb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ba253fdfcac16… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 22 11:07:09 2017 +0100 Fixed categories() call sites (Method does not return a dict) Change-Id: I978d931c0299595200026cc7d0992d6bce0be95c --- web/htdocs/valuespec.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index f529d45..6136b18 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -4167,12 +4167,12 @@ class IconSelector(ValueSpec): @classmethod def categories(cls): import config# FIXME: Clean this up. But how? - return (config.wato_icon_categories) + return config.wato_icon_categories @classmethod def category_alias(cls, category_name): - return cls.categories().get(category_name, category_name) + return dict(cls.categories()).get(category_name, category_name) # All icons within the images/icons directory have the ident of a category @@ -4185,7 +4185,7 @@ class IconSelector(ValueSpec): if not only_local: dirs.append(os.path.join(cmk.paths.omd_root, "share/check_mk/web/htdocs/images/icons")) - valid_categories = self.categories().keys() + valid_categories = dict(self.categories()).keys() from PIL import Image @@ -4235,7 +4235,7 @@ class IconSelector(ValueSpec): by_cat[category_name].append(icon_name) icon_categories = [] - for category_name, category_alias in self.categories().items(): + for category_name, category_alias in self.categories(): if category_name in by_cat: icon_categories.append((category_name, category_alias, by_cat[category_name])) return icon_categories

6 years, 7 months

← Newer
1
...
9
10
11
12
13
14
15
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2017