Checkmk git commits April 2018

checkmk-commits@lists.checkmk.com

10 participants
287 discussions

docker_node_images: Cleaned up duplicate JSON evaluation

by Lars Michelsen

Module: check_mk Branch: master Commit: 6baa6be2dd6653ba557ed1f21c8c51eefb9eeab7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6baa6be2dd6653… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 16 21:10:55 2018 +0200 docker_node_images: Cleaned up duplicate JSON evaluation Change-Id: Ic2de768e250ab3379de810619494b069e71776c3 --- inventory/docker_node_images | 1 - 1 file changed, 1 deletion(-) diff --git a/inventory/docker_node_images b/inventory/docker_node_images index 21da417..4565a55 100644 --- a/inventory/docker_node_images +++ b/inventory/docker_node_images @@ -36,7 +36,6 @@ def _parse_docker_node_images(info): data = json.loads(" ".join(line)) if section_name == "images": - data = json.loads(" ".join(line)) parsed.setdefault(data["Repository"], data) elif section_name.startswith("images_labels"):

6 years, 2 months

5982 FIX BI: Only show bulk move action when targets are available

by Lars Michelsen

Module: check_mk Branch: master Commit: 67f0f78431a20cb446cde4b985d9f38ecf4d700d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67f0f78431a20c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 16 17:04:23 2018 +0200 5982 FIX BI: Only show bulk move action when targets are available Change-Id: Ie333e84920d6ac0ecee878e4150e6075c7adc57d --- .werks/5982 | 11 +++++++++++ web/plugins/wato/bi.py | 38 ++++++++++++++++++++++---------------- 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/.werks/5982 b/.werks/5982 new file mode 100644 index 0000000..e7f5e12 --- /dev/null +++ b/.werks/5982 @@ -0,0 +1,11 @@ +Title: BI: Only show bulk move action when targets are available +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1523891040 + + diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index 88bbd64..5ba2cbf 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -1218,16 +1218,19 @@ class ModeBIAggregations(ModeBI): if self._pack["aggregations"]: fieldstyle = "margin-top:10px" html.button("_bulk_delete_bi_aggregations", _("Bulk delete"), "submit", style=fieldstyle) - html.button("_bulk_move_bi_aggregations", _("Bulk move"), "submit", style=fieldstyle) - if html.has_var('bulk_moveto'): - html.javascript('update_bulk_moveto("%s")' % html.var('bulk_moveto', '')) - - choices = [ (pack_id, attrs["title"]) for pack_id, attrs in self._packs.items() + move_choices = [ (pack_id, attrs["title"]) for pack_id, attrs in self._packs.items() if pack_id is not self._pack["id"] and self.is_contact_for_pack(attrs) ] - html.select("bulk_moveto", choices, "@", - onchange = "update_bulk_moveto(this.value)", - attrs = {'class': 'bulk_moveto', 'style': fieldstyle}) + + if move_choices: + html.button("_bulk_move_bi_aggregations", _("Bulk move"), "submit", style=fieldstyle) + + if html.has_var('bulk_moveto'): + html.javascript('update_bulk_moveto("%s")' % html.var('bulk_moveto', '')) + + html.select("bulk_moveto", move_choices, "@", + onchange = "update_bulk_moveto(this.value)", + attrs = {'class': 'bulk_moveto', 'style': fieldstyle}) html.end_form() @@ -1432,16 +1435,19 @@ class ModeBIRules(ModeBI): if self._pack["rules"]: fieldstyle = "margin-top:10px" html.button("_bulk_delete_bi_rules", _("Bulk delete"), "submit", style=fieldstyle) - html.button("_bulk_move_bi_rules", _("Bulk move"), "submit", style=fieldstyle) - if html.has_var('bulk_moveto'): - html.javascript('update_bulk_moveto("%s")' % html.var('bulk_moveto', '')) - - choices = [ (pack_id, attrs["title"]) for pack_id, attrs in self._packs.items() + move_choices = [ (pack_id, attrs["title"]) for pack_id, attrs in self._packs.items() if pack_id is not self._pack["id"] and self.is_contact_for_pack(attrs) ] - html.select("bulk_moveto", choices, "@", - onchange = "update_bulk_moveto(this.value)", - attrs = {'class': 'bulk_moveto', 'style': fieldstyle}) + + if move_choices: + html.button("_bulk_move_bi_rules", _("Bulk move"), "submit", style=fieldstyle) + + if html.has_var('bulk_moveto'): + html.javascript('update_bulk_moveto("%s")' % html.var('bulk_moveto', '')) + + html.select("bulk_moveto", move_choices, "@", + onchange = "update_bulk_moveto(this.value)", + attrs = {'class': 'bulk_moveto', 'style': fieldstyle}) html.end_form()

6 years, 2 months

BI: Improved error handling of not existant rule packs

by Lars Michelsen

Module: check_mk Branch: master Commit: 6b7cefdbbe5d98b8c228774eee0f54597ed06631 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b7cefdbbe5d98… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 16 17:01:00 2018 +0200 BI: Improved error handling of not existant rule packs Change-Id: Id93bdf3bc5b08d059f840d12d9059582e551e05a --- web/plugins/wato/bi.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index da9ef51..88bbd64 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -77,9 +77,10 @@ class ModeBI(WatoMode): # Most modes need a pack as context if html.has_var("pack"): self._pack_id = html.var("pack") - if self._pack_id not in self._packs: - raise MKGeneralException(_("The BI pack '%s' does not exist.") % html.attrencode(self._pack_id)) - self._pack = self._packs[self._pack_id] + try: + self._pack = self._packs[self._pack_id] + except KeyError: + raise MKUserError("pack", _("This BI pack does not exist.")) else: self._pack_id = None self._pack = None @@ -963,7 +964,11 @@ class ModeBIPacks(ModeBI): def action(self): if config.user.may("wato.bi_admin") and html.has_var("_delete"): pack_id = html.var("_delete") - pack = self._packs[pack_id] + try: + pack = self._packs[pack_id] + except KeyError: + raise MKUserError("_delete", _("This BI pack does not exist.")) + if pack["rules"]: raise MKUserError(None, _("You cannot delete this pack. It contains <b>%d</b> rules.") % len(pack["rules"])) c = wato_confirm(_("Confirm BI pack deletion"),

6 years, 2 months

5979 FIX Availability: Fixed broken highlighting of timeline entries on hover

by Lars Michelsen

Module: check_mk Branch: master Commit: c3464d7a324ac47451798742486af9e574ad994a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3464d7a324ac4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 16 15:49:14 2018 +0200 5979 FIX Availability: Fixed broken highlighting of timeline entries on hover Change-Id: I22dea48d5bf1847319b65ee5ec39c04e62c9edcb --- .werks/5979 | 11 +++++++++++ web/htdocs/js/checkmk.js | 26 ++++++++++++++------------ web/plugins/views/availability.py | 19 +++++++++++++------ 3 files changed, 38 insertions(+), 18 deletions(-) diff --git a/.werks/5979 b/.werks/5979 new file mode 100644 index 0000000..8ffe80d --- /dev/null +++ b/.werks/5979 @@ -0,0 +1,11 @@ +Title: Availability: Fixed broken highlighting of timeline entries on hover +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1523886523 + + diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 8ecb1f0..68c930f 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -2946,11 +2946,12 @@ function host_tag_update_value(prefix, grp) { //# | | //# '--------------------------------------------------------------------' -function timeline_hover(td, row_nr, onoff) +function timeline_hover(row_nr, onoff) { - var timeline_bar_table = td.parentNode.parentNode.parentNode.parentNode; - var events_table = timeline_bar_table.nextElementSibling; - var row = events_table.children[0].children[row_nr+1]; + var row = document.getElementById("timetable_" + row_nr); + if (!row) + return; + if (onoff) { add_class(row, 'hilite'); } else { @@ -2959,15 +2960,16 @@ function timeline_hover(td, row_nr, onoff) } -function timetable_hover(tr, row_nr, onoff) { +function timetable_hover(row_nr, onoff) +{ + var slice = document.getElementById("timeline_" + row_nr); + if (!slice) + return; - var timeline_bar_table = tr.parentNode.parentNode.previousElementSibling; - var tds = timeline_bar_table.getElementsByTagName("TD"); - var td = tds[row_nr]; - if (td && onoff) { - add_class(td, 'hilite'); - } else if (td) { - remove_class(td, 'hilite'); + if (onoff) { + add_class(slice, 'hilite'); + } else { + remove_class(slice, 'hilite'); } } diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index adba2fd..877f838 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -327,7 +327,11 @@ def render_availability_timeline(what, av_entry, avoptions): # Table with detailed events table.begin("av_timeline", "", css="timelineevents", sortable=False, searchable=False) for row_nr, row in enumerate(timeline_layout["table"]): - table.row(onmouseover="timetable_hover(this, %d, 1);" % row_nr, onmouseout="timetable_hover(this, %d, 0);" % row_nr) + table.row( + id_="timetable_%d" % row_nr, + onmouseover="timetable_hover(%d, 1);" % row_nr, + onmouseout="timetable_hover(%d, 0);" % row_nr + ) table.cell(_("Links"), css="buttons") if what == "bi": url = html.makeuri([("timewarp", str(int(row["from"])))]) @@ -455,13 +459,16 @@ def render_timeline_bar(timeline_layout, style): html.open_tr(class_="timeline") for row_nr, title, width, css in timeline_layout["spans"]: - td_attrs = {"style": "width: %.3f%%" % width, - "title": title, - "class": css,} + td_attrs = { + "style": "width: %.3f%%" % width, + "title": title, + "class": css, + "id_": "timeline_%d" % row_nr, + } if style == "standalone" and row_nr is not None: - td_attrs.update({"onmouseover": "timeline_hover(this, %d, 1);" % row_nr, - "onmouseout" : "timeline_hover(this, %d, 0);" % row_nr, }) + td_attrs.update({"onmouseover": "timeline_hover(%d, 1);" % row_nr, + "onmouseout" : "timeline_hover(%d, 0);" % row_nr, }) html.td('', **td_attrs)

6 years, 2 months

Fix unstable test_mkbackup restore and backup tests

by Lars Michelsen

Module: check_mk Branch: master Commit: c65c683831b510d80576ca5afbf8623891a2e91b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c65c683831b510… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 16 13:56:26 2018 +0200 Fix unstable test_mkbackup restore and backup tests The integration tests could influence each other when multiple test jobs are executed on a single host. Change-Id: Ibe1655bfd558bfa38e396e13d24a505781fdf2fd --- tests/integration/bin/test_mkbackup.py | 56 +++++++++++++++++----------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/tests/integration/bin/test_mkbackup.py b/tests/integration/bin/test_mkbackup.py index 70c6016..71b5907 100644 --- a/tests/integration/bin/test_mkbackup.py +++ b/tests/integration/bin/test_mkbackup.py @@ -4,6 +4,7 @@ import pytest import subprocess import re import os +import lockfile from testlib import web, repo_path @@ -73,14 +74,19 @@ def test_cfg(web, site, tmpdir): site.delete_file("etc/check_mk/backup.mk") +def BackupLock(): + return lockfile.FileLock("/tmp/cmk-test-execute-backup") + + def _execute_backup(site, job_id="testjob"): - # Perform the backup - p = site.execute(["mkbackup", "backup", job_id], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = p.communicate() - assert stderr == "" - assert p.wait() == 0 - assert "Backup completed " in stdout + with BackupLock(): + # Perform the backup + p = site.execute(["mkbackup", "backup", job_id], + stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout, stderr = p.communicate() + assert stderr == "" + assert p.wait() == 0 + assert "Backup completed " in stdout # Check successful backup listing p = site.execute(["mkbackup", "list", "test-target"], @@ -101,6 +107,18 @@ def _execute_backup(site, job_id="testjob"): return backup_id + +def _execute_restore(site, backup_id, env=None): + with BackupLock(): + p = site.execute(["mkbackup", "restore", "test-target", backup_id], + stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env) + stdout, stderr = p.communicate() + assert "Restore completed" in stdout + assert stderr == "" + assert p.wait() == 0 + + + #. # .--Command line--------------------------------------------------------. # | ____ _ _ _ | @@ -173,13 +191,7 @@ def test_mkbackup_simple_backup(site, test_cfg): def test_mkbackup_simple_restore(site, test_cfg): backup_id = _execute_backup(site) - - p = site.execute(["mkbackup", "restore", "test-target", backup_id], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = p.communicate() - assert "Restore completed" in stdout - assert stderr == "" - assert p.wait() == 0 + _execute_restore(site, backup_id) def test_mkbackup_encrypted_backup(site, test_cfg): @@ -192,21 +204,9 @@ def test_mkbackup_encrypted_backup_and_restore(site, test_cfg): env = os.environ.copy() env["MKBACKUP_PASSPHRASE"] = "lala" - p = site.execute(["mkbackup", "restore", "test-target", backup_id], - stdout=subprocess.PIPE, stderr=subprocess.PIPE, - env=env) - stdout, stderr = p.communicate() - assert stderr == "" - assert p.wait() == 0 - assert "Restore completed" in stdout + _execute_restore(site, backup_id, env) def test_mkbackup_compressed_backup_and_restore(site, test_cfg): backup_id = _execute_backup(site, job_id="testjob-compressed") - - p = site.execute(["mkbackup", "restore", "test-target", backup_id], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = p.communicate() - assert stderr == "" - assert p.wait() == 0 - assert "Restore completed" in stdout + _execute_restore(site, backup_id)

6 years, 2 months

5978 FIX Fixed possible exception when user has invalid idle timeout value configured

by Lars Michelsen

Module: check_mk Branch: master Commit: 168cbcc2dc0ac4df8e71cf15dc133a493c5792d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=168cbcc2dc0ac4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 16 13:42:04 2018 +0200 5978 FIX Fixed possible exception when user has invalid idle timeout value configured The login session idle timeout can be configured individually per user. This setting is stored in the file <tt>var/check_mk/web/[user]/idle_timeout.mk</tt>. When this file contains an invalid value, the global default value is used instead of raising an error message. Change-Id: I7bbec234d0dcd8acb467b1422fbc2e458ec60116 --- .werks/5978 | 14 ++++++++++++++ web/htdocs/userdb.py | 8 +++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/5978 b/.werks/5978 new file mode 100644 index 0000000..3018567 --- /dev/null +++ b/.werks/5978 @@ -0,0 +1,14 @@ +Title: Fixed possible exception when user has invalid idle timeout value configured +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1523878776 + +The login session idle timeout can be configured individually per user. This setting +is stored in the file <tt>var/check_mk/web/[user]/idle_timeout.mk</tt>. When this +file contains an invalid value, the global default value is used instead of raising +an error message. diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index be52ffa..b8139a5 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -912,7 +912,13 @@ def contactgroups_of_user(user_id): def convert_idle_timeout(value): - return value != "False" and int(value) or False + if value == "False": + return False # Idle timeout disabled + + try: + return int(value) + except ValueError: + return None # Invalid value -> use global setting #.

6 years, 2 months

5977 FIX Fixed broken dropdown fields in several places

by Lars Michelsen

Module: check_mk Branch: master Commit: faf55a5cf94147003251d62e38984770ea8009e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=faf55a5cf94147… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 16 13:27:51 2018 +0200 5977 FIX Fixed broken dropdown fields in several places Some dropdown (select) fields were broken in Check_MK 1.5.0 for a longer time, especially in WATO configuration dialogs. This issue existed in all previous 1.5.0 releases. E.g. when setting the "Match syslog priority" option in a Event Console rule, the selected option was not persisted as expected. Change-Id: I68d266e1e12fdbd6249c4c5cc5741112fc84381b --- .werks/5977 | 16 ++++++++++++++++ web/htdocs/htmllib.py | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.werks/5977 b/.werks/5977 new file mode 100644 index 0000000..1c90837 --- /dev/null +++ b/.werks/5977 @@ -0,0 +1,16 @@ +Title: Fixed broken dropdown fields in several places +Level: 2 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1523877884 + +Some dropdown (select) fields were broken in Check_MK 1.5.0 for a longer time, +especially in WATO configuration dialogs. This issue existed in all previous +1.5.0 releases. + +E.g. when setting the "Match syslog priority" option in a Event Console rule, +the selected option was not persisted as expected. diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 3692a82..0357c31 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -2430,8 +2430,8 @@ class html(HTMLGenerator, RequestHandler): if error: self.open_x(class_="inputerror") - if "read_only" in attrs: - attrs["disabled"] = "disabled" if attrs.pop("read_only") else None + if "read_only" in attrs and attrs.pop("read_only"): + attrs["disabled"] = "disabled" self.hidden_field(varname, current, add_var=False) self.open_select(name=varname, id_=varname, **attrs)

6 years, 2 months

5975 FIX Agent output / SNMP walk download: Now processed asynchronously

by Lars Michelsen

Module: check_mk Branch: master Commit: 4962375029dde72e3347b38507f70eeddb59d893 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4962375029dde7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 12 21:26:11 2018 +0200 5975 FIX Agent output / SNMP walk download: Now processed asynchronously The download of the agent output or SNMP walks, that can be triggered from the hosts or Check_MK service context menus could run into time out situations with bad error messages like "Gateway timeout" in case the destination devices need more than ~110 seconds to respond. We have now changed the process of fetching the data to be executed as background job. The GUI is displaying the progress during processing and presenting a download icon on the progress page to finally download the created file. Change-Id: Ia3fc705454d2b5409bc852421202b8df5bf104ad --- .werks/5975 | 19 ++++++ web/htdocs/wato.py | 151 ++++++++++++++++++++++++++++++++++++------- web/plugins/icons/builtin.py | 1 + web/plugins/icons/wato.py | 18 ++++-- web/plugins/pages/wato.py | 1 + 5 files changed, 164 insertions(+), 26 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4962375029…

6 years, 2 months

Refactoring: Made agent output download page a class

by Lars Michelsen

Module: check_mk Branch: master Commit: 7969597fc635194c26c5700d7571976c3e1c0c99 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7969597fc63519… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 12 12:06:06 2018 +0200 Refactoring: Made agent output download page a class Change-Id: I959cb6e9c9d3e66be33c6bdb33db422fcaa417a3 --- web/htdocs/wato.py | 67 ++++++++++++++++++++++++++--------------------- web/plugins/pages/wato.py | 2 +- 2 files changed, 38 insertions(+), 31 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2ac9a31..65ee95f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15079,42 +15079,49 @@ def page_user_profile(change_pw=False): # | Page for downloading the current agent output / SNMP walk of a host | # '----------------------------------------------------------------------' -def page_download_agent_output(): - config.user.need_permission("wato.download_agent_output") +class PageDownloadAgentOutput(object): + def page(self): + self._from_vars() - host_name = html.var("host") - if not host_name: - raise MKGeneralException(_("The host is missing.")) + import htmllib + try: + success, output, agent_data = watolib.check_mk_automation(self._host.site_id(), "get-agent-output", + [self._host.name(), self._ty]) + except htmllib.RequestTimeout, e: + success, output, agent_data = False, "%s" % e, "" + + if success: + html.set_output_format("text") + html.set_http_header("Content-Disposition", "Attachment; filename=" + self._host.name()) + html.write(agent_data) + else: + html.header(_("Failed to fetch agent data"), stylesheets=["status", "pages"]) + html.p(_("There was a problem fetching data from the host.")) + if output: + html.show_error(output) + html.pre(agent_data) + html.footer() - ty = html.var("type") - if ty not in [ "walk", "agent" ]: - raise MKGeneralException(_("Invalid type specified.")) - init_wato_datastructures(with_wato_lock=True) + def _from_vars(self): + config.user.need_permission("wato.download_agent_output") - host = watolib.Folder.current().host(host_name) - if not host: - raise MKGeneralException(_("Invalid host.")) - host.need_permission("read") + host_name = html.var("host") + if not host_name: + raise MKGeneralException(_("The host is missing.")) - import htmllib - try: - success, output, agent_data = watolib.check_mk_automation(host.site_id(), "get-agent-output", - [host_name, ty]) - except htmllib.RequestTimeout, e: - success, output, agent_data = False, "%s" % e, "" + ty = html.var("type") + if ty not in [ "walk", "agent" ]: + raise MKGeneralException(_("Invalid type specified.")) + self._ty = ty - if success: - html.set_output_format("text") - html.set_http_header("Content-Disposition", "Attachment; filename=" + host_name) - html.write(agent_data) - else: - html.header(_("Failed to fetch agent data"), stylesheets=["status", "pages"]) - html.p(_("There was a problem fetching data from the host.")) - if output: - html.show_error(output) - html.pre(agent_data) - html.footer() + init_wato_datastructures(with_wato_lock=True) + + host = watolib.Folder.current().host(host_name) + if not host: + raise MKGeneralException(_("Invalid host.")) + host.need_permission("read") + self._host = host #. # .--Sampleconfig--------------------------------------------------------. diff --git a/web/plugins/pages/wato.py b/web/plugins/pages/wato.py index e2c660c..cdcbc18 100644 --- a/web/plugins/pages/wato.py +++ b/web/plugins/pages/wato.py @@ -41,7 +41,7 @@ register_handlers({ "wato_ajax_diag_host" : lambda: wato.ModeAjaxDiagHost().handle_page(), "wato_ajax_profile_repl" : watolib.ajax_profile_repl, "wato_ajax_execute_check" : lambda: wato.ModeAjaxExecuteCheck().handle_page(), - "download_agent_output" : wato.page_download_agent_output, + "download_agent_output" : lambda: wato.PageDownloadAgentOutput().page(), "ajax_popup_move_to_folder" : wato.ajax_popup_move_to_folder, "ajax_backup_job_state" : lambda: wato.ModeAjaxBackupJobState().page(), })

6 years, 2 months

5836 FIX Event Console messages without a service level can be matched against service level 0 now.

by Sven Panne

Module: check_mk Branch: master Commit: 49518478a90ae071e54dd54a90ff4dd1b03acbb9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49518478a90ae0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 16 11:54:36 2018 +0200 5836 FIX Event Console messages without a service level can be matched against service level 0 now. Various message sources, e.g. syslog messages or SNMP traps, do not carry a service level with them. If an event console rule specified a matching criterion including the service level value 0 (meaning "no service level specified"), the rule didn't fire for such messages. This behavior was confusing and inconsistent with the rule matching for notifications. Messages not carrying a service level have an implicit service level 0 now, so EC rules can match for this case. Change-Id: I1d77bbb86e610c1b1b61ed910fb3716a6259a646 --- .werks/5836 | 17 +++++++++++++++++ cmk/ec/main.py | 7 +------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.werks/5836 b/.werks/5836 new file mode 100644 index 0000000..3db21e8 --- /dev/null +++ b/.werks/5836 @@ -0,0 +1,17 @@ +Title: Event Console messages without a service level can be matched against service level 0 now. +Level: 1 +Component: ec +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1523871989 +Class: fix + +Various message sources, e.g. syslog messages or SNMP traps, do not carry a +service level with them. If an event console rule specified a matching +criterion including the service level value 0 (meaning "no service level +specified"), the rule didn't fire for such messages. This behavior was +confusing and inconsistent with the rule matching for notifications. + +Messages not carrying a service level have an implicit service level 0 now, +so EC rules can match for this case. diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 241c211..7bc7013 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -2420,12 +2420,7 @@ class EventServer(ECServerThread): sl_from, sl_to = rule["match_sl"] if sl_from > sl_to: sl_to, sl_from = sl_from, sl_to - p = event.get("sl") - if p is None: - if self._config["debug_rules"]: - self.logger.info(" did not match, because no service level is set in event") - return False - + p = event.get("sl", 0) if p < sl_from or p > sl_to: if self._config["debug_rules"]: self.logger.info(" did not match because of wrong service level %d (need %d..%d)" %

6 years, 2 months

← Newer
1
...
10
11
12
13
14
15
16
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2018