Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

by Moritz Kiemer

Module: check_mk Branch: master Commit: 369c421c702fde4784087e3666520b843fe9da29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=369c421c702fde… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Jan 10 09:37:44 2019 +0100 graphs: change util_average The metric 'util_average' is only created if the user configured it. In that that case it should be shown -- regardles of wether 'user' metric is present. Change-Id: I2813115f9ee9820055eb12ec9dfe6eade121f361 --- cmk/gui/plugins/metrics/check_mk.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index b354960..233aab0 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -8342,9 +8342,7 @@ graph_info["util_average"] = { "util:warn", "util:crit", ], - "range": (0, 100), - "optional_metrics": ["util_average"], - "conflicting_metrics": ["user"], + "range": ("util:min", "util:max"), } graph_info["cpu_utilization_1"] = {

5 years, 8 months

graphs: rearrange definitions

by Moritz Kiemer

Module: check_mk Branch: master Commit: c18c47ce8eff23f29feff6546692b98e6c85d140 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c18c47ce8eff23… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Jan 10 09:21:04 2019 +0100 graphs: rearrange definitions Change-Id: I488bd78daa91b019d3f52f2942b81cf615ddcfe5 --- cmk/gui/plugins/metrics/check_mk.py | 114 +++++++++++++++++++----------------- 1 file changed, 59 insertions(+), 55 deletions(-) diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index 3c243c3..b354960 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -8329,6 +8329,10 @@ graph_info["fgpa_utilization"] = { "range": (0, 100), } +# +# CPU UTILIZATION +# + graph_info["util_average"] = { "metrics": [ ("util", "area"), @@ -8367,61 +8371,6 @@ graph_info["cpu_utilization_2"] = { "range": (0, 100), } -graph_info["per_core_utilization"] = { - "title": _("Per Core utilization"), - "metrics": [("cpu_core_util_%d" % num, "line") for num in range(MAX_CORES)], - "range": (0, 100), - "optional_metrics": ["cpu_core_util_%d" % num for num in range(2, MAX_CORES)] -} - -graph_info["fs_used"] = { - "metrics": [ - ("fs_used", "area"), - ("fs_size,fs_used,-#e3fff9", "stack", _("Free space")), - ("fs_size", "line"), - ], - "scalars": [ - "fs_used:warn", - "fs_used:crit", - ], - "range": (0, "fs_used:max"), - "conflicting_metrics": ["fs_free"], -} - -# draw a different graph if space reserved for root was excluded -graph_info["fs_used_2"] = { - "metrics": [ - ("fs_used", "area"), - ("fs_free", "stack"), - ("reserved", "stack"), - ("fs_size", "line"), - ], - "scalars": [ - "fs_used:warn", - "fs_used:crit", - ], - "range": (0, "fs_used:max"), -} - -graph_info["growing"] = { - "title": _("Growing"), - "metrics": [( - "fs_growth.max,0,MAX", - "area", - _("Growth"), - ),], -} - -graph_info["shrinking"] = { - "title": _("Shrinking"), - "consolidation_function": "min", - "metrics": [("fs_growth.min,0,MIN,-1,*#299dcf", "-area", _("Shrinkage")),], -} - -graph_info["fs_trend"] = { - "metrics": [("fs_trend", "line"),], -} - graph_info["cpu_utilization_3"] = { "title": _("CPU utilization"), "metrics": [ @@ -8497,6 +8446,61 @@ graph_info["cpu_utilization_8"] = { "range": (0, 100), } +graph_info["per_core_utilization"] = { + "title": _("Per Core utilization"), + "metrics": [("cpu_core_util_%d" % num, "line") for num in range(MAX_CORES)], + "range": (0, 100), + "optional_metrics": ["cpu_core_util_%d" % num for num in range(2, MAX_CORES)] +} + +graph_info["fs_used"] = { + "metrics": [ + ("fs_used", "area"), + ("fs_size,fs_used,-#e3fff9", "stack", _("Free space")), + ("fs_size", "line"), + ], + "scalars": [ + "fs_used:warn", + "fs_used:crit", + ], + "range": (0, "fs_used:max"), + "conflicting_metrics": ["fs_free"], +} + +# draw a different graph if space reserved for root was excluded +graph_info["fs_used_2"] = { + "metrics": [ + ("fs_used", "area"), + ("fs_free", "stack"), + ("reserved", "stack"), + ("fs_size", "line"), + ], + "scalars": [ + "fs_used:warn", + "fs_used:crit", + ], + "range": (0, "fs_used:max"), +} + +graph_info["growing"] = { + "title": _("Growing"), + "metrics": [( + "fs_growth.max,0,MAX", + "area", + _("Growth"), + ),], +} + +graph_info["shrinking"] = { + "title": _("Shrinking"), + "consolidation_function": "min", + "metrics": [("fs_growth.min,0,MIN,-1,*#299dcf", "-area", _("Shrinkage")),], +} + +graph_info["fs_trend"] = { + "metrics": [("fs_trend", "line"),], +} + graph_info["wasted_space_of_tables_and_indexes"] = { "title": _("Wasted space of tables and indexes"), "metrics": [

5 years, 8 months

Icons in mkeventd.py refactored to new plugin registry structure

by Florian Kromer

Module: check_mk Branch: master Commit: ac5f2eac86053ad75e00679c94b98891fd068e26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac5f2eac86053a… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Wed Jan 9 18:44:47 2019 +0100 Icons in mkeventd.py refactored to new plugin registry structure CMK-1514 Change-Id: I497aa998166242923a581f5fa4a0bf14c2aa948b --- cmk/gui/plugins/views/icons/mkeventd.py | 130 +++++++++++++++++--------------- 1 file changed, 69 insertions(+), 61 deletions(-) diff --git a/cmk/gui/plugins/views/icons/mkeventd.py b/cmk/gui/plugins/views/icons/mkeventd.py index 54f734c..0d47600 100644 --- a/cmk/gui/plugins/views/icons/mkeventd.py +++ b/cmk/gui/plugins/views/icons/mkeventd.py @@ -25,84 +25,92 @@ # Boston, MA 02110-1301 USA. import cmk.gui.config as config -from cmk.gui.i18n import _ from cmk.gui.globals import html +from cmk.gui.i18n import _ +from cmk.gui.plugins.views.icons import Icon, icon_and_action_registry + + +(a)icon_and_action_registry.register +class MkeventdIcon(Icon): + @classmethod + def ident(cls): + return "mkeventd" -from cmk.gui.plugins.views.icons import multisite_icons_and_actions + def default_toplevel(self): + return False + def default_sort_index(self): + return 30 -def paint_mkeventd(what, row, tags, custom_vars): - if not config.mkeventd_enabled: - return + def columns(self): + return ["check_command"] - # show for services based on the mkevents active check - command = row[what + '_check_command'] + def host_columns(self): + return ["address", "name"] - if what != 'service' or not command.startswith('check_mk_active-mkevents'): - return + def render(self, what, row, tags, custom_vars): + if not config.mkeventd_enabled: + return - if '!' not in command: - return + # show for services based on the mkevents active check + command = row[what + '_check_command'] - host = None - app = None + if what != 'service' or not command.startswith('check_mk_active-mkevents'): + return - # Extract parameters from check_command: - args = command.split('!')[1].split() - if not args: - return + if '!' not in command: + return - # Handle -a and -H options. Sorry for the hack. We currently - # have no better idea - if len(args) >= 2 and args[0] == '-H': - args = args[2:] # skip two arguments - if len(args) >= 1 and args[0] == '-a': - args = args[1:] + host = None + app = None - if len(args) >= 1: - if args[0] == '$HOSTNAME$': - host = row['host_name'] - elif args[0] == '$HOSTADDRESS$': - host = row['host_address'] - else: - host = args[0] + # Extract parameters from check_command: + args = command.split('!')[1].split() + if not args: + return - # If we have no host then the command line from the check_command seems - # to be garbled. Better show nothing in this case. - if not host: - return + # Handle -a and -H options. Sorry for the hack. We currently + # have no better idea + if len(args) >= 2 and args[0] == '-H': + args = args[2:] # skip two arguments + if len(args) >= 1 and args[0] == '-a': + args = args[1:] - # It is possible to have a central event console, this is the default case. - # Another possible architecture is to have an event console in each site in - # a distributed environment. For the later case the base url need to be - # constructed here - url_prefix = '' - if getattr(config, 'mkeventd_distributed', False): - site = config.site(row["site"]) - url_prefix = site['url_prefix'] + 'check_mk/' + if len(args) >= 1: + if args[0] == '$HOSTNAME$': + host = row['host_name'] + elif args[0] == '$HOSTADDRESS$': + host = row['host_address'] + else: + host = args[0] - url_vars = [ - ("view_name", "ec_events_of_monhost"), - ("site", row["site"]), - ("host", row["host_name"]), - ] + # If we have no host then the command line from the check_command seems + # to be garbled. Better show nothing in this case. + if not host: + return - title = _('Events of Host %s') % (row["host_name"]) + # It is possible to have a central event console, this is the default case. + # Another possible architecture is to have an event console in each site in + # a distributed environment. For the later case the base url need to be + # constructed here + url_prefix = '' + if getattr(config, 'mkeventd_distributed', False): + site = config.site(row["site"]) + url_prefix = site['url_prefix'] + 'check_mk/' - if len(args) >= 2: - app = args[1].strip('\'').replace("\\\\", "\\") - title = _('Events of Application "%s" on Host %s') % (app, host) - url_vars.append(("event_application", app)) + url_vars = [ + ("view_name", "ec_events_of_monhost"), + ("site", row["site"]), + ("host", row["host_name"]), + ] - url = 'view.py?' + html.urlencode_vars(url_vars) + title = _('Events of Host %s') % (row["host_name"]) - return 'mkeventd', title, url_prefix + url + if len(args) >= 2: + app = args[1].strip('\'').replace("\\\\", "\\") + title = _('Events of Application "%s" on Host %s') % (app, host) + url_vars.append(("event_application", app)) + url = 'view.py?' + html.urlencode_vars(url_vars) -multisite_icons_and_actions["mkeventd"] = { - "columns": ["check_command"], - "host_columns": ["address", "name"], - "paint": paint_mkeventd, - "toplevel": False, - "sort_index": 30, -} + return 'mkeventd', title, url_prefix + url

5 years, 8 months

Refactoring: Moved last application check parameters from unsorted.py to dedicated modules (CMK-1393)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 7589294fa7c50634aae5a5af55f673b8c146e3b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7589294fa7c506… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Dec 20 17:08:21 2018 +0100 Refactoring: Moved last application check parameters from unsorted.py to dedicated modules (CMK-1393) Change-Id: I2dc7c4ab7e027c40fe602acca42649d0797de32f --- .../wato/check_parameters/hacmp_resources.py | 61 +++++++++ .../wato/check_parameters/oracle_logswitches.py | 96 +++++++++++++ .../wato/check_parameters/systemd_services.py | 66 +++++++++ cmk/gui/plugins/wato/check_parameters/unsorted.py | 150 --------------------- cmk/gui/plugins/wato/check_parameters/webserver.py | 75 +++++++++++ 5 files changed, 298 insertions(+), 150 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7589294fa7…

5 years, 8 months

Icons in builtin.py refactored to new plugin registry structure

by Florian Kromer

Module: check_mk Branch: master Commit: 664524072983027670f5acce850df158ad683e0e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66452407298302… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Wed Jan 9 13:56:57 2019 +0100 Icons in builtin.py refactored to new plugin registry structure CMK-1514 Change-Id: Icef49e1adbf0223aea21b042ab2e1cc78b269530 --- cmk/gui/plugins/views/icons/builtin.py | 1007 ++++++++++++++++++-------------- 1 file changed, 568 insertions(+), 439 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6645240729…

5 years, 8 months

TLS is not there yet

by Lars Michelsen

Module: check_mk Branch: master Commit: 4a99983fa26143ff2b78bcc8a4659e7aefc2fc21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a99983fa26143… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 10 12:00:43 2019 +0100 TLS is not there yet Change-Id: I7bdd85b1d0cdf006f3d0a1cd15f3c0ae3a072896 --- tests/integration/cmk/gui/test_webapi.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/integration/cmk/gui/test_webapi.py b/tests/integration/cmk/gui/test_webapi.py index 7d44e25..f3d3642 100644 --- a/tests/integration/cmk/gui/test_webapi.py +++ b/tests/integration/cmk/gui/test_webapi.py @@ -133,7 +133,7 @@ def test_get_all_sites(web, site): "tcp:1.2.3.4:6557", ("tcp", { "address": ("1.2.3.4", 6557), - "tls": ("plain_text", {}), + #"tls": ("plain_text", {}), }), ]) def test_set_site(web, site, sock_spec): @@ -147,7 +147,7 @@ def test_set_site(web, site, sock_spec): expected_site_config = copy.deepcopy(original_site["site_config"]) expected_site_config["socket"] = ("tcp", { "address": ("1.2.3.4", 6557), - "tls": ("plain_text", {}), + #"tls": ("plain_text", {}), }) try: @@ -168,7 +168,7 @@ def test_set_site(web, site, sock_spec): "tcp:1.2.3.4:6557", ("tcp", { "address": ("1.2.3.4", 6557), - "tls": ("plain_text", {}), + #"tls": ("plain_text", {}), }), ]) def test_set_all_sites(web, site, sock_spec): @@ -183,7 +183,7 @@ def test_set_all_sites(web, site, sock_spec): expected_site_config = copy.deepcopy(copy.deepcopy(response["sites"][site.id])) expected_site_config["socket"] = ("tcp", { "address": ("1.2.3.4", 6557), - "tls": ("plain_text", {}), + #"tls": ("plain_text", {}), }) response["sites"][new_site_id] = new_site_config

5 years, 8 months

Fixed screenshot mode in facelift theme

by Mathias Kettner

Module: check_mk Branch: master Commit: 020d2bf806c53e10811141ac5a4c4da3d233157a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=020d2bf806c53e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 10 11:31:13 2019 +0100 Fixed screenshot mode in facelift theme removed gray background between columns of multi columned service or host table --- web/htdocs/themes/facelift/theme.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/themes/facelift/theme.css b/web/htdocs/themes/facelift/theme.css index 7225f34..358fd94 100644 --- a/web/htdocs/themes/facelift/theme.css +++ b/web/htdocs/themes/facelift/theme.css @@ -312,6 +312,8 @@ table { table.data tr td.gap { background: #f0f2f4; border: 1px solid #f0f2f4; } + .screenshotmode table.data tr td.gap { + background: white; border-style: none; } table.data tr th a.toggle_actions img, table.data tr th body.main .popup_menu span.toggle_actions img, body.main .popup_menu table.data tr th span.toggle_actions img { filter: invert(100%); } table.data tr.notification_context table {

5 years, 8 months

Improved site socket rendering in site table

by Lars Michelsen

Module: check_mk Branch: master Commit: 93e40f0b1c30bdaa1e8a31ca467af3eda5cd85ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93e40f0b1c30bd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Jan 5 16:37:46 2019 +0100 Improved site socket rendering in site table Change-Id: I62753ca2b7a7eff70c277788b3cf86e9b497d746 --- cmk/gui/valuespec.py | 25 ++++++++++++++++++++++++- cmk/gui/watolib.py | 1 + 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/cmk/gui/valuespec.py b/cmk/gui/valuespec.py index a3f4e20..d7f0f8a 100644 --- a/cmk/gui/valuespec.py +++ b/cmk/gui/valuespec.py @@ -1860,6 +1860,10 @@ class HostState(DropdownChoice): # y is the value of the valuespec assigned to that entry. # choices is a list of triples: [ ( value, title, vs ), ... ] class CascadingDropdown(ValueSpec): + class Render(Enum): + normal = "normal" + foldable = "foldable" + def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) @@ -1872,6 +1876,7 @@ class CascadingDropdown(ValueSpec): self._separator = kwargs.get("separator", ", ") self._sorted = kwargs.get("sorted", True) self._orientation = kwargs.get("orientation", "vertical") # or horizontal + self._render = kwargs.get("render", CascadingDropdown.Render.normal) if kwargs.get("encoding", "tuple") == "list": self._encoding_type = list else: @@ -1996,8 +2001,26 @@ class CascadingDropdown(ValueSpec): (value == val): if not vs: return title + + rendered_value = vs.value_to_text(value[1]) + if not rendered_value: + return title + + if self._render == CascadingDropdown.Render.foldable: + with html.plugged(): + html.begin_foldable_container( + "foldable_cascading_dropdown", + id_=hashlib.sha256(repr(value)).hexdigest(), + isopen=False, + title=title, + indent=False) + html.write(vs.value_to_text(value[1])) + html.end_foldable_container() + return html.drain() + return title + self._separator + \ - vs.value_to_text(value[1]) + vs.value_to_text(value[1]) + return "" # Nothing selected? Should never happen def from_html_vars(self, varprefix): diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index be5b1bd..fa67d43 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -4017,6 +4017,7 @@ class SiteManagement(object): return CascadingDropdown( orientation="horizontal", choices=cls._connection_choices(), + render=CascadingDropdown.Render.foldable, ) @classmethod

5 years, 8 months

Cleaned up internal site config handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 1282b7e6b91e79891d92fc2efc9fe7154b7d18d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1282b7e6b91e79… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 4 20:38:20 2019 +0100 Cleaned up internal site config handling * Several different places cared about converting legacy config formats and conversions. A lot of logic has been centralized which simplifies the consuming code. * Sockets are now handled in their CascadingDropdown data format * Moved livestatus socketurl encoding to livestatus API calls * Added tests for the old "socket" config format conversions Change-Id: I3bf892eaf4a1e04ec9908a329898d9d4f25d93cb --- cmk/gui/config.py | 95 ++++++++++++++---- cmk/gui/plugins/webapi/webapi.py | 6 +- cmk/gui/sites.py | 37 ++++++- cmk/gui/wato/pages/sites.py | 29 +----- cmk/gui/watolib.py | 159 +++++++++++++++++-------------- tests/integration/cmk/gui/test_webapi.py | 38 ++++++-- tests/unit/cmk/gui/test_gui_config.py | 90 +++++++++++++++++ tests/unit/cmk/gui/test_sites.py | 23 +++++ 8 files changed, 346 insertions(+), 131 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1282b7e6b9…

5 years, 8 months

Cleaned up permission test: Only check permission names instead of whole permission specification

by Lars Michelsen

Module: check_mk Branch: master Commit: 872edd8a4ab2e3306236b077675e57bc2871e688 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=872edd8a4ab2e3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 9 15:27:54 2019 +0100 Cleaned up permission test: Only check permission names instead of whole permission specification Change-Id: Ifc970afe2d80948908ce8337849779849f450d7d --- cmk/gui/notifications.py | 3 + tests/unit/cmk/gui/test_gui_config.py | 2810 +++++---------------------------- 2 files changed, 406 insertions(+), 2407 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=872edd8a4a…

5 years, 8 months

← Newer
1
...
33
34
35
36
37
38
39
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2019