Checkmk git commits January 2017

checkmk-commits@lists.checkmk.com

10 participants
302 discussions

Refactoring table.py: Made testable using try catch blocks.

by Roland Halbig

Module: check_mk Branch: master Commit: 4eb5d3b7e7c90eccb5f38424e56337990dc37709 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4eb5d3b7e7c90e… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Jan 5 15:27:37 2017 +0100 Refactoring table.py: Made testable using try catch blocks. Change-Id: I75f2311029dd35cdf4c013775d3fdfed69816502 --- web/htdocs/table.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 1be5b2e..4615b6b 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -23,7 +23,6 @@ # License along with GNU Make; see the file COPYING. If not, write # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. - import config from lib import num_split @@ -172,6 +171,7 @@ def end(): search_term = None actions_enabled = (table["searchable"] or table["sortable"]) and not do_csv if actions_enabled: + user_opts = config.user.load_file("tableoptions", {}) user_opts.setdefault(table_id, {}) table_opts = user_opts[table_id] @@ -388,9 +388,8 @@ def end(): 'Click <a href="%s">here</a> to disable the limitation.') % (limit, num_rows_unlimited, html.makeuri([('limit', 'none')]))) - if actions_enabled and not do_csv: + if actions_enabled: config.user.save_file("tableoptions", user_opts) - table = None

7 years, 8 months

Refactoring table.py: Isolated csv writing.

by Roland Halbig

Module: check_mk Branch: master Commit: e44134303bfada9f42074a0c9830cb4dcc9ec14e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e44134303bfada… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Jan 5 15:48:32 2017 +0100 Refactoring table.py: Isolated csv writing. Change-Id: Ifb876c527b20c6cf3ad5f98dc034dafdc1f11ee4 --- web/htdocs/table.py | 199 ++++++++++++++++++++++++++++------------------------ 1 file changed, 109 insertions(+), 90 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e44134303b…

7 years, 8 months

4227 New manual WATO configuration lock mechanism

by Lars Michelsen

Module: check_mk Branch: master Commit: 61081c74754cc07bb485c5e370bfd09c22b45ae5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61081c74754cc0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 14:21:17 2017 +0100 4227 New manual WATO configuration lock mechanism It is now possible to manually lock the WATO configuration for modifications and set the configuration to read only mode. You can find the option to configure it below <i>Global Settings > Read only mode</i>. On that page the WATO configuration can be set to read only mode for all users that are not permitted to ignore the read only mode. All users that are permitted to set the read only mode can disable it again when another permitted user enabled it before. The read only mode can be set permanently or in a specific time window. You can set a message which is then shown to all users while the read only mode is active. Change-Id: I94fac7c7c23d49444016dc1ea506cbaa2a61433f --- .werks/4227 | 20 ++++++ ChangeLog | 1 + web/htdocs/images/icon_read_only.png | Bin 0 -> 3062 bytes web/htdocs/wato.py | 125 +++++++++++++++++++++++++++++++++++ web/htdocs/watolib.py | 54 +++++++++++++++ web/htdocs/webapi.py | 3 + web/plugins/config/wato.py | 1 + 7 files changed, 204 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=61081c7475…

