Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

wmi.include, wmi_cpuload: Own discovery function for wmi_cpuload

by Moritz Kiemer

Module: check_mk Branch: master Commit: f77b690f8492f8c201d8b322a47a48aa307f3a6b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f77b690f8492f8… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Nov 8 11:43:50 2018 +0100 wmi.include, wmi_cpuload: Own discovery function for wmi_cpuload Eliminate 'skip_intersection' keyword argument Change-Id: I6e1acba344361ab5e7bdd28a695986d87929a4b1 --- checks/wmi.include | 24 +++++++----------------- checks/wmi_cpuload | 10 ++++++---- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/checks/wmi.include b/checks/wmi.include index 058f378..8162ee0 100644 --- a/checks/wmi.include +++ b/checks/wmi.include @@ -261,23 +261,13 @@ def inventory_wmi_table(tables, **kwargs): return [] potential_instances = set() - if kwargs.get("skip_intersection", False): - # Unfortunately there are tables which do NOT provide any - # names. In this case we fallback to old behaviour. - # - # Eg. wmi_cpuload check plugin: - # 'system_perf' section has only counters and comes together - # with 'computer_system' which has table names and intersection - # of these tables would be empty. Thus no service is discovered. - potential_instances = set([None]) - else: - # inventarize one item per instance that exists in all tables - for required_table in required_tables: - table_rows = tables[required_table].row_labels() - if potential_instances: - potential_instances &= set(table_rows) - else: - potential_instances = set(table_rows) + # inventarize one item per instance that exists in all tables + for required_table in required_tables: + table_rows = tables[required_table].row_labels() + if potential_instances: + potential_instances &= set(table_rows) + else: + potential_instances = set(table_rows) # if there are multiple instances, don't include the summary line as it is redundant if len(potential_instances) > 1: diff --git a/checks/wmi_cpuload b/checks/wmi_cpuload index 0a96466..a4dc9ed 100644 --- a/checks/wmi_cpuload +++ b/checks/wmi_cpuload @@ -25,10 +25,12 @@ # Boston, MA 02110-1301 USA. -def inventory_wmi_cpuload(parsed): - return inventory_wmi_table(parsed, \ - required_tables = [ "computer_system", "system_perf" ], - skip_intersection=True) +def inventory_wmi_cpuload(tables): + if ("computer_system" not in tables.keys() or + "system_perf" not in tables.keys() or + any(isinstance(table, NullTable) for table in tables.itervalues())): + return [] + return [(None, None)] def check_wmi_cpuload(item, params, parsed):

5 years, 7 months

Reserved 10 Werk IDS

by Moritz Kiemer

Module: check_mk Branch: master Commit: 8305093adb0a1662a832a14d62baa2752b88e712 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8305093adb0a16… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Nov 12 08:17:36 2018 +0100 Reserved 10 Werk IDS Change-Id: Iba6d5e8e6d9ce58b834395cddf8e340f9e5a9292 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 5c6e481..8d2e9df 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6901 +6911

5 years, 7 months

mk_jolokia: refactoring

by Moritz Kiemer

Module: check_mk Branch: master Commit: 5575aaedc7a698eff726c59d4ee728d0f1691c7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5575aaedc7a698… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Nov 9 15:34:20 2018 +0100 mk_jolokia: refactoring Reduce global variables, somewhat limit execfile scope, fix some white spaces. Maybe we can use pylint and other tools someday? Change-Id: I655506c686c53a553f9630974a82639cd0e477c1 --- agents/plugins/mk_jolokia | 224 ++++++++++++++++++++++++---------------------- 1 file changed, 117 insertions(+), 107 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5575aaedc7…

5 years, 7 months

6678 Added new hostname painter with configurable colors

by Andreas Boesl

