Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

by Sebastian Herbord

Module: check_mk Branch: master Commit: dfa1d592ec50d4bb456eda8b5bddd6869fc58707 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dfa1d592ec50d4… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Apr 8 11:45:40 2016 +0200 windows agent: updated binaries --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 939520 -> 940544 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 939520 -> 940544 bytes agents/windows/check_mk_agent.exe | Bin 867328 -> 868352 bytes agents/windows/check_mk_agent.msi | Bin 2068480 -> 2070528 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 867328 -> 868352 bytes agents/windows/install_agent-64.exe | Bin 431298 -> 431814 bytes agents/windows/install_agent.exe | Bin 422023 -> 422666 bytes 8 files changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 2973cf2..6afcd4b 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1592 +1594 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 0f2094f..85ed24c 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index ffd1a63..3bca929 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 4164f35..c728f22 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 09e308f..938691b 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 279b4b4..d2a34a9 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 3ac854f..52132fe 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 9b2fde3..ec1bae5 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 5 months

3117 FIX windows agent: fixed installer may fail to re-start service on update

by Sebastian Herbord

Module: check_mk Branch: master Commit: 68999dfa1aa144059cf13e9f47045b05c5b357f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68999dfa1aa144… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Apr 8 11:44:32 2016 +0200 3117 FIX windows agent: fixed installer may fail to re-start service on update When updating the agent (i.e. through the auto updater) there was only a fairly short timeout for the agent-service to stop. If the agent failed to stop in time (i.e. because of a long-running plugin) the agent was still installed but the service wasn't started afterwards. This has now been fixed by enforcing an unlimited wait when the service is being shut down. --- .werks/3117 | 14 ++++++++++++++ ChangeLog | 1 + agents/windows/check_mk_agent.cc | 29 +++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+) diff --git a/.werks/3117 b/.werks/3117 new file mode 100644 index 0000000..9d71fed --- /dev/null +++ b/.werks/3117 @@ -0,0 +1,14 @@ +Title: windows agent: fixed installer may fail to re-start service on update +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460108180 + +When updating the agent (i.e. through the auto updater) there was only a fairly short timeout for +the agent-service to stop. +If the agent failed to stop in time (i.e. because of a long-running plugin) the agent was still +installed but the service wasn't started afterwards. +This has now been fixed by enforcing an unlimited wait when the service is being shut down. diff --git a/ChangeLog b/ChangeLog index 087fa9c..118acca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -135,6 +135,7 @@ * 3368 FIX: Fixed regression since 1.2.8b9 which broke all SNMP checks with Nagios core * 3370 FIX: check_mail: Fixed mail parsing bug when using POP3 * 3372 FIX: check_mailboxes: Improved error handling + * 3117 FIX: windows agent: fixed installer may fail to re-start service on update... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 471491c..5e18b11 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -277,6 +277,13 @@ void debug_script_container(script_container *container) { crash_log("buffer_work: \n<<<<\n%s\n>>>>", container->buffer_work); } + +template <typename T> +bool in_set(const T &val, const std::set<T> &test_set) { + return test_set.find(val) != test_set.end(); +} + + // .----------------------------------------------------------------------. // | ______ _ _ _ ______ | // | / / / /___ _ _ ___| |_ ___ _ __ ___ | |_(_)_ __ ___ ___\ \ \ \ | @@ -2708,6 +2715,28 @@ void UninstallService() { if (service) { SERVICE_STATUS serviceStatus; if (QueryServiceStatus(service, &serviceStatus)) { + while (in_set(serviceStatus.dwCurrentState, + {SERVICE_RUNNING, SERVICE_STOP_PENDING})) { + if (serviceStatus.dwCurrentState == SERVICE_STOP_PENDING) { + printf(SERVICE_NAME " waiting for service to finish\n"); + // wait for the wait-hint but no less than 1 second and + // no more than 10 + DWORD waitTime = serviceStatus.dwWaitHint / 10; + waitTime = + std::max(1000UL, std::min(waitTime, 10000UL)); + Sleep(waitTime); + if (!QueryServiceStatus(service, &serviceStatus)) { + break; + } + } else { + if (ControlService(service, SERVICE_CONTROL_STOP, + &serviceStatus) == 0) { + break; + } + printf(SERVICE_NAME " stopped\n"); + } + } + if (serviceStatus.dwCurrentState == SERVICE_STOPPED) { if (DeleteService(service)) printf(SERVICE_NAME " Removed Successfully\n");

