Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

3321 FIX Globes in dashboards now correctly reflect selected WATO folder

by Mathias Kettner

Module: check_mk Branch: master Commit: 9a210fa2e0497ce7068f10f8264a93b398318b34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a210fa2e0497c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 6 10:04:21 2016 +0200 3321 FIX Globes in dashboards now correctly reflect selected WATO folder The bug was that they always showed the stats of all hosts, not just of the selected folder (if you are using the {{Folders}} snapin). --- .werks/3321 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/dashboard.py | 9 ++++++--- web/plugins/dashboard/dashlets.py | 9 +++++++-- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.werks/3321 b/.werks/3321 new file mode 100644 index 0000000..eccd641 --- /dev/null +++ b/.werks/3321 @@ -0,0 +1,11 @@ +Title: Globes in dashboards now correctly reflect selected WATO folder +Level: 2 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459929807 + +The bug was that they always showed the stats of all hosts, not just +of the selected folder (if you are using the {{Folders}} snapin). diff --git a/ChangeLog b/ChangeLog index 256412a..24fa9f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -166,6 +166,7 @@ * 3021 FIX: interface metrics: fixed broken interface metrics when using nagios core... * 3360 FIX: Fixed different exceptions in predictive monitoring GUI * 3320 FIX: Fix bogus interfering snapins Tree of folders and Folders... + * 3321 FIX: Globes in dashboards now correctly reflect selected WATO folder... WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 06d5804..07be582 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -440,13 +440,14 @@ def dashlet_container_end(): html.write("</div>\n") -def draw_dashlet_content(nr, the_dashlet, stash_html_vars=True): +def draw_dashlet_content(nr, the_dashlet, wato_folder, stash_html_vars=True): if stash_html_vars: html.stash_vars() html.del_all_vars() try: visuals.add_context_to_uri_vars(the_dashlet) + html.set_var("wato_folder", wato_folder) dashlet_type = dashlet_types[the_dashlet['type']] if 'iframe_render' in dashlet_type: @@ -692,7 +693,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) + draw_dashlet_content(nr, dashlet, wato_folder) elif "content" in dashlet: # fixed content html.write(dashlet["content"]) @@ -762,7 +763,9 @@ def ajax_dashlet(): if the_dashlet['type'] not in dashlet_types: raise MKGeneralException(_('The requested dashlet type does not exist.')) - draw_dashlet_content(ident, the_dashlet, stash_html_vars=False) + + wato_folder = html.var("wato_folder") + draw_dashlet_content(ident, the_dashlet, wato_folder, stash_html_vars=False) #. # .--Dashboard List------------------------------------------------------. diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 28e548b..e21b7fe 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -214,8 +214,13 @@ def render_statistics(pie_id, what, table, filter, dashlet): pie_left_aspect = 0.5 pie_right_aspect = 0.8 - info = what == 'hosts' and 'host' or 'service' - use_filters = visuals.filters_of_visual(dashlet, [info]) + if what == 'hosts': + info = 'host' + infos = [ info ] + else: + info = 'service' + infos = [ 'host', 'service' ] + use_filters = visuals.filters_of_visual(dashlet, infos) for filt in use_filters: if filt.available() and not isinstance(filt, visuals.FilterSite): filter += filt.filter(info)

8 years, 5 months

3320 FIX Fix bogus interfering snapins Tree of folders and Folders

by Mathias Kettner

