Checkmk git commits July 2017

checkmk-commits@lists.checkmk.com

11 participants
286 discussions

Fixed name resolution during cmk --dump calls

by Lars Michelsen

Module: check_mk Branch: master Commit: 6d748690132ac55e8c887f841f8d1952dd27d211 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d748690132ac5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 11 08:17:13 2017 +0200 Fixed name resolution during cmk --dump calls Change-Id: Ifb153dae14bc763905e1b6a1996f922b39611d96 --- cmk_base/modes/check_mk.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cmk_base/modes/check_mk.py b/cmk_base/modes/check_mk.py index 627e6aa..7122de0 100644 --- a/cmk_base/modes/check_mk.py +++ b/cmk_base/modes/check_mk.py @@ -316,8 +316,14 @@ modes.register(Mode( def mode_dump_agent(hostname): import cmk_base.agent_data as agent_data import cmk_base.piggyback as piggyback + import cmk_base.ip_lookup as ip_lookup try: - console.output(agent_data.get_agent_info(hostname, hostname, 999999999)) + if config.is_cluster(hostname): + raise MKBailOut("Can not be used with cluster hosts") + + if config.is_tcp_host(hostname): + ipaddress = ip_lookup.lookup_ip_address(hostname) + console.output(agent_data.get_agent_info(hostname, ipaddress, 999999999)) console.output(piggyback.get_piggyback_info(hostname)) except MKAgentError, e: raise MKBailOut("Problem contacting agent: %s" % e)

6 years, 11 months

Fixed issues with tooltips while editing views

by Lars Michelsen

Module: check_mk Branch: master Commit: c0c01e48000affe23e3c3eebe71a2318e9dfac06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0c01e48000aff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 11 08:36:34 2017 +0200 Fixed issues with tooltips while editing views Change-Id: Id5663bde50c7f52da13ab69d2171d4cb78d97957 --- web/htdocs/valuespec.py | 6 +++--- web/htdocs/views.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 3a2301e..4fb02bb 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1569,7 +1569,7 @@ class DropdownChoice(ValueSpec): self._sorted = kwargs.get("sorted", False) self._empty_text = kwargs.get("empty_text", _("There are no elements defined for this selection yet.")) self._invalid_choice = kwargs.get("invalid_choice", "complain") # also possible: "replace" - self._invalid_choice_title = kwargs.get("invalid_choice_title", _("Element does not exist anymore")) + self._invalid_choice_title = kwargs.get("invalid_choice_title", _("Element '%r' does not exist anymore")) self._invalid_choice_error = kwargs.get("invalid_choice_error", _("The selected element is not longer available. Please select something else.")) self._no_preselect = kwargs.get("no_preselect", False) @@ -1634,8 +1634,8 @@ class DropdownChoice(ValueSpec): def _get_invalid_choice_title(self, value): - if "%s" in self._invalid_choice_title: - return self._invalid_choice_title % value + if "%s" in self._invalid_choice_title or "%r" in self._invalid_choice_title: + return self._invalid_choice_title % (value,) else: return self._invalid_choice_title diff --git a/web/htdocs/views.py b/web/htdocs/views.py index d1c0bd6..4ca2962 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1293,7 +1293,7 @@ def transform_view_to_valuespec_value(view): else: pname, viewname = entry - columns.append((pname, viewname, '')) + columns.append((pname, viewname, None)) def transform_valuespec_value_to_view(view):

6 years, 11 months

Slightly improved exception handling during icon rendering

by Lars Michelsen

Module: check_mk Branch: master Commit: e1bd0cfbbb37a68abc6fea87267a7b5cac15aba6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1bd0cfbbb37a6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 10 16:12:45 2017 +0200 Slightly improved exception handling during icon rendering Change-Id: Ic48ea8747f8db345a69c615e5d38b0d850e63ae2 --- .werks/4956 | 39 +++++++++++++++++++++++++++++++++++++++ cmk_base/piggyback.py | 13 ++++--------- web/plugins/views/painters.py | 6 ++++-- 3 files changed, 47 insertions(+), 11 deletions(-) diff --git a/.werks/4956 b/.werks/4956 new file mode 100644 index 0000000..9203b97 --- /dev/null +++ b/.werks/4956 @@ -0,0 +1,39 @@ +Title: Fixed possible exception in cmc.log when working with piggyback data +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1499694823 + +When monitoring hosts using piggyback data an exception could occur when +a host is checked by different processes at the same time. This could happen +e.g. when the running core updates the piggyback data while a manual +"check_mk -nv [hostname]" call also tries to update this data. + +The fixed exception looks like this in cmc.log: + +C+: +2017-07-03 19:39:04 [4] [Check_MK helper 2835] >> Traceback (most recent call last): +2017-07-03 19:39:04 [4] [Check_MK helper 2835] >> File "/omd/sites/master/share/check_mk/modules/keepalive.py", line 118, in do_keepalive +2017-07-03 19:39:04 [4] [Check_MK helper 2835] >> status = command_function(command_tuple) +2017-07-03 19:39:04 [4] [Check_MK helper 2835] >> File "/omd/sites/master/share/check_mk/modules/keepalive.py", line 464, in execute_keepalive_command +2017-07-03 19:39:04 [4] [Check_MK helper 2835] >> return mode_function(hostname, ipaddress) +2017-07-03 19:39:04 [4] [Check_MK helper 2835] >> File "/omd/sites/master/share/check_mk/modules/check_mk_base.py", line 1242, in do_check +2017-07-03 19:39:04 [4] [Check_MK helper 2835] >> do_all_checks_on_host(hostname, ipaddress, only_check_types) +2017-07-03 19:39:04 [4] [Check_MK helper 2835] >> File "/omd/sites/master/share/check_mk/modules/check_mk_base.py", line 1526, in do_all_checks_on_host +2017-07-03 19:39:04 [4] [Check_MK helper 2835] >> res = execute_check(checkname, item, params, description, aggrname, address) +2017-07-03 19:39:04 [4] [Check_MK helper 2835] >> File "/omd/sites/master/share/check_mk/modules/check_mk_base.py", line 1415, in execute_check +2017-07-03 19:39:04 [4] [Check_MK helper 2835] >> info = get_info_for_check(hostname, ipaddress, infotype) +2017-07-03 19:39:04 [4] [Check_MK helper 2835] >> File "/omd/sites/master/share/check_mk/modules/check_mk_base.py", line 224, in get_info_for_check +2017-07-03 19:39:04 [4] [Check_MK helper 2835] >> info = apply_parse_function(get_host_info(hostname, ipaddress, section_name, max_cachefile_age, ignore_check_interval), section_name) +2017-07-03 19:39:04 [4] [Check_MK helper 2835] >> File "/omd/sites/master/share/check_mk/modules/check_mk_base.py", line 317, in get_host_info +2017-07-03 19:39:04 [4] [Check_MK helper 2835] >> ignore_check_interval) +2017-07-03 19:39:04 [4] [Check_MK helper 2835] >> File "/omd/sites/master/share/check_mk/modules/check_mk_base.py", line 461, in get_realhost_info +2017-07-03 19:39:04 [4] [Check_MK helper 2835] >> store_piggyback_info(hostname, piggybacked) +2017-07-03 19:39:04 [4] [Check_MK helper 2835] >> File "/omd/sites/master/share/check_mk/modules/check_mk_base.py", line 598, in store_piggyback_info +2017-07-03 19:39:04 [4] [Check_MK helper 2835] >> os.rename(dir + "/.new." + sourcehost, dir + "/" + sourcehost) +2017-07-03 19:39:04 [4] [Check_MK helper 2835] >> OSError: [Errno 2] No such file or directory +C-: diff --git a/cmk_base/piggyback.py b/cmk_base/piggyback.py index c945587..edeb9d0 100644 --- a/cmk_base/piggyback.py +++ b/cmk_base/piggyback.py @@ -28,6 +28,7 @@ import os import cmk.paths import cmk.hostname_translation +import cmk.store as store from cmk.exceptions import MKGeneralException import cmk_base.utils @@ -66,7 +67,7 @@ def get_piggyback_files(hostname): raise for sourcehost in source_hosts: - if sourcehost in ['.', '..'] or sourcehost.startswith(".new."): + if sourcehost.startswith("."): continue file_path = dir + "/" + sourcehost @@ -97,16 +98,10 @@ def get_piggyback_files(hostname): def store_piggyback_info(sourcehost, piggybacked): - piggyback_path = cmk.paths.tmp_dir + "/piggyback/" for backedhost, lines in piggybacked.items(): console.verbose("Storing piggyback data for %s.\n" % backedhost) - dir = piggyback_path + backedhost - if not os.path.exists(dir): - os.makedirs(dir) - out = file(dir + "/.new." + sourcehost, "w") - for line in lines: - out.write("%s\n" % line) - os.rename(dir + "/.new." + sourcehost, dir + "/" + sourcehost) + content = "\n".join(lines) + "\n" + store.save_file(os.path.join(cmk.paths.tmp_dir, "piggyback", backedhost, sourcehost), content) # Remove piggybacked information that is not # being sent this turn diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 057c434..a4f8f06 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -62,6 +62,8 @@ # styles are not modular and all defined in check_mk.css. This will # change in future. +import traceback + import bi # Needed for BI Icon. For arkane reasons (ask htdocs/module.py) this # cannot be imported in views.py directly. @@ -302,7 +304,8 @@ def process_multisite_icons(what, row, tags, custom_vars, toplevel): except Exception, e: if config.debug: raise - result = ("alert", "%s" % e) + result = ("alert", "Exception in icon '%s': %s" % + (icon_id, traceback.format_exc())) if result is None: continue @@ -338,7 +341,6 @@ def process_multisite_icons(what, row, tags, custom_vars, toplevel): icons.append((sort_index, icon_name, title, url)) except Exception, e: - import traceback icons.append((sort_index, 'Exception in icon plugin!<br />' + traceback.format_exc())) return icons

6 years, 11 months

Standardized config handling of liveproxyd (has liveproxyd.d directory now )

by Lars Michelsen

Module: check_mk Branch: master Commit: 921989fcc657765daa0134ccd3fcd65337938635 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=921989fcc65776… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 10 15:30:32 2017 +0200 Standardized config handling of liveproxyd (has liveproxyd.d directory now) Change-Id: Ib29e3ce3d6d3316d78064a3e3f95c3b1b29601ec --- web/htdocs/watolib.py | 81 +++++++++------------------------------------------ 1 file changed, 13 insertions(+), 68 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 29ddaa3..2069297 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -402,64 +402,6 @@ class ConfigDomainEventConsole(ConfigDomain): - -class ConfigDomainLiveproxy(ConfigDomain): - needs_sync = False - needs_activation = False - ident = "liveproxyd" - in_global_settings = True - - - @classmethod - def enabled(self): - return config.liveproxyd_enabled - - - def config_file(self, site_specific): - return cmk.paths.default_config_dir + "/liveproxyd.mk" - - - # The load() and save() method only deal with the "global settings" and not - # the "sites" option that is saved by editing the sites. This must be merged - def load(self): - cfg = self.load_full_liveproxyd_config() - - try: - del cfg["sites"] - except KeyError: - pass - - return cfg - - - def save(self, settings, site_specific=False): - if site_specific: - raise NotImplementedError() - - cfg = self.load_full_liveproxyd_config() - cfg.update(settings) - super(ConfigDomainLiveproxy, self).save(cfg, site_specific=site_specific) - - self.activate() - - - def load_full_liveproxyd_config(self): - return store.load_mk_file(self.config_file(site_specific=False), {"sites": {}}) - - - def activate(self): - log_audit(None, "liveproxyd-activate", - _("Activating changes of liveproxyd configuration")) - try: - pidfile = cmk.paths.livestatus_unix_socket + "proxyd.pid" - pid = int(file(pidfile).read().strip()) - os.kill(pid, 10) - except Exception, e: - log_exception() - html.show_error(_("Warning: cannot reload Livestatus Proxy-Daemon: %s") % e) - - - class ConfigDomainCACertificates(ConfigDomain): needs_sync = True needs_activation = True @@ -3750,17 +3692,17 @@ class SiteManagement(object): @staticmethod def save_liveproxyd_config(sites): - config_domain = ConfigDomainLiveproxy() - cfg = config_domain.load() + path = cmk.paths.default_config_dir + "/liveproxyd.mk" - site_cfg = {} - for siteid, siteconf in sites.items(): - s = siteconf.get("socket") - if type(s) == tuple and s[0] == "proxy": - site_cfg[siteid] = s[1] + conf = {} + for siteid, siteconf in sites.items(): + s = siteconf.get("socket") + if type(s) == tuple and s[0] == "proxy": + conf[siteid] = s[1] - cfg["sites"] = site_cfg - config_domain.save(cfg) + store.save_to_mk_file(path, "sites", conf) + + ConfigDomainLiveproxy().activate() @staticmethod @@ -3786,12 +3728,15 @@ class SiteManagement(object): "assigned to it. You can use the <a href=\"%s\">host " "search</a> to get a list of the hosts.") % search_url) + domains = [ConfigDomainGUI] + if config.liveproxyd_enabled: + domains = ConfigDomainLiveproxy del all_sites[site_id] SiteManagement.save_sites(all_sites) clear_site_replication_status(site_id) add_change("edit-sites", _("Deleted site %s") % html.render_tt(site_id), - domains=[ConfigDomainGUI,ConfigDomainLiveproxy], sites=[default_site()]) + domains=domains, sites=[default_site()]) return None

6 years, 11 months

4915 solaris_mem: Unified graphs and Per-O-Meter with common memory checks

by Marcel Arentz

Module: check_mk Branch: master Commit: a28b38a941e6e93b0f725e9f038da7bb99280f04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a28b38a941e6e9… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Jul 10 15:26:55 2017 +0200 4915 solaris_mem: Unified graphs and Per-O-Meter with common memory checks The graphs have been different between common memory checks and services provided by solaris_mem. This has been changed now. A side effect is the Per-O-Meter which is now also available. Change-Id: I79dc6a76cc4afc527e70e134a3bce47a50c50507 --- .werks/4915 | 12 ++++++++++++ web/plugins/metrics/check_mk.py | 1 + 2 files changed, 13 insertions(+) diff --git a/.werks/4915 b/.werks/4915 new file mode 100644 index 0000000..02001ea --- /dev/null +++ b/.werks/4915 @@ -0,0 +1,12 @@ +Title: solaris_mem: Unified graphs and Per-O-Meter with common memory checks +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1499693045 +Class: feature + +The graphs have been different between common memory checks and services +provided by solaris_mem. This has been changed now. A side effect is the +Per-O-Meter which is now also available. diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 0812c60..7434dc8 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -4036,6 +4036,7 @@ ram_used_swap_translation = { check_metrics["check_mk-statgrab_mem"] = ram_used_swap_translation check_metrics["check_mk-hr_mem"] = ram_used_swap_translation +check_metrics["check_mk-solaris_mem"] = ram_used_swap_translation check_metrics["check_mk-mem.used"] = { "ramused" : { "name" : "mem_used", "scale" : MB },

6 years, 11 months

Virtual host tree: Whole "WATO folder tree" can now be added

by Lars Michelsen

Module: check_mk Branch: master Commit: 0008a35f7201d36f43421824f7477aa1f32e8233 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0008a35f7201d3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 10 09:07:41 2017 +0200 Virtual host tree: Whole "WATO folder tree" can now be added Change-Id: Ia4bcae9f731541803c8702283579631eaa92ac0d --- web/plugins/sidebar/shipped.py | 234 ++++++++++++++++------------- web/plugins/wato/check_mk_configuration.py | 17 ++- 2 files changed, 142 insertions(+), 109 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0008a35f72…

6 years, 11 months

virtual host trees: refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: eede1bb057b5e19990b9737dcbab08d34b1b3af8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eede1bb057b5e1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 10 07:33:20 2017 +0200 virtual host trees: refactoring Change-Id: I49dbf9bf96436ffaffd7fa66ace8a7b5f053c6fa --- web/plugins/sidebar/shipped.py | 184 +++++++++++++++++++++++------------------ 1 file changed, 104 insertions(+), 80 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=eede1bb057…

6 years, 11 months

virtual host tree: some refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: cf3427f7e8da623ce316d3659834a2904c0d9af9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf3427f7e8da62… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 7 12:12:52 2017 +0200 virtual host tree: some refactoring Change-Id: I3d6cbe192f120683e69968b16cb9d953ec3300ba --- web/plugins/sidebar/shipped.py | 73 ++++++++++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 27 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index aef3ce8..83242cf 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1835,6 +1835,12 @@ sidebar_snapins["wiki"] = { # '----------------------------------------------------------------------' class VirtualHostTree(SidebarSnapin): + def _load_trees(self): + import wato + self._trees = dict([ (tree["id"], tree) for tree in + wato.transform_virtual_host_trees(config.virtual_host_trees) ]) + + def title(self): return _("Virtual Host Tree") @@ -1846,6 +1852,7 @@ class VirtualHostTree(SidebarSnapin): def show(self): + self._load_trees() if not config.virtual_host_trees: url = 'wato.py?varname=virtual_host_trees&mode=edit_configvar' multisite = html.render_a("Multisite", href=url, target="main") @@ -1853,22 +1860,20 @@ class VirtualHostTree(SidebarSnapin): 'in the global settings for %s.') % multisite) return - tree_conf = config.user.load_file("virtual_host_tree", {"tree": 0, "cwd": {}}) - if type(tree_conf) == int: - tree_conf = {"tree": tree_conf, "cwd":{}} # convert from old style + tree_id, cwd = self._get_user_settings() - trees = dict([ (tree["id"], tree) for tree in - wato.transform_virtual_host_trees(config.virtual_host_trees) ]) + self._show_tree_selection(tree_id, cwd) + self._show_tree(tree_id, cwd) - choices = sorted([ (tree["id"], tree["title"]) for tree in trees.values() ], - key=lambda x: x[1]) + def _show_tree_selection(self, tree_id, cwd): html.begin_form("vtree") - cwd = tree_conf["cwd"].get(tree_conf["tree"]) - - html.dropdown("vtree", choices, deflt="%s" % tree_conf["tree"], - onchange='virtual_host_tree_changed(this)', style="width:210px" if cwd else None) + html.dropdown("vtree", self._tree_choices(), + deflt="%s" % tree_id, + onchange='virtual_host_tree_changed(this)', + style="width:210px" if cwd else None + ) # Give chance to change one level up, if we are in a subtree if cwd: @@ -1879,11 +1884,9 @@ class VirtualHostTree(SidebarSnapin): html.end_form() html.final_javascript(self._javascript()) - try: - tag_groups = trees[tree_conf["tree"]]["tag_groups"] - except KeyError: - # Fallback to first host tree in case the wanted does not exist (anymore) - tag_groups = trees[choices[0][0]]["tag_groups"] + + def _show_tree(self, tree_id, cwd): + tag_groups = self._trees[tree_id]["tag_groups"] tree = self._compute_tag_tree(tag_groups) html.open_div(class_="tag_tree") @@ -1891,6 +1894,26 @@ class VirtualHostTree(SidebarSnapin): html.close_div() + def _get_user_settings(self): + tree_conf = config.user.load_file("virtual_host_tree", {"tree": 0, "cwd": {}}) + if type(tree_conf) == int: + tree_conf = {"tree": tree_conf, "cwd":{}} # convert from old style + + cwd = tree_conf["cwd"].get(tree_conf["tree"]) + tree_id = tree_conf["tree"] + + # Fallback to first defined tree in case the user selected does not exist anymore + if tree_id not in self._trees: + tree_id, cwd = self._tree_choices()[0][0], {} + + return tree_id, cwd + + + def _tree_choices(self): + return sorted([ (tree["id"], tree["title"]) for tree in self._trees.values() ], + key=lambda x: x[1]) + + def _render_tag_tree_level(self, taggroups, path, cwd, title, tree): if not self._is_tag_subdir(path, cwd) and not self._is_tag_subdir(cwd, path): return @@ -2168,21 +2191,17 @@ function virtual_host_tree_enter(path) def _ajax_tag_tree(self): - new_tree = html.var("conf") - - tree_conf = config.user.load_file("virtual_host_tree", {"tree": 0, "cwd": {}}) - - if type(tree_conf) == int: - tree_conf = {"cwd":{}} # convert from old style + self._load_trees() + new_tree = html.var("tree_id") - trees = dict([ (tree["id"], tree) for tree in - wato.transform_virtual_host_trees(config.virtual_host_trees) ]) + tree_id, cwd = self._get_user_settings() - if new_tree not in trees: + if new_tree not in self._trees: raise MKUserError("conf", _("This virtual host tree does not exist.")) - tree_conf["tree"] = new_tree - config.user.save_file("virtual_host_tree", tree_conf) + config.user.save_file("virtual_host_tree", + {"tree": tree_id, "cwd": {}}) + html.write("OK")

6 years, 11 months

Introduce new snapin API; Refactored virtual host tree snapin to use new API

by Lars Michelsen

Module: check_mk Branch: master Commit: d10f755b6d7d058ce19bf0a353823a914dbdeb7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d10f755b6d7d05… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 7 11:33:14 2017 +0200 Introduce new snapin API; Refactored virtual host tree snapin to use new API Change-Id: Ifa1cd323016ff8b59e91e210f3d7399b9fdc7f83 --- web/htdocs/sidebar.py | 164 ++++++++--- web/plugins/pages/shipped.py | 2 - web/plugins/sidebar/shipped.py | 598 ++++++++++++++++++++++------------------- 3 files changed, 450 insertions(+), 314 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d10f755b6d…

6 years, 11 months

virtua host trees: a bit more refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 1d3031169490845091254898b689f2a88d26a643 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d303116949084… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 7 12:29:37 2017 +0200 virtua host trees: a bit more refactoring Change-Id: I7a62adf11d3ee462522ea41f7008f04d335a81fa --- web/plugins/sidebar/shipped.py | 89 +++++++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 40 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 83242cf..c9a6bcc 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1835,12 +1835,40 @@ sidebar_snapins["wiki"] = { # '----------------------------------------------------------------------' class VirtualHostTree(SidebarSnapin): + def _load(self): + self._load_trees() + self._load_user_settings() + + def _load_trees(self): import wato self._trees = dict([ (tree["id"], tree) for tree in wato.transform_virtual_host_trees(config.virtual_host_trees) ]) + def _load_user_settings(self): + tree_conf = config.user.load_file("virtual_host_tree", {"tree": 0, "cwd": {}}) + if type(tree_conf) == int: + tree_conf = {"tree": tree_conf, "cwd":{}} # convert from old style + + tree_id = tree_conf["tree"] + + # Fallback to first defined tree in case the user selected does not exist anymore + if tree_id not in self._trees: + tree_id = self._tree_choices()[0][0] + + self._cwds = tree_conf["cwd"] + self._current_tree_id = tree_id + self._current_tree_path = self._cwds.get(self._current_tree_id, []) + + + def _save_user_settings(self): + config.user.save_file("virtual_host_tree", { + "tree" : self._current_tree_id, + "cwd" : self._cwds + }) + + def title(self): return _("Virtual Host Tree") @@ -1852,7 +1880,7 @@ class VirtualHostTree(SidebarSnapin): def show(self): - self._load_trees() + self._load() if not config.virtual_host_trees: url = 'wato.py?varname=virtual_host_trees&mode=edit_configvar' multisite = html.render_a("Multisite", href=url, target="main") @@ -1860,24 +1888,22 @@ class VirtualHostTree(SidebarSnapin): 'in the global settings for %s.') % multisite) return - tree_id, cwd = self._get_user_settings() + self._show_tree_selection() + self._show_tree() - self._show_tree_selection(tree_id, cwd) - self._show_tree(tree_id, cwd) - - def _show_tree_selection(self, tree_id, cwd): + def _show_tree_selection(self): html.begin_form("vtree") html.dropdown("vtree", self._tree_choices(), - deflt="%s" % tree_id, + deflt="%s" % self._current_tree_id, onchange='virtual_host_tree_changed(this)', - style="width:210px" if cwd else None + style="width:210px" if self._current_tree_path else None ) # Give chance to change one level up, if we are in a subtree - if cwd: - upurl = "javascript:virtual_host_tree_enter('%s')" % "|".join(cwd[:-1]) + if self._current_tree_path: + upurl = "javascript:virtual_host_tree_enter('%s')" % "|".join(self._current_tree_path[:-1]) html.icon_button(upurl, _("Go up one tree level"), "back") html.br() @@ -1885,30 +1911,15 @@ class VirtualHostTree(SidebarSnapin): html.final_javascript(self._javascript()) - def _show_tree(self, tree_id, cwd): - tag_groups = self._trees[tree_id]["tag_groups"] + def _show_tree(self): + tag_groups = self._trees[self._current_tree_id]["tag_groups"] tree = self._compute_tag_tree(tag_groups) html.open_div(class_="tag_tree") - self._render_tag_tree_level(tag_groups, [], cwd, _("Virtual Host Tree"), tree) + self._render_tag_tree_level(tag_groups, [], self._current_tree_path, _("Virtual Host Tree"), tree) html.close_div() - def _get_user_settings(self): - tree_conf = config.user.load_file("virtual_host_tree", {"tree": 0, "cwd": {}}) - if type(tree_conf) == int: - tree_conf = {"tree": tree_conf, "cwd":{}} # convert from old style - - cwd = tree_conf["cwd"].get(tree_conf["tree"]) - tree_id = tree_conf["tree"] - - # Fallback to first defined tree in case the user selected does not exist anymore - if tree_id not in self._trees: - tree_id, cwd = self._tree_choices()[0][0], {} - - return tree_id, cwd - - def _tree_choices(self): return sorted([ (tree["id"], tree["title"]) for tree in self._trees.values() ], key=lambda x: x[1]) @@ -2044,9 +2055,8 @@ class VirtualHostTree(SidebarSnapin): return """ function virtual_host_tree_changed(field) { - var tree_conf = field.value; - // Then send the info to python code via ajax call for persistance - get_url_sync('sidebar_ajax_tag_tree.py?conf=' + escape(tree_conf)); + var tree_id = field.value; + get_url_sync('sidebar_ajax_tag_tree.py?tree_id=' + escape(tree_id)); refresh_single_snapin("tag_tree"); } @@ -2191,25 +2201,24 @@ function virtual_host_tree_enter(path) def _ajax_tag_tree(self): - self._load_trees() + self._load() new_tree = html.var("tree_id") - tree_id, cwd = self._get_user_settings() - if new_tree not in self._trees: raise MKUserError("conf", _("This virtual host tree does not exist.")) - config.user.save_file("virtual_host_tree", - {"tree": tree_id, "cwd": {}}) - + self._current_tree_id = new_tree + self._save_user_settings() html.write("OK") + # TODO: Validate path in current tree def _ajax_tag_tree_enter(self): + self._load() path = html.var("path").split("|") if html.var("path") else [] - tree_conf = config.user.load_file("virtual_host_tree", {"tree": 0, "cwd": {}}) - tree_conf["cwd"][tree_conf["tree"]] = path - config.user.save_file("virtual_host_tree", tree_conf) + self._cwds[self._current_tree_id] = path + self._save_user_settings() + html.write("OK") def refresh_regularly(self):

6 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2017