Checkmk git commits September 2018

checkmk-commits@lists.checkmk.com

12 participants
371 discussions

6629 FIX jolokia_generic: Make service descriptions consistent with jolokia_metrics

by Konstantin Büttner

Module: check_mk Branch: master Commit: 91ad89f2da0aed3c4c0132ea2183d090d54d20c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91ad89f2da0aed… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Sep 24 13:46:19 2018 +0200 6629 FIX jolokia_generic: Make service descriptions consistent with jolokia_metrics Rediscovery is required on the affected hosts. Change-Id: Icc3ceb44c925a3ffd3d5863bf80a5010c3038010 --- .werks/6629 | 10 ++++++++++ checks/jolokia_generic | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.werks/6629 b/.werks/6629 new file mode 100644 index 0000000..3697918 --- /dev/null +++ b/.werks/6629 @@ -0,0 +1,10 @@ +Title: jolokia_generic: Make service descriptions consistent with jolokia_metrics +Level: 1 +Component: checks +Compatible: incomp +Edition: cre +Version: 1.6.0i1 +Date: 1537789397 +Class: fix + +Rediscovery is required on the affected hosts. diff --git a/checks/jolokia_generic b/checks/jolokia_generic index 8eb2c2b..2704ba7 100644 --- a/checks/jolokia_generic +++ b/checks/jolokia_generic @@ -30,7 +30,7 @@ def parse_jolokia_generic(info): for line in info: instance, mbean, value, value_type = line - item = instance + " " + mbean + item = instance + " MBean " + mbean parsed[item] = { "type" : value_type, @@ -72,7 +72,7 @@ def check_jolokia_generic_string(item, params, parsed): check_info["jolokia_generic.string"] = { "inventory_function" : inventory_jolokia_generic_string, "check_function" : check_jolokia_generic_string, - "service_description" : "MBean %s", + "service_description" : "JVM %s", "group" : "generic_string", } @@ -146,7 +146,7 @@ def check_jolokia_generic_rate(item, params, parsed): check_info["jolokia_generic.rate"] = { "inventory_function" : inventory_jolokia_generic_rate, "check_function" : check_jolokia_generic_rate, - "service_description" : "MBean %s", + "service_description" : "JVM %s", "has_perfdata" : True, "group" : "generic_rate", } @@ -220,7 +220,7 @@ check_info["jolokia_generic"] = { "parse_function" : parse_jolokia_generic, "inventory_function" : inventory_jolokia_generic, "check_function" : check_jolokia_generic, - "service_description" : "MBean %s", + "service_description" : "JVM %s", "has_perfdata" : True, "group" : "generic_number", }

5 years, 12 months

Refactored time period editing to be valuespec based

by Lars Michelsen

Module: check_mk Branch: master Commit: d2e690736df14968a0eda433c9978d76a3a75586 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2e690736df149… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 19 20:33:26 2018 +0200 Refactored time period editing to be valuespec based CMK-522 Change-Id: Iaf4070d2fe9a3193c45b04fb62d1db3292fdcf84 --- cmk/gui/valuespec.py | 1 + cmk/gui/wato/pages/timeperiods.py | 315 +++++++++++++++++++++----------------- 2 files changed, 178 insertions(+), 138 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d2e690736d…

5 years, 12 months

Timeperiods can now be cloned

by Lars Michelsen

Module: check_mk Branch: master Commit: 113c37f21df6d6dc1819d984547cf9a7efe46894 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=113c37f21df6d6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 19 14:00:57 2018 +0200 Timeperiods can now be cloned CMK-522 Change-Id: If55e8b1a9cb94b29023c13afe54a109bea78bc3f --- cmk/gui/wato/pages/timeperiods.py | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/cmk/gui/wato/pages/timeperiods.py b/cmk/gui/wato/pages/timeperiods.py index e68aa02..b5bfc0f 100644 --- a/cmk/gui/wato/pages/timeperiods.py +++ b/cmk/gui/wato/pages/timeperiods.py @@ -279,10 +279,12 @@ class ModeTimeperiods(WatoMode): timeperiod = self._timeperiods[name] edit_url = watolib.folder_preserving_link([("mode", "edit_timeperiod"), ("edit", name)]) + clone_url = watolib.folder_preserving_link([("mode", "edit_timeperiod"), ("clone", name)]) delete_url = make_action_link([("mode", "timeperiods"), ("_delete", name)]) table.cell(_("Actions"), css="buttons") html.icon_button(edit_url, _("Properties"), "edit") + html.icon_button(clone_url, _("Create a copy"), "clone") html.icon_button(delete_url, _("Delete"), "delete") table.text_cell(_("Name"), name) @@ -609,17 +611,25 @@ class ModeEditTimeperiod(WatoMode): def _from_vars(self): self._timeperiods = watolib.load_timeperiods() self._name = html.var("edit") # missing -> new group + self._new = self._name == None - if self._name == None: - self._new = True - self._timeperiod = {} + if self._new: + clone_name = html.var("clone") + if clone_name: + self._name = clone_name + + self._timeperiod = self._get_timeperiod(self._name) + else: + self._timeperiod = {} else: - self._new = False + self._timeperiod = self._get_timeperiod(self._name) - try: - self._timeperiod = self._timeperiods[self._name] - except KeyError: - raise MKUserError(None, _("This timeperiod does not exist.")) + + def _get_timeperiod(self, name): + try: + return self._timeperiods[name] + except KeyError: + raise MKUserError(None, _("This timeperiod does not exist.")) def _convert_from_range(self, rng): @@ -780,20 +790,15 @@ class ModeEditTimeperiod(WatoMode): # Name forms.section(_("Internal name"), simple = not self._new) if self._new: - html.text_input("name") + html.text_input("name", default_value=self._name) html.set_focus("name") else: html.write_text(self._name) # Alias - if not self._new: - alias = self._timeperiod.get("alias", "") - else: - alias = "" - forms.section(_("Alias")) html.help(_("An alias or description of the timeperiod")) - html.text_input("alias", alias, size = 81) + html.text_input("alias", default_value=self._timeperiod.get("alias", ""), size = 81) if not self._new: html.set_focus("alias")

5 years, 12 months

Centralized some weekday specifications

by Lars Michelsen

Module: check_mk Branch: master Commit: d161a10a862c6c9898cbf5bacacac6b51953c6c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d161a10a862c6c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 19 14:44:31 2018 +0200 Centralized some weekday specifications CMK-522 Change-Id: I66613c9f396fb8e2855a9d28397c64c521c70fe8 --- cmk/defines.py | 20 ++++++++++++++++++++ cmk/gui/plugins/wato/check_parameters.py | 14 ++------------ cmk/gui/wato/pages/timeperiods.py | 26 +++++++------------------- cmk_base/prediction.py | 10 +++------- 4 files changed, 32 insertions(+), 38 deletions(-) diff --git a/cmk/defines.py b/cmk/defines.py index ff6a935..fb53b0e 100644 --- a/cmk/defines.py +++ b/cmk/defines.py @@ -88,10 +88,17 @@ def short_host_state_name(state_num, deflt=""): def weekday_name(day_num): + """Returns the human readable day name of a given weekday number (starting with 0 at Monday)""" return weekdays()[day_num] +def weekday_ids(): + """Returns a list of the internal week day names""" + return [ d[0] for d in weekdays_by_name() ] + + def weekdays(): + """Returns a map of weekday number (starting with 0 at Monday) to the human readable day name""" return { 0: _("Monday"), 1: _("Tuesday"), @@ -103,6 +110,19 @@ def weekdays(): } +def weekdays_by_name(): + """Returns a list of two element tuples containing the weekday ID and the human readable day name""" + return [ + ( "monday", _("Monday") ), + ( "tuesday", _("Tuesday") ), + ( "wednesday", _("Wednesday") ), + ( "thursday", _("Thursday") ), + ( "friday", _("Friday") ), + ( "saturday", _("Saturday") ), + ( "sunday", _("Sunday") ), + ] + + def interface_oper_state_name(state_num, deflt=""): return interface_oper_states().get(state_num, deflt) diff --git a/cmk/gui/plugins/wato/check_parameters.py b/cmk/gui/plugins/wato/check_parameters.py index 35c2559..31beacc 100755 --- a/cmk/gui/plugins/wato/check_parameters.py +++ b/cmk/gui/plugins/wato/check_parameters.py @@ -5118,18 +5118,8 @@ register_check_parameters( help = _("Specifiy time ranges during which no motion is expected. " "Outside these times, the motion detector will always be in " "state OK"), - elements = [ - (day_id, TimeofdayRanges(count = 3, title = day_str)) - for day_id, day_str in [ - ("monday", _("Monday")), - ("tuesday", _("Tuesday")), - ("wednesday", _("Wednesday")), - ("thursday", _("Thursday")), - ("friday", _("Friday")), - ("saturday", _("Saturday")), - ("sunday", _("Sunday")) - ] - ], + elements = [ (day_id, TimeofdayRanges(count = 3, title = day_str)) + for day_id, day_str in defines.weekdays_by_name() ], optional_keys = [] ) ), diff --git a/cmk/gui/wato/pages/timeperiods.py b/cmk/gui/wato/pages/timeperiods.py index e469f08..e68aa02 100644 --- a/cmk/gui/wato/pages/timeperiods.py +++ b/cmk/gui/wato/pages/timeperiods.py @@ -29,6 +29,8 @@ import re import time +import cmk.defines as defines + import cmk.gui.config as config import cmk.gui.watolib as watolib import cmk.gui.userdb as userdb @@ -421,8 +423,7 @@ class ModeTimeperiodImportICal(WatoMode): html.set_var('alias', data.get('descr', data.get('name', filename))) - for day in [ "monday", "tuesday", "wednesday", "thursday", - "friday", "saturday", "sunday" ]: + for day in defines.weekday_ids(): html.set_var('%s_0_from' % day, '') html.set_var('%s_0_until' % day, '') @@ -672,8 +673,7 @@ class ModeEditTimeperiod(WatoMode): def _validate_timeperiod_exception(self, value, varprefix): - if value in [ "monday", "tuesday", "wednesday", "thursday", - "friday", "saturday", "sunday" ]: + if value in defines.weekday_ids(): raise MKUserError(varprefix, _("You cannot use weekday names (%s) in exceptions") % value) if value in [ "name", "alias", "timeperiod_name", "register", "use", "exclude" ]: @@ -726,7 +726,7 @@ class ModeEditTimeperiod(WatoMode): self._timeperiod.clear() # extract time ranges of weekdays - for weekday, _weekday_name in self._weekdays_by_name(): + for weekday, _weekday_name in defines.weekdays_by_name(): ranges = self._get_ranges(weekday) if ranges: self._timeperiod[weekday] = ranges @@ -804,7 +804,7 @@ class ModeEditTimeperiod(WatoMode): "should be active.") html.open_table(class_="timeperiod") - for weekday, weekday_alias in self._weekdays_by_name(): + for weekday, weekday_alias in defines.weekdays_by_name(): html.open_tr() html.td(weekday_alias, class_="name") self._timeperiod_ranges(weekday, weekday) @@ -820,7 +820,7 @@ class ModeEditTimeperiod(WatoMode): exceptions = [] for k in self._timeperiod: - if k not in [ w[0] for w in self._weekdays_by_name() ] and k not in [ "alias", "exclude" ]: + if k not in [ w[0] for w in defines.weekdays_by_name() ] and k not in [ "alias", "exclude" ]: exceptions.append((k, map(self._convert_from_range, self._timeperiod[k]))) exceptions.sort() self._vs_exceptions().render_input("except", exceptions) @@ -851,15 +851,3 @@ class ModeEditTimeperiod(WatoMode): html.open_td() MultipleTimeRanges().render_input(vp, value) html.close_td() - - - def _weekdays_by_name(self): - return [ - ( "monday", _("Monday") ), - ( "tuesday", _("Tuesday") ), - ( "wednesday", _("Wednesday") ), - ( "thursday", _("Thursday") ), - ( "friday", _("Friday") ), - ( "saturday", _("Saturday") ), - ( "sunday", _("Sunday") ), - ] diff --git a/cmk_base/prediction.py b/cmk_base/prediction.py index 67b5633..29c735f 100644 --- a/cmk_base/prediction.py +++ b/cmk_base/prediction.py @@ -36,10 +36,10 @@ import livestatus import cmk.paths import cmk.debug import cmk.utils - +import cmk.log +import cmk.defines as defines from cmk.exceptions import MKGeneralException -import cmk.log logger = cmk.log.get_logger(__name__) # Fetch RRD historic metrics data of a specific service. returns a tuple @@ -71,10 +71,6 @@ def get_rrd_data(hostname, service_description, varname, cf, fromtime, untiltime step, values = response[2], response[3:] return step, values - -daynames = [ "monday", "tuesday", "wednesday", "thursday", - "friday", "saturday", "sunday"] - # Check wether a certain time stamp lies with in daylight safing time (DST) def is_dst(timestamp): return time.localtime(timestamp).tm_isdst @@ -89,7 +85,7 @@ def timezone_at(timestamp): def group_by_wday(t): wday = time.localtime(t).tm_wday rel_time = divmod(t - timezone_at(t), 86400)[1] - return daynames[wday], rel_time + return defines.weekday_ids()[wday], rel_time def group_by_day(t): return "everyday", (t - timezone_at(t)) % 86400