Module: check_mk Branch: master Commit: fbb73a4d855106febce2c5ddcb6e495247cf7d9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fbb73a4d855106… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 6 09:50:53 2016 +0200 3320 FIX Fix bogus interfering snapins Tree of folders and Folders If you have both snapins enabled than folding the tree in one would affect the tree of the other. This has been fixed. --- .werks/3320 | 11 +++++++++++ ChangeLog | 1 + web/plugins/sidebar/wato.py | 27 ++++++++++++++++----------- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/.werks/3320 b/.werks/3320 new file mode 100644 index 0000000..7e46150 --- /dev/null +++ b/.werks/3320 @@ -0,0 +1,11 @@ +Title: Fix bogus interfering snapins Tree of folders and Folders +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459928994 + +If you have both snapins enabled than folding the tree in one +would affect the tree of the other. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 79b691b..256412a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -165,6 +165,7 @@ * 3355 FIX: Fixed possible broken HW-/SW-Inventory history view * 3021 FIX: interface metrics: fixed broken interface metrics when using nagios core... * 3360 FIX: Fixed different exceptions in predictive monitoring GUI + * 3320 FIX: Fix bogus interfering snapins Tree of folders and Folders... WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index b8b008d..74b2cf8 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -184,25 +184,28 @@ def compute_foldertree(): return user_folders -def render_tree_folder(f, js_func): - subfolders = f.get(".folders", {}).values() +# Note: the dictionary that represents the folder here is *not* +# the datastructure from WATO but a result of compute_foldertree(). The reason: +# We fetch the information via livestatus - not from WATO. +def render_tree_folder(tree_id, folder, js_func): + subfolders = folder.get(".folders", {}).values() subfolders.sort(cmp = lambda f1, f2: cmp(f1["title"].lower(), f2["title"].lower())) is_leaf = len(subfolders) == 0 # Suppress indentation for non-emtpy root folder - if f['.path'] == '' and is_leaf: + if folder['.path'] == '' and is_leaf: html.write("<ul>") # empty root folder - elif f and f['.path'] != '': + elif folder and folder['.path'] != '': html.write("<ul style='padding-left: 0px;'>") title = '<a class="link" href="#" onclick="%s(this, \'%s\');">%s (%d)</a>' % ( - js_func, f[".path"], html.attrencode(f["title"]), f[".num_hosts"]) + js_func, folder[".path"], html.attrencode(folder["title"]), folder[".num_hosts"]) if not is_leaf: - html.begin_foldable_container('wato-hosts', "/" + f[".path"], False, HTML(title)) + html.begin_foldable_container(tree_id, "/" + folder[".path"], False, HTML(title)) for subfolder in subfolders: - render_tree_folder(subfolder, js_func) + render_tree_folder(tree_id, subfolder, js_func) html.end_foldable_container() else: html.write("<li>" + title + "</li>") @@ -263,12 +266,14 @@ def render_wato_foldertree(): # Now render the whole tree if user_folders: - render_tree_folder(user_folders.values()[0], 'wato_tree_click') + render_tree_folder("wato-hosts", user_folders.values()[0], 'wato_tree_click') sidebar_snapins['wato_foldertree'] = { - 'title' : _('Tree of Folders'), - 'description' : _('This snapin shows the folders defined in WATO. It can be used to open views filtered by the WATO folder. It works standalone, without interaction with any other snapin.'), + 'title' : _('Tree of folders'), + 'description' : _('This snapin shows the folders defined in WATO. It can be used to ' + 'open views filtered by the WATO folder. It works standalone, without ' + 'interaction with any other snapin.'), 'render' : render_wato_foldertree, 'allowed' : [ 'admin', 'user', 'guest' ], 'styles' : """ @@ -299,7 +304,7 @@ def render_wato_folders(): user_folders = compute_foldertree() if user_folders: - render_tree_folder(user_folders.values()[0], 'wato_folders_clicked') + render_tree_folder("wato-folders", user_folders.values()[0], 'wato_folders_clicked') sidebar_snapins['wato_folders'] = { 'title' : _('Folders'),

8 years, 5 months

ewon: fixed reporting of N2 supply

by Sebastian Herbord

