Checkmk git commits March 2018

checkmk-commits@lists.checkmk.com

10 participants
326 discussions

Make dashboard name available to dashlets to make links in e.g. limit errors work

by Lars Michelsen

Module: check_mk Branch: master Commit: e6c7716c39647974faba9ef20a8b22c0545ecdcd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6c7716c396479… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 5 11:19:54 2018 +0100 Make dashboard name available to dashlets to make links in e.g. limit errors work Change-Id: Ie009d2303bee02bfbb1af03a3c7735098e8a12e7 --- web/htdocs/dashboard.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 9dd3079..dc5fc19 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -447,10 +447,11 @@ def dashlet_container_end(): html.close_div() -def draw_dashlet_content(nr, the_dashlet, wato_folder, stash_html_vars=True): +def draw_dashlet_content(name, nr, the_dashlet, wato_folder, stash_html_vars=True): if stash_html_vars: html.stash_vars() html.del_all_vars() + html.set_var("name", name) try: visuals.add_context_to_uri_vars(the_dashlet) @@ -716,7 +717,7 @@ def draw_dashlet(name, board, nr, dashlet, wato_folder): # The content is rendered only if it is fixed. In the # other cases the initial (re)-size will paint the content. if "render" in dashlet_type: - draw_dashlet_content(nr, dashlet, wato_folder) + draw_dashlet_content(name, nr, dashlet, wato_folder) elif "content" in dashlet: # fixed content html.write(dashlet["content"]) @@ -792,7 +793,7 @@ def ajax_dashlet(): raise MKGeneralException(_('The requested dashlet type does not exist.')) wato_folder = html.var("wato_folder") - draw_dashlet_content(ident, the_dashlet, wato_folder, stash_html_vars=False) + draw_dashlet_content(board, ident, the_dashlet, wato_folder, stash_html_vars=False) #. # .--Dashboard List------------------------------------------------------.

6 years, 6 months

Replaced another conjunction in disguise by an AndingFilter.

by Sven Panne

Module: check_mk Branch: master Commit: 179b9a70a8a3f93bbe4ce499574a2c7320dc6835 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=179b9a70a8a3f9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 5 11:00:29 2018 +0100 Replaced another conjunction in disguise by an AndingFilter. Change-Id: I03d225417e6808fe8d84a74dc4eea6e27878dd45 --- livestatus/src/TableStateHistory.cc | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index bab2d05..042b831 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -23,8 +23,8 @@ // Boston, MA 02110-1301 USA. #include "TableStateHistory.h" +#include <algorithm> #include <ctime> -#include <deque> #include <memory> #include <mutex> #include <ostream> @@ -32,6 +32,7 @@ #include <stdexcept> #include <utility> #include <vector> +#include "AndingFilter.h" #include "Column.h" #include "ColumnFilter.h" #include "Filter.h" @@ -50,7 +51,6 @@ #include "StringUtils.h" #include "TableHosts.h" #include "TableServices.h" -class AndingFilter; class OringFilter; #ifdef CMC @@ -285,16 +285,18 @@ private: void TableStateHistory::answerQuery(Query *query) { // Create a partial filter, that contains only such filters that check // attributes of current hosts and services - std::deque<Filter *> object_filter; + std::vector<std::unique_ptr<Filter>> subfilters; if (core()->stateHistoryFilteringEnabled()) { for (const auto &filter : *query->filter()) { IsObjectFilter is_obj; filter->accept(is_obj); if (is_obj._value) { - object_filter.push_back(filter.get()); + subfilters.push_back(filter->copy()); } } } + std::reverse(subfilters.begin(), subfilters.end()); + AndingFilter object_filter(LogicalOperator::and_, std::move(subfilters)); std::lock_guard<std::mutex> lg(_log_cache->_lock); if (!_log_cache->logCachePreChecks()) { @@ -465,16 +467,9 @@ void TableStateHistory::answerQuery(Query *query) { // filtered out. Note: we currently do not filter out hosts // since they might be needed for service states if (!entry->_svc_desc.empty()) { - bool filtered_out = false; - for (auto filter : object_filter) { - if (!filter->accepts(Row(state), query->authUser(), - query->timezoneOffset())) { - filtered_out = true; - break; - } - } - - if (filtered_out) { + if (!object_filter.accepts(Row(state), + query->authUser(), + query->timezoneOffset())) { object_blacklist.insert(key); delete state; continue;

6 years, 6 months

Added missing import

by Lars Michelsen