5 years, 12 months

Timeperiod excludes are now sorted

by Lars Michelsen

Module: check_mk Branch: master Commit: 4d938b56adfbb7890fb48227d573e6b41f88e43d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d938b56adfbb7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 20 13:31:37 2018 +0200 Timeperiod excludes are now sorted CMK-522 Change-Id: I3eb5c2b4ffc82afd52932edd4d381f97095aff74 --- cmk/gui/wato/pages/timeperiods.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmk/gui/wato/pages/timeperiods.py b/cmk/gui/wato/pages/timeperiods.py index 696c3d8..8978e28 100644 --- a/cmk/gui/wato/pages/timeperiods.py +++ b/cmk/gui/wato/pages/timeperiods.py @@ -784,10 +784,12 @@ class ModeEditTimeperiod(WatoMode): We offer the list of all other timeperiods - but only those that do not exclude the current timeperiod (in order to avoid cycles)""" other_tps = [] + for tpname, tp in self._timeperiods.items(): if not self._timeperiod_excludes(tpname): other_tps.append((tpname, tp.get("alias") or tpname)) - return other_tps + + return sorted(other_tps, key=lambda a: a[1].lower()) def _timeperiod_excludes(self, tpa_name):

5 years, 12 months

Configuring equal times for all weekdays is now easier

by Lars Michelsen

Module: check_mk Branch: master Commit: e2a1e6c1edc77677dd3d0a83bbb1d05597c8d6f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2a1e6c1edc776… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 20 13:23:02 2018 +0200 Configuring equal times for all weekdays is now easier Instead of setting the same time ranges for each weekday it is now possible to select "Same times for all week days". Then it is only needed to configure the time range once for all. CMK-522 Change-Id: Ibc83f9d42968be90ab8a125e86d40623779dd289 --- cmk/gui/wato/pages/timeperiods.py | 77 ++++++++++++++++++++++++++++++++------- 1 file changed, 64 insertions(+), 13 deletions(-) diff --git a/cmk/gui/wato/pages/timeperiods.py b/cmk/gui/wato/pages/timeperiods.py index cce9403..696c3d8 100644 --- a/cmk/gui/wato/pages/timeperiods.py +++ b/cmk/gui/wato/pages/timeperiods.py @@ -55,6 +55,7 @@ from cmk.gui.valuespec import ( ValueSpec, TimeofdayRange, ListChoice, + CascadingDropdown, ) from cmk.gui.plugins.wato import ( @@ -679,15 +680,7 @@ class ModeEditTimeperiod(WatoMode): size = 80, validate = self._validate_alias, )), - ("weekdays", Dictionary( - title = _("Weekdays"), - help = _("For each weekday you can setup no, one or several " - "time ranges in the format <tt>23:39</tt>, in which the time period " - "should be active."), - elements = self._weekday_elements(), - optional_keys = None, - indent = False, - )), + ("weekdays", self._vs_weekdays()), ("exceptions", self._vs_exceptions()), ("exclude", self._vs_exclude()), ], @@ -709,6 +702,24 @@ class ModeEditTimeperiod(WatoMode): raise MKUserError("alias", message) + def _vs_weekdays(self): + return CascadingDropdown( + title = _("Active time range"), + help = _("For each weekday you can setup no, one or several " + "time ranges in the format <tt>23:39</tt>, in which the time period " + "should be active."), + choices = [ + ("whole_week", _("Same times for all weekdays"), MultipleTimeRanges( + )), + ("day_specific", _("Weekday specific times"), Dictionary( + elements = self._weekday_elements(), + optional_keys = None, + indent = False, + )), + ], + ) + + def _weekday_elements(self): elements = [] for tp_id, tp_title in cmk.defines.weekdays_by_name(): @@ -851,8 +862,7 @@ class ModeEditTimeperiod(WatoMode): vs_spec = { "name": self._name, "alias": tp_spec.get("alias", ""), - "weekdays": { day: map(self._time_range_to_valuespec, tp_spec.get(day, [])) - for day in defines.weekday_ids() }, + "weekdays": self._weekdays_to_valuespec(tp_spec), "exclude": tp_spec.get("exclude", []), "exceptions": sorted(exceptions), } @@ -860,6 +870,22 @@ class ModeEditTimeperiod(WatoMode): return vs_spec + def _weekdays_to_valuespec(self, tp_spec): + if self._has_same_time_specs_during_whole_week(tp_spec): + return ("whole_week", map(self._time_range_to_valuespec, tp_spec.get("monday", []))) + + return ("day_specific", { day: map(self._time_range_to_valuespec, tp_spec.get(day, [])) + for day in defines.weekday_ids() }) + + + def _has_same_time_specs_during_whole_week(self, tp_spec): + """Put the time ranges of all weekdays into a set to reduce the duplicates to see whether + or not all days have the same time spec and return True if they have the same.""" + unified_time_ranges = set([ tuple(tp_spec.get(day, [])) + for day in defines.weekday_ids() ]) + return len(unified_time_ranges) == 1 + + def _time_range_to_valuespec(self, time_range): """Convert a time range specification to valuespec format e.g. ("00:30", "10:17") -> ((0,30),(10,17))""" @@ -880,10 +906,35 @@ class ModeEditTimeperiod(WatoMode): if vs_spec["exclude"]: tp_spec["exclude"] = vs_spec["exclude"] - for day, time_ranges in vs_spec["weekdays"].items() + vs_spec["exceptions"]: + tp_spec.update(self._exceptions_from_valuespec(vs_spec)) + tp_spec.update(self._weekdays_from_valuespec(vs_spec)) + + return tp_spec + + + def _exceptions_from_valuespec(self, vs_spec): + tp_spec = {} + for exception_name, time_ranges in vs_spec["exceptions"]: if time_ranges: - tp_spec[day] = map(self._time_range_from_valuespec, time_ranges) + tp_spec[exception_name] = map(self._time_range_from_valuespec, time_ranges) + return tp_spec + + + def _weekdays_from_valuespec(self, vs_spec): + weekday_ty, weekday_values = vs_spec["weekdays"] + if weekday_ty == "whole_week": + # produce a data structure equal to the "day_specific" structure + weekday_values = { day: weekday_values for day in defines.weekday_ids() } + + elif weekday_ty != "day_specific": + raise NotImplementedError() + + tp_spec = {} + for day in defines.weekday_ids(): + time_specs = map(self._time_range_from_valuespec, weekday_values[day]) + if time_specs: + tp_spec[day] = time_specs return tp_spec

5 years, 12 months

Timeperiods: Number of time ranges is now flexible

by Lars Michelsen

Module: check_mk Branch: master Commit: 913ad42c810763a0cc9268da8d0420a62714ad07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=913ad42c810763… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 20 17:21:27 2018 +0200 Timeperiods: Number of time ranges is now flexible * Add new render style "floating" to ListOf() valuespec to make the time range list as compact as they were before * Cleaned up ListOf() valuespec javascript code on the way * Refactored MultipleTimeRanges() and TimeofdayRanges() to base on the generic ListOf() valuespec CMK-522 Change-Id: I07772d6582246a81e7b9ab7abad149c33eaa958a --- cmk/gui/plugins/wato/check_mk_configuration.py | 3 +- cmk/gui/plugins/wato/check_parameters.py | 8 +- cmk/gui/valuespec.py | 155 +++++++++++++++++++------ cmk/gui/wato/pages/timeperiods.py | 89 ++++---------- web/htdocs/check_mk.css | 18 ++- web/htdocs/js/checkmk.js | 140 +++++++++------------- web/htdocs/themes/facelift/theme.css | 18 +-- 7 files changed, 225 insertions(+), 206 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=913ad42c81…

5 years, 12 months

Add missing validation of timeperiod exceptions

by Lars Michelsen

Module: check_mk Branch: master Commit: 09038d12e9c1a42c88417183803dc379c234039f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09038d12e9c1a4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 21 08:25:41 2018 +0200 Add missing validation of timeperiod exceptions CMK-522 Change-Id: Ic6daf8e50646ed2ab144f766e7c997f55cbdeb71 --- cmk/gui/wato/pages/timeperiods.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cmk/gui/wato/pages/timeperiods.py b/cmk/gui/wato/pages/timeperiods.py index bb85f85..5f3bfce 100644 --- a/cmk/gui/wato/pages/timeperiods.py +++ b/cmk/gui/wato/pages/timeperiods.py @@ -721,6 +721,13 @@ class ModeEditTimeperiod(WatoMode): if value in [ "name", "alias", "timeperiod_name", "register", "use", "exclude" ]: raise MKUserError(varprefix, _("<tt>%s</tt> is a reserved keyword.")) + config = watolib.ConfigDomainOMD().default_globals() + if config["site_core"] == "cmc": + try: + time.strptime(value, "%Y-%m-%d") + except ValueError: + raise MKUserError(varprefix, _("You need to provide timeperiod exceptions in YYYY-MM-DD format")) + def _vs_exclude(self): return ListChoice(

5 years, 12 months

Cleaned up special case of timeperiod 24X7 in the GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: 00659e23a54cf1f0cd931a12b32ae7fbc2b7bacd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00659e23a54cf1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 21 09:38:20 2018 +0200 Cleaned up special case of timeperiod 24X7 in the GUI The timeperiod was implicitly defined and handled as special case in many parts of Check_MK. This timeperiod is now visible to the user in the timeperiods view, always available and declared as "builtin" in the GUI. It can not be modified by the user. CMK-522 Change-Id: I4f040fd0f32b8d871c4e4b80c31b02b69035c6dc --- cmk/gui/wato/__init__.py | 9 ++++----- cmk/gui/wato/pages/timeperiods.py | 32 +++++++++++++++++++++----------- cmk/gui/watolib.py | 27 +++++++++++++++++++++++++-- 3 files changed, 50 insertions(+), 18 deletions(-) diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index a61fe6f..100049d 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -9147,13 +9147,13 @@ class ModeUsers(WatoMode): html.write_text(_("all events disabled")) else: tp = user.get("notification_period", "24X7") - if tp != "24X7" and tp not in timeperiods: + if tp not in timeperiods: tp = tp + _(" (invalid)") - elif tp != "24X7": + elif tp not in watolib.builtin_timeperiods(): url = watolib.folder_preserving_link([("mode", "edit_timeperiod"), ("edit", tp)]) tp = html.render_a(timeperiods[tp].get("alias", tp), href=url) else: - tp = _("Always") + tp = timeperiods[tp].get("alias", tp) html.write(tp) # the visible custom attributes @@ -9608,8 +9608,7 @@ class ModeEditUser(WatoMode): # Notification period forms.section(_("Notification time period")) - choices = [ ( "24X7", _("Always")) ] + \ - [ ( id, "%s" % (tp["alias"])) for (id, tp) in self._timeperiods.items() ] + choices = [ ( id, "%s" % (tp["alias"])) for (id, tp) in self._timeperiods.items() ] html.dropdown("notification_period", choices, deflt=self._user.get("notification_period"), sorted=True) html.help(_("Only during this time period the " "user will get notifications about host or service alerts.")) diff --git a/cmk/gui/wato/pages/timeperiods.py b/cmk/gui/wato/pages/timeperiods.py index 5f3bfce..1b30347 100644 --- a/cmk/gui/wato/pages/timeperiods.py +++ b/cmk/gui/wato/pages/timeperiods.py @@ -98,6 +98,9 @@ class ModeTimeperiods(WatoMode): def action(self): delname = html.var("_delete") if delname and html.transaction_valid(): + if delname in watolib.builtin_timeperiods(): + raise MKUserError("_delete", _("Builtin timeperiods can not be modified")) + usages = self._find_usages_of_timeperiod(delname) if usages: message = "<b>%s</b><br>%s:<ul>" % \ @@ -279,24 +282,30 @@ class ModeTimeperiods(WatoMode): def page(self): table.begin("timeperiods", empty_text = _("There are no timeperiods defined yet.")) - for name in sorted(self._timeperiods.keys()): + for name, timeperiod in sorted(self._timeperiods.items()): table.row() - timeperiod = self._timeperiods[name] - edit_url = watolib.folder_preserving_link([("mode", "edit_timeperiod"), ("edit", name)]) - clone_url = watolib.folder_preserving_link([("mode", "edit_timeperiod"), ("clone", name)]) - delete_url = make_action_link([("mode", "timeperiods"), ("_delete", name)]) - table.cell(_("Actions"), css="buttons") - html.icon_button(edit_url, _("Properties"), "edit") - html.icon_button(clone_url, _("Create a copy"), "clone") - html.icon_button(delete_url, _("Delete"), "delete") + if name in watolib.builtin_timeperiods(): + html.write_text(html.i(_("(builtin)"))) + else: + self._action_buttons(name) table.text_cell(_("Name"), name) table.text_cell(_("Alias"), timeperiod.get("alias", "")) table.end() + def _action_buttons(self, name): + edit_url = watolib.folder_preserving_link([("mode", "edit_timeperiod"), ("edit", name)]) + clone_url = watolib.folder_preserving_link([("mode", "edit_timeperiod"), ("clone", name)]) + delete_url = make_action_link([("mode", "timeperiods"), ("_delete", name)]) + + html.icon_button(edit_url, _("Properties"), "edit") + html.icon_button(clone_url, _("Create a copy"), "clone") + html.icon_button(delete_url, _("Delete"), "delete") + + # Displays a dialog for uploading an ical file which will then # be used to generate timeperiod exceptions etc. and then finally @@ -579,6 +588,9 @@ class ModeEditTimeperiod(WatoMode): self._name = html.var("edit") # missing -> new group self._new = self._name == None + if self._name in watolib.builtin_timeperiods(): + raise MKUserError("edit", _("Builtin timeperiods can not be modified")) + if self._new: clone_name = html.var("clone") if clone_name: @@ -653,8 +665,6 @@ class ModeEditTimeperiod(WatoMode): def _validate_id(self, value, varprefix): if value in self._timeperiods: raise MKUserError(varprefix, _("This name is already being used by another timeperiod.")) - if value == "24X7": - raise MKUserError(varprefix, _("The time period name 24X7 cannot be used. It is always autmatically defined.")) def _validate_alias(self, value, varprefix): diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index b91d36d..0f49b10 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -8812,13 +8812,36 @@ def may_override_read_only_mode(): # | |_| | # +----------------------------------------------------------------------+ +def builtin_timeperiods(): + return { + "24X7": { + "alias" : _("Always"), + "monday" : ("00:00", "24:00"), + "tuesday" : ("00:00", "24:00"), + "wednesday" : ("00:00", "24:00"), + "thursday" : ("00:00", "24:00"), + "friday" : ("00:00", "24:00"), + "saturday" : ("00:00", "24:00"), + "sunday" : ("00:00", "24:00"), + } + } + + def load_timeperiods(): - return store.load_from_mk_file(wato_root_dir + "timeperiods.mk", "timeperiods", {}) + timeperiods = store.load_from_mk_file(wato_root_dir + "timeperiods.mk", "timeperiods", {}) + timeperiods.update(builtin_timeperiods()) + return timeperiods def save_timeperiods(timeperiods): store.mkdir(wato_root_dir) - store.save_to_mk_file(wato_root_dir + "timeperiods.mk", "timeperiods", timeperiods, pprint_value = config.wato_pprint_config) + store.save_to_mk_file(wato_root_dir + "timeperiods.mk", "timeperiods", + filter_builtin_timeperiods(timeperiods), pprint_value = config.wato_pprint_config) + + +def filter_builtin_timeperiods(timeperiods): + builtin_keys = builtin_timeperiods().keys() + return { k: v for k, v in timeperiods.items() if k not in builtin_keys} class TimeperiodSelection(DropdownChoice):

5 years, 12 months

6628 Improved timeperiod management

by Lars Michelsen

Module: check_mk Branch: master Commit: f08152f3b14263604177dd692c23ba111c9727a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f08152f3b14263… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 21 09:12:11 2018 +0200 6628 Improved timeperiod management The timeperiod management pages have been improved ins several ways: <ul> <li>Timeperiods can now be cloned.</li> <li>Configuring equal times for all weekdays is now easier. Instead of setting the same time ranges for each weekday it is now possible to select "Same times for all week days".</li> <li>Timeperiods listed in the excludes list are now sorted.</li> <li>The number of time ranges per day is now flexible. The dialog starts with a single time range. You may click on "add time range" to add more.</li> <li>Improved validations of input values.</li> <li>The builtin timeperiod 24X7 is now always visible. The implicit existance of this timeperiod confused users.</li> </ul> CMK-522 Change-Id: Icb9ab740bd5cf78a0874deebe0670a3a0642f5e1 --- .werks/6628 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.werks/6628 b/.werks/6628 new file mode 100644 index 0000000..43e4124 --- /dev/null +++ b/.werks/6628 @@ -0,0 +1,22 @@ +Title: Improved timeperiod management +Level: 2 +Component: wato +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1537513718 +Class: feature + +The timeperiod management pages have been improved ins several ways: + +<ul> +<li>Timeperiods can now be cloned.</li> +<li>Configuring equal times for all weekdays is now easier. Instead of setting +the same time ranges for each weekday it is now possible to select "Same times for all week days".</li> +<li>Timeperiods listed in the excludes list are now sorted.</li> +<li>The number of time ranges per day is now flexible. The dialog starts with +a single time range. You may click on "add time range" to add more.</li> +<li>Improved validations of input values.</li> +<li>The builtin timeperiod 24X7 is now always visible. The implicit existance +of this timeperiod confused users.</li> +</ul>

5 years, 12 months

← Newer
1
...
9
10
11
12
13
14
15
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2018