Checkmk git commits September 2018

checkmk-commits@lists.checkmk.com

12 participants
371 discussions

6550 FIX Fixed warning "bad ps syntax" when stopping a site on e.g. SLES11

by Lars Michelsen

Module: check_mk Branch: master Commit: 00d27085deca4ed09a1974be9d04124eb800162e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00d27085deca4e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 5 11:33:14 2018 +0200 6550 FIX Fixed warning "bad ps syntax" when stopping a site on e.g. SLES11 When using older ps versions like procps 3.2.7, which is used e.g. on SLES11, a warning message like this was displayed when executing "omd stop" on a site: Warning: bad ps syntax, perhaps a bogus '-'? See http://procps.sf.net/faq.html Stopping 1 remaining site processes...OK Change-Id: I7643eeb156c4e6a0a0e1150f94f7dde0559cb296 --- .werks/6550 | 15 +++++++++++++++ omd/packages/omd/omd | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/6550 b/.werks/6550 new file mode 100644 index 0000000..3b4bee7 --- /dev/null +++ b/.werks/6550 @@ -0,0 +1,15 @@ +Title: Fixed warning "bad ps syntax" when stopping a site on e.g. SLES11 +Level: 1 +Component: omd +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1536139894 + +When using older ps versions like procps 3.2.7, which is used e.g. on SLES11, a warning message +like this was displayed when executing "omd stop" on a site: + +Warning: bad ps syntax, perhaps a bogus '-'? See http://procps.sf.net/faq.html +Stopping 1 remaining site processes...OK diff --git a/omd/packages/omd/omd b/omd/packages/omd/omd index ea8da3e..c5a2d35 100644 --- a/omd/packages/omd/omd +++ b/omd/packages/omd/omd @@ -3957,7 +3957,7 @@ def site_user_processes(exclude_current_and_parents): if exclude_current_and_parents: exclude = get_current_and_parent_pids() - p = subprocess.Popen(["ps", "-U", g_sitename, "-o", "pid", "-h"], close_fds=True, + p = subprocess.Popen(["ps", "-U", g_sitename, "-o", "pid", "--no-headers"], close_fds=True, stdin=open(os.devnull), stdout=subprocess.PIPE) exclude.append(p.pid)

6 years

6549 FIX Crash reports: Filter out password/ _password from HTTP vars of GUI crashes

by Lars Michelsen