7 years, 8 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 8fb1f020d6ff80c1a65c9474e6aef85572647f2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fb1f020d6ff80… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 10 11:39:58 2017 +0100 Fetched livestatus from downstream. Change-Id: If8f45bed3e75c87bde9c1c6fd9f531c1db38bd69 --- livestatus/src/DownCommColumn.cc | 2 +- livestatus/src/DowntimeOrComment.cc | 16 +++++------- livestatus/src/DowntimeOrComment.h | 2 +- livestatus/src/OffsetBoolColumn.cc | 33 +++++++++++++++++++++++++ livestatus/src/OffsetBoolColumn.h | 49 +++++++++++++++++++++++++++++++++++++ livestatus/src/TableComments.cc | 3 ++- livestatus/src/TableDowntimes.cc | 3 ++- 7 files changed, 94 insertions(+), 14 deletions(-) diff --git a/livestatus/src/DownCommColumn.cc b/livestatus/src/DownCommColumn.cc index 36fe24c..2b6fd30 100644 --- a/livestatus/src/DownCommColumn.cc +++ b/livestatus/src/DownCommColumn.cc @@ -63,7 +63,7 @@ bool DownCommColumn::match(DowntimeOrComment *dt, void *data) { // TableDownComm always enumerates dowtimes/comments for both hosts and // services, regardless of what we are interested in. So we have to skip the // ones which have the wrong kind. - if (_is_service != (dt->_is_service != 0)) { + if (_is_service != dt->_is_service) { return false; } diff --git a/livestatus/src/DowntimeOrComment.cc b/livestatus/src/DowntimeOrComment.cc index 014c9c4..3dee1a7 100644 --- a/livestatus/src/DowntimeOrComment.cc +++ b/livestatus/src/DowntimeOrComment.cc @@ -27,19 +27,15 @@ DowntimeOrComment::DowntimeOrComment(nebstruct_downtime_struct *dt, unsigned long id) : _type(dt->downtime_type) + , _is_service(dt->service_description != nullptr) + , _host(find_host(dt->host_name)) + , _service(_is_service + ? find_service(dt->host_name, dt->service_description) + : nullptr) , _entry_time(dt->entry_time) , _author_name(dt->author_name) , _comment(dt->comment_data) - , _id(id) { - _host = find_host(dt->host_name); - if (dt->service_description != nullptr) { - _service = find_service(dt->host_name, dt->service_description); - _is_service = 1; - } else { - _service = nullptr; - _is_service = 0; - } -} + , _id(id) {} DowntimeOrComment::~DowntimeOrComment() = default; diff --git a/livestatus/src/DowntimeOrComment.h b/livestatus/src/DowntimeOrComment.h index 3d9c44a..70bf6bb 100644 --- a/livestatus/src/DowntimeOrComment.h +++ b/livestatus/src/DowntimeOrComment.h @@ -82,13 +82,13 @@ class DowntimeOrComment { public: int _type; + bool _is_service; host *_host; service *_service; time_t _entry_time; std::string _author_name; std::string _comment; unsigned long _id; - int _is_service; DowntimeOrComment(nebstruct_downtime_struct *dt, unsigned long id); virtual ~DowntimeOrComment(); diff --git a/livestatus/src/OffsetBoolColumn.cc b/livestatus/src/OffsetBoolColumn.cc new file mode 100644 index 0000000..578f584 --- /dev/null +++ b/livestatus/src/OffsetBoolColumn.cc @@ -0,0 +1,33 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +// +------------------------------------------------------------------+ +// +// This file is part of Check_MK. +// The official homepage is at http://mathias-kettner.de/check_mk. +// +// check_mk is free software; you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by +// the Free Software Foundation in version 2. check_mk is distributed +// in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +// out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +// PARTICULAR PURPOSE. See the GNU General Public License for more de- +// tails. You should have received a copy of the GNU General Public +// License along with GNU Make; see the file COPYING. If not, write +// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +// Boston, MA 02110-1301 USA. + +#include "OffsetBoolColumn.h" +#include "Column.h" + +int32_t OffsetBoolColumn::getValue(void *row, contact * /* auth_user */) { + if (auto p = rowData<void>(row)) { + return *offset_cast<bool>(p, _offset) ? 1 : 0; + } + return 0; +} diff --git a/livestatus/src/OffsetBoolColumn.h b/livestatus/src/OffsetBoolColumn.h new file mode 100644 index 0000000..929b923 --- /dev/null +++ b/livestatus/src/OffsetBoolColumn.h @@ -0,0 +1,49 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +// +------------------------------------------------------------------+ +// +// This file is part of Check_MK. +// The official homepage is at http://mathias-kettner.de/check_mk. +// +// check_mk is free software; you can redistribute it and/or modify it +// under the terms of the GNU General Public License as published by +// the Free Software Foundation in version 2. check_mk is distributed +// in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +// out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +// PARTICULAR PURPOSE. See the GNU General Public License for more de- +// tails. You should have received a copy of the GNU General Public +// License along with GNU Make; see the file COPYING. If not, write +// to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +// Boston, MA 02110-1301 USA. + +#ifndef OffsetBoolColumn_h +#define OffsetBoolColumn_h + +#include "config.h" // IWYU pragma: keep +#include <sys/types.h> +#include <string> +#include "OffsetIntColumn.h" + +#ifdef CMC +#include "cmc.h" +#else +#include "nagios.h" +#endif + +class OffsetBoolColumn : public OffsetIntColumn { +public: + OffsetBoolColumn(const std::string& name, const std::string& description, + int offset, int indirect_offset, int extra_offset, + int extra_extra_offset) + : OffsetIntColumn(name, description, offset, indirect_offset, + extra_offset, extra_extra_offset) {} + int32_t getValue(void* row, contact* auth_user) override; +}; + +#endif // OffsetBoolColumn_h diff --git a/livestatus/src/TableComments.cc b/livestatus/src/TableComments.cc index fbee58d..c82a687 100644 --- a/livestatus/src/TableComments.cc +++ b/livestatus/src/TableComments.cc @@ -29,6 +29,7 @@ #include "DowntimeOrComment.h" #include "DowntimesOrComments.h" // IWYU pragma: keep #include "MonitoringCore.h" +#include "OffsetBoolColumn.h" #include "OffsetIntColumn.h" #include "OffsetSStringColumn.h" #include "OffsetTimeColumn.h" @@ -61,7 +62,7 @@ TableComments::TableComments(const DowntimesOrComments &downtimes_holder, addColumn(make_unique<OffsetIntColumn>( "type", "The type of the comment: 1 is host, 2 is service", DANGEROUS_OFFSETOF(Comment, _type), -1, -1, -1)); - addColumn(make_unique<OffsetIntColumn>( + addColumn(make_unique<OffsetBoolColumn>( "is_service", "0, if this entry is for a host, 1 if it is for a service", DANGEROUS_OFFSETOF(Comment, _is_service), -1, -1, -1)); diff --git a/livestatus/src/TableDowntimes.cc b/livestatus/src/TableDowntimes.cc index 9b2fd64..11628d3 100644 --- a/livestatus/src/TableDowntimes.cc +++ b/livestatus/src/TableDowntimes.cc @@ -29,6 +29,7 @@ #include "DowntimeOrComment.h" #include "DowntimesOrComments.h" // IWYU pragma: keep #include "MonitoringCore.h" +#include "OffsetBoolColumn.h" #include "OffsetIntColumn.h" #include "OffsetSStringColumn.h" #include "OffsetTimeColumn.h" @@ -62,7 +63,7 @@ TableDowntimes::TableDowntimes(const DowntimesOrComments &downtimes_holder, "type", "The type of the downtime: 0 if it is active, 1 if it is pending", DANGEROUS_OFFSETOF(Downtime, _type), -1, -1, -1)); - addColumn(make_unique<OffsetIntColumn>( + addColumn(make_unique<OffsetBoolColumn>( "is_service", "0, if this entry is for a host, 1 if it is for a service", DANGEROUS_OFFSETOF(Downtime, _is_service), -1, -1, -1));

7 years, 8 months

Small refactoring for access to computation of availability annotations

by Mathias Kettner

Module: check_mk Branch: master Commit: dd2bafdb69068ec505940393ee02299c46a01800 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd2bafdb69068e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 10 11:46:03 2017 +0100 Small refactoring for access to computation of availability annotations This was neccessary for printing the annotations in reports Change-Id: If5b9ebdfbc1a3c0e3d0fc69b83d7a266c3a7b59e --- web/plugins/views/availability.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index b2c2c50..262bfe0 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -640,14 +640,8 @@ def render_bi_availability(title, aggr_rows): # | for loading, saving and using them is in the availability module. | # '----------------------------------------------------------------------' -def render_annotations(annotations, by_host, what, avoptions, omit_service): +def get_relevant_annotations(annotations, by_host, what, avoptions): (from_time, until_time), range_title = avoptions["range"] - format = "%H:%M:%S" - if time.localtime(from_time)[:3] != time.localtime(until_time-1)[:3]: - format = "%Y-%m-%d " + format - def render_date(ts): - return time.strftime(format, time.localtime(ts)) - annos_to_render = [] annos_rendered = set() @@ -666,7 +660,18 @@ def render_annotations(annotations, by_host, what, avoptions, omit_service): annos_to_render.sort(cmp=lambda a,b: cmp(a[1]["from"], b[1]["from"]) or cmp(a[0], b[0])) - labelling = avoptions["labelling"] + # Prepare rendering of time stamps + ts_format = "%H:%M:%S" + if time.localtime(from_time)[:3] != time.localtime(until_time-1)[:3]: + ts_format = "%Y-%m-%d " + ts_format + def render_date(ts): + return time.strftime(ts_format, time.localtime(ts)) + + return annos_to_render, render_date + + +def render_annotations(annotations, av_rawdata, what, avoptions, omit_service): + annos_to_render, render_date = get_relevant_annotations(annotations, av_rawdata, what, avoptions) table.begin(title = _("Annotations"), omit_if_empty = True) for (site_id, host, service), annotation in annos_to_render: @@ -685,7 +690,7 @@ def render_annotations(annotations, by_host, what, avoptions, omit_service): html.icon_button(delete_url, _("Delete this annotation"), "delete") if not omit_service: - if not "omit_host" in labelling: + if not "omit_host" in avoptions["labelling"]: host_url = "view.py?" + html.urlencode_vars([("view_name", "hoststatus"), ("site", site_id), ("host", host)]) table.cell(_("Host"), '<a href="%s">%s</a>' % (host_url, host))

7 years, 8 months

Cleaned up twice initialized vars

by Lars Michelsen

Module: check_mk Branch: master Commit: 4cbbddf8f2e259e2be7fba8474c9fa753ceedf65 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4cbbddf8f2e259… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 9 17:05:28 2017 +0100 Cleaned up twice initialized vars Change-Id: Iab0b14bf7adac51e76421b1229476bcedbaee347 --- web/htdocs/availability.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index 67f51bc..06aa0ef 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -684,9 +684,6 @@ def compute_availability(what, av_rawdata, avoptions): os_aggrs, os_states = get_outage_statistic_options(avoptions) need_statistics = os_aggrs and os_states grouping = avoptions["grouping"] - timeline_rows = [] # Need this as a global variable if just one service is affected - total_duration = 0 - considered_duration = 0 # Note: in case of timeline, we have data from exacly one host/service for site_host, site_host_entry in reclassified_rawdata.iteritems(): @@ -1264,11 +1261,13 @@ def layout_availability_table(what, group_title, availability_table, avoptions): for sid, css, sname, help in availability_columns[what]: if not cell_active(sid, avoptions): continue + number = summary.get(sid, 0) if show_summary == "average" or avoptions["timeformat"].startswith("percentage"): number /= len_availability_table if avoptions["timeformat"].startswith("percentage"): number *= entry["considered_duration"] + if not number: css = "unused"

7 years, 8 months

Fixed possibly wrong calculated availability percentage

by Lars Michelsen

Module: check_mk Branch: master Commit: 85d209a6b70e9d0ec1a6194a36dfa6413a62ea5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85d209a6b70e9d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 07:16:05 2017 +0100 Fixed possibly wrong calculated availability percentage Fixed possible wrong calculated availability percentage when excluding times with downtimes or excluding unmonitored times Change-Id: I590d8492f41183b52f4703298f16cb6e5c1425ed --- web/htdocs/availability.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index 06aa0ef..d64de67 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -1099,6 +1099,8 @@ def delete_annotation(annotations, site_host_svc, fromtime, untiltime): # } def layout_availability_table(what, group_title, availability_table, avoptions): time_range, range_title = avoptions["range"] + from_time, until_time = time_range + total_duration = until_time - from_time render_number = render_number_function(avoptions) @@ -1203,7 +1205,6 @@ def layout_availability_table(what, group_title, availability_table, avoptions): if show_timeline: row["timeline"] = layout_timeline(what, entry["timeline"], entry["considered_duration"], avoptions, style="inline") - # Actuall cells with availability data row["cells"] = [] for sid, css, sname, help in availability_columns[what]: @@ -1266,16 +1267,16 @@ def layout_availability_table(what, group_title, availability_table, avoptions): if show_summary == "average" or avoptions["timeformat"].startswith("percentage"): number /= len_availability_table if avoptions["timeformat"].startswith("percentage"): - number *= entry["considered_duration"] + number *= total_duration if not number: css = "unused" if number and av_levels and sid in [ "ok", "up" ]: - css = "state%d" % check_av_levels(number, av_levels, entry["considered_duration"]) + css = "state%d" % check_av_levels(number, av_levels, total_duration) css = css + " narrow number" - summary_cells.append((render_number(number, entry["considered_duration"]), css)) + summary_cells.append((render_number(number, total_duration), css)) if sid in os_states: for aggr in os_aggrs: if aggr == "cnt":

7 years, 8 months

pylint tests: Output the pylint log by default

by Lars Michelsen

Module: check_mk Branch: master Commit: 04babc50f7968b9911370b78fbab6b6fc1d07203 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04babc50f7968b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 10 09:33:27 2017 +0100 pylint tests: Output the pylint log by default Change-Id: I1fc7c3281c9b70a2580df41347724f4a2c9f606a --- tests/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index bbf1ccb..6cdec5f 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -20,8 +20,11 @@ test-pylint-ci: export TERM="linux" ; \ export PYLINT_ARGS="--output-format=cmk_parseable" ; \ export PYLINT_OUTPUT="$$WORKDIR/pylint.log" ; \ - echo -n > $$WORKDIR/pylint.log ; \ - $(MAKE) test-pylint + echo -n > "$$PYLINT_OUTPUT" ; \ + $(MAKE) test-pylint ; \ + echo "### PYLINT LOG ###############################################" ; \ + cat "$$PYLINT_OUTPUT" ; \ + echo "##############################################################" test-bandit:

7 years, 8 months

4184 FIX hivemanager_devices: Fixed bug if device is up for more than 1 year

by Marcel Arentz

Module: check_mk Branch: master Commit: 2ad76288321e3eaf909a54e18375d49488a54284 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ad76288321e3e… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Jan 4 10:32:53 2017 +0100 4184 FIX hivemanager_devices: Fixed bug if device is up for more than 1 year The checkplugin does not crash anymore if a device is up for more than 1 year. Change-Id: I72143751b5d011a6ea4833e0b8d273e87fbe2490 --- .werks/4184 | 10 ++++++++++ ChangeLog | 1 + checks/hivemanager_devices | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4184 b/.werks/4184 new file mode 100644 index 0000000..9ae048e --- /dev/null +++ b/.werks/4184 @@ -0,0 +1,10 @@ +Title: hivemanager_devices: Fixed bug if device is up for more than 1 year +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1483522214 +Class: fix + +The checkplugin does not crash anymore if a device is up for more than 1 year. + diff --git a/ChangeLog b/ChangeLog index 2a90dd8..073a4c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ * 4182 FIX: mysql_slave: fixed crash if agent output is empty... * 4176 FIX: postfix_mailq_status: fixed wrong status handling * 4183 FIX: ibm_imm_fan: Fixed crash if fan speed is "unavailable"... + * 4184 FIX: hivemanager_devices: Fixed bug if device is up for more than 1 year... Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/checks/hivemanager_devices b/checks/hivemanager_devices index 9a91de5..a440041 100644 --- a/checks/hivemanager_devices +++ b/checks/hivemanager_devices @@ -81,7 +81,7 @@ def check_hivemanager_devices(item, params, info): uptime_secs = 0 if infos['upTime'] != 'down': uptime_tokens = map(int, infos['upTime'].split()[-2::-2]) - token_multiplier = [1, 60, 3600, 86400] + token_multiplier = [1, 60, 3600, 86400, 31536000] for idx, entry in enumerate(uptime_tokens): uptime_secs += token_multiplier[idx] * entry infotext = "Uptime: %s" % get_age_human_readable(uptime_secs)

7 years, 8 months

4009 FIX Business intelligence: Multihost aggregations are no longer broken after a core restart

by Andreas Boesl

Module: check_mk Branch: master Commit: dbbea82eebdb00e06b28e23e2bbed7198a12b18f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dbbea82eebdb00… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jan 9 15:36:46 2017 +0100 4009 FIX Business intelligence: Multihost aggregations are no longer broken after a core restart Change-Id: I8c5f2b2b93e5a00ca1887f287faf0b31b0360e15 --- .werks/4009 | 9 +++++++++ ChangeLog | 1 + web/htdocs/bi.py | 7 ++++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/4009 b/.werks/4009 new file mode 100644 index 0000000..1189230 --- /dev/null +++ b/.werks/4009 @@ -0,0 +1,9 @@ +Title: Business intelligence: Multihost aggregations are no longer broken after a core restart +Level: 1 +Component: bi +Compatible: compat +Version: 1.4.0i4 +Date: 1483972494 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 1794caa..2a90dd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,7 @@ BI: * 4202 FIX: Availability now avoids pending states for times before new hosts or services were added... + * 4009 FIX: Business intelligence: Multihost aggregations are no longer broken after a core restart Reporting & Availability: * 3652 FIX: Unbreak PDF exports... diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 80fcaa0..16f193c 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -910,7 +910,7 @@ class BIJobManager(object): # Single host aggregation, no hosts in queue - GOOD! continue else: - if info.get("compiled") == True: + if not discard_old_cache and info.get("compiled") == True: # Fully compiled multi aggregation - GOOD! continue @@ -981,12 +981,13 @@ class BIJobManager(object): job_id = job["id"] job_info = job["info"] - jobfile_data["jobs"].setdefault(job_id, {"queued_hosts": set([]), - "compiled_hosts": set([])}) if job_id[0] == AGGR_HOST: + jobfile_data["jobs"].setdefault(job_id, {"queued_hosts": set([]), + "compiled_hosts": set([])}) jobfile_data["jobs"][job_id]["queued_hosts"] -= job_info["queued_hosts"] jobfile_data["jobs"][job_id]["compiled_hosts"].update(job_info["queued_hosts"]) else: + jobfile_data["jobs"].setdefault(job_id, {}) jobfile_data["jobs"][job_id]["compiled"] = True self.save_jobs(jobfile_data) g_bi_cache_manager.generate_cachefiles()

7 years, 8 months

← Newer
1
...
22
23
24
25
26
27
28
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2017