Checkmk git commits September 2018

checkmk-commits@lists.checkmk.com

12 participants
371 discussions

6553 FIX Fix "Error running .../MKEVENTD 'set' 'on'" error in case of config errors during update

by Lars Michelsen

Module: check_mk Branch: master Commit: 40ca710aabe8166472846fa28555521a2c258d33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40ca710aabe816… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 7 14:06:51 2018 +0200 6553 FIX Fix "Error running .../MKEVENTD 'set' 'on'" error in case of config errors during update This error message could occur during the "omd update" procedure when the configuration is detected to have some issues. This message is now being suppressed while the configuration error is still be printed to the user. Change-Id: I1b23ab20a1c94ff8979cdbc307b7ee85e141ea40 --- .werks/6553 | 13 +++++++++++++ omd/packages/check_mk/MKEVENTD.hook | 4 +++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/6553 b/.werks/6553 new file mode 100644 index 0000000..520ac2a --- /dev/null +++ b/.werks/6553 @@ -0,0 +1,13 @@ +Title: Fix "Error running .../MKEVENTD 'set' 'on'" error in case of config errors during update +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1536321907 + +This error message could occur during the "omd update" procedure when the configuration is +detected to have some issues. This message is now being suppressed while the configuration +error is still be printed to the user. diff --git a/omd/packages/check_mk/MKEVENTD.hook b/omd/packages/check_mk/MKEVENTD.hook index fbc4521..4f5e759 100755 --- a/omd/packages/check_mk/MKEVENTD.hook +++ b/omd/packages/check_mk/MKEVENTD.hook @@ -26,6 +26,8 @@ case "$1" in > $OMD_ROOT/etc/check_mk/multisite.d/mkeventd.mk echo -e "# Set by OMD hook MKEVENTD, do not change here!\nmkeventd_enabled = $enabled" \ > $OMD_ROOT/etc/check_mk/conf.d/mkeventd.mk - cmk -U >/dev/null 2>&1 + # Try to update the core config to make the Microcore/Livestatus know whether or not the + # Event Console is enabled. Totally ignore configuration validation errors here. Be silent. + cmk -U >/dev/null 2>&1 || true ;; esac

6 years, 2 months

Add custom sidebar icons for classic theme

by Lars Michelsen

Module: check_mk Branch: master Commit: 4581cf2127090fc6157efe3337fd4f2a808177fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4581cf2127090f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 7 18:52:17 2018 +0200 Add custom sidebar icons for classic theme Change-Id: I6f55b9144be28b23ce420e6932b398a42fb9147f --- web/htdocs/images/icon_custom_snapin.png | Bin 0 -> 1848 bytes web/htdocs/images/icon_new_custom_snapin.png | Bin 0 -> 1848 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_custom_snapin.png b/web/htdocs/images/icon_custom_snapin.png new file mode 100644 index 0000000..022bdce Binary files /dev/null and b/web/htdocs/images/icon_custom_snapin.png differ diff --git a/web/htdocs/images/icon_new_custom_snapin.png b/web/htdocs/images/icon_new_custom_snapin.png new file mode 100644 index 0000000..022bdce Binary files /dev/null and b/web/htdocs/images/icon_new_custom_snapin.png differ

6 years, 2 months

6556 Tactical overview and host matrix snapins can be customized

by Lars Michelsen

Module: check_mk Branch: master Commit: d70c6c1cb41e6da793fa04a3ed814a1225e96ad6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d70c6c1cb41e6d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 10 07:51:28 2018 +0200 6556 Tactical overview and host matrix snapins can be customized Based on the changes of werk #6555 the Tactical overview snapin can now be configured to show statistics about custom sets of hosts / services / events. It can also be configured to show or not show stale objects and failed notifications. It is now also possible to create custom copies of the host matrix snapin to set arbitrary host filters for them which make them able to visualize different collections of hosts. Change-Id: I5dd0225339b7d074c7ae7ea7bc67260cd4e94be7 --- .werks/6556 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.werks/6556 b/.werks/6556 new file mode 100644 index 0000000..d5b5d7d --- /dev/null +++ b/.werks/6556 @@ -0,0 +1,17 @@ +Title: Tactical overview and host matrix snapins can be customized +Level: 2 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1536558591 +Class: feature + +Based on the changes of werk #6555 the Tactical overview snapin can now be +configured to show statistics about custom sets of hosts / services / events. +It can also be configured to show or not show stale objects and failed +notifications. + +It is now also possible to create custom copies of the host matrix snapin to +set arbitrary host filters for them which make them able to visualize different +collections of hosts.