Module: check_mk Branch: master Commit: 4452dc43c5ddbe2e9ad70b77ef28ab42c348f914 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4452dc43c5ddbe… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Apr 6 08:57:06 2016 +0200 ewon: fixed reporting of N2 supply --- checks/ewon | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/ewon b/checks/ewon index a546e13..5ca0b03 100644 --- a/checks/ewon +++ b/checks/ewon @@ -55,11 +55,11 @@ oxyreduct_tag_map = { "incident", "O2 high", "O2 low", "alarms", ]}, - 5: {"flags": "00??????0000?101", + 5: {"flags": "00??????00**0101", "flag_names": [ "recovery", "maintenance", "", "", "", "", "", "", - "warnings", "incidents", "N2 to safe area", "N2 from safe area", + "warnings", "incidents", "N2 to safe area", "N2 request from safe area", "N2 via outlet", "N2 via compressor", "N2-supply locked", "N2-supply open" ]}, 6: {"name": "O2 minimum", "levels": (16, 17, 14, 13), "scale": 0.01, "unit": "%",

8 years, 5 months

3114 linux and windows agent can now be configured to directly encrypt their output. For real-time updates encryption is now optional (but active per default)

by Sebastian Herbord

Module: check_mk Branch: master Commit: ef09824efa32c03d2db723b0b4c0939dcaf2f1b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef09824efa32c0… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Apr 5 17:32:56 2016 +0200 3114 linux and windows agent can now be configured to directly encrypt their output. For real-time updates encryption is now optional (but active per default) This feature can be configured through Host&Service Parameters -> Access to agents -> Encryption. When "Encryption for Agents" is set to "enforce" or "enable", two things will happen: a) Baked windows or linux agents will be configured to encrypt their output b) check_mk will be configured to try to decrypt output from agents. In case of "enable" it will also accept unencrypted output, in case of "enforce" it won't. This change also affects real-time updates as these were already encrypted. The passphrase configured for real-time updates will now only serve as a default, agents with "Encryption" configured will use the same passphrase for rt and regular updates. Finally, it is now also possible to configure real-time updates to be unencrypted. All encryption happens with AES using 256bit keys and cbc. The above is completely optional, the default behaviour for everything (including real-time updates) is compatible with previous versions. --- .werks/3114 | 23 +++++ ChangeLog | 1 + agents/check_mk_agent.linux | 28 ++++++- agents/windows/Configuration.cc | 13 ++- agents/windows/Configuration.h | 8 +- agents/windows/OutputProxy.cc | 20 +++-- agents/windows/OutputProxy.h | 8 +- agents/windows/build_version | 2 +- agents/windows/check_mk.example.ini | 9 +- agents/windows/check_mk_agent-64.exe | Bin 939520 -> 939520 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 939520 -> 939520 bytes agents/windows/check_mk_agent.cc | 97 ++++++++++++---------- agents/windows/check_mk_agent.exe | Bin 866304 -> 867328 bytes agents/windows/check_mk_agent.msi | Bin 2067456 -> 2068480 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 866304 -> 867328 bytes agents/windows/install_agent-64.exe | Bin 431102 -> 431298 bytes agents/windows/install_agent.exe | Bin 421747 -> 422023 bytes modules/check_mk.py | 8 ++ modules/check_mk_base.py | 40 +++++++++ modules/config.py | 1 + web/htdocs/images/button_showhide.png | Bin 0 -> 3885 bytes web/htdocs/js/checkmk.js | 11 +++ web/htdocs/valuespec.py | 18 +++- web/plugins/wato/check_mk_configuration.py | 36 ++++++++ 24 files changed, 249 insertions(+), 74 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ef09824efa…

8 years, 5 months

Better title for button for new bookmark list

by Mathias Kettner

Module: check_mk Branch: master Commit: 4b5c11d04c7ab7f00c3886fa07eaa4f906a0093c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b5c11d04c7ab7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 5 17:08:06 2016 +0200 Better title for button for new bookmark list --- web/htdocs/pagetypes.py | 2 +- web/plugins/sidebar/shipped.py | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index 9583d99..b7565db 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -712,7 +712,7 @@ class Overridable: html.header(self.phrase("title_plural"), stylesheets=["pages", "views", "status"]) html.begin_context_buttons() - html.context_button(_('New'), self.create_url(), "new_" + self.type_name()) + html.context_button(self.phrase("new"), self.create_url(), "new_" + self.type_name()) # TODO: Remove this legacy code as soon as views, dashboards and reports have been # moved to pagetypes.py diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 9507cb9..034a450 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1073,12 +1073,13 @@ class BookmarkList(pagetypes.Overridable, pagetypes.Base): @classmethod def phrase(self, what): return { - "title" : _("Bookmark List"), - "title_plural" : _("Bookmark Lists"), - "add_to" : _("Add to Bookmark List"), - "clone" : _("Clone Bookmark List"), - "create" : _("Create Bookmark List"), - "edit" : _("Edit Bookmark List"), + "title" : _("Bookmark list"), + "title_plural" : _("Bookmark lists"), + "add_to" : _("Add to bookmark list"), + "clone" : _("Clone bookmark list"), + "create" : _("Create bookmark list"), + "edit" : _("Edit bookmark list"), + "new" : _("New list"), }.get(what, pagetypes.Base.phrase(what))