8 years, 5 months

Fixed text when showing a display limit

by Mathias Kettner

Module: check_mk Branch: master Commit: 44a8970f4dd2833447b0b6d2e821b767b1afe4d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44a8970f4dd283… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 8 11:17:11 2016 +0200 Fixed text when showing a display limit --- web/htdocs/html_mod_python.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 715126e..3e5239f 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -261,7 +261,7 @@ class html_mod_python(htmllib.html): elif self.var("limit") == "hard" and config.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 do not reflect the sort order.") + text += " " + _("Note: the shown results are incomplete and do not reflect the sort order.") self.show_warning(text) del rows[limit:] return False

8 years, 5 months

3240 FIX Fixed various quotation issues in GUI parts related to the EC

by Sven Panne

Module: check_mk Branch: master Commit: 58f83b9e0f1139a256635b72a116f54e84af4cb3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58f83b9e0f1139… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 8 10:34:22 2016 +0200 3240 FIX Fixed various quotation issues in GUI parts related to the EC --- .werks/3240 | 10 ++++++++++ ChangeLog | 1 + web/.f12 | 1 - web/plugins/wato/mkeventd.py | 6 +++--- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.werks/3240 b/.werks/3240 new file mode 100644 index 0000000..ec79c1a --- /dev/null +++ b/.werks/3240 @@ -0,0 +1,10 @@ +Title: Fixed various quotation issues in GUI parts related to the EC +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460104355 + + diff --git a/ChangeLog b/ChangeLog index 821623d..087fa9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -273,6 +273,7 @@ * 3335 FIX: Improved error handling when requested rule pack does not exist * 3348 FIX: Improved error handling when trying to edit not existing rules/rule packs * 3350 FIX: Merged source of Event Console with Check_MK... + * 3240 FIX: Fixed various quotation issues in GUI parts related to the EC Livestatus: * 3233 FIX: Fixed shutdown of Nagios core with Livestatus module... diff --git a/web/.f12 b/web/.f12 index 0acbb42..00af3ce 100644 --- a/web/.f12 +++ b/web/.f12 @@ -3,7 +3,6 @@ SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} sudo rsync \ --exclude=defaults.py \ - --exclude "*mkevent*" \ --exclude "*cmc.py" \ --exclude "*omd_configuration.py" \ -varx htdocs plugins /omd/sites/$SITE/share/check_mk/web/ diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 118dfbe..951b3c8 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -192,7 +192,7 @@ vs_mkeventd_actions = \ ), title_function = lambda value: not value["id"] and _("New Action") or (value["id"] + " - " + value["title"]), ), - title = _("Actions (Emails &amp Scripts)"), + title = _("Actions (Emails & Scripts)"), help = _("Configure that possible actions that can be performed when a " "rule triggers and also manually by a user."), totext = _("%d actions"), @@ -748,8 +748,8 @@ vs_mkeventd_rule = Dictionary( ( _("Rule Properties"), [ "id", "description", "comment", "docu_url", "disabled" ] ), ( _("Matching Criteria"), [ "match", "match_host", "match_ipaddress", "match_application", "match_priority", "match_facility", "match_sl", "match_ok", "cancel_priority", "match_timeperiod", "invert_matching" ]), - ( _("Outcome & Action"), [ "state", "sl", "contact_groups", "actions", "cancel_actions", "cancel_action_phases", "drop", "autodelete" ]), - ( _("Counting & Timing"), [ "count", "expect", "delay", "livetime", ]), + ( _("Outcome & Action"), [ "state", "sl", "contact_groups", "actions", "cancel_actions", "cancel_action_phases", "drop", "autodelete" ]), + ( _("Counting & Timing"), [ "count", "expect", "delay", "livetime", ]), ( _("Rewriting"), [ "set_text", "set_host", "set_application", "set_comment", "set_contact" ]), ], render = "form",