6 years, 2 months

6555 Snapins can now be customized

by Lars Michelsen

Module: check_mk Branch: master Commit: 3325b759a6bce01daa7839a4ca7e5f68ee15507d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3325b759a6bce0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 10 07:49:49 2018 +0200 6555 Snapins can now be customized It is now possible to create customized copies of the default sidebar snapins. To make this possible the snapin developer needs to prepare the snapin for this feature. The developer needs to specify which parameters can be customized by the users and make the snapin use the user configuration. The user can then navigate to "Add snapin page > Custom snapins" to manage his custom snapins. When editing such a custom snapin the attributes of the snapin can be edited. The snapins can be shared with other users of the installation. The sharing logic is equal to the bookmarks, reports and so on. Once a custom snapin has been created, the user can choose the new dashlet from the "add snapin page" for adding it to his dashboard. Change-Id: If0966d9697102f8a1f883bd18908f5ab633a9c6c --- .werks/6555 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.werks/6555 b/.werks/6555 new file mode 100644 index 0000000..d74b233 --- /dev/null +++ b/.werks/6555 @@ -0,0 +1,22 @@ +Title: Snapins can now be customized +Level: 2 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1536558291 +Class: feature + +It is now possible to create customized copies of the default sidebar snapins. + +To make this possible the snapin developer needs to prepare the snapin for this +feature. The developer needs to specify which parameters can be customized by +the users and make the snapin use the user configuration. + +The user can then navigate to "Add snapin page > Custom snapins" to manage his +custom snapins. When editing such a custom snapin the attributes of the snapin +can be edited. The snapins can be shared with other users of the installation. +The sharing logic is equal to the bookmarks, reports and so on. + +Once a custom snapin has been created, the user can choose the new dashlet from +the "add snapin page" for adding it to his dashboard.

6 years, 2 months

Fixed a few unused-variable warnings.

by Sven Panne

Module: check_mk Branch: master Commit: 0fc5db93de97894f27aab0424a6098b7e7ddcbf5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fc5db93de9789… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Sep 7 15:13:24 2018 +0200 Fixed a few unused-variable warnings. Change-Id: I7bde174fa48bacee7e07ebe780717a9165af0e17 --- checks/if.include | 21 +++++++++------------ checks/ipmi_common.include | 4 ---- checks/ipmi_sensors.include | 8 +++----- checks/perle.include | 8 ++++---- checks/ps.include | 7 +++---- checks/temperature.include | 8 ++++---- 6 files changed, 23 insertions(+), 33 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0fc5db93de…

6 years, 2 months

Fixed issue introduced with #6552

by Lars Michelsen

Module: check_mk Branch: master Commit: 490d811e06fa26ad547032737beed1f0183c0ed0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=490d811e06fa26… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 7 17:41:10 2018 +0200 Fixed issue introduced with #6552 Change-Id: Ib3b3e24b0ff9f44785eeef1c172b0345dc588bc0 --- cmk/gui/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/config.py b/cmk/gui/config.py index b109980..c719d83 100644 --- a/cmk/gui/config.py +++ b/cmk/gui/config.py @@ -563,7 +563,7 @@ class LoggedInUser(object): def authorized_login_sites(self): - login_site_ids = get_login_sites() + login_site_ids = get_login_slave_sites() login_sites = [ (site_id, site) for site_id, site in allsites().items() if site_id in login_site_ids ] return self.authorized_sites(login_sites)

6 years, 2 months

Fixed merge issues and other problems in recent commits

by Lars Michelsen

