Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

Fixed different issues in recent changes

by Lars Michelsen

Module: check_mk Branch: master Commit: 82929028509bd3d75f19cc4cf343df79f8e1a96e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82929028509bd3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 14 08:06:48 2017 +0100 Fixed different issues in recent changes * Added several explaining comments * Implemented some TODOs * Storing of piggyback information is now done after processing all data sources for all sources at once * Small cleanups for persisting of agent sections Change-Id: I58d147c6489cc905ad3300892ef544fd7662ecca --- cmk_base/data_sources/__init__.py | 71 +++++++++++++++++++++++--------------- cmk_base/data_sources/abstract.py | 47 +++++++++++++++---------- cmk_base/data_sources/host_info.py | 6 +++- cmk_base/data_sources/piggyback.py | 10 ++++++ cmk_base/data_sources/snmp.py | 16 +++++++-- cmk_base/discovery.py | 8 +++-- cmk_base/snmp.py | 1 - 7 files changed, 106 insertions(+), 53 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8292902850…

6 years, 10 months

Fixed handling of edge case on service discovery page with snmp check interval configured

by Lars Michelsen

Module: check_mk Branch: master Commit: 2a6bf53693c5304fc4d4e701959f6f7b1faac886 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a6bf53693c530… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 16 12:22:57 2017 +0100 Fixed handling of edge case on service discovery page with snmp check interval configured Change-Id: I1c1133ebd225b212c1e1e8891c1753b22758ba0d --- cmk_base/checking.py | 3 ++- cmk_base/data_sources/abstract.py | 18 +++++++++++------- cmk_base/data_sources/piggyback.py | 2 +- cmk_base/discovery.py | 10 ++++++++++ tests/cmk_base/test_data_sources.py | 10 +++++----- 5 files changed, 29 insertions(+), 14 deletions(-) diff --git a/cmk_base/checking.py b/cmk_base/checking.py index 046a447..eb55c6b 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -305,6 +305,7 @@ def execute_check(all_host_infos, hostname, ipaddress, check_name, item, params, x = e.exc_info() raise x[0], x[1], x[2] # re-raise the original exception to not destory the trace + # TODO: Move this to a helper function if info is None: # No data for this check type return False @@ -314,7 +315,7 @@ def execute_check(all_host_infos, hostname, ipaddress, check_name, item, params, # In case of SNMP checks but missing agent response, skip this check. # Special checks which still need to be called even with empty data # may declare this. - if info == [] and checks.is_snmp_check(check_name) \ + if not info and checks.is_snmp_check(check_name) \ and not checks.check_info[check_name]["handle_empty_info"]: return False diff --git a/cmk_base/data_sources/abstract.py b/cmk_base/data_sources/abstract.py index d005145..d17c938 100644 --- a/cmk_base/data_sources/abstract.py +++ b/cmk_base/data_sources/abstract.py @@ -78,14 +78,14 @@ class DataSource(object): try: cpu_tracking.push_phase(self._cpu_tracking_id()) - raw_data = self._get_raw_data(hostname, ipaddress) + raw_data, is_cached_data = self._get_raw_data(hostname, ipaddress) if get_raw_data: return raw_data host_info = self._convert_to_infos(raw_data, hostname) assert isinstance(host_info, HostInfo) - if host_info.persisted_info: + if host_info.persisted_info and not is_cached_data: self._store_persisted_info(hostname, host_info.persisted_info) # Add information from previous persisted infos @@ -115,7 +115,7 @@ class DataSource(object): raw_data = self._read_cache_file(hostname) if raw_data: self._logger.verbose("[%s] Use cached data" % self.id()) - return raw_data + return raw_data, True elif raw_data is None and config.simulation_mode: raise MKAgentError("Got no data (Simulation mode enabled and no cachefile present)") @@ -125,7 +125,7 @@ class DataSource(object): self._write_cache_file(hostname, raw_data) - return raw_data + return raw_data, False def run_raw(self, hostname, ipaddress): @@ -164,7 +164,7 @@ class DataSource(object): may_use_outdated = config.simulation_mode or self._use_outdated_cache_file if not may_use_outdated and cmk_base.utils.cachefile_age(cachefile) > self._max_cachefile_age: self._logger.debug("[%s] Not using cache (Too old. Age is %d sec, allowed is %s sec)" % - (cmk_base.utils.cachefile_age(cachefile), self._max_cachefile_age)) + (self.id(), cmk_base.utils.cachefile_age(cachefile), self._max_cachefile_age)) return # TODO: Use some generic store file read function to generalize error handling, @@ -338,7 +338,12 @@ class DataSource(object): persisted_info = store.load_data_from_file(file_path, {}) persisted_info = self._filter_outdated_persisted_info(persisted_info, hostname) - self._logger.debug("[%s] Loaded persisted sections: %s" % (self.id(), ", ".join(persisted_info.keys()))) + + if not persisted_info: + self._logger.debug("[%s] No persisted sections loaded" % (self.id())) + else: + self._logger.debug("[%s] Loaded persisted sections: %s" % (self.id(), ", ".join(persisted_info.keys()))) + return persisted_info @@ -367,7 +372,6 @@ class DataSource(object): pass elif modified: - print "XXXXXX" self._store_persisted_info(hostname, persisted_info) return persisted_info diff --git a/cmk_base/data_sources/piggyback.py b/cmk_base/data_sources/piggyback.py index c5e51e9..d6e96d4 100644 --- a/cmk_base/data_sources/piggyback.py +++ b/cmk_base/data_sources/piggyback.py @@ -53,4 +53,4 @@ class PiggyBackDataSource(CheckMKAgentDataSource): Special for piggyback: No caching of raw data """ self._logger.verbose("[%s] Execute data source" % self.id()) - return self._execute(hostname, ipaddress) + return self._execute(hostname, ipaddress), False diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index 160f083..dadbc8e 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -1106,6 +1106,16 @@ def get_check_preview(hostname, use_caches, do_snmp_scan, on_error): exitcode = 3 output = "Error: %s" % e + # TODO: Move this to a helper function + if info is None: # No data for this check type + exitcode = 3 + output = "Received no data" + + if not info and checks.is_snmp_check(check_type) \ + and not checks.check_info[check_type]["handle_empty_info"]: + exitcode = 0 + output = "Received no data" + item_state.set_item_state_prefix(check_type, item) if exitcode == None: diff --git a/tests/cmk_base/test_data_sources.py b/tests/cmk_base/test_data_sources.py index acbee69..d1fbe9e 100644 --- a/tests/cmk_base/test_data_sources.py +++ b/tests/cmk_base/test_data_sources.py @@ -189,7 +189,7 @@ def test_mode_inventory_caching(test_cfg, hosts, cache, force, monkeypatch): assert _counter_run == num_runs finally: # TODO: Can't the mode clean this up on it's own? - cmk_base.data_sources.restore_original_agent_caching_usage() + cmk_base.data_sources.abstract.DataSource.set_use_outdated_cache_file(False) def test_mode_inventory_as_check(test_cfg, monkeypatch, mock): @@ -229,7 +229,7 @@ def test_mode_check_discovery_cached(test_cfg, monkeypatch, mock): assert _counter_run == 2 finally: # TODO: Can't the mode clean this up on it's own? - cmk_base.data_sources.restore_original_agent_caching_usage() + cmk_base.data_sources.abstract.DataSource.set_use_outdated_cache_file(False) def test_mode_discover_all_hosts(test_cfg, monkeypatch, mock): @@ -253,7 +253,7 @@ def test_mode_discover_explicit_hosts_cache(test_cfg, monkeypatch): assert _counter_run == 2 finally: # TODO: Can't the mode clean this up on it's own? - cmk_base.data_sources.restore_original_agent_caching_usage() + cmk_base.data_sources.abstract.DataSource.set_use_outdated_cache_file(False) def test_mode_discover_explicit_hosts_no_cache(test_cfg, monkeypatch): @@ -277,7 +277,7 @@ def test_mode_check_explicit_host_cache(test_cfg, monkeypatch): assert _counter_run == 2 finally: # TODO: Can't the mode clean this up on it's own? - cmk_base.data_sources.restore_original_agent_caching_usage() + cmk_base.data_sources.abstract.DataSource.set_use_outdated_cache_file(False) def test_mode_check_explicit_host_no_cache(test_cfg, monkeypatch): @@ -301,7 +301,7 @@ def test_mode_dump_agent_explicit_host_cache(test_cfg, monkeypatch): assert _counter_run == 2 finally: # TODO: Can't the mode clean this up on it's own? - cmk_base.data_sources.restore_original_agent_caching_usage() + cmk_base.data_sources.abstract.DataSource.set_use_outdated_cache_file(False) def test_mode_dump_agent_explicit_host_no_cache(test_cfg, monkeypatch):

6 years, 10 months

Updated comments; added piggyback data source

by Lars Michelsen

Module: check_mk Branch: master Commit: 2ab72b0357df11267e55217cce9fef54cc97df42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ab72b0357df11… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 14 11:59:00 2017 +0100 Updated comments; added piggyback data source Change-Id: I203d2e4616f44b8f2c2665dbe81cc273277d5358 --- cmk_base/data_sources/__init__.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cmk_base/data_sources/__init__.py b/cmk_base/data_sources/__init__.py index 99b8374..6b60086 100644 --- a/cmk_base/data_sources/__init__.py +++ b/cmk_base/data_sources/__init__.py @@ -278,7 +278,7 @@ class DataSources(object): self._add_source(self._get_agent_data_source()) self._initialize_management_board_data_sources() - # TODO: Piggyback datasource + self._initialize_piggyback_data_source() def _initialize_management_board_data_sources(self): @@ -296,6 +296,10 @@ class DataSources(object): self._add_source(SNMPManagementBoardDataSource()) + def _initialize_management_board_data_sources(self): + self._add_source(PiggyBackDataSource()) + + def _add_sources(self, sources): for source in sources: self._add_source(source) @@ -317,7 +321,6 @@ class DataSources(object): def _get_agent_data_source(self): - # TODO: It's not defined in which order the special agent rules overwrite eachother. special_agents = self._get_special_agent_data_sources() if special_agents: return special_agents[0][1] @@ -329,6 +332,7 @@ class DataSources(object): return TCPDataSource() + # TODO: It's not defined in which order the special agent rules overwrite eachother. def _get_special_agent_data_sources(self): special_agents = [] @@ -364,7 +368,6 @@ class DataSources(object): def get_data_sources(self): - # TODO: Ensure deterministic order return sorted(self._sources.values(), key=lambda s: s.id())

6 years, 10 months

Started adding tests to verify caching behaviour of data_source based modes

by Lars Michelsen

Module: check_mk Branch: master Commit: 2c3a2f71afda070b836736204d4611be68b5e899 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c3a2f71afda07… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 13 13:09:24 2017 +0100 Started adding tests to verify caching behaviour of data_source based modes Change-Id: Iba38ef5432ce5073cfacc77a1c652a736b379837 --- cmk_base/automations/check_mk.py | 6 +- cmk_base/data_sources/__init__.py | 7 +- cmk_base/data_sources/abstract.py | 10 +- cmk_base/modes/check_mk.py | 10 +- tests/cmk_base/test_data_sources.py | 340 +++++++++++++++++++++++++++++++----- 5 files changed, 323 insertions(+), 50 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2c3a2f71af…

6 years, 10 months

5436 FIX Fixed logical problem with SNMP check interval rule

by Lars Michelsen

Module: check_mk Branch: master Commit: 53d0d35e2b042bb9c517a04fd22a234553d3e8fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53d0d35e2b042b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 17 10:24:48 2017 +0100 5436 FIX Fixed logical problem with SNMP check interval rule The rule was previously configured for each individual check. This was not really correct, because the SNMP data is fetched for main checks and their sub checks together. This means that you can not define inidividual SNMP checks intervals for these checks. The ruleset "Check intervals for SNMP checks" has now been changed to work with the "section names" instead of inidividual checks. Change-Id: I56f00bd5e49f4bf791801da94740b0329eb83671 --- .werks/5436 | 16 ++++++++++++++ cmk_base/checks.py | 8 +++++-- cmk_base/config.py | 9 +++++--- cmk_base/core_nagios.py | 2 +- cmk_base/data_sources/snmp.py | 2 -- web/plugins/wato/check_mk_configuration.py | 35 +++++++++++++++++++++++------- 6 files changed, 56 insertions(+), 16 deletions(-) diff --git a/.werks/5436 b/.werks/5436 new file mode 100644 index 0000000..ea2a38b --- /dev/null +++ b/.werks/5436 @@ -0,0 +1,16 @@ +Title: Fixed logical problem with SNMP check interval rule +Level: 1 +Component: core +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1510910528 +Class: fix + +The rule was previously configured for each individual check. This was not really +correct, because the SNMP data is fetched for main checks and their sub checks +together. This means that you can not define inidividual SNMP checks intervals for +these checks. + +The ruleset "Check intervals for SNMP checks" has now been changed to work with the +"section names" instead of inidividual checks. diff --git a/cmk_base/checks.py b/cmk_base/checks.py index abe34b0..1c249c6 100644 --- a/cmk_base/checks.py +++ b/cmk_base/checks.py @@ -449,6 +449,10 @@ def initialize_check_type_caches(): # | Misc check related helper functions | # '----------------------------------------------------------------------' +def section_name_of(check_name): + return check_name.split(".")[0] + + def set_hostname(hostname): check_api._hostname = hostname @@ -466,7 +470,7 @@ def is_snmp_check(check_name): except KeyError: snmp_checks = cmk_base.runtime_cache.get_set("check_type_snmp") - result = check_name.split(".")[0] in snmp_checks + result = section_name_of(check_name) in snmp_checks cache[check_name] = result return result @@ -479,7 +483,7 @@ def is_tcp_check(check_name): except KeyError: tcp_checks = cmk_base.runtime_cache.get_set("check_type_tcp") - result = check_name.split(".")[0] in tcp_checks + result = section_name_of(check_name) in tcp_checks cache[check_name] = result return result diff --git a/cmk_base/config.py b/cmk_base/config.py index 73fce5d..5a52167 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -852,13 +852,16 @@ def check_period_of(hostname, service): return None -def check_interval_of(hostname, checkname): +def check_interval_of(hostname, section_name): import cmk_base.checks - if not cmk_base.checks.is_snmp_check(checkname): + if not cmk_base.checks.is_snmp_check(section_name): return # no values at all for non snmp checks + # Previous to 1.5 "match" could be a check name (including subchecks) instead of + # only main check names -> section names. This has been cleaned up, but we still + # need to be compatible. Strip of the sub check part of "match". for match, minutes in rulesets.host_extra_conf(hostname, snmp_check_interval): - if match is None or match == checkname: + if match is None or match.split(".")[0] == section_name: return minutes # use first match #. diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index 9493c91..6507699 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -308,7 +308,7 @@ define servicedependency { check_interval = int(values[0]) except: check_interval = float(values[0]) - value = config.check_interval_of(hostname, checkname) + value = config.check_interval_of(hostname, checks.section_name_of(checkname)) if value is not None: check_interval = value diff --git a/cmk_base/data_sources/snmp.py b/cmk_base/data_sources/snmp.py index 2ade572..d55da51 100644 --- a/cmk_base/data_sources/snmp.py +++ b/cmk_base/data_sources/snmp.py @@ -213,8 +213,6 @@ class SNMPDataSource(DataSource): persisted_info = {} for section_name, section_info in raw_data.items(): - # TODO: check_type/section_name? Previously check_type was used - # for this kind of call. Possibly we need to redefine this! check_interval = config.check_interval_of(hostname, section_name) if check_interval is None: continue diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index dda8be7..169c209 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -2585,12 +2585,20 @@ register_rule(group, ), match_type="all") + def get_snmp_checktypes(): - checks = watolib.check_mk_local_automation("get-check-information") - types = [ (cn, (c['title'] != cn and '%s: ' % cn or '') + c['title']) - for (cn, c) in checks.items() if c['snmp'] ] - types.sort() - return [ (None, _('All SNMP Checks')) ] + types + checks = watolib.check_mk_local_automation("get-check-information") + types = [ (cn, (c['title'] != cn and '%s: ' % cn or '') + c['title']) + for (cn, c) in checks.items() if c['snmp'] ] + types.sort() + return [ (None, _('All SNMP Checks')) ] + types + + +def get_snmp_section_names(): + checks = watolib.check_mk_local_automation("get-check-information") + return [ (None, _('All SNMP Checks')) ] \ + + sorted([ (cn, cn) for (cn, c) in checks.items() if c['snmp'] ]) + register_rule(group, "snmp_check_interval", @@ -2600,9 +2608,20 @@ register_rule(group, 'With this option it is possible to configure a longer check interval for specific ' 'checks, than then normal check interval.'), elements = [ - DropdownChoice( - title = _("Checktype"), - choices = get_snmp_checktypes, + Transform( + DropdownChoice( + title = _("Check"), + help = _("You can only configure \"section names\" here and not choose all " + "individual SNMP based checks here. It is only possible to define " + "SNMP check intervals for main checks and all the related sub " + "checks together. The reason for this is that the data of the " + "main check and it's sub checks is defined for the whole group " + "of checks in the main check and also fetched for all these " + "checks together."), + choices = get_snmp_section_names, + ), + # Transform check types to section names + forth = lambda e: e.split(".")[0] if e is not None else None, ), Integer( title = _("Do check every"),

6 years, 10 months

Builtin host tag groups can now be used in the status GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: fe94ba13766330a8fbb239a31132479827380745 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe94ba13766330… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 6 11:31:54 2017 +0100 Builtin host tag groups can now be used in the status GUI Change-Id: I66cc5771d7d214d5a67c71d86a1878be1d05eb36 --- web/htdocs/config.py | 27 +++++++++++++++++++++++++++ web/htdocs/views.py | 2 +- web/plugins/sidebar/search.py | 2 +- web/plugins/sidebar/shipped.py | 4 ++-- web/plugins/views/painters.py | 2 +- web/plugins/views/sorters.py | 2 +- web/plugins/visuals/filters.py | 6 +++--- web/plugins/wato/check_mk_configuration.py | 2 +- 8 files changed, 37 insertions(+), 10 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 3b9fe41..ebb406f 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -650,6 +650,33 @@ def save_user_file(name, data, user, unlock=False): #. +# .--Host tags-----------------------------------------------------------. +# | _ _ _ _ | +# | | | | | ___ ___| |_ | |_ __ _ __ _ ___ | +# | | |_| |/ _ \/ __| __| | __/ _` |/ _` / __| | +# | | _ | (_) \__ \ |_ | || (_| | (_| \__ \ | +# | |_| |_|\___/|___/\__| \__\__,_|\__, |___/ | +# | |___/ | +# +----------------------------------------------------------------------+ +# | Helper functions for dealing with host tags | +# '----------------------------------------------------------------------' + +# Returns the effective set of tag groups defined by WATO. This includes +# the implicitly declared builtin host tags. This function must be used by +# the GUI code to get the tag group definitions. +def host_tag_groups(): + import watolib + tag_groups = wato_host_tags[:] + tag_group_ids = set([ tg[0] for tg in tag_groups ]) + + for tag_group in watolib.builtin_host_tags: + if tag_group[0] not in tag_group_ids: + tag_groups.append(tag_group) + + return tag_groups + + +#. # .--Sites---------------------------------------------------------------. # | ____ _ _ | # | / ___|(_) |_ ___ ___ | diff --git a/web/htdocs/views.py b/web/htdocs/views.py index ffae17c..4ec808f 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2958,7 +2958,7 @@ g_taggroups_by_id = {} def get_tag_group(tgid): # Build a cache if not g_taggroups_by_id: - for entry in config.wato_host_tags: + for entry in config.host_tag_groups(): g_taggroups_by_id[entry[0]] = (entry[1], entry[2]) return g_taggroups_by_id.get(tgid, (_("N/A"), [])) diff --git a/web/plugins/sidebar/search.py b/web/plugins/sidebar/search.py index 463b24a..86e9af0 100644 --- a/web/plugins/sidebar/search.py +++ b/web/plugins/sidebar/search.py @@ -398,7 +398,7 @@ class HosttagMatchPlugin(QuicksearchMatchPlugin): def _get_hosttag_dict(self): lookup_dict = {} - for group, text, values in config.wato_host_tags: + for group, text, values in config.host_tag_groups(): for value in values: lookup_dict[value[0]] = group return lookup_dict diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 293d70d..828e96c 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -2137,7 +2137,7 @@ class VirtualHostTree(SidebarSnapin): for nr, (level_spec, tag) in enumerate(zip(tag_tree_spec, tag_node_values)): if level_spec.startswith("topic:"): # Find correct tag group for this tag - for entry in config.wato_host_tags: + for entry in config.host_tag_groups(): for tagentry in entry[2]: if tagentry[0] == tag: # Found our tag taggroup = entry[0] @@ -2338,7 +2338,7 @@ function virtual_host_tree_enter(path) def _get_tag_config(self): tag_groups = {} topics = {} - for entry in config.wato_host_tags: + for entry in config.host_tag_groups(): grouptitle = entry[1] if '/' in grouptitle: topic, grouptitle = grouptitle.split("/", 1) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index a01ac8b..d99ae02 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -2576,7 +2576,7 @@ def load_host_tag_painters(): if key.startswith('host_tag_'): del multisite_painters[key] - for entry in config.wato_host_tags: + for entry in config.host_tag_groups(): tgid = entry[0] tit = entry[1] ch = entry[2] diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py index 468cd28..fe17996 100644 --- a/web/plugins/views/sorters.py +++ b/web/plugins/views/sorters.py @@ -410,7 +410,7 @@ def cmp_host_tag(r1, r2, tgid): return cmp(val1, val2) -for entry in config.wato_host_tags: +for entry in config.host_tag_groups(): tgid = entry[0] tit = entry[1] diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 34c2d18..6e32022 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -1076,7 +1076,7 @@ class FilterHostTags(Filter): ) def display(self): - groups = [ (e[0], e[1].lstrip("/") ) for e in config.wato_host_tags ] + groups = [ (e[0], e[1].lstrip("/") ) for e in config.host_tag_groups() ] operators = [ ("is", "="), ("isnot", u"≠"), @@ -1084,7 +1084,7 @@ class FilterHostTags(Filter): # replace unicode strings, before writing out as "json" grouped = {} - for entry in config.wato_host_tags: + for entry in config.host_tag_groups(): grouped.setdefault(entry[0], [["", ""]]) for tag_entry in entry[2]: @@ -1139,7 +1139,7 @@ class FilterHostTags(Filter): # of the group group = html.var(prefix + '_grp') grouptags = None - for entry in config.wato_host_tags: + for entry in config.host_tag_groups(): if entry[0] == group: # found our group grouptags = [ x[0] for x in entry[2] if x[0] ] break diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index e708e54..dda8be7 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -349,7 +349,7 @@ def wato_host_tag_group_choices(): # - contain at least two entries choices = [] by_topic = {} - for entry in config.wato_host_tags: + for entry in config.host_tag_groups(): tgid = entry[0] topic, tit = watolib.parse_hosttag_title(entry[1]) choices.append((tgid, tit))

6 years, 10 months

Made "agent" a builtin tag group

by Lars Michelsen

Module: check_mk Branch: master Commit: 983ce66c663e74ca70eba5fbcd3a116717324d90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=983ce66c663e74… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 6 13:05:20 2017 +0100 Made "agent" a builtin tag group Change-Id: I115108b86020549548065b9a4b35830271728055 --- web/htdocs/config.py | 19 +++--- web/htdocs/wato.py | 125 ++++++++++++++++------------------ web/htdocs/watolib.py | 156 ++++++++++++++++++++++++++----------------- web/plugins/webapi/webapi.py | 8 +-- 4 files changed, 167 insertions(+), 141 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=983ce66c66…

6 years, 10 months

cpu_tracking: Fixed exception when popping the last phase

by Lars Michelsen

Module: check_mk Branch: master Commit: 613d987c09416ced1506e047e30e61507e5ca5a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=613d987c09416c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 15 16:58:21 2017 +0100 cpu_tracking: Fixed exception when popping the last phase Change-Id: Ia0ec8e9235fc07e603480da8f0fad959f9090a00 --- lib/cpu_tracking.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/cpu_tracking.py b/lib/cpu_tracking.py index 2e3b070..1d8a60f 100644 --- a/lib/cpu_tracking.py +++ b/lib/cpu_tracking.py @@ -61,7 +61,11 @@ def push_phase(phase): def pop_phase(): if current_phase != None: - set_phase(phase_stack[-1]) + if len(phase_stack) == 1: + set_phase(None) + else: + set_phase(phase_stack[-1]) + del phase_stack[-1]

6 years, 10 months

refactored () to use cmk.store

by Lars Michelsen

Module: check_mk Branch: master Commit: 0d616aaf3830789c5b8c25c5aa71542d1ef8a4b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d616aaf383078… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 6 11:34:24 2017 +0100 refactored () to use cmk.store Change-Id: Ice73fbc2d9a79054e5280a1036cf361e6da9de70 --- web/htdocs/watolib.py | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 159e373..deb1853 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -6186,27 +6186,25 @@ def format_php(data, lvl = 1): # as tuple of at least three elements. The elements are used as follows: # taggroup_id, group_title, list_of_choices, depends_on_tags, depends_on_roles, editable def load_hosttags(): - filename = multisite_dir + "hosttags.mk" - if not os.path.exists(filename): - return [], [] - try: - vars = { - "wato_host_tags" : [], - "wato_aux_tags" : []} - execfile(filename, vars, vars) - # Convert manually crafted host tags tags WATO-style. This - # makes the migration easier - for taggroup in vars["wato_host_tags"]: - for nr, entry in enumerate(taggroup[2]): - if len(entry) <= 2: - taggroup[2][nr] = entry + ([],) - return vars["wato_host_tags"], vars["wato_aux_tags"] + default_config = { + "wato_host_tags" : [], + "wato_aux_tags" : [], + } - except Exception, e: - if config.debug: - raise MKGeneralException(_("Cannot read configuration file %s: %s") % - (filename, e)) - return [], [] + config = cmk.store.load_mk_file(multisite_dir + "hosttags.mk", default_config) + + _convert_manual_host_tags(config["wato_host_tags"]) + + return config["wato_host_tags"], config["wato_aux_tags"] + + +# Convert manually crafted host tags tags WATO-style. This +# makes the migration easier +def _convert_manual_host_tags(host_tags): + for taggroup in host_tags: + for nr, entry in enumerate(taggroup[2]): + if len(entry) <= 2: + taggroup[2][nr] = entry + ([],) def validate_tag_id(tag_id, varname):

6 years, 10 months

local automations: Log failed commands with exit code to web.log

by Lars Michelsen

Module: check_mk Branch: master Commit: e2c6a0589012c4e4cdef09192f6d45c3b5a0a587 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2c6a0589012c4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 16 10:09:10 2017 +0100 local automations: Log failed commands with exit code to web.log Change-Id: Iae6c302095f67e3cc0d2e33263ace5c3625c0364 --- web/htdocs/watolib.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 846d833..159e373 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -6821,6 +6821,7 @@ def check_mk_local_automation(command, args=None, indata="", stdin_data=None, ti outdata = p.stdout.read() exitcode = p.wait() if exitcode != 0: + logger.error("Error running %r (exit code %d)" % (" ".join(cmd), exitcode)) if config.debug: raise MKGeneralException("Error running <tt>%s</tt> (exit code %d): <pre>%s</pre>" % (" ".join(cmd), exitcode, hilite_errors(outdata)))

6 years, 10 months

← Newer
1
...
14
15
16
17
18
19
20
...
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