Module: check_mk Branch: master Commit: 230af936e731fa264a1dfe378334d19be4d25213 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=230af936e731fa… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 9 13:26:39 2018 +0100 6678 Added new hostname painter with configurable colors Change-Id: I01bb0bc6e1a0f03bb6096fd47b9d965000b384f3 --- .werks/6678 | 18 ++++++++++ cmk/gui/plugins/views/painters.py | 71 +++++++++++++++++++++++++++++++++++---- 2 files changed, 82 insertions(+), 7 deletions(-) diff --git a/.werks/6678 b/.werks/6678 new file mode 100644 index 0000000..b902905 --- /dev/null +++ b/.werks/6678 @@ -0,0 +1,18 @@ +Title: The hostname painter now has configurable background colors +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1541766366 +Class: feature + +In addition you can also configure that the background color changes if the host is in downtime. +The following coloring options are now available +<ul> +<li>Colorize background if host is up</li> +<li>Colorize background if host is down</li> +<li>Colorize background if host is unreachable</li> +<li>Colorize background if host is pending</li> +<li>Colorize background if host is in downtime</li> +</ul> diff --git a/cmk/gui/plugins/views/painters.py b/cmk/gui/plugins/views/painters.py index b254b83..92eb0d5 100644 --- a/cmk/gui/plugins/views/painters.py +++ b/cmk/gui/plugins/views/painters.py @@ -79,6 +79,8 @@ from cmk.gui.valuespec import ( Timerange, DropdownChoice, DateFormat, + Dictionary, + ListChoice, ) from . import ( @@ -1216,7 +1218,7 @@ def paint_host_black(row): multisite_painters["host_black"] = { - "title": _("Hostname, red background if down or unreachable"), + "title": _("Hostname, red background if down or unreachable (Deprecated)"), "short": _("Host"), "columns": ["site", "host_name", "host_state"], "paint": paint_host_black, @@ -1261,21 +1263,76 @@ def paint_host_with_state(row): multisite_painters["host_with_state"] = { - "title": _("Hostname, marked red if down"), + "title": _("Hostname, marked red if down (Deprecated)"), "short": _("Host"), "columns": ["site", "host_name", "host_state", "host_has_been_checked"], "paint": paint_host_with_state, "sorter": 'site_host', } + +def paint_hostname_configurable(row, cell): + params = cell.painter_parameters() + color_choices = params["color_choices"] + + if row["host_has_been_checked"]: + state = row["host_state"] + else: + state = "p" + + css = ["nobr"] + if "colorize_downtime" in color_choices and row["host_scheduled_downtime_depth"] > 0: + css.extend(["hstate", "hstated"]) + + # Also apply other css classes, even if its already in downtime + for key, option_state in [ + ("colorize_up", 0), + ("colorize_down", 1), + ("colorize_unreachable", 2), + ("colorize_pending", "p"), + ]: + if key in color_choices and state == option_state: + if "hstate" not in css: + css.append("hstate") + css.append("hstate%s" % option_state) + break + + return " ".join(css), row["host_name"] + + +def params_hostname_configurable(): + elements = [ + ("color_choices", ListChoice( + choices = [ + ("colorize_up", _("Colorize background if host is up")), + ("colorize_down", _("Colorize background if host is down")), + ("colorize_unreachable", _("Colorize background if host unreachable")), + ("colorize_pending", _("Colorize background if host is pending")), + ("colorize_downtime", _("Colorize background if host is downtime")) + ], + title=_("Coloring"), + help=_("Here you can configure the background color for specific states. " + "The coloring for host in dowtime overrules all other coloring.") + )) + ] + + return Dictionary( + elements = elements, + title = _("Options"), + optional_keys = [] + ) + + multisite_painters["host"] = { - "title": _("Hostname"), - "short": _("Host"), - "columns": ["host_name"], - "paint": lambda row: ("nobr", row["host_name"]), - "sorter": 'site_host', + "title" : _("Hostname, with configurable colors"), + "short" : _("Host"), + "columns" : ["host_name", "host_state", "host_has_been_checked", "host_scheduled_downtime_depth"], + "params": params_hostname_configurable, + "paint" : paint_hostname_configurable, + "sorter" : 'site_host', } + multisite_painters["alias"] = { "title": _("Host alias"), "short": _("Alias"),

5 years, 7 months

6855 FIX Locally installed notification plugins were not immediately available

by Lars Michelsen

Module: check_mk Branch: master Commit: f3bb5610f9cc7b6ba13640ea7731913863992bb4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3bb5610f9cc7b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 9 17:02:14 2018 +0100 6855 FIX Locally installed notification plugins were not immediately available When installing a new notification plugin to local/share/check_mk/notifications this script was not immediately visible in the configuration GUI in all previous 1.5 releases. Workaround: Restarting the site apache made the script available in previous versions. Change-Id: I9d2f5d4ea853b63a1ba59df0ebdc57f17151b772 --- .werks/6855 | 16 ++++++++++++++++ cmk/gui/notifications.py | 45 +++++++++++++++++---------------------------- 2 files changed, 33 insertions(+), 28 deletions(-) diff --git a/.werks/6855 b/.werks/6855 new file mode 100644 index 0000000..12bbfc1 --- /dev/null +++ b/.werks/6855 @@ -0,0 +1,16 @@ +Title: Locally installed notification plugins were not immediately available +Level: 1 +Component: notifications +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1541754471 + +When installing a new notification plugin to local/share/check_mk/notifications +this script was not immediately visible in the configuration GUI in all +previous 1.5 releases. + +Workaround: Restarting the site apache made the script available in previous +versions. diff --git a/cmk/gui/notifications.py b/cmk/gui/notifications.py index 5953353..6b56782 100644 --- a/cmk/gui/notifications.py +++ b/cmk/gui/notifications.py @@ -38,31 +38,20 @@ from cmk.gui.i18n import _u, _ from cmk.gui.globals import html g_acknowledgement_time = {} -g_modified_time = 0 -g_columns = ["time", "contact_name", "type", "host_name", - "service_description", "comment"] -loaded_with_language = False +g_modified_time = 0 +g_columns = ["time", "contact_name", "type", "host_name", "service_description", "comment"] +# The permissions need to be loaded dynamically on each page load instead of +# only when the plugins need to be loaded because the user may have placed +# new notification plugins in the local hierarchy. def load_plugins(force): - global loaded_with_language - if loaded_with_language == cmk.gui.i18n.get_current_language() and not force: - return - - config.declare_permission_section("notification_plugin", - _("Notification plugins"), - do_sort = True) + config.declare_permission_section( + "notification_plugin", _("Notification plugins"), do_sort=True) for name, attrs in watolib.load_notification_scripts().items(): - config.declare_permission( - "notification_plugin.%s" % name, - _u(attrs["title"]), u"", - [ "admin", "user" ]) - - # This must be set after plugin loading to make broken plugins raise - # exceptions all the time and not only the first time (when the plugins - # are loaded). - loaded_with_language = cmk.gui.i18n.get_current_language() + config.declare_permission("notification_plugin.%s" % name, _u(attrs["title"]), u"", + ["admin", "user"]) def acknowledge_failed_notifications(timestamp): @@ -139,7 +128,7 @@ def load_failed_notifications(before=None, after=None, stat_only=False, extra_he if stat_only: result = sites.live().query_summed_stats(query) if result is None: - result = [0] # Normalize the result when no site answered + result = [0] # Normalize the result when no site answered if result[0] == 0 and not sites.live().dead_sites(): # In case there are no errors and all sites are reachable: @@ -159,19 +148,20 @@ def render_notification_table(failed_notifications): for row in failed_notifications: table.row() - table.cell(_("Time"), cmk.render.approx_age(time.time() - row[header['time']])) + table.cell(_("Time"), cmk.render.approx_age(time.time() - row[header['time']])) table.cell(_("Contact"), row[header['contact_name']]) - table.cell(_("Plugin"), row[header['type']]) - table.cell(_("Host"), row[header['host_name']]) + table.cell(_("Plugin"), row[header['type']]) + table.cell(_("Host"), row[header['host_name']]) table.cell(_("Service"), row[header['service_description']]) - table.cell(_("Output"), row[header['comment']]) + table.cell(_("Output"), row[header['comment']]) table.end() # TODO: We should really recode this to use the view and a normal view command / action def render_page_confirm(acktime, prev_url, failed_notifications): - html.header(_("Confirm failed notifications"), javascripts=[], stylesheets=[ "pages", "check_mk" ]) + html.header( + _("Confirm failed notifications"), javascripts=[], stylesheets=["pages", "check_mk"]) if failed_notifications: html.open_div(class_="really") @@ -206,6 +196,5 @@ def page_clear(): cmk.gui.wato.user_profile.user_profile_async_replication_page() return - failed_notifications = load_failed_notifications(before=acktime, - after=acknowledged_time()) + failed_notifications = load_failed_notifications(before=acktime, after=acknowledged_time()) render_page_confirm(acktime, prev_url, failed_notifications)

5 years, 7 months

Fix tycheckidioms and comparison to None in cmk/gui/plugins/views

by Óscar Nájera

Module: check_mk Branch: master Commit: e5b89ab11707d9d2efa7786514f9b1036071a59f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5b89ab11707d9… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Nov 8 14:53:15 2018 +0100 Fix tycheckidioms and comparison to None in cmk/gui/plugins/views CMK-837 Change-Id: Idedcac01f7a593772886acc85059392d7a6b4e41 --- cmk/gui/plugins/views/availability.py | 4 +-- cmk/gui/plugins/views/icons/__init__.py | 9 +++++- cmk/gui/plugins/views/inventory.py | 18 ++++++------ cmk/gui/plugins/views/mkeventd.py | 14 ++++----- cmk/gui/plugins/views/utils.py | 52 ++++++++++++++++----------------- cmk/gui/plugins/views/webservice.py | 6 ++-- 6 files changed, 55 insertions(+), 48 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e5b89ab117…

5 years, 7 months

Yapf cmk/gui/plugins/views

by Óscar Nájera

Module: check_mk Branch: master Commit: 4317de44b885e74487a8c17eb72f9ec86800185e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4317de44b885e7… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Nov 8 14:39:50 2018 +0100 Yapf cmk/gui/plugins/views CMK-1180 Change-Id: If3642b530c870102a23200fc727be56c96982522 --- cmk/gui/plugins/views/availability.py | 367 +- cmk/gui/plugins/views/bi.py | 243 +- cmk/gui/plugins/views/builtin.py | 7163 ++++++++++++++++++--------------- cmk/gui/plugins/views/commands.py | 523 +-- cmk/gui/plugins/views/dashboard.py | 262 +- cmk/gui/plugins/views/datasources.py | 223 +- cmk/gui/plugins/views/inventory.py | 1866 +++++---- cmk/gui/plugins/views/layouts.py | 199 +- cmk/gui/plugins/views/mkeventd.py | 1052 ++--- cmk/gui/plugins/views/mobile.py | 919 ++--- cmk/gui/plugins/views/painters.py | 1750 ++++---- cmk/gui/plugins/views/perfometer.py | 44 +- cmk/gui/plugins/views/sorters.py | 406 +- cmk/gui/plugins/views/utils.py | 258 +- cmk/gui/plugins/views/wato.py | 63 +- cmk/gui/plugins/views/webservice.py | 77 +- 16 files changed, 8280 insertions(+), 7135 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4317de44b8…

5 years, 7 months

Propose new yapf format settings

by Óscar Nájera

Module: check_mk Branch: master Commit: 9b668c2c01571ed507a38389a03381f494ea67d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b668c2c01571e… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Fri Nov 9 15:51:12 2018 +0100 Propose new yapf format settings Given our profuse use of dictionaries, this option procures compact dictionaries, when most of its values are short. CMK-1180 Change-Id: I5814b791e19917f662e53440c4f72335d2a886e8 --- .style.yapf | 8 + cmk/gui/plugins/dashboard/builtin.py | 283 ++++++++++++----------------------- 2 files changed, 103 insertions(+), 188 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9b668c2c01…

5 years, 7 months

Fixed position of GUI message number in sidebar footer

by Lars Michelsen

Module: check_mk Branch: master Commit: e1848d92fab70f53735c982265a8c06e1385b955 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1848d92fab70f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 9 15:30:36 2018 +0100 Fixed position of GUI message number in sidebar footer Change-Id: If724db02ea98caf3c0517afee7fad666fa49bb81 --- web/htdocs/themes/facelift/theme.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/web/htdocs/themes/facelift/theme.css b/web/htdocs/themes/facelift/theme.css index 63bbbda..89f941d 100644 --- a/web/htdocs/themes/facelift/theme.css +++ b/web/htdocs/themes/facelift/theme.css @@ -1129,6 +1129,12 @@ div.add_snapin div.snapinadder, div.add_snapin div.snapinadder:hover { div.add_snapin div.snapinadder .content { color: #1A243D; } +div#side_footer span#msg_label { + left: -10px; + top: -6px; + font-size: 12px; +} + #mk_side_search, #wiki_search { width: 100%; } #mk_side_search input, #mk_side_search select, #mk_side_search textarea, #mk_side_search #mk_side_search_field, #wiki_search input, #wiki_search select, #wiki_search textarea, #wiki_search #mk_side_search_field {

5 years, 7 months

6416 FIX mknotifyd: set a default timeout if no value is given for a method

by Tom Baerwinkel

Module: check_mk Branch: master Commit: df0fe1f79454156e5e170a938e905b4cb715c343 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df0fe1f7945415… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Nov 9 11:05:19 2018 +0100 6416 FIX mknotifyd: set a default timeout if no value is given for a method If the option "Timing settings for specific methods" was used for a notification method and no explicit timeout was given an exception was raised in the mknotifyd if a timeout occured. As a result notification processes that run in a timeout are not killed, the list of notifications that are in progress are not updated as long as the timed out process exists and the output of the timed out process is discarded. The issue is now fixed and the default timeout of 60s is set if no timeout is specified in the global settings. If you use the option "Timing settings for specific methods" in versions prior to 1.5.0p8 please set a timeout explicitlyto circumvent this issue. Change-Id: I25de48609ab6c00cd594374ffca2c1698c9ed253 --- .werks/6416 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.werks/6416 b/.werks/6416 new file mode 100644 index 0000000..69c7fc6 --- /dev/null +++ b/.werks/6416 @@ -0,0 +1,22 @@ +Title: mknotifyd: set a default timeout if no value is given for a method +Level: 1 +Component: notifications +Class: fix +Compatible: incomp +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1541754179 + +If the option "Timing settings for specific methods" was used for a notification +method and no explicit timeout was given an exception was raised in the mknotifyd +if a timeout occured. As a result notification processes that run in a timeout +are not killed, the list of notifications that are in progress are not updated +as long as the timed out process exists and the output of the timed out process +is discarded. + +The issue is now fixed and the default timeout of 60s is set if no timeout +is specified in the global settings. + +If you use the option "Timing settings for specific methods" in versions prior +to 1.5.0p8 please set a timeout explicitlyto circumvent this issue.

5 years, 7 months

← Newer
1
...
34
35
36
37
38
39
40
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018