8 years, 5 months

Avoid to show host annotations in service views multiple times

by Mathias Kettner

Module: check_mk Branch: master Commit: a17a9789f6da2684df9ae9cb01026eca34787df7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a17a9789f6da26… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 8 10:02:27 2016 +0200 Avoid to show host annotations in service views multiple times --- web/plugins/views/availability.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 7f57dc7..187af4c 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -588,6 +588,8 @@ def render_annotations(annotations, by_host, what, avoptions, omit_service): return time.strftime(format, time.localtime(ts)) annos_to_render = [] + annos_rendered = set() + for site_host, avail_entries in by_host.iteritems(): for service in avail_entries.keys(): site_host_svc = site_host[0], site_host[1], (service or None) @@ -597,7 +599,9 @@ def render_annotations(annotations, by_host, what, avoptions, omit_service): for annotation in annotations_to_check: if (annotation["from"] >= from_time and annotation["from"] <= until_time) or \ (annotation["until"] >= from_time and annotation["until"] <= until_time): - annos_to_render.append((site_host_svc, annotation)) + if id(annotation) not in annos_rendered: + annos_to_render.append((site_host_svc, annotation)) + annos_rendered.add(id(annotation)) annos_to_render.sort(cmp=lambda a,b: cmp(a[1]["from"], b[1]["from"]) or cmp(a[0], b[0]))

8 years, 5 months

3394 Availability: Annotations can now be used to reclassify the scheduled downtime status

by Mathias Kettner

Module: check_mk Branch: master Commit: 690128b3a5138d041bbb83313bfeb0d51f054695 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=690128b3a5138d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 8 09:56:58 2016 +0200 3394 Availability: Annotations can now be used to reclassify the scheduled downtime status The availability computation of hosts and services now allows to use the existing {{Annotations}} in order to reclassify the annotated periods as having been in scheduled downtime or even as not having been in scheduled downtime. That way you can fix your figures in case one has forgotten to enter a scheduled downtime in the past or in the case that scheduled downtimes were just used in order to disable notifications (but the breakdown was in fact real and not scheduled). Availability of BI aggregations currently does not support annotations or any reclassifications. Neither does it honor reclassifications in the underlying host and service history. --- .werks/3394 | 19 +++++++++++++++++++ ChangeLog | 1 + web/htdocs/availability.py | 4 ++-- web/plugins/views/availability.py | 6 ------ 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.werks/3394 b/.werks/3394 new file mode 100644 index 0000000..537b617 --- /dev/null +++ b/.werks/3394 @@ -0,0 +1,19 @@ +Title: Availability: Annotations can now be used to reclassify the scheduled downtime status +Level: 2 +Component: reporting +Compatible: compat +Version: 1.2.9i1 +Date: 1460101981 +Class: feature + +The availability computation of hosts and services now allows to use the +existing {{Annotations}} in order to reclassify the annotated periods as +having been in scheduled downtime or even as not having been in scheduled +downtime. That way you can fix your figures in case one has forgotten to enter +a scheduled downtime in the past or in the case that scheduled downtimes +were just used in order to disable notifications (but the breakdown was in +fact real and not scheduled). + +Availability of BI aggregations currently does not support annotations or any +reclassifications. Neither does it honor reclassifications in the underlying +host and service history. diff --git a/ChangeLog b/ChangeLog index a485aa0..821623d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -257,6 +257,7 @@ Reporting & Availability: * 3267 New availability option for reclassifying host state "unreachable"... * 3102 added option to availability to include host alias in reports... + * 3394 Availability: Annotations can now be used to reclassify the scheduled downtime status... * 3249 FIX: Fix missing filter for non-OK services when report is called via context button * 3268 FIX: Availability options were invalid after resetting them... * 3269 FIX: Fix rendering of floating point values < 1 in graphs (e.g. CPU load) diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index d05b2c5..43115df 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -762,8 +762,8 @@ def compute_availability(what, av_rawdata, avoptions): return filtered_table -# TODO: Wir müssen auch den Fall behandeln, dass ein Host reklassifiert wird. -# dann müssen die Services das Feld in_host_downtime ebenfalls nachziehen! +# Note: Reclassifications of host/service periods do currently *not* have +# any impact on BI aggregations. def reclassify_by_annotations(what, av_rawdata): annotations = load_annotations() if not annotations: diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 47a238b..7f57dc7 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -24,12 +24,6 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# ZUTUN / TODO: -# -# - Test mit Hosts und BI-Aggregaten -# - Host-Annotations nicht mehrfach zeigen! - - import availability, table from valuespec import *