Module: check_mk Branch: master Commit: 05377166b10669efe2e1b7d7a259729b9bbc114b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05377166b10669… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 5 10:48:23 2018 +0100 Added missing import Change-Id: Ieee9b39d4dc41f4de34e908585c993a8ec5c67de --- web/htdocs/bi.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 389aa80..22dcba6 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -3432,6 +3432,7 @@ def table(columns, add_headers, only_sites, limit, filters): row["aggr_group"] = group rows.append(row) + import views if not views.check_limit(rows, limit): return rows @@ -3573,6 +3574,7 @@ def singlehost_table(columns, add_headers, only_sites, limit, filters, joinbynam row.update(new_row) row["aggr_group"] = group rows.append(row) + import views if not views.check_limit(rows, limit): return rows

6 years, 6 months

5784 FIX WATO Web-API: fixed broken update of host tags

by Andreas Boesl

Module: check_mk Branch: master Commit: 33a018be9f03f7282f275ff0db66e260402f465d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33a018be9f03f7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Mar 5 10:38:40 2018 +0100 5784 FIX WATO Web-API: fixed broken update of host tags The updating of host tags was no longer working due the recent changes in the host datasource management. Change-Id: If3b9c92527b1ec3766089b2d87e363a564af3995 --- .werks/5784 | 10 ++++++++++ web/plugins/webapi/webapi.py | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/5784 b/.werks/5784 new file mode 100644 index 0000000..97e77ac --- /dev/null +++ b/.werks/5784 @@ -0,0 +1,10 @@ +Title: WATO Web-API: fixed broken update of host tags +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1520242609 +Class: fix + +The updating of host tags was no longer working due the recent changes in the host datasource management. diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index 34e2e42..7f52dfe 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -838,7 +838,9 @@ class APICallHosttags(APICallCollection): new_tags.update(changed_hosttags_config.get_tag_ids_with_group_prefix()) # Remove the builtin hoststags from the list of used_tags - for tag_group_id, tag_group__title, tags in watolib.builtin_host_tags: + for builtin_tag_group in watolib.builtin_host_tags: + tag_group_id = builtin_tag_group[0] + tags = builtin_tag_group[2] for tag_id, tag_title, aux_tags in tags: used_tags.discard("%s/%s" % (tag_group_id, tag_id)) used_tags.discard(tag_id)

6 years, 6 months

Moved the bulk of the mkeventd implementation into a module.

by Sven Panne

Module: check_mk Branch: master Commit: 7d83f67602ef778b6d0613f4073216de65afb90e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d83f67602ef77… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 5 10:29:55 2018 +0100 Moved the bulk of the mkeventd implementation into a module. This has several advantages: * Easier testing * Easier deployment via f12, with no need to use f12 twice * No need for imp-Kung-Fu Change-Id: Ic199bfe41c12b75110f7613bb09eaf7baf54d7cc --- bin/mkeventd | 5160 +------------------------------ cmk/ec/main.py | 5162 ++++++++++++++++++++++++++++++++ tests/mkeventd/test_mkeventd_status.py | 22 +- 3 files changed, 5174 insertions(+), 5170 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7d83f67602…

6 years, 6 months

Moved most of the toplevel code into main().

by Sven Panne

Module: check_mk Branch: master Commit: c0156269de0415465b57d1e0e8025ba0de054714 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0156269de0415… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 5 10:10:15 2018 +0100 Moved most of the toplevel code into main(). Change-Id: If82377974d1763f46e0830d1521801841d7d67be --- bin/mkeventd | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index c37a3d2..f9d1e1f 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -5043,9 +5043,8 @@ lock_logging = ECLock("history") g_terminate_main_event = threading.Event() -if __name__ == "__main__": - # TODO(sp) Move all the stuff below in to a function so we don't have to - # pollute the global namspace like hell. + +def main(): os.unsetenv("LANG") settings = cmk.ec.settings.settings(cmk.__version__, @@ -5079,6 +5078,7 @@ if __name__ == "__main__": settings.paths.status_file.value.parent.mkdir(parents=True, exist_ok=True) # First do all things that might fail, before daemonizing + global g_perfcounters, g_event_status, g_status_server, g_event_server g_perfcounters = Perfcounters() g_event_status = EventStatus(settings) g_status_server = StatusServer(settings) @@ -5156,3 +5156,7 @@ if __name__ == "__main__": pid_path.unlink() except OSError: pass + + +if __name__ == "__main__": + main()

6 years, 6 months

5879 FIX Dashboard: View dashlets were not applying row limits

by Lars Michelsen

Module: check_mk Branch: master Commit: 5a8b571445796326b51d26eb1b5daa549f7be435 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a8b5714457963… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 5 10:27:35 2018 +0100 5879 FIX Dashboard: View dashlets were not applying row limits The row limits of the views were not applied in the dashlets. This could result in long load times caused by very large views. The view dashlets are now limited exactly like when viewing the dedicated views. Change-Id: Id709775a4cee604516414046401f2be2f98ce7b7 --- .werks/5879 | 13 +++++++++++++ web/htdocs/views.css | 6 ++++++ web/htdocs/views.py | 12 ++++++++---- web/plugins/dashboard/dashlets.py | 2 +- 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/.werks/5879 b/.werks/5879 new file mode 100644 index 0000000..3e84beb --- /dev/null +++ b/.werks/5879 @@ -0,0 +1,13 @@ +Title: Dashboard: View dashlets were not applying row limits +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i4 +Date: 1520241957 + +The row limits of the views were not applied in the dashlets. This could result +in long load times caused by very large views. The view dashlets are now limited +exactly like when viewing the dedicated views. diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 3c89fc7..fb0672f 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -32,6 +32,12 @@ body.main.dashlet { padding: 0px; } +body.main.dashlet div.warning { + margin: 0; + border-radius: 0; + box-shadow: 0; +} + /*-------------------------------------------------------------------------. | _____ _ ___ ___ _ _ | | |_ _|_ _| |__ ___ ( _ ) / _ \ _ __ | |_(_) ___ _ __ ___ | diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 7c04406..ecadb13 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1965,12 +1965,16 @@ def check_limit(rows, limit): count = len(rows) if limit != None and count >= limit + 1: text = _("Your query produced more than %d results. ") % limit + if html.var("limit", "soft") == "soft" and config.user.may("general.ignore_soft_limit"): - text += '<a href="%s">%s</a>' % \ - (html.makeuri([("limit", "hard")]), _('Repeat query and allow more results.')) + text += html.render_a(_('Repeat query and allow more results.'), + target="_self", + href=html.makeuri([("limit", "hard")])) elif html.var("limit") == "hard" and config.user.may("general.ignore_hard_limit"): - text += '<a href="%s">%s</a>' % \ - (html.makeuri([("limit", "none")]), _('Repeat query without limit.')) + text += html.render_a(_('Repeat query without limit.'), + target="_self", + href=html.makeuri([("limit", "none")])) + text += " " + _("Note: the shown results are incomplete and do not reflect the sort order.") html.show_warning(text) del rows[limit:] diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index cdc007a..3a23c7a 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -675,7 +675,7 @@ def dashlet_view(nr, dashlet): is_reload = html.has_var("_reload") - display_options = "SIXL" + display_options = "SIXLW" if not is_reload: display_options += "HR"

6 years, 6 months

Moved view specific limit function to views module

by Lars Michelsen

Module: check_mk Branch: master Commit: 933abd6304395e0e2d423dd7fa7eb1b34296e311 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=933abd6304395e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 5 09:53:10 2018 +0100 Moved view specific limit function to views module Change-Id: Id154aebd86b102cc3748c3d811bf9bd127e9f581 --- web/htdocs/bi.py | 4 ++-- web/htdocs/html_mod_python.py | 17 ----------------- web/htdocs/mobile.py | 3 +-- web/htdocs/views.py | 19 ++++++++++++++++++- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 4b1b786..389aa80 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -3432,7 +3432,7 @@ def table(columns, add_headers, only_sites, limit, filters): row["aggr_group"] = group rows.append(row) - if not html.check_limit(rows, limit): + if not views.check_limit(rows, limit): return rows return rows @@ -3573,7 +3573,7 @@ def singlehost_table(columns, add_headers, only_sites, limit, filters, joinbynam row.update(new_row) row["aggr_group"] = group rows.append(row) - if not html.check_limit(rows, limit): + if not views.check_limit(rows, limit): return rows diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 5baae11..b69cced 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -251,23 +251,6 @@ class html_mod_python(htmllib.html): def set_content_type(self, ty): self.req.content_type = ty - def check_limit(self, rows, limit): - count = len(rows) - if limit != None and count >= limit + 1: - text = _("Your query produced more than %d results. ") % limit - if self.var("limit", "soft") == "soft" and config.user.may("general.ignore_soft_limit"): - text += '<a href="%s">%s</a>' % \ - (self.makeuri([("limit", "hard")]), _('Repeat query and allow more results.')) - elif self.var("limit") == "hard" and config.user.may("general.ignore_hard_limit"): - text += '<a href="%s">%s</a>' % \ - (self.makeuri([("limit", "none")]), _('Repeat query without limit.')) - text += " " + _("Note: the shown results are incomplete and do not reflect the sort order.") - self.show_warning(text) - del rows[limit:] - return False - return True - - def load_transids(self, lock = False): return config.user.load_file("transids", [], lock) diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index 30923c5..9d21d32 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -312,8 +312,7 @@ def render_view(view, rows, datasource, group_painters, painters, html.write(_("No hosts/services found.")) else: try: - # TODO: special limit for mobile UI - html.check_limit(rows, views.get_limit()) + views.check_limit(rows, views.get_limit()) layout["render"](rows, view, group_painters, painters, num_columns, show_checkboxes and not html.do_actions()) except Exception, e: diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 29c9b4f..7c04406 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1898,7 +1898,7 @@ def render_view(view, rows, datasource, group_painters, painters, if not has_done_actions: # Limit exceeded? Show warning if display_options.enabled(display_options.W): - html.check_limit(rows, get_limit()) + check_limit(rows, get_limit()) layout["render"](rows, view, group_painters, painters, num_columns, show_checkboxes and not html.do_actions()) headinfo = "%d %s" % (row_count, _("row") if row_count == 1 else _("rows")) @@ -1961,6 +1961,23 @@ def render_view(view, rows, datasource, group_painters, painters, html.body_end() +def check_limit(rows, limit): + count = len(rows) + if limit != None and count >= limit + 1: + text = _("Your query produced more than %d results. ") % limit + if html.var("limit", "soft") == "soft" and config.user.may("general.ignore_soft_limit"): + text += '<a href="%s">%s</a>' % \ + (html.makeuri([("limit", "hard")]), _('Repeat query and allow more results.')) + elif html.var("limit") == "hard" and config.user.may("general.ignore_hard_limit"): + text += '<a href="%s">%s</a>' % \ + (html.makeuri([("limit", "none")]), _('Repeat query without limit.')) + text += " " + _("Note: the shown results are incomplete and do not reflect the sort order.") + html.show_warning(text) + del rows[limit:] + return False + return True + + def do_table_join(master_ds, master_rows, master_filters, join_cells, join_columns, only_sites): join_table, join_master_column = master_ds["join"] slave_ds = multisite_datasources[join_table]

6 years, 6 months

Removed the last remnants of our gitbugs machinery.

by Sven Panne

Module: check_mk Branch: master Commit: 9c1fbb8460913bbe9eb42830419ecac1a1c730af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c1fbb8460913b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 5 10:05:47 2018 +0100 Removed the last remnants of our gitbugs machinery. Change-Id: I8048d5d783aaa2faa2592e4f1fbf5a832af201db --- Makefile | 6 +- gb | 663 --------------------------------------------------------------- 2 files changed, 1 insertion(+), 668 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9c1fbb8460…

6 years, 6 months

Relaxed type a bit. Added a TODO.

by Sven Panne

Module: check_mk Branch: master Commit: 0198d4500ed4544028424c80b0314f8526cd3cf6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0198d4500ed454… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 5 10:03:40 2018 +0100 Relaxed type a bit. Added a TODO. Change-Id: I8e70e78af3ba25cb53e4e144c79f9f93890feb1f --- livestatus/src/Query.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/livestatus/src/Query.h b/livestatus/src/Query.h index 93138c7..b4d6702 100644 --- a/livestatus/src/Query.h +++ b/livestatus/src/Query.h @@ -87,9 +87,12 @@ private: Table &_table; bool _keepalive; using FilterStack = std::vector<std::unique_ptr<Filter>>; + // TODO(sp) This should really use Filter instead of AndingFilter, but + // TableStateHistory::answerQuery and TableCachedStatehist::answerQuery rely + // on the current state of affairs in a *very* dubious way... std::unique_ptr<AndingFilter> _filter; contact *_auth_user; - std::unique_ptr<AndingFilter> _wait_condition; + std::unique_ptr<Filter> _wait_condition; std::chrono::milliseconds _wait_timeout; Triggers::Kind _wait_trigger; Row _wait_object;

6 years, 6 months

← Newer
1
...
25
26
27
28
29
30
31
32
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2018