8 years, 5 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 403efefc7e4eb60555c8b0eb9832f8ccc721dcbf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=403efefc7e4eb6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Apr 5 16:38:26 2016 +0200 Fetched livestatus from downstream. --- livestatus/src/Query.cc | 33 +++++++++++++-------------------- livestatus/src/Query.h | 7 +++---- livestatus/src/Store.cc | 38 +++++++++++++++++--------------------- 3 files changed, 33 insertions(+), 45 deletions(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 91ad351..4f49d33 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -169,6 +169,13 @@ Query::Query(const list<string> &lines, OutputBuffer *output, Table *table) break; } } + + if (_columns.empty() && !doStats()) { + table->addAllColumnsToQuery(this); + // TODO(sp) We overwrite the value from a possible ColumnHeaders: line + // here, is that really what we want? + _show_column_headers = true; + } } Query::~Query() { @@ -199,8 +206,6 @@ void Query::setError(int error_code, const char *msg) { _output->setError(error_code, msg); } -bool Query::hasNoColumns() { return _columns.empty() && !doStats(); } - int Query::lookupOperator(const char *opname) { int opid; int negate = 1; @@ -382,10 +387,6 @@ void Query::parseStatsNegateLine(char *line) { } void Query::parseStatsLine(char *line) { - if (_table == nullptr) { - return; - } - // first token is either aggregation operator or column name char *col_or_op = next_field(&line); if (col_or_op == nullptr) { @@ -472,10 +473,6 @@ void Query::parseStatsLine(char *line) { } void Query::parseFilterLine(char *line, bool is_filter) { - if (_table == nullptr) { - return; - } - char *column_name = next_field(&line); if (column_name == nullptr) { _output->setError(RESPONSE_CODE_INVALID_HEADER, "empty filter line"); @@ -523,9 +520,6 @@ void Query::parseFilterLine(char *line, bool is_filter) { } void Query::parseAuthUserHeader(char *line) { - if (_table == nullptr) { - return; - } _auth_user = find_contact(line); if (_auth_user == nullptr) { // Do not handle this as error any more. In a multi site setup @@ -544,9 +538,6 @@ void Query::parseStatsGroupLine(char *line) { } void Query::parseColumnsLine(char *line) { - if (_table == nullptr) { - return; - } char *column_name; while (nullptr != (column_name = next_field(&line))) { Column *column = _table->column(column_name); @@ -758,10 +749,6 @@ void Query::parseWaitTriggerLine(char *line) { } void Query::parseWaitObjectLine(char *line) { - if (_table == nullptr) { - return; - } - char *objectspec = lstrip(line); _wait_object = _table->findObject(objectspec); if (_wait_object == nullptr) { @@ -811,6 +798,12 @@ void Query::parseLocaltimeLine(char *line) { bool Query::doStats() { return !_stats_columns.empty(); } +void Query::process() { + start(); + _table->answerQuery(this); + finish(); +} + void Query::start() { doWait(); diff --git a/livestatus/src/Query.h b/livestatus/src/Query.h index d7af3c8..8eac4e6 100644 --- a/livestatus/src/Query.h +++ b/livestatus/src/Query.h @@ -93,15 +93,12 @@ class Query { public: Query(const std::list<std::string> &lines, OutputBuffer *output, Table *); ~Query(); + void process(); bool processDataset(void *); bool timelimitReached(); - void start(); - void finish(); void setDefaultColumns(const char *); void addColumn(Column *column); - void setShowColumnHeaders(bool x) { _show_column_headers = x; } void setError(int error_code, const char *msg); - bool hasNoColumns(); contact *authUser() { return _auth_user; } void outputDatasetBegin(); void outputDatasetEnd(); @@ -160,6 +157,8 @@ private: void parseWaitTriggerLine(char *line); void parseWaitObjectLine(char *line); void parseLocaltimeLine(char *line); + void start(); + void finish(); int lookupOperator(const char *opname); Column *createDummyColumn(const char *name); }; diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index c2f2d0d..c139d87 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -24,13 +24,12 @@ #include "Store.h" #include <string.h> -#include <sys/time.h> #include <time.h> +#include <chrono> #include <utility> #include "InputBuffer.h" #include "OutputBuffer.h" #include "Query.h" -#include "Table.h" #include "global_counters.h" #include "logger.h" #include "strutil.h" @@ -43,12 +42,16 @@ #include "tables.h" // IWYU pragma: keep #undef EXTERN +using std::chrono::duration_cast; +using std::chrono::microseconds; +using std::chrono::system_clock; using std::list; using std::lock_guard; using std::make_pair; using std::mutex; using std::pair; using std::string; +using std::to_string; extern int g_debug_level; extern unsigned long g_max_cached_messages; @@ -188,34 +191,27 @@ void Store::answerCommandRequest(const char *command) { void Store::answerGetRequest(const list<string> &lines, OutputBuffer *output, const char *tablename) { output->reset(); + if (tablename[0] == 0) { output->setError(RESPONSE_CODE_INVALID_REQUEST, "Invalid GET request, missing tablename"); + return; } + Table *table = findTable(tablename); if (table == nullptr) { output->setError(RESPONSE_CODE_NOT_FOUND, "Invalid GET request, no such table '%s'", tablename); + return; } - Query query(lines, output, table); - if ((table != nullptr) && !output->hasError()) { - if (query.hasNoColumns()) { - table->addAllColumnsToQuery(&query); - query.setShowColumnHeaders(true); - } - struct timeval before, after; - gettimeofday(&before, nullptr); - query.start(); - table->answerQuery(&query); - query.finish(); - gettimeofday(&after, nullptr); - unsigned long ustime = (after.tv_sec - before.tv_sec) * 1000000 + - (after.tv_usec - before.tv_usec); - if (g_debug_level > 0) { - logger(LG_INFO, - "Time to process request: %lu us. Size of answer: %d bytes", - ustime, output->size()); - } + auto start = system_clock::now(); + Query(lines, output, table).process(); + if (g_debug_level > 0) { + auto elapsed = duration_cast<microseconds>(system_clock::now() - start); + logger(LG_INFO, "%s", + ("Time to process request: " + to_string(elapsed.count()) + + " us. Size of answer: " + to_string(output->size()) + " bytes") + .c_str()); } }

8 years, 5 months

GUI: Improved error handling in case of missing prediction information

by Lars Michelsen

Module: check_mk Branch: master Commit: 54956378ee7ce1fb317d12d0beafbda8ce473b22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54956378ee7ce1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 5 16:34:38 2016 +0200 GUI: Improved error handling in case of missing prediction information --- web/htdocs/prediction.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/web/htdocs/prediction.py b/web/htdocs/prediction.py index d18a85d..2caf7c6 100644 --- a/web/htdocs/prediction.py +++ b/web/htdocs/prediction.py @@ -51,6 +51,10 @@ def page_graph(): dir = "%s/prediction/%s/%s/%s" % ( defaults.var_dir, host, pnp_cleanup(service), pnp_cleanup(dsname)) + if not os.path.exists(dir): + raise MKGeneralException(_("There is currently no predition information " + "available for this for this service.")) + # Load all prediction information, sort by time of generation tg_name = html.var("timegroup") timegroup = None @@ -72,8 +76,11 @@ def page_graph(): for tg_info in timegroups ] if not timegroup: - timegroup = timegroups[0] - tg_name = choices[0][0] + if timegroups: + timegroup = timegroups[0] + tg_name = choices[0][0] + else: + raise MKGeneralException(_("Missing prediction information.")) html.begin_form("prediction") html.write(_("Show prediction for ")) @@ -82,7 +89,12 @@ def page_graph(): html.end_form() # Get prediction data - tg_data = eval(file(dir + "/" + timegroup["name"]).read()) + try: + path = dir + "/" + timegroup["name"] + tg_data = eval(file(path).read()) + except IOError: + raise MKGeneralException(_("Failed to read the prediction data from <tt>%s</tt>.") % path) + swapped = swap_and_compute_levels(tg_data, timegroup) vertical_range = compute_vertical_range(swapped) legend = [

8 years, 5 months

Updated bug entries #2461

by Lars Michelsen

Module: check_mk Branch: master Commit: 40cbd949c5056411495a084d74a133b3c6704c82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40cbd949c50564… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 5 16:26:07 2016 +0200 Updated bug entries #2461 --- .bugs/2461 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/2461 b/.bugs/2461 new file mode 100644 index 0000000..5c37818 --- /dev/null +++ b/.bugs/2461 @@ -0,0 +1,9 @@ +Title: Predictive icon for Interface outbound traffic missing +Component: multisite +State: open +Date: 2016-04-05 16:25:10 +Targetversion: 1.2.8 +Class: bug + +There is only one icon created by the icon plugin for the first +found predictive value.

8 years, 5 months

3360 FIX Fixed different exceptions in predictive monitoring GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: 0d5b8c11ee57b9db3b02b10398878de15b536693 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d5b8c11ee57b9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 5 16:24:32 2016 +0200 3360 FIX Fixed different exceptions in predictive monitoring GUI --- .werks/3360 | 10 +++++++ ChangeLog | 1 + modules/prediction.py | 3 +- web/htdocs/prediction.py | 68 ++++++++++++++++++++++++++---------------- web/plugins/icons/builtin.py | 3 ++ 5 files changed, 58 insertions(+), 27 deletions(-) diff --git a/.werks/3360 b/.werks/3360 new file mode 100644 index 0000000..d2fd935 --- /dev/null +++ b/.werks/3360 @@ -0,0 +1,10 @@ +Title: Fixed different exceptions in predictive monitoring GUI +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1459863592 + + diff --git a/ChangeLog b/ChangeLog index ff40508..8ab331a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -163,6 +163,7 @@ * 3347 FIX: Improved performance when having a lot of users... * 3355 FIX: Fixed possible broken HW-/SW-Inventory history view * 3021 FIX: interface metrics: fixed broken interface metrics when using nagios core... + * 3360 FIX: Fixed different exceptions in predictive monitoring GUI WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/modules/prediction.py b/modules/prediction.py index 53d3cb8..21c2137 100644 --- a/modules/prediction.py +++ b/modules/prediction.py @@ -32,6 +32,8 @@ # Fetch RRD historic metrics data of a specific service. returns a tuple # of (step, [value1, value2, ...]) +# IMPORTANT: Until we have a central library, keep this function in sync with +# the function get_rrd_data() from web/prediction.py. def get_rrd_data(hostname, service_description, varname, cf, fromtime, untiltime): step = 1 rpn = "%s.%s" % (varname, cf.lower()) # "MAX" -> "max" @@ -56,7 +58,6 @@ def get_rrd_data(hostname, service_description, varname, cf, fromtime, untiltime return step, values - daynames = [ "monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday"] diff --git a/web/htdocs/prediction.py b/web/htdocs/prediction.py index 1add68c..d18a85d 100644 --- a/web/htdocs/prediction.py +++ b/web/htdocs/prediction.py @@ -24,46 +24,29 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import defaults -import sites import os import time +import defaults +import config +import sites from lib import * graph_size = 2000, 700 -# Import helper functions from check_mk module prediction.py. Maybe we should -# find some more clean way some day for creating common Python code between -# Check_MK CCE and Multisite. -execfile(defaults.modules_dir + "/prediction.py") -rrd_path = defaults.rrd_path -rrdcached_socket = None -omd_root = None -try: - omd_root = default.omd_root - if omd_root: - rrdcached_socket = omd_root + "/tmp/run/rrdcached.sock" - else: - try: - rrdcached_socket = config.rrdcached_socket - except: - pass -except: - pass def page_graph(): - host = html.var("host") + host = html.var("host") service = html.var("service") - dsname = html.var("dsname") + dsname = html.var("dsname") + html.header(_("Prediction for %s - %s - %s") % (host, service, dsname), javascripts=["prediction"], stylesheets=["pages", "prediction"]) # Get current value from perf_data via Livestatus - current_value = \ - get_current_perfdata(host, service, dsname) + current_value = get_current_perfdata(host, service, dsname) dir = "%s/prediction/%s/%s/%s" % ( defaults.var_dir, host, pnp_cleanup(service), pnp_cleanup(dsname)) @@ -208,14 +191,47 @@ def compute_vertical_scala(low, high): return vert_scala + def get_current_perfdata(host, service, dsname): - perf_data = sites.live().query_value("GET services\nFilter: host_name = %s\nFilter: description = %s\nColumns: perf_data" % ( - lqencode(host), lqencode(service))) + perf_data = sites.live().query_value( + "GET services\nFilter: host_name = %s\nFilter: description = %s\n" + "Columns: perf_data" % (lqencode(host), lqencode(service))) + for part in perf_data.split(): name, rest = part.split("=") if name == dsname: return float(rest.split(";")[0]) + +# Fetch RRD historic metrics data of a specific service. returns a tuple +# of (step, [value1, value2, ...]) +# IMPORTANT: Until we have a central library, keep this function in sync with +# the function get_rrd_data() from modules/prediction.py. +def get_rrd_data(hostname, service_description, varname, cf, fromtime, untiltime): + step = 1 + rpn = "%s.%s" % (varname, cf.lower()) # "MAX" -> "max" + query = "GET services\n" \ + "Columns: rrddata:m1:%s:%d:%d:%d\n" \ + "Filter: host_name = %s\n" \ + "Filter: description = %s\n" % ( + rpn, fromtime, untiltime, step, + lqencode(hostname), lqencode(service_description)) + + try: + response = sites.live().query_row(query)[0] + except Exception, e: + if opt_debug: + raise + raise MKGeneralException("Cannot get historic metrics via Livestatus: %s" % e) + + if not response: + raise MKGeneralException("Got no historic metrics") + + real_fromtime, real_untiltime, step = response[:3] + values = response[3:] + return step, values + + # Compute check levels from prediction data and check parameters def swap_and_compute_levels(tg_data, tg_info): columns = tg_data["columns"] diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 5486ff1..6bc5da3 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -394,6 +394,9 @@ multisite_icons_and_actions['perfgraph'] = { # | | # '----------------------------------------------------------------------' +# TODO: At least for interfaces we have 2 predictive values. But this icon +# only creates a link to the first one. Add multiple icons or add a navigation +# element to the prediction page. def paint_prediction_icon(what, row, tags, host_custom_vars): if what == "service": parts = row[what + "_perf_data"].split()

8 years, 5 months

Cleaned up prediction compute_levels a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: 7dd0dc4f47dfc1816f54100d01973d4ff73ebcd1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7dd0dc4f47dfc1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 5 16:17:19 2016 +0200 Cleaned up prediction compute_levels a bit --- web/htdocs/prediction.py | 48 ++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/web/htdocs/prediction.py b/web/htdocs/prediction.py index ceaceff..1add68c 100644 --- a/web/htdocs/prediction.py +++ b/web/htdocs/prediction.py @@ -249,29 +249,35 @@ def stack(apoints, bpoints, scale): # copy&paste. This was neccessary since there is currently no common # code between Check_MK CCE and Multisite. def compute_levels(params, ref_value, stdev): - levels = [] - for what, sig in [ ( "upper", 1 ), ( "lower", -1 )]: - p = "levels_" + what - if p in params: - how, (warn, crit) = params[p] - if how == "absolute": - this_levels = (ref_value + (sig * warn), ref_value + (sig * crit)) - - elif how == "relative": - this_levels = (ref_value + sig * (ref_value * warn / 100), - ref_value + sig * (ref_value * crit / 100)) - - else: # how == "stdev": - this_levels = (ref_value + sig * (stdev * warn), - ref_value + sig * (stdev * crit)) - if what == "upper" and "levels_upper_min" in params: - limit_warn, limit_crit = params["levels_upper_min"] - this_levels = (max(limit_warn, this_levels[0]), max(limit_crit, this_levels[1])) - levels.append(this_levels) - else: - levels.append((None, None)) + return compute_level(params, ref_value, stdev, "levels_upper", 1), \ + compute_level(params, ref_value, stdev, "levels_lower", -1) + + +def compute_level(params, ref_value, stdev, param, sig): + if param not in params: + return None, None + + how, (warn, crit) = params[param] + if how == "absolute": + levels = (ref_value + (sig * warn), + ref_value + (sig * crit)) + + elif how == "relative": + levels = (ref_value + sig * (ref_value * warn / 100), + ref_value + sig * (ref_value * crit / 100)) + + else: # how == "stdev": + levels = (ref_value + sig * (stdev * warn), + ref_value + sig * (stdev * crit)) + + if param == "levels_upper" and "levels_upper_min" in params: + limit_warn, limit_crit = params["levels_upper_min"] + levels = (max(limit_warn, levels[0]), + max(limit_crit, levels[1])) + return levels + def compute_vertical_range(swapped): mmin, mmax = 0.0, 0.0 for name, points in swapped.items():

8 years, 5 months

← Newer
1
...
29
30
31
32
33
34
35
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016