Module: check_mk Branch: master Commit: 11e1aeed71e5c3efd678af51f6d79c56bef432c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11e1aeed71e5c3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 7 17:34:52 2018 +0200 Fixed merge issues and other problems in recent commits Change-Id: I33baf1dfbd8fb3f2298cc152083f77b54f3c749d --- cmk/gui/plugins/sidebar/tactical_overview.py | 8 ++++---- cmk/gui/sidebar.py | 12 ++---------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/cmk/gui/plugins/sidebar/tactical_overview.py b/cmk/gui/plugins/sidebar/tactical_overview.py index 729a09b..328cd30 100644 --- a/cmk/gui/plugins/sidebar/tactical_overview.py +++ b/cmk/gui/plugins/sidebar/tactical_overview.py @@ -155,14 +155,14 @@ class TacticalOverviewSnapin(CustomizableSidebarSnapin): def _show_rows(self): rows = self._get_rows() - if bool(r for r in rows if r.stats is None): + if bool([r for r in rows if r.stats is None]): html.center(_("No data from any site")) return html.open_table(class_=["content_center", "tacticaloverview"], cellspacing=2, cellpadding=0, border=0) show_stales = self.parameters()["show_stale"] and config.user.may("general.see_stales_in_tactical_overview") - has_stale_objects = bool(r for r in rows if r.what != "events" and r.stats[-1]) + has_stale_objects = bool([r for r in rows if r.what != "events" and r.stats[-1]]) for row in rows: if row.what == "events": @@ -423,7 +423,7 @@ class TacticalOverviewSnapin(CustomizableSidebarSnapin): if not self.parameters()["show_failed_notifications"]: return - failed_notifications = self._get_failed_notification_stats()[0] + failed_notifications = self._get_failed_notification_stats() if not failed_notifications: return @@ -445,7 +445,7 @@ class TacticalOverviewSnapin(CustomizableSidebarSnapin): return notifications.load_failed_notifications( after=notifications.acknowledged_time(), stat_only=True, - ) + )[0] except livestatus.MKLivestatusNotFoundError: return None diff --git a/cmk/gui/sidebar.py b/cmk/gui/sidebar.py index c075bf1..dd23e93 100644 --- a/cmk/gui/sidebar.py +++ b/cmk/gui/sidebar.py @@ -428,7 +428,7 @@ class SidebarRenderer(object): html.open_div(id_="snapin_container_%s" % name, class_="snapin") self._render_snapin_styles(snapin_instance) # When not permitted to open/close snapins, the snapins are always opened - if snapin.visibility == SnapinVisibility.OPEN or not config.user.may("general.configure_sidebar"): + if snapin.visible == SnapinVisibility.OPEN or not config.user.may("general.configure_sidebar"): style = None minimaxi = "mini" else: @@ -445,15 +445,7 @@ class SidebarRenderer(object): "onmousedown" : "snapinStartDrag(event)", "onmouseup" : "snapinStopDrag(event)"} - html.open_div(class_=["head", snapin.visibility.value], **head_actions) - - if config.user.may("general.configure_sidebar"): - # Icon for mini/maximizing - html.open_div(class_="minisnapin") - html.icon_button(url=None, help=_("Toggle this snapin"), icon="%ssnapin" % minimaxi, - onclick="toggle_sidebar_snapin(this, '%s')" % toggle_url) - - html.open_div(class_=["head", snapin.visibility.value], **head_actions) + html.open_div(class_=["head", snapin.visible.value], **head_actions) if config.user.may("general.configure_sidebar"): # Icon for mini/maximizing

6 years, 2 months

Host matrix snapin can now be customized

by Lars Michelsen