8 years, 5 months

3116 Timerange buttons for downtimes can now be configured

by Sebastian Herbord

Module: check_mk Branch: master Commit: 5c54152b26364072fa166f8ebb4e7372086ae5bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c54152b263640… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Apr 8 09:53:46 2016 +0200 3116 Timerange buttons for downtimes can now be configured The dialog to set a downtime currently offers 5 buttons to quickly set a downtime: 2 hours, today, this week, this month and this year. Now one can add additional ranges or replace the current ones. The configuration can be found under Globals Settings->Custom Downtime Timeranges --- .werks/3116 | 12 ++++ ChangeLog | 1 + web/plugins/config/builtin.py | 8 +++ web/plugins/views/commands.py | 90 ++++++++++++++++------------ web/plugins/wato/check_mk_configuration.py | 45 ++++++++++++++ 5 files changed, 119 insertions(+), 37 deletions(-) diff --git a/.werks/3116 b/.werks/3116 new file mode 100644 index 0000000..9b6f2ec --- /dev/null +++ b/.werks/3116 @@ -0,0 +1,12 @@ +Title: Timerange buttons for downtimes can now be configured +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.9i1 +Date: 1460101816 +Class: feature + +The dialog to set a downtime currently offers 5 buttons to quickly set a downtime: 2 hours, today, +this week, this month and this year. +Now one can add additional ranges or replace the current ones. The configuration can be found under +Globals Settings->Custom Downtime Timeranges diff --git a/ChangeLog b/ChangeLog index e71a681..a485aa0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -189,6 +189,7 @@ * 3003 New treasure script: migrate_oldcmk2wato.py... * 3304 Bulk deleting users is now available * 3239 The delay and the period of notifications can be fractions of a minute now. + * 3116 Timerange buttons for downtimes can now be configured... * 3060 FIX: Folder properties: Fixed exception when a user has no alias set... * 3062 FIX: Git integration: Fixed not adding files in WATO folders to git control * 3203 FIX: Distributed WATO: Fixed exception in remote host service discovery... diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index 66b9b73..c23c1d1 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -263,6 +263,14 @@ user_localizations = { # Contains user specified icons and actions for hosts and services user_icons_and_actions = {} +user_downtime_timeranges = [ + {'title': _("2 hours"), 'end': 2 * 60 * 60}, + {'title': _("Today"), 'end': 'next_day'}, + {'title': _("This week"), 'end': 'next_week'}, + {'title': _("This month"), 'end': 'next_month'}, + {'title': _("This year"), 'end': 'next_year'}, + ] + # Override toplevel and sort_index settings of builtin icons builtin_icon_visibility = {} diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index c5fc3c6..8fd2726 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -499,6 +499,20 @@ config.declare_permission("action.downtimes", _("Schedule and remove downtimes on hosts and services"), [ "user", "admin" ]) + +def get_duration_human_readable(secs): + days, rest = divmod(secs, 86400) + hours, rest = divmod(rest, 3600) + mins, secs = divmod(rest, 60) + + return ", ".join(["%d %s" % (val, label) + for val, label in [(days, "days"), + (hours, "hours"), + (mins, "minutes"), + (secs, "seconds")] + if val > 0]) + + def command_downtime(cmdtag, spec, row): down_from = int(time.time()) down_to = None @@ -509,39 +523,44 @@ def command_downtime(cmdtag, spec, row): else: title_start = _("schedule an immediate downtime") - if html.var("_down_2h"): - down_to = down_from + 7200 - title = _("%s of 2 hours length on") % title_start - - elif html.var("_down_today"): - br = time.localtime(down_from) - down_to = time.mktime((br.tm_year, br.tm_mon, br.tm_mday, 23, 59, 59, 0, 0, br.tm_isdst)) + 1 - title = _("%s until 24:00:00 on") % title_start - - elif html.var("_down_week"): - br = time.localtime(down_from) - wday = br.tm_wday - days_plus = 6 - wday - down_to = time.mktime((br.tm_year, br.tm_mon, br.tm_mday, 23, 59, 59, 0, 0, br.tm_isdst)) + 1 - down_to += days_plus * 24 * 3600 - title = _("%s until sunday night on") % title_start - - elif html.var("_down_month"): - br = time.localtime(down_from) - new_month = br.tm_mon + 1 - if new_month == 13: - new_year = br.tm_year + 1 - new_month = 1 + rangebtns = html.all_varnames_with_prefix("_downrange") + + def resolve_end(name): + now = time.localtime(down_from) + if name == "next_day": + return time.mktime((br.tm_year, br.tm_mon, br.tm_mday, 23, 59, 59, 0, 0, br.tm_isdst)) + 1, \ + _("%s until 24:00:00 on") % title_start + elif name == "next_week": + br = time.localtime(down_from) + wday = br.tm_wday + days_plus = 6 - wday + res = time.mktime((br.tm_year, br.tm_mon, br.tm_mday, 23, 59, 59, 0, 0, br.tm_isdst)) + 1 + res += days_plus * 24 * 3600 + return res, _("%s until sunday night on") % title_start + elif name == "next_month": + br = time.localtime(down_from) + new_month = br.tm_mon + 1 + if new_month == 13: + new_year = br.tm_year + 1 + new_month = 1 + else: + new_year = br.tm_year + return time.mktime((new_year, new_month, 1, 0, 0, 0, 0, 0, br.tm_isdst)), \ + _("%s until end of month on") % title_start + elif name == "next_year": + br = time.localtime(down_from) + return time.mktime((br.tm_year, 12, 31, 23, 59, 59, 0, 0, br.tm_isdst)) + 1, \ + _("%s until end of %d on") % (title_start, br.tm_year) else: - new_year = br.tm_year - down_to = time.mktime((new_year, new_month, 1, 0, 0, 0, 0, 0, br.tm_isdst)) - title = _("%s until end of month on") % title_start - - elif html.var("_down_year"): - br = time.localtime(down_from) - down_to = time.mktime((br.tm_year, 12, 31, 23, 59, 59, 0, 0, br.tm_isdst)) + 1 - title = _("%s until end of %d on") % (title_start, br.tm_year) - + duration = int(name) + return down_from + duration, \ + _("%s of %s length on") %\ + (title_start, get_duration_human_readable(duration)) + + if rangebtns: + rangebtn = rangebtns.next() + btnname, end = rangebtn.split("__", 1) + down_to, title = resolve_end(end) elif html.var("_down_from_now"): try: minutes = int(html.var("_down_minutes")) @@ -668,11 +687,8 @@ def paint_downtime_buttons(what): html.number_input("_down_minutes", 60, size=4, submit="_down_from_now") html.write("  " + _("minutes")) html.write("<hr>") - html.button("_down_2h", _("2 hours")) - html.button("_down_today", _("Today")) - html.button("_down_week", _("This week")) - html.button("_down_month", _("This month")) - html.button("_down_year", _("This year")) + for time_range in config.user_downtime_timeranges: + html.button("_downrange__%s" % time_range['end'], time_range['title']) if what != "aggr": html.write("   -  ") html.button("_down_remove", _("Remove all")) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 832d07e..66ef2a5 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -554,6 +554,51 @@ register_configvar(group, domain = "multisite", ) +register_configvar(group, + "user_downtime_timeranges", + ListOf( + Dictionary( + elements = [ + ('title', TextUnicode(title = _('Title'))), + ('end', Alternative( + title = _("To"), + elements = [ + Age( + title = _("Duration"), + display = [ "minutes", "hours", "days" ] + ), + DropdownChoice( + title = _("Until"), + choices = [ + ('next_day', _("Start of next day")), + ('next_week', _("Start of next week")), + ('next_month', _("Start of next month")), + ('next_year', _("Start of next year")), + ], + default_value = "next_day" + ) + ], + style = "dropdown", + default_value = 24 *60 * 60, + )) + ], + optional_keys = [], + ), + title = _("Custom Downtime Timeranges"), + movable = True, + totext = _("%d timeranges"), + default_value = [ + {'title': _("2 hours"), 'end': 2 * 60 * 60}, + {'title': _("Today"), 'end': 'next_day'}, + {'title': _("This week"), 'end': 'next_week'}, + {'title': _("This month"), 'end': 'next_month'}, + {'title': _("This year"), 'end': 'next_year'}, + ] + ), + domain = "multisite", +) + + def get_builtin_icons(): import views return [ (id, id) for id in views.get_multisite_icons().keys() ]

8 years, 5 months

Availability annotations of hosts now also affect their services

by Mathias Kettner

Module: check_mk Branch: master Commit: 8ab36026be5bb176a3d157b31403091b6452c7d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ab36026be5bb1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 8 09:47:58 2016 +0200 Availability annotations of hosts now also affect their services --- web/htdocs/availability.py | 29 ++++++++++++++++++----------- web/plugins/views/availability.py | 2 +- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index 6b94c39..d05b2c5 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -617,7 +617,7 @@ def spans_by_object(spans): # Compute an availability table. what is one of "bi", "host", "service". def compute_availability(what, av_rawdata, avoptions): - reclassified_rawdata = reclassify_by_annotations(av_rawdata) + reclassified_rawdata = reclassify_by_annotations(what, av_rawdata) # Now compute availability table. We have the following possible states: # 1. "unmonitored" @@ -764,7 +764,7 @@ def compute_availability(what, av_rawdata, avoptions): # TODO: Wir müssen auch den Fall behandeln, dass ein Host reklassifiert wird. # dann müssen die Services das Feld in_host_downtime ebenfalls nachziehen! -def reclassify_by_annotations(av_rawdata): +def reclassify_by_annotations(what, av_rawdata): annotations = load_annotations() if not annotations: return av_rawdata @@ -775,25 +775,32 @@ def reclassify_by_annotations(av_rawdata): reclassified_rawdata[(site, host_name)] = new_entries for service_description, service_history in service_entries.iteritems(): anno_key = (site, host_name, service_description) - if anno_key in annotations: - new_entries[service_description] = reclassify_service_by_annotations(service_history, annotations[anno_key]) - else: - new_entries[service_description] = service_history + cycles = [ ((site, host_name, service_description), "in_downtime") ] + if what == "service": + cycles = [ ((site, host_name, None), "in_host_downtime") ] + cycles + + for anno_key, entry_to_change in cycles: + if anno_key in annotations: + new_entries[service_description] = \ + reclassify_service_by_annotations(service_history, annotations[anno_key], entry_to_change) + service_history = new_entries[service_description] + else: + new_entries[service_description] = service_history return reclassified_rawdata -def reclassify_service_by_annotations(service_history, annotation_entries): +def reclassify_service_by_annotations(service_history, annotation_entries, entry_to_change): new_history = service_history for annotation in annotation_entries: downtime = annotation.get("downtime") if downtime == None: continue - new_history = reclassify_service_by_annotation(new_history, annotation) + new_history = reclassify_service_by_annotation(new_history, annotation, entry_to_change) return new_history -def reclassify_service_by_annotation(service_history, annotation): +def reclassify_service_by_annotation(service_history, annotation, entry_to_change): downtime = annotation["downtime"] new_history = [] @@ -801,7 +808,7 @@ def reclassify_service_by_annotation(service_history, annotation): if annotation["from"] < history_entry["until"] and annotation["until"] > history_entry["from"]: for is_in, p_from, p_until in [ ( False, history_entry["from"], max(history_entry["from"], annotation["from"]) ), - ( True, max(history_entry["from"], annotation["from"]), min(history_entry["until"], annotation["until"]) ), + ( True, max(history_entry["from"], annotation["from"]), min(history_entry["until"], annotation["until"]) ), ( False, min(history_entry["until"], annotation["until"]), history_entry["until"] ), ]: if p_from < p_until: @@ -810,7 +817,7 @@ def reclassify_service_by_annotation(service_history, annotation): new_entry["until"] = p_until new_entry["duration"] = p_until - p_from if is_in: - new_entry["in_downtime"] = downtime and 1 or 0 + new_entry[entry_to_change] = downtime and 1 or 0 new_history.append(new_entry) else: diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index cac4e53..47a238b 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -26,8 +26,8 @@ # ZUTUN / TODO: # -# - Host-Downtimes müssen auch auf Services wirken # - Test mit Hosts und BI-Aggregaten +# - Host-Annotations nicht mehrfach zeigen! import availability, table

8 years, 5 months

3393 FIX Availability annotations: also show annotations for hosts when showing services

by Mathias Kettner

Module: check_mk Branch: master Commit: 18b7ee1c824147417b1853da43efbfe0e42602a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18b7ee1c824147… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 8 09:30:11 2016 +0200 3393 FIX Availability annotations: also show annotations for hosts when showing services --- .werks/3393 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/availability.py | 5 ++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/3393 b/.werks/3393 new file mode 100644 index 0000000..c254306 --- /dev/null +++ b/.werks/3393 @@ -0,0 +1,10 @@ +Title: Availability annotations: also show annotations for hosts when showing services +Level: 1 +Component: reporting +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1460100559 + + diff --git a/ChangeLog b/ChangeLog index 464a98c..e71a681 100644 --- a/ChangeLog +++ b/ChangeLog @@ -261,6 +261,7 @@ * 3269 FIX: Fix rendering of floating point values < 1 in graphs (e.g. CPU load) * 3331 FIX: Availability: avoid duplication of annotation when changing time while editing * 3332 FIX: Avoid falling back to annotation edit form when reloading page directly after editing + * 3393 FIX: Availability annotations: also show annotations for hosts when showing services Event Console: * 2999 The contact name is now included in Event Console notifications... diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 9da5b5e..cac4e53 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -597,7 +597,10 @@ def render_annotations(annotations, by_host, what, avoptions, omit_service): for site_host, avail_entries in by_host.iteritems(): for service in avail_entries.keys(): site_host_svc = site_host[0], site_host[1], (service or None) - for annotation in annotations.get(site_host_svc, []): + annotations_to_check = annotations.get(site_host_svc, []) + if what == "service": # Also show host annotations for services + annotations_to_check += annotations.get((site_host[0], site_host[1], None), []) + for annotation in annotations_to_check: if (annotation["from"] >= from_time and annotation["from"] <= until_time) or \ (annotation["until"] >= from_time and annotation["until"] <= until_time): annos_to_render.append((site_host_svc, annotation))

8 years, 5 months

Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 866b9d17e18ce40d1eca28c90cd6e5ba2958e2bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=866b9d17e18ce4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 8 09:29:07 2016 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 8899893..8903fed 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3393 +3403

8 years, 5 months

← Newer
1
...
23
24
25
26
27
28
29
...
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