Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d519e376d5ff3cab09184771340ff21ed99d7956 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d519e376d5ff3c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu May 3 16:02:17 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 1 month

Check_MK Git: check_mk: Correction in doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d65d61e33912f2a127b364f9113085045a0b6d65 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d65d61e33912f2… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu May 3 08:49:33 2012 +0200 Correction in doku --- checkman/fileinfo.groups | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checkman/fileinfo.groups b/checkman/fileinfo.groups index ed4fb24..edf48bb 100644 --- a/checkman/fileinfo.groups +++ b/checkman/fileinfo.groups @@ -23,8 +23,8 @@ item: examples: fileinfo_groups = [ - ([("Auth_group","/var/log/auth.*")], ALL_HOSTS), - ([("Message_group", "/var/log/messages*")], ['test2'], ALL_HOSTS), + ([("Auth_group",r"/var/log/auth.*")], ALL_HOSTS), + ([("Message_group", r"/var/log/messages*")], ['test2'], ALL_HOSTS), ] check_parameters = [

12 years, 1 month

Check_MK Git: check_mk: Added hr_cpu to a check_group

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a91e0404a6e2c617528bb7e8a4e1ef49021bc01f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a91e0404a6e2c6… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu May 3 16:02:10 2012 +0200 Added hr_cpu to a check_group --- checks/hr_cpu | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/checks/hr_cpu b/checks/hr_cpu index b066255..521b97d 100644 --- a/checks/hr_cpu +++ b/checks/hr_cpu @@ -50,6 +50,7 @@ def check_hr_cpu(item, params, info): check_info["hr_cpu"] = (check_hr_cpu, "CPU utilization", 1, inventory_hr_cpu) snmp_info["hr_cpu"] = ( ".1.3.6.1.2.1.25.3.3.1", [ 2 ] ) +checkgroup_of['hr_cpu'] = "cpu_utilization" # HOST-RESOURCES-MIB::hrSystemUptime.0 snmp_scan_functions["hr_cpu"] = lambda oid: \

12 years, 1 month

Check_MK Git: check_mk: WATO: Configuration of notification_delay and notification_interval

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 18d32c403818caf045ccf554c85bd771a252e0eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18d32c403818ca… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 3 15:58:18 2012 +0200 WATO: Configuration of notification_delay and notification_interval --- ChangeLog | 1 + web/plugins/wato/check_mk_configuration.py | 30 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 656a3de..7fd89c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ manual ones (via multisite.mk) * Timeperiods: Make list of exceptions dynamic, not fixed to 10 entries * Timeperiods: Configure exclusion of other timeperiods + * Configuration of notification_delay and notification_interval 1.2.0b2: Core: diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index ad6fbf1..5356642 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -670,6 +670,34 @@ register_rule(group, itemtype = "service") register_rule(group, + "extra_host_conf:first_notification_delay", + Integer( + minvalue = 0, + default_value = 60, + label = _("Delay:"), + unit = _("minutes"), + title = _("Delay host notifications"), + help = _("This setting delays notifications about host problems by the " + "specified amount of time. If the host is up again within that " + "time, no notification will be sent out."), + ) + ) + +register_rule(group, + "extra_service_conf:first_notification_delay", + Integer( + minvalue = 0, + default_value = 60, + label = _("Delay:"), + unit = _("minutes"), + title = _("Delay service notifications"), + help = _("This setting delays notifications about service problems by the " + "specified amount of time. If the service is OK again within that " + "time, no notification will be sent out."), + ) + ) + +register_rule(group, "extra_host_conf:notification_interval", Optional( Integer( @@ -687,6 +715,8 @@ register_rule(group, ) ) + + register_rule(group, "extra_service_conf:notification_interval", Optional(

12 years, 1 month

Check_MK Git: check_mk: WATO: make notification_interval configurable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 63b7ef6510eb54952d1fb37232ffeb3e42bc531e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63b7ef6510eb54… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 3 15:39:49 2012 +0200 WATO: make notification_interval configurable --- web/htdocs/valuespec.py | 17 +++++++------ web/plugins/wato/check_mk_configuration.py | 36 ++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 8 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 5a29b85..a1ecff0 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1341,19 +1341,20 @@ class Optional(ValueSpec): self._label = kwargs.get("label") self._negate = kwargs.get("negate", False) self._none_label = kwargs.get("none_label", _("(unset)")) + self._none_value = kwargs.get("none_value", None) self._sameline = kwargs.get("sameline", False) def canonical_value(self): - return None + return self._none_value def render_input(self, varprefix, value): div_id = "option_" + varprefix checked = html.get_checkbox(varprefix + "_use") if checked == None: if self._negate: - checked = value == None + checked = value == self._none_value else: - checked = value != None + checked = value != self._none_value html.write("<span>") @@ -1382,7 +1383,7 @@ class Optional(ValueSpec): display = "" html.write('<span id="%s" style="display: %s">' % (div_id, display)) - if value == None: + if value == self._none_value: value = self._valuespec.default_value() if self._valuespec.title(): html.write(self._valuespec.title() + " ") @@ -1390,7 +1391,7 @@ class Optional(ValueSpec): html.write('</span>\n') def value_to_text(self, value): - if value == None: + if value == self._none_value: return self._none_label else: return self._valuespec.value_to_text(value) @@ -1399,14 +1400,14 @@ class Optional(ValueSpec): if html.get_checkbox(varprefix + "_use") != self._negate: return self._valuespec.from_html_vars(varprefix + "_value") else: - return None + return self._none_value def validate_datatype(self, value, varprefix): - if value != None: + if value != self._none_value: self._valuespec.validate_datatype(value, varprefix + "_value") def validate_value(self, value, varprefix): - if value != None: + if value != self._none_value: self._valuespec.validate_value(value, varprefix + "_value") # Handle case when there are several possible allowed formats diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 61a5d93..ad6fbf1 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -669,6 +669,42 @@ register_rule(group, "as the 'service time'.")), itemtype = "service") +register_rule(group, + "extra_host_conf:notification_interval", + Optional( + Integer( + minvalue = 1, + default_value = 120, + label = _("Interval:"), + unit = _("minutes")), + title = _("Periodic notifications during host problems"), + help = _("If you enable periodic notifications, then during a problem state " + "of the host notifications will be sent out in regular intervals " + "until the problem is acknowledged."), + label = _("Enable periodic notifications"), + none_label = _("disabled"), + none_value = 0, + ) + ) + +register_rule(group, + "extra_service_conf:notification_interval", + Optional( + Integer( + minvalue = 1, + default_value = 120, + label = _("Interval:"), + unit = _("minutes")), + title = _("Periodic notifications during service problems"), + help = _("If you enable periodic notifications, then during a problem state " + "of the service notifications will be sent out in regular intervals " + "until the problem is acknowledged."), + label = _("Enable periodic notifications"), + none_label = _("disabled"), + none_value = 0, + ), + itemtype = "service") + group = "monconf/Inventory and Check_MK settings" register_rule(group,

12 years, 1 month

Check_MK Git: check_mk: WATO: configure timeperiod exclusion

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d615289c77f5814522f27b345210b957c184897d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d615289c77f581… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 3 13:41:13 2012 +0200 WATO: configure timeperiod exclusion --- ChangeLog | 1 + modules/check_mk.py | 4 ++- web/htdocs/check_mk.css | 3 ++ web/htdocs/valuespec.py | 4 +- web/htdocs/views.css | 2 +- web/htdocs/wato.py | 64 ++++++++++++++++++++++++++++++++++++++++------ 6 files changed, 65 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index acfab98..656a3de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,7 @@ * FIX: do not loose host tags when both using WATO-configured and manual ones (via multisite.mk) * Timeperiods: Make list of exceptions dynamic, not fixed to 10 entries + * Timeperiods: Configure exclusion of other timeperiods 1.2.0b2: Core: diff --git a/modules/check_mk.py b/modules/check_mk.py index 461c4d5..67c42b9 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1926,10 +1926,12 @@ def create_nagios_config_timeperiods(outfile): if "alias" in tp: outfile.write(" alias\t\t\t\t%s\n" % tp["alias"].encode("utf-8")) for key, value in tp.items(): - if key != "alias": + if key not in [ "alias", "exclude" ]: times = ",".join([ ("%s-%s" % (fr, to)) for (fr, to) in value ]) if times: outfile.write(" %-20s\t\t%s\n" % (key, times)) + if "exclude" in tp: + outfile.write(" exclude\t\t\t%s\n" % ",".join(tp["exclude"])) outfile.write("}\n\n") def create_nagios_config_contacts(outfile): diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 9dd620c..a0c5c43 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -300,6 +300,9 @@ div.error { border-color: #e40; color: white; } +div.error a { + color: white; +} div.warning { background-color: #ff4; diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 666fa3b..5a29b85 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -942,8 +942,8 @@ class ListChoice(ValueSpec): html.write("</tr>") html.write("<tr>") html.write("<td>") - html.checkbox("%s_%d" % (varprefix, nr), key in value) - html.write(" %s</td>\n" % title) + html.checkbox("%s_%d" % (varprefix, nr), key in value, label = title) + html.write("</td>") html.write("</tr></table>") def value_to_text(self, value): diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 3dcd248..00cf5c9 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -171,7 +171,7 @@ div.floatfilter { } div.floatfilter.double { - height: 111px; + height: 110px; } div.floatfilter input[type=text] { diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2c48d2e..d037128 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5704,7 +5704,7 @@ class ExceptionName(TextAscii): if value in [ "monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday" ]: raise MKUserError(varprefix, _("You cannot use weekday names (%s) in exceptions" % value)) - if value in [ "name", "alias", "timeperiod_name", "register", "use" ]: + if value in [ "name", "alias", "timeperiod_name", "register", "use", "exclude" ]: raise MKUserError(varprefix, _("<tt>%s</tt> is a reserved keyword.")) TextAscii.validate_value(self, value, varprefix) @@ -5745,10 +5745,27 @@ class MultipleTimeRanges(ValueSpec): for c, v in enumerate(value): self._rangevs.validate_value(v, varprefix + "_%d" % c) +# Check, if timeperiod tpa excludes or is tpb +def timeperiod_excludes(timeperiods, tpa_name, tpb_name): + if tpa_name == tpb_name: + return True + + tpa = timeperiods[tpa_name] + for ex in tpa.get("exclude", []): + if ex == tpb_name: + return True + if timeperiod_excludes(timeperiods, ex, tpb_name): + return True + return False + def mode_edit_timeperiod(phase): num_columns = 3 + timeperiods = load_timeperiods() + name = html.var("edit") # missing -> new group + new = name == None + # ValueSpec for the list of Exceptions vs_ex = ListOf( Tuple( orientation = "horizontal", @@ -5760,6 +5777,16 @@ def mode_edit_timeperiod(phase): movable = False, add_label = _("Add Exception")) + # ValueSpec for excluded Timeperiods. 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 timeperiods.items(): + if not new and not timeperiod_excludes(timeperiods, tpname, name): + other_tps.append((tpname, tp.get("alias") or name)) + + vs_excl = ListChoice(choices = other_tps) + # convert Check_MK representation of range to ValueSpec-representation def convert_from_tod(tod): # "00:30" -> (0, 30) @@ -5792,10 +5819,6 @@ def mode_edit_timeperiod(phase): MultipleTimeRanges().validate_value(value, varprefix) return map(convert_to_range, value) - - name = html.var("edit") # missing -> new group - new = name == None - if phase == "title": if new: return _("Create new time period") @@ -5806,7 +5829,6 @@ def mode_edit_timeperiod(phase): html.context_button(_("All Timeperiods"), make_link([("mode", "timeperiods")]), "back") return - timeperiods = load_timeperiods() if new: timeperiod = {} else: @@ -5844,6 +5866,12 @@ def mode_edit_timeperiod(phase): for exname, ranges in exceptions: timeperiod[exname] = map(convert_to_range, ranges) + # extract excludes + excludes = vs_excl.from_html_vars("exclude") + vs_excl.validate_value(excludes, "exclude") + if excludes: + timeperiod["exclude"] = excludes + if new: name = html.var("name") if len(name) == 0: @@ -5915,11 +5943,21 @@ def mode_edit_timeperiod(phase): exceptions = [] for k in timeperiod: - if k not in [ w[0] for w in weekdays ] and k != "alias": + if k not in [ w[0] for w in weekdays ] and k not in [ "alias", "exclude" ]: exceptions.append((k, map(convert_from_range, timeperiod[k]))) exceptions.sort() vs_ex.render_input("except", exceptions) + + # Excludes + if other_tps: + html.write("<tr><td class=legend>") + html.write(_("Exclude")) + html.write("</td><td class=content>") + vs_excl.render_input("exclude", timeperiod.get("exclude", [])) + html.write("</td></tr>") + + html.write("<tr><td colspan=2 class=buttons>") html.button("save", _("Save")) html.write("</td></tr>") @@ -5940,8 +5978,9 @@ class TimeperiodSelection(ElementSelection): # Check if a timeperiod is currently in use and cannot be deleted # Returns a list of occurrances. # Possible usages: -# - user accounts (notification period) -# - rules: service/host-notification/check-period +# - 1. rules: service/host-notification/check-period +# - 2. user accounts (notification period) +# - 3. excluded by other timeperiods def find_usage_of_timeperiod(tpname): # Part 1: Rules @@ -5963,6 +6002,13 @@ def find_usage_of_timeperiod(tpname): used_in.append(("%s: %s" % (_("User"), userid), make_link([("mode", "edit_user"), ("edit", userid)]))) + # Part 3: Other Timeperiods + for tpn, tp in load_timeperiods().items(): + if tpname in tp.get("exclude", []): + used_in.append(("%s: %s (%s)" % (_("Timeperiod"), tp.get("alias", tpn), + _("excluded")), + make_link([("mode", "edit_timeperiod"), ("edit", tpn)]))) + return used_in

12 years, 1 month

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 72bd683990374ac21e6ccb1aa28baa407f830b63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72bd683990374a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 3 11:20:09 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 1 month

Check_MK Git: check_mk: WATO: timeperiods: make list of exceptions dynamic

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: de904d4fd3f6ab58afb01ce86ae89b724d99f538 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de904d4fd3f6ab… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 3 11:20:06 2012 +0200 WATO: timeperiods: make list of exceptions dynamic --- ChangeLog | 1 + web/htdocs/htmllib.py | 2 +- web/htdocs/js/checkmk.js | 40 ++++++++++++++------------- web/htdocs/valuespec.py | 15 ++++++---- web/htdocs/wato.css | 15 ++++++---- web/htdocs/wato.py | 68 ++++++++++++++++++++++++--------------------- 6 files changed, 77 insertions(+), 64 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=de904d4fd3…

12 years, 1 month

Check_MK Git: check_mk: WATO: bugfix create_distributed_wato_file. no longer puts random

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2be87dd23acaf3045c460ce47ee03ec3bbb678bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2be87dd23acaf3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 2 21:18:56 2012 +0200 WATO: bugfix create_distributed_wato_file. no longer puts random sites into distributed_wato.mk --- web/htdocs/wato.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9605bc8..4aef34c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6561,7 +6561,8 @@ def update_distributed_wato_file(sites): for siteid, site in sites.items(): if site.get("replication"): distributed = True - create_distributed_wato_file(siteid, site.get("replication")) + if site_is_local(siteid): + create_distributed_wato_file(siteid, site.get("replication")) if not distributed: delete_distributed_wato_file()

12 years, 2 months

Check_MK Git: check_mk: WATO: timeperiod: fix deletion of one day

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: de1a09987dadbaa1d606d28d1b7b16681f5a1836 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de1a09987dadba… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 2 18:13:58 2012 +0200 WATO: timeperiod: fix deletion of one day --- web/htdocs/wato.py | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ec73dc6..9605bc8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5706,7 +5706,7 @@ class MultipleTimeRanges(ValueSpec): for c in range(0, self._num_columns): if c: html.write("   ") - if len(value) >= c: + if c < len(value): v = value[c] else: v = self._rangevs.canonical_value() @@ -5750,16 +5750,13 @@ def mode_edit_timeperiod(phase): def convert_to_range(value): return tuple(map(convert_to_tod, value)) - def timeperiod_ranges(vp, keyname): + def timeperiod_ranges(vp, keyname, new): ranges = timeperiod.get(keyname, []) value = [] for range in ranges: value.append(convert_from_range(range)) - while len(value) < num_columns: - if len(value) == 0 and new: - value.append(((0,0),(24,0))) - else: - value.append(None) + if len(value) == 0 and new: + value.append(((0,0),(24,0))) html.write("<td>") MultipleTimeRanges().render_input(vp, value) @@ -5811,6 +5808,8 @@ def mode_edit_timeperiod(phase): ranges = get_ranges(weekday) if ranges: timeperiod[weekday] = ranges + elif weekday in timeperiod: + del timeperiod[weekday] # extract ranges for custom days for e in range(0, num_exceptions): @@ -5883,7 +5882,7 @@ def mode_edit_timeperiod(phase): for weekday, weekday_alias in weekdays: ranges = timeperiod.get(weekday) html.write("<tr><td class=name>%s</td>" % weekday_alias) - timeperiod_ranges(weekday, weekday) + timeperiod_ranges(weekday, weekday, new) html.write("</tr>") html.write("</table></td></tr>") @@ -5913,7 +5912,7 @@ def mode_edit_timeperiod(phase): html.write("<tr><td class=name>") html.text_input(varprefix + "_name", exname) html.write("</td>") - timeperiod_ranges(varprefix, exname) + timeperiod_ranges(varprefix, exname, False) html.write("</tr>") html.write("</table></td></tr>")

12 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2012