Module: check_mk Branch: master Commit: 2979c524f2508f7a1ad5da6a15704139ab1c03c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2979c524f2508f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 24 20:27:40 2018 +0200 Host matrix snapin can now be customized It is now possible to create custom copies of the host matrix snapin to set arbitrary host filters for them which make them able to visualize different collections of hosts. CMK-857 Change-Id: I346345b2d295784b6f05a997e19ca5016b833a52 --- cmk/gui/plugins/sidebar/host_matrix.py | 67 ++++++++++++++++++++++++++++------ 1 file changed, 55 insertions(+), 12 deletions(-) diff --git a/cmk/gui/plugins/sidebar/host_matrix.py b/cmk/gui/plugins/sidebar/host_matrix.py index c70fc7a..285dd0c 100644 --- a/cmk/gui/plugins/sidebar/host_matrix.py +++ b/cmk/gui/plugins/sidebar/host_matrix.py @@ -35,13 +35,13 @@ from cmk.gui.i18n import _ from cmk.gui.globals import html from cmk.gui.valuespec import Checkbox, ListOf, CascadingDropdown, Dictionary, TextUnicode from . import ( - SidebarSnapin, + CustomizableSidebarSnapin, snapin_registry, snapin_width, ) @snapin_registry.register -class HostMatrixSnapin(SidebarSnapin): +class HostMatrixSnapin(CustomizableSidebarSnapin): @staticmethod def type_name(): return "hostmatrix" @@ -62,21 +62,33 @@ class HostMatrixSnapin(SidebarSnapin): return True + @classmethod + def vs_parameters(cls): + return [ + ("context", visuals.VisualFilterList( + title = _("Filters"), + infos = ["host"], + )), + ] + + + @classmethod + def parameters(cls): + return { + "context": {}, + } + + 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: + hosts = self._get_hosts() + num_hosts = len(hosts) + + if num_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 @@ -101,7 +113,7 @@ class HostMatrixSnapin(SidebarSnapin): 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: + for site, host, state, has_been_checked, worstsvc, downtimedepth in sorted(hosts): if col == 1: html.open_tr() if downtimedepth > 0: @@ -130,6 +142,37 @@ class HostMatrixSnapin(SidebarSnapin): html.close_table() + def _get_hosts(self): + context_filters, only_sites = visuals.get_filter_headers({ + "table": "hosts", + "infos": ["host"], + }, self.parameters()["context"]) + + return self._execute_host_query(self._get_host_query(context_filters), only_sites) + + + def _get_host_query(self, context_filters): + query = ( + "GET hosts\n" + "Columns: name state has_been_checked worst_service_state scheduled_downtime_depth\n" + "Limit: 901\n" + ) + context_filters + + return query + + + def _execute_host_query(self, query, only_sites): + try: + sites.live().set_prepend_site(True) + if only_sites: + sites.live().set_only_sites(only_sites) + + return sites.live().query(query) + finally: + sites.live().set_only_sites(None) + sites.live().set_prepend_site(False) + + @classmethod def allowed_roles(cls): return [ "user", "admin", "guest" ]

6 years, 2 months

Snapins can now be customized

by Lars Michelsen

Module: check_mk Branch: master Commit: 092bb7bb6c68588e1bf1f5aaf938bbf2be968147 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=092bb7bb6c6858… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 24 13:49:12 2018 +0200 Snapins can now be customized * The snapin developer can make a default snapin customizable by subclassing from CustomizableSidebarSnapin. * The user can then navigate to "Add snapin page > Custom snapins" to manage his custom snapins. * When editing such a custom snapin the attributes of the snapin can be edited. The user can also choose to share this dashlet with other users. * Once a custom snapin has been created, the user can choose the new dashlet from the "add snapin page" for adding it to his dashboard. * As first dashlet, the Tactical Overview snapin can now be configured to show statistics about custom sets of hosts / services / events. It can also be configured to show or not show stale objects and failed notifications. CMK-856 Change-Id: I9e32736d90cd21c6c4aaa08f778ff21970dd1a28 --- cmk/gui/plugins/sidebar/__init__.py | 1 + cmk/gui/plugins/sidebar/tactical_overview.py | 490 +++++++++++++++++---------- cmk/gui/plugins/sidebar/utils.py | 98 ++++++ cmk/gui/sidebar.py | 162 +++++++-- tests/unit/web/test_sidebar.py | 1 + 5 files changed, 548 insertions(+), 204 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=092bb7bb6c…

6 years, 2 months

Moved sidebar rendering to SidebarRenderer() class

by Lars Michelsen

Module: check_mk Branch: master Commit: 93acece146c2f2c6b698e030a5e3d252ee38ec83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93acece146c2f2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 24 14:04:26 2018 +0200 Moved sidebar rendering to SidebarRenderer() class CMK-855 Change-Id: I2243f85069849b24450d3571d77c0e9d65892b88 --- cmk/gui/plugins/dashboard/dashlets.py | 4 +- cmk/gui/sidebar.py | 472 ++++++++++++++++++---------------- 2 files changed, 248 insertions(+), 228 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=93acece146…

6 years, 2 months

← Newer
1
...
26
27
28
29
30
31
32
...
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