Module: check_mk Branch: master Commit: 4bfdc76bd04eaafe106ec8e5405b46f948f6cefe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4bfdc76bd04eaa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 5 10:20:41 2018 +0200 6549 FIX Crash reports: Filter out password/_password from HTTP vars of GUI crashes When a crash occurs during the login procedure where a user entered his password during verification of this password, the crash could contain this password in plain text in the HTTP variable data structure. The vars named password/_password are now explicitly filtered to prevent this. FEED-932 Change-Id: Ief4909a2a64e2ac8f79521a273170a4fa0a710a3 --- .werks/6549 | 14 ++++++++++++++ cmk/gui/crash_reporting.py | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/6549 b/.werks/6549 new file mode 100644 index 0000000..1564ca1 --- /dev/null +++ b/.werks/6549 @@ -0,0 +1,14 @@ +Title: Crash reports: Filter out password/_password from HTTP vars of GUI crashes +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1536130136 + +When a crash occurs during the login procedure where a user entered his password during +verification of this password, the crash could contain this password in plain text in +the HTTP variable data structure. The vars named password/_password are now explicitly +filtered to prevent this. diff --git a/cmk/gui/crash_reporting.py b/cmk/gui/crash_reporting.py index 3ac10d8..57d20d6 100644 --- a/cmk/gui/crash_reporting.py +++ b/cmk/gui/crash_reporting.py @@ -444,7 +444,8 @@ def show_agent_output(tardata): def create_crash_dump_info_file(tar, what): crash_info = cmk.crash_reporting.create_crash_info(what, details={ "page" : html.myfile+".py", - "vars" : html.request.vars, + "vars" : {key: "***" if value in ["password", "_password"] else value + for key, value in html.request.vars.iteritems()}, "username" : config.user.id, "user_agent" : html.request.user_agent, "referer" : html.request.referer,

6 years

Extracted some config default setting loading to make testing easier

by Lars Michelsen

Module: check_mk Branch: master Commit: 9133c6b0e98cf788aa0b93df9f84a4752b096b6c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9133c6b0e98cf7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 21 19:38:13 2018 +0200 Extracted some config default setting loading to make testing easier CMK-854 Change-Id: I834982de95fab96609076a84df63534322b1bea5 --- cmk/gui/config.py | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/cmk/gui/config.py b/cmk/gui/config.py index 9542047..7acf278 100644 --- a/cmk/gui/config.py +++ b/cmk/gui/config.py @@ -45,7 +45,7 @@ import cmk.gui.plugins.config # This import is added for static analysis tools like pylint to make them # know about all shipped config options. The default config options are -# later handled with the default_config dict and load_default_config() +# later handled with the default_config dict and _load_default_config() from cmk.gui.plugins.config.base import * if not cmk.is_raw_edition(): @@ -165,16 +165,7 @@ def load_config(): modification_timestamps = [] # Set default values for all user-changable configuration settings - vars_before_plugins = all_nonfunction_vars(globals()) - load_plugins(True) - vars_after_plugins = all_nonfunction_vars(globals()) - load_default_config(vars_before_plugins, vars_after_plugins) - - # Apply the default configuration to the module global level - for k, v in default_config.items(): - if isinstance(v, (dict, list)): - v = copy.deepcopy(v) - globals()[k] = v + _initialize_with_default_config() # Initialze sites with default site configuration. Need to do it here to # override possibly deleted sites @@ -205,7 +196,23 @@ def load_config(): migrate_old_sample_config_tag_groups(wato_host_tags, wato_aux_tags) -def load_default_config(vars_before_plugins, vars_after_plugins): +def _initialize_with_default_config(): + vars_before_plugins = all_nonfunction_vars(globals()) + load_plugins(True) + vars_after_plugins = all_nonfunction_vars(globals()) + _load_default_config(vars_before_plugins, vars_after_plugins) + + _apply_default_config() + + +def _apply_default_config(): + for k, v in default_config.items(): + if isinstance(v, (dict, list)): + v = copy.deepcopy(v) + globals()[k] = v + + +def _load_default_config(vars_before_plugins, vars_after_plugins): default_config.clear() _load_default_config_from_module_plugins() _load_default_config_from_legacy_plugins(vars_before_plugins, vars_after_plugins)

6 years

Fixed a few unused-variables warnings.

by Sven Panne

Module: check_mk Branch: master Commit: 63741968059c5a9a9fc1572755c5014f4f0f4f2a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63741968059c5a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Sep 5 09:03:14 2018 +0200 Fixed a few unused-variables warnings. Change-Id: Iac0ed3c2ee739001496461366547e53f137bc61c --- cmk/gui/plugins/metrics/check_mk.py | 2 - cmk/gui/plugins/metrics/utils.py | 7 +- cmk/gui/plugins/userdb/ldap_connector.py | 19 ++--- cmk/gui/plugins/views/availability.py | 2 +- cmk/gui/plugins/webapi/webapi.py | 16 ++--- cmk/gui/watolib.py | 118 +++++++++++++------------------ 6 files changed, 65 insertions(+), 99 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6374196805…

6 years

Cleaned up pseudo JSON encoding

by Lars Michelsen

Module: check_mk Branch: master Commit: 4bbd02050c63af4feb7a6c960b1d8a7d8e6c74ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4bbd02050c63af… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 23 13:24:10 2018 +0200 Cleaned up pseudo JSON encoding CMK-854 Change-Id: I0b847686eeaf8e034dbe37ce17031a0ce466eaf8 --- cmk/gui/sidebar.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmk/gui/sidebar.py b/cmk/gui/sidebar.py index 200e8c2..e217c18 100644 --- a/cmk/gui/sidebar.py +++ b/cmk/gui/sidebar.py @@ -505,8 +505,7 @@ def ajax_snapin(): finally: snapin_code.append(html.drain()) - # write all snapins - html.write('[%s]' % ','.join([ '"%s"' % s.replace('"', '\\"').replace('\n', '') for s in snapin_code])) + html.write(json.dumps(snapin_code)) @cmk.gui.pages.register("sidebar_move_snapin")

6 years

Refactored site status snapin to SidebarSnapin class

by Lars Michelsen

Module: check_mk Branch: master Commit: cd62ab849b7117e21697395b56ddaf95d72959d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd62ab849b7117… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 23 10:32:38 2018 +0200 Refactored site status snapin to SidebarSnapin class CMK-855 Change-Id: Ic7bbefff107ae855d6ded9311a6301444e3c44bc --- cmk/gui/plugins/sidebar/shipped.py | 93 ------------------- cmk/gui/plugins/sidebar/site_status.py | 165 +++++++++++++++++++++++++++++++++ cmk/gui/sidebar.py | 20 ---- 3 files changed, 165 insertions(+), 113 deletions(-) diff --git a/cmk/gui/plugins/sidebar/shipped.py b/cmk/gui/plugins/sidebar/shipped.py index 0110c19..624ae4b 100644 --- a/cmk/gui/plugins/sidebar/shipped.py +++ b/cmk/gui/plugins/sidebar/shipped.py @@ -418,99 +418,6 @@ table.hostmatrix td { border: 1px solid #123a4a; padding: 0; border-spacing: 0; """ } - -#. -# .--Site Status---------------------------------------------------------. -# | ____ _ _ ____ _ _ | -# | / ___|(_) |_ ___ / ___|| |_ __ _| |_ _ _ ___ | -# | \___ \| | __/ _ \ \___ \| __/ _` | __| | | / __| | -# | ___) | | || __/ ___) | || (_| | |_| |_| \__ \ | -# | |____/|_|\__\___| |____/ \__\__,_|\__|\__,_|___/ | -# | | -# '----------------------------------------------------------------------' - -def render_sitestatus(): - html.open_table(cellspacing=0, class_="sitestate") - - sites.update_site_states_from_dead_sites() - - for sitename, sitealias in config.sorted_sites(): - site = config.site(sitename) - - state = sites.state(sitename, {}) - - if state.get("state") == None: - state = "missing" - text = _("Missing site") - title = _("Site %s does not exist") % sitename - - else: - if state["state"] == "disabled": - switch = "on" - text = site["alias"] - title = _("Site %s is switched off") % site["alias"] - else: - switch = "off" - text = render_link(site["alias"], "view.py?view_name=sitehosts&site=%s" % sitename) - ex = state.get("exception") - shs = state.get("status_host_state") - - if ex: - title = ex - else: - title = "Site %s is online" % site["alias"] - - html.open_tr() - html.open_td(class_="left") - html.write(text) - html.close_td() - html.open_td(class_="state") - html.status_label_button(content=state["state"], status=state["state"], - help=_("%s this site") % (state["state"] == "disabled" and _("enable") or _("disable")), - onclick="switch_site('_site_switch=%s:%s')" % (sitename, switch)) - html.close_tr() - html.close_table() - - -sidebar_snapins["sitestatus"] = { - "title" : _("Site Status"), - "description" : _("Connection state of each site and button for enabling " - "and disabling the site connection"), - "render" : render_sitestatus, - "allowed" : [ "user", "admin" ], - "refresh" : True, - "styles" : """ -table.sitestate { - width: %dpx; -} - -table.sitestate td { - padding: 1px 0px; - text-align: right; -} - -table.sitestate td.left { - text-align: left; -} - -div.snapin table.sitestate td img.iconbutton { - width: 60px; - height: 16px; -} - -table.sitestate td.left a { - text-align: left; - font-weight: normal; -} - -table.sitestate td.state { - width: 60px; - font-size: 7pt; -} - -""" % snapin_width -} - #. # .--Tactical Overv.-----------------------------------------------------. # | _____ _ _ _ ___ | diff --git a/cmk/gui/plugins/sidebar/site_status.py b/cmk/gui/plugins/sidebar/site_status.py new file mode 100644 index 0000000..e6c4954 --- /dev/null +++ b/cmk/gui/plugins/sidebar/site_status.py @@ -0,0 +1,165 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +import json + +from cmk.gui.i18n import _ +from cmk.gui.globals import html +import cmk.gui.sites as sites +import cmk.gui.config as config + +from . import ( + SidebarSnapin, + snapin_registry, + snapin_width, + render_link, +) + +(a)snapin_registry.register +class SiteStatus(SidebarSnapin): + @staticmethod + def type_name(): + return "sitestatus" + + + @classmethod + def refresh_regularly(cls): + return True + + + @classmethod + def title(cls): + return _("Site Status") + + + @classmethod + def description(cls): + return _("Connection state of each site and button for enabling " + "and disabling the site connection") + + + def show(self): + html.open_table(cellspacing=0, class_="sitestate") + + sites.update_site_states_from_dead_sites() + + for sitename, sitealias in config.sorted_sites(): + site = config.site(sitename) + + state = sites.state(sitename, {}) + + if state.get("state") == None: + state = "missing" + text = _("Missing site") + title = _("Site %s does not exist") % sitename + + else: + if state["state"] == "disabled": + switch = "on" + text = site["alias"] + title = _("Site %s is switched off") % site["alias"] + else: + switch = "off" + text = render_link(site["alias"], "view.py?view_name=sitehosts&site=%s" % sitename) + ex = state.get("exception") + shs = state.get("status_host_state") + + if ex: + title = ex + else: + title = "Site %s is online" % site["alias"] + + html.open_tr() + html.open_td(class_="left") + html.write(text) + html.close_td() + html.open_td(class_="state") + html.status_label_button(content=state["state"], status=state["state"], + help=_("%s this site") % (state["state"] == "disabled" and _("enable") or _("disable")), + onclick="switch_site('_site_switch=%s:%s')" % (sitename, switch)) + html.close_tr() + html.close_table() + + + @classmethod + def allowed_roles(cls): + return [ "user", "admin" ] + + + def styles(self): + return """ +table.sitestate { + width: %dpx; +} + +table.sitestate td { + padding: 1px 0px; + text-align: right; +} + +table.sitestate td.left { + text-align: left; +} + +div.snapin table.sitestate td img.iconbutton { + width: 60px; + height: 16px; +} + +table.sitestate td.left a { + text-align: left; + font-weight: normal; +} + +table.sitestate td.state { + width: 60px; + font-size: 7pt; +} + +""" % snapin_width + + def page_handlers(self): + return { + "switch_site": self._ajax_switch_site, + } + + + def _ajax_switch_site(self): + # _site_switch=sitename1:on,sitename2:off,... + if not config.user.may("sidesnap.sitestatus"): + return + + switch_var = html.var("_site_switch") + if switch_var: + for info in switch_var.split(","): + sitename, onoff = info.split(":") + if sitename not in config.sitenames(): + continue + + d = config.user.siteconf.get(sitename, {}) + d["disabled"] = onoff != "on" + config.user.siteconf[sitename] = d + config.user.save_site_config() diff --git a/cmk/gui/sidebar.py b/cmk/gui/sidebar.py index be1b358..200e8c2 100644 --- a/cmk/gui/sidebar.py +++ b/cmk/gui/sidebar.py @@ -602,23 +602,3 @@ def ajax_set_snapin_site(): sites = config.user.load_file("sidebar_sites", {}, lock=True) sites[ident] = site config.user.save_file("sidebar_sites", sites, unlock=True) - - -# TODO: This is snapin specific. Move this handler to the snapin file -(a)cmk.gui.pages.register("switch_site") -def ajax_switch_site(): - # _site_switch=sitename1:on,sitename2:off,... - if not config.user.may("sidesnap.sitestatus"): - return - - switch_var = html.var("_site_switch") - if switch_var: - for info in switch_var.split(","): - sitename, onoff = info.split(":") - if sitename not in config.sitenames(): - continue - - d = config.user.siteconf.get(sitename, {}) - d["disabled"] = onoff != "on" - config.user.siteconf[sitename] = d - config.user.save_site_config()

6 years

Fixed snapin dashlet rendering after GUI refactoring several weeks ago

by Lars Michelsen

Module: check_mk Branch: master Commit: 2715871eefef20457562b1f01827da11ce33c3a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2715871eefef20… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 4 16:57:11 2018 +0200 Fixed snapin dashlet rendering after GUI refactoring several weeks ago CMK-887 Change-Id: I30dd65a06b35e273110f396653ab9cb0c8f5a10a --- cmk/gui/plugins/dashboard/dashlets.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmk/gui/plugins/dashboard/dashlets.py b/cmk/gui/plugins/dashboard/dashlets.py index 8eef734..c9c177b 100644 --- a/cmk/gui/plugins/dashboard/dashlets.py +++ b/cmk/gui/plugins/dashboard/dashlets.py @@ -814,6 +814,7 @@ def dashlet_snapin(nr, dashlet): snapin = sidebar.snapin_registry.get(dashlet['snapin']) if not snapin: raise MKUserError(None, _('The configured snapin does not exist.')) + snapin_instance = snapin() dashlet_type = dashlet_types[dashlet['type']] @@ -855,8 +856,8 @@ def dashlet_snapin(nr, dashlet): html.open_div(id_="side_content") html.open_div(id_="snapin_container_%s" % dashlet['snapin'], class_="snapin") html.open_div(id_="snapin_%s" % dashlet['snapin'], class_="content") - sidebar.render_snapin_styles(snapin) - snapin.show() + sidebar.render_snapin_styles(snapin_instance) + snapin_instance.show() html.close_div() html.close_div() html.close_div()

6 years

Refactored host matrix snapin to SidebarSnapin

by Lars Michelsen

Module: check_mk Branch: master Commit: 67392124634fb09e615c8249fe09ef9f3e8aecd9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67392124634fb0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 24 20:21:41 2018 +0200 Refactored host matrix snapin to SidebarSnapin CMK-857 Change-Id: I139a8eaaa7fdb11520ab33d17237ce0b23d520b5 --- cmk/gui/plugins/sidebar/host_matrix.py | 144 +++++++++++++++++++++++++++++++++ cmk/gui/plugins/sidebar/shipped.py | 92 --------------------- 2 files changed, 144 insertions(+), 92 deletions(-) diff --git a/cmk/gui/plugins/sidebar/host_matrix.py b/cmk/gui/plugins/sidebar/host_matrix.py new file mode 100644 index 0000000..c70fc7a --- /dev/null +++ b/cmk/gui/plugins/sidebar/host_matrix.py @@ -0,0 +1,144 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +import livestatus +from collections import namedtuple + +import cmk.gui.config as config +import cmk.gui.sites as sites +import cmk.gui.visuals as visuals +import cmk.gui.notifications as notifications +from cmk.gui.i18n import _ +from cmk.gui.globals import html +from cmk.gui.valuespec import Checkbox, ListOf, CascadingDropdown, Dictionary, TextUnicode +from . import ( + SidebarSnapin, + snapin_registry, + snapin_width, +) + +(a)snapin_registry.register +class HostMatrixSnapin(SidebarSnapin): + @staticmethod + def type_name(): + return "hostmatrix" + + + @classmethod + def title(cls): + return _("Host Matrix") + + + @classmethod + def description(cls): + return _("A matrix showing a colored square for each host") + + + @classmethod + def refresh_regularly(cls): + return True + + + def show(self): + sites.live().set_prepend_site(True) + query = "GET hosts\n" \ + "Columns: name state has_been_checked worst_service_state scheduled_downtime_depth\n" \ + "Limit: 901\n" + hosts = sites.live().query(query) + sites.live().set_prepend_site(False) + hosts.sort() + if len(hosts) > 900: + html.write_text(_("Sorry, I will not display more than 900 hosts.")) + return + + # Choose smallest square number large enough + # to show all hosts + num_hosts = len(hosts) + n = 1 + while n*n < num_hosts: + n += 1 + + rows = num_hosts / n + lastcols = num_hosts % n + if lastcols > 0: + rows += 1 + + # Calculate cell size (Automatic sizing with 100% does not work here) + # - Get cell spacing: 1px between each cell + # - Substract the cell spacing for each column from the total width + # - Then divide the total width through the number of columns + # - Then get the full-digit width of the cell and summarize the rest + # to be substracted from the cell width + # This is not a 100% solution but way better than having no links + cell_spacing = 1 + cell_size = ((snapin_width - cell_spacing * (n+1)) / n) + cell_size, cell_size_rest = divmod(cell_size, 1) + style = 'width:%spx' % (snapin_width - n * cell_size_rest) + + html.open_table(class_=["content_center", "hostmatrix"], cellspacing=0, style=["border-collapse:collapse;", style]) + col = 1 + row = 1 + for site, host, state, has_been_checked, worstsvc, downtimedepth in hosts: + if col == 1: + html.open_tr() + if downtimedepth > 0: + s = "d" + elif not has_been_checked: + s = "p" + elif worstsvc == 2 or state == 1: + s = 2 + elif worstsvc == 3 or state == 2: + s = 3 + elif worstsvc == 1: + s = 1 + else: + s = 0 + url = "view.py?view_name=host&site=%s&host=%s" % (html.urlencode(site), html.urlencode(host)) + html.open_td(class_=["state", "state%s" % s]) + html.a('', href=url, title=host, target="main", style=["width:%spx;" % cell_size, "height:%spx;" % cell_size]) + html.close_td() + + if col == n or (row == rows and n == lastcols): + html.open_tr() + col = 1 + row += 1 + else: + col += 1 + html.close_table() + + + @classmethod + def allowed_roles(cls): + return [ "user", "admin", "guest" ] + + + def styles(self): + return """ +table.hostmatrix { border-spacing: 0; } +table.hostmatrix tr { padding: 0; border-spacing: 0; } +table.hostmatrix a { display: block; width: 100%; height: 100%; line-height: 100%; } +table.hostmatrix td { border: 1px solid #123a4a; padding: 0; border-spacing: 0; } + """ diff --git a/cmk/gui/plugins/sidebar/shipped.py b/cmk/gui/plugins/sidebar/shipped.py index e940785..1926605 100644 --- a/cmk/gui/plugins/sidebar/shipped.py +++ b/cmk/gui/plugins/sidebar/shipped.py @@ -324,98 +324,6 @@ sidebar_snapins["problem_hosts"] = { "styles" : snapin_allhosts_styles, } -#. -# .--Host Matrix---------------------------------------------------------. -# | _ _ _ __ __ _ _ | -# | | | | | ___ ___| |_ | \/ | __ _| |_ _ __(_)_ __ | -# | | |_| |/ _ \/ __| __| | |\/| |/ _` | __| '__| \ \/ / | -# | | _ | (_) \__ \ |_ | | | | (_| | |_| | | |> < | -# | |_| |_|\___/|___/\__| |_| |_|\__,_|\__|_| |_/_/\_\ | -# | | -# '----------------------------------------------------------------------' - -def render_hostmatrix(): - sites.live().set_prepend_site(True) - query = "GET hosts\n" \ - "Columns: name state has_been_checked worst_service_state scheduled_downtime_depth\n" \ - "Limit: 901\n" - hosts = sites.live().query(query) - sites.live().set_prepend_site(False) - hosts.sort() - if len(hosts) > 900: - html.write_text(_("Sorry, I will not display more than 900 hosts.")) - return - - # Choose smallest square number large enough - # to show all hosts - num_hosts = len(hosts) - n = 1 - while n*n < num_hosts: - n += 1 - - rows = num_hosts / n - lastcols = num_hosts % n - if lastcols > 0: - rows += 1 - - # Calculate cell size (Automatic sizing with 100% does not work here) - # - Get cell spacing: 1px between each cell - # - Substract the cell spacing for each column from the total width - # - Then divide the total width through the number of columns - # - Then get the full-digit width of the cell and summarize the rest - # to be substracted from the cell width - # This is not a 100% solution but way better than having no links - cell_spacing = 1 - cell_size = ((snapin_width - cell_spacing * (n+1)) / n) - cell_size, cell_size_rest = divmod(cell_size, 1) - style = 'width:%spx' % (snapin_width - n * cell_size_rest) - - html.open_table(class_=["content_center", "hostmatrix"], cellspacing=0, style=["border-collapse:collapse;", style]) - col = 1 - row = 1 - for site, host, state, has_been_checked, worstsvc, downtimedepth in hosts: - if col == 1: - html.open_tr() - if downtimedepth > 0: - s = "d" - elif not has_been_checked: - s = "p" - elif worstsvc == 2 or state == 1: - s = 2 - elif worstsvc == 3 or state == 2: - s = 3 - elif worstsvc == 1: - s = 1 - else: - s = 0 - url = "view.py?view_name=host&site=%s&host=%s" % (html.urlencode(site), html.urlencode(host)) - html.open_td(class_=["state", "state%s" % s]) - html.a('', href=url, title=host, target="main", style=["width:%spx;" % cell_size, "height:%spx;" % cell_size]) - html.close_td() - - if col == n or (row == rows and n == lastcols): - html.open_tr() - col = 1 - row += 1 - else: - col += 1 - html.close_table() - - -sidebar_snapins["hostmatrix"] = { - "title" : _("Host Matrix"), - "description" : _("A matrix showing a colored square for each host"), - "render" : render_hostmatrix, - "allowed" : [ "user", "admin", "guest" ], - "refresh" : True, - "styles" : """ -table.hostmatrix { border-spacing: 0; } -table.hostmatrix tr { padding: 0; border-spacing: 0; } -table.hostmatrix a { display: block; width: 100%; height: 100%; line-height: 100%; } -table.hostmatrix td { border: 1px solid #123a4a; padding: 0; border-spacing: 0; } - """ - -} #. # .--Performance---------------------------------------------------------.

6 years

site status snapin: Fixed handling of missing sites and cleaned up unused variables

by Lars Michelsen

Module: check_mk Branch: master Commit: bfbfb19d2cefe46db31dc2d77129a108b8840ba6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfbfb19d2cefe4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 4 16:54:42 2018 +0200 site status snapin: Fixed handling of missing sites and cleaned up unused variables Change-Id: Ie66e26e8879db93714000e7d558f9171f37973aa --- cmk/gui/plugins/sidebar/site_status.py | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/cmk/gui/plugins/sidebar/site_status.py b/cmk/gui/plugins/sidebar/site_status.py index e6c4954..4ac1321 100644 --- a/cmk/gui/plugins/sidebar/site_status.py +++ b/cmk/gui/plugins/sidebar/site_status.py @@ -69,37 +69,32 @@ class SiteStatus(SidebarSnapin): for sitename, sitealias in config.sorted_sites(): site = config.site(sitename) - state = sites.state(sitename, {}) + state = sites.state(sitename, {}).get("state") - if state.get("state") == None: + if state is None: state = "missing" - text = _("Missing site") - title = _("Site %s does not exist") % sitename + switch = "missing" + text = sitename else: - if state["state"] == "disabled": + if state == "disabled": switch = "on" text = site["alias"] - title = _("Site %s is switched off") % site["alias"] else: switch = "off" text = render_link(site["alias"], "view.py?view_name=sitehosts&site=%s" % sitename) - ex = state.get("exception") - shs = state.get("status_host_state") - - if ex: - title = ex - else: - title = "Site %s is online" % site["alias"] html.open_tr() html.open_td(class_="left") html.write(text) html.close_td() html.open_td(class_="state") - html.status_label_button(content=state["state"], status=state["state"], - help=_("%s this site") % (state["state"] == "disabled" and _("enable") or _("disable")), - onclick="switch_site('_site_switch=%s:%s')" % (sitename, switch)) + if switch == "missing": + html.status_label(content=state, status=state, help=_("Site is missing")) + else: + html.status_label_button(content=state, status=state, + help=_("enable this site") if state == "disabled" else _("disable this site"), + onclick="switch_site('_site_switch=%s:%s')" % (sitename, switch)) html.close_tr() html.close_table()

6 years

Refactored tactical overview snapin to SidebarSnapin class

by Lars Michelsen

Module: check_mk Branch: master Commit: e3c6c6bfd58433997658272990217690369e6bcd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3c6c6bfd58433… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 23 20:35:38 2018 +0200 Refactored tactical overview snapin to SidebarSnapin class CMK-856 Change-Id: Ibeadc9db26fedd13a28aad7ac94069b10ff53d04 --- cmk/gui/plugins/sidebar/shipped.py | 314 ----------------------- cmk/gui/plugins/sidebar/tactical_overview.py | 365 +++++++++++++++++++++++++++ 2 files changed, 365 insertions(+), 314 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e3c6c6bfd5…

6 years

← Newer
1
...
30
31
32
33
34
35
36
37
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2018