Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

Check_MK Git: check_mk: Implemented piggyback_max_cachefile_age to ignore too old piggybacked data ; Fixed piggyback removal during checking piggybacked hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: 18c363b766d5ce995fe44468fd8bcc7f067155f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18c363b766d5ce… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 18 14:20:40 2013 +0100 Implemented piggyback_max_cachefile_age to ignore too old piggybacked data; Fixed piggyback removal during checking piggybacked hosts --- ChangeLog | 3 +-- modules/check_mk.py | 2 ++ modules/check_mk_base.py | 15 +++++++++++---- web/plugins/wato/check_mk_configuration.py | 9 +++++++++ 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2377f3..abe6f73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,6 @@ 1.2.3i1: Core: - * New feature: agents can send data for other hosts - "piggyback". + * New feature: agents can send data for other hosts "piggyback". Event Console: * New rule feature: automatically delete after action diff --git a/modules/check_mk.py b/modules/check_mk.py index 7a1ff6c..47da0aa 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -219,6 +219,7 @@ aggr_summary_hostname = "%s-s" agent_min_version = 0 # warn, if plugin has not at least version check_max_cachefile_age = 0 # per default do not use cache files when checking cluster_max_cachefile_age = 90 # secs. +piggyback_max_cachefile_age = 900 # secs simulation_mode = False agent_simulator = False perfdata_format = "pnp" # also possible: "standard" @@ -2650,6 +2651,7 @@ no_inventory_possible = None 'var_dir', 'counters_directory', 'tcp_cache_dir', 'tmp_dir', 'snmpwalks_dir', 'check_mk_basedir', 'nagios_user', 'www_group', 'cluster_max_cachefile_age', 'check_max_cachefile_age', + 'piggyback_max_cachefile_age', 'simulation_mode', 'agent_simulator', 'aggregate_check_mk', 'debug_log', 'check_mk_perfdata_with_times', 'livestatus_unix_socket', ]: diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 7c8cbef..5b40f1b 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -370,7 +370,7 @@ def get_realhost_info(hostname, ipaddress, check_type, max_cache_age): if is_tcp_host(hostname): try: output = get_agent_info(hostname, ipaddress, max_cache_age) - except: + except Exception, e: agent_failed = True # Remove piggybacked information from the host (in the # role of the pig here). Why? We definitely haven't @@ -410,11 +410,18 @@ def get_piggyback_info(hostname): if os.path.exists(dir): for sourcehost in os.listdir(dir): if sourcehost not in ['.', '..'] \ - and not sourcehost.startswith(".new."): + and not sourcehost.startswith(".new."): + file_path = dir + "/" + sourcehost + + if cachefile_age(file_path) > piggyback_max_cachefile_age: + os.remove(file_path) + continue + if opt_debug: sys.stderr.write("Using piggyback information from host %s.\n" % sourcehost) - output += file(dir + "/" + sourcehost).read() + + output += file(file_path).read() return output @@ -433,7 +440,7 @@ def store_piggyback_info(sourcehost, piggybacked): # Remove piggybacked information that is not # being sent this turn - remove_piggyback_info_from(sourcehost, keep=piggybacked) + remove_piggyback_info_from(sourcehost, keep=piggybacked.keys()) def remove_piggyback_info_from(sourcehost, keep=[]): removed = 0 diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index cf7ceb4..eb4cd05 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -640,6 +640,15 @@ register_configvar(group, need_restart = True) register_configvar(group, + "piggyback_max_cachefile_age", + Integer(title = _("Maximum age for piggyback files"), + label = _("seconds"), + help = _("The number of seconds a piggyback file may be old to be valid for monitoring. " + "Older files are deleted before processing them.")), + need_restart = True) + + +register_configvar(group, "check_submission", DropdownChoice( title = _("Check submission method"),

11 years, 7 months

Check_MK Git: check_mk: ps: Allow %1, %2, .. instead of %s in process_inventory.

by Mathias Kettner

Module: check_mk Branch: master Commit: 6dd32b7e62e4bd609c1d1d63d33ebea51a58b3b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6dd32b7e62e4bd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 18 12:03:31 2013 +0100 ps: Allow %1, %2, .. instead of %s in process_inventory. --- ChangeLog | 2 ++ checkman/ps | 4 ++++ checks/ps | 5 +++++ web/plugins/wato/check_parameters.py | 11 +++++++---- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c759304..a1ee131 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,8 @@ 1.2.2b4: Checks & Agents: * Linux agent: limit netstat to 10 seconds + * ps: Allow %1, %2, .. instead of %s in process_inventory. That allows + reordering of matched groups BI: * FIX: fixed invalid links to hosts and services in BI tree view diff --git a/checkman/ps b/checkman/ps index 84f423a..65d2c69 100644 --- a/checkman/ps +++ b/checkman/ps @@ -44,6 +44,10 @@ inventory: are used for the service descriptions. The matched substrings corresponding to the remaining groups are copied into the regular expression, nevertheless. + New in version 1.2.2: As an alternative to {%s} you may also use {%1}, {%2}, + etc. These will be replaced by the first, second, ... matching group. This + allows you to reorder things. + Wildcards not enclosed by brackets are simply copied verbatim to the created checks. Please refer to the examples for more details. diff --git a/checks/ps b/checks/ps index fb2aa8c..4b62529 100644 --- a/checks/ps +++ b/checks/ps @@ -120,6 +120,11 @@ def inventory_ps_common(invdata, info, handle_perfdata = False): i_userspec = userspec i_servicedesc = servicedesc + # New in 1.2.2b4: Alle %1, %2, etc. to be replaced with first, second, ... + # group. This allows a reordering of the matched groups + for nr, group in enumerate(matches): + i_servicedesc = i_servicedesc.replace("%%%d" % (nr+1), group) + # It is allowed (1.1.4) that the pattern contains more subexpressions then the # service description. In that case only the first subexpressions are used as # item. diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index fc2ebb5..334a725 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -293,14 +293,17 @@ register_rule(group + '/' + subgroup_inventory, elements = [ ('descr', TextAscii( title = _('Service Description'), - help = _('<p>The service description may contain one or more occurances of %s. If you do this, then the pattern must be a regular ' + help = _('<p>The service description may contain one or more occurances of <tt>%s</tt>. If you do this, then the pattern must be a regular ' 'expression and be prefixed with ~. For each %s in the description, the expression has to contain one "group". A group ' - 'is a subexpression enclosed in brackets, for example (.*) or ([a-zA-Z]+) or (...). When the inventory finds a process ' + 'is a subexpression enclosed in brackets, for example <tt>(.*)</tt> or <tt>([a-zA-Z]+)</tt> or <tt>(...)</tt>. When the inventory finds a process ' 'matching the pattern, it will substitute all such groups with the actual values when creating the check. That way one ' 'rule can create several checks on a host.</p>' - '<p>If the pattern contains more groups thenoccurrances of %s in the service description then only the first matching ' + '<p>If the pattern contains more groups then occurrances of <tt>%s</tt> in the service description then only the first matching ' 'subexpressions are used for the service descriptions. The matched substrings corresponding to the remaining groups ' - 'are copied into the regular expression, nevertheless.</p>'), + 'are copied into the regular expression, nevertheless.</p>' + '<p>As an alternative to <tt>%s</tt> you may also use <tt>%1</tt>, <tt>%2</tt>, etc. ' + 'These will be replaced by the first, second, ... matching group. This allows you to reorder things.</p>' + ), )), ('match', Alternative( title = _("Process Matching"),

11 years, 7 months

Check_MK Git: check_mk: Linux agent: limit netstat to 10 seconds

by Mathias Kettner

Module: check_mk Branch: master Commit: 5764e2dd745d75db42a8245b7281af5eaf738dee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5764e2dd745d75… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 18 10:34:46 2013 +0100 Linux agent: limit netstat to 10 seconds --- ChangeLog | 3 +++ agents/check_mk_agent.linux | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26a6d59..c759304 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,9 @@ * New editor for Business Intelligence rules 1.2.2b4: + Checks & Agents: + * Linux agent: limit netstat to 10 seconds + BI: * FIX: fixed invalid links to hosts and services in BI tree view diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 73b80a1..27dc5d9 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -180,7 +180,7 @@ fi # Number of TCP connections in the various states echo '<<<tcp_conn_stats>>>' -netstat -nt | awk ' /^tcp/ { c[$6]++; } END { for (x in c) { print x, c[x]; } }' +waitmax 10 netstat -nt | awk ' /^tcp/ { c[$6]++; } END { for (x in c) { print x, c[x]; } }' # Platten- und RAID-Status von LSI-Controlleren, falls vorhanden if type cfggen > /dev/null ; then

11 years, 7 months

Check_MK Git: check_mk: FIX: fixed invalid links to hosts and services in BI tree view

by Mathias Kettner

Module: check_mk Branch: master Commit: 9b9afa8ab215a394e0797554be4d7847a626c578 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b9afa8ab215a3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 18 09:26:51 2013 +0100 FIX: fixed invalid links to hosts and services in BI tree view Conflicts: ChangeLog web/htdocs/bi.py --- ChangeLog | 5 ++++- web/htdocs/bi.py | 4 ++-- web/htdocs/htmllib.py | 8 +++++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50ff3a3..26a6d59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,8 +22,11 @@ * Configuration of datasource programs via dedicated rules * New editor for Business Intelligence rules +1.2.2b4: + BI: + * FIX: fixed invalid links to hosts and services in BI tree view -1.2.2b3 +1.2.2b3: Checks & Agents: * FIX: Fixed date parsing code ignoring the seconds value in several checks (ad_replication, cups_queues, heartbeat_crm, mssql_backup, smbios_sel) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index d2005d3..05fe2f0 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1529,10 +1529,10 @@ def aggr_render_leaf(tree, show_host, bare = False): # (4) CPU load (show_host == False, service != None) if show_host or not service: - host_url = "view.py?" + htmllib.urlencode_vars([("view_name", "hoststatus"), ("site", site), ("host", host)]) + host_url = html.makeuri([("view_name", "hoststatus"), ("site", site), ("host", host)], filename="view.py") if service: - service_url = "view.py?" + htmllib.urlencode_vars([("view_name", "service"), ("site", site), ("host", host), ("service", service)]) + service_url = html.makeuri([("view_name", "service"), ("site", site), ("host", host), ("service", service)], filename="view.py") if show_host: content += '<a href="%s">%s</a><b class=bullet>&diams;</b>' % (host_url, host.replace(" ", " ")) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 91bb250..dee2564 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -358,15 +358,17 @@ class html: self.global_vars += varnames # [('varname1', value1), ('varname2', value2) ] - def makeuri(self, addvars, remove_prefix = None): + def makeuri(self, addvars, remove_prefix = None, filename=None): vars = [ (v, self.var(v)) for v in self.req.vars if v[0] != "_" ] if remove_prefix != None: vars = [ i for i in vars if not i[0].startswith(remove_prefix) ] vars = vars + addvars + if filename == None: + filename = self.req.myfile + ".py" if vars: - return self.req.myfile + ".py?" + urlencode_vars(vars) + return filename + "?" + urlencode_vars(vars) else: - return self.req.myfile + ".py" + return filename def makeactionuri(self, addvars): return self.makeuri(addvars + [("_transid", self.fresh_transid())])

11 years, 7 months

Check_MK Git: check_mk: Availability: removed internal notes

by Mathias Kettner

Module: check_mk Branch: master Commit: a2af29fb9daf40afb247a59b3f85cf3cbd0d841d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2af29fb9daf40… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 17 13:10:19 2013 +0100 Availability: removed internal notes --- web/plugins/views/availability.py | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index dcb2f91..9e9ba3f 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -913,12 +913,3 @@ def compute_tree_state(tree, status): return tree_state -# Idee: -# Bei OK während Downtime OK Vorrang lassen (einstellbar) - -# Probleme: -# Timeline z.B. OK --> Flapping start --> CRIT --> Flapping stop. -# => Bei dem Zeitabschnitt, zu dem das Flapping endet, ist der -# Plugin output vom CRIT-Ereignis verschwunden. Soll man das so -# lassen? -

11 years, 7 months

Check_MK Git: check_mk: Availability: add context button from timeline to history

by Mathias Kettner

Module: check_mk Branch: master Commit: 0968da3c5f14c65f0c221b9c99507a70f755f951 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0968da3c5f14c6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 17 13:09:52 2013 +0100 Availability: add context button from timeline to history --- web/htdocs/htmllib.py | 1 + web/plugins/views/availability.py | 64 ++++++++++++++++++++++-------------- 2 files changed, 40 insertions(+), 25 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index eae3a46..91bb250 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -260,6 +260,7 @@ class html: return '' def unplug(self): + self.flush() self.plugged = False def heading(self, text): diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 088bc4e..dcb2f91 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -30,6 +30,15 @@ from valuespec import * # Function building the availability view def render_availability(view, datasource, filterheaders, display_options, only_sites, limit): + + # We need the availability options now, but cannot display the + # form code for that yet. + html.plug() + avoptions = render_availability_options() + range, range_title = avoptions["range"] + avoptions_html = html.drain() + html.unplug() + timeline = not not html.var("timeline") if timeline: tl_site = html.var("timeline_site") @@ -48,15 +57,16 @@ def render_availability(view, datasource, filterheaders, display_options, html.top_heading(title) if 'B' in display_options: html.begin_context_buttons() - togglebutton("avoptions", False, "painteroptions", _("Configure details of the report")) + togglebutton("avoptions", html.has_user_errors(), "painteroptions", _("Configure details of the report")) html.context_button(_("Status View"), html.makeuri([("mode", "status")]), "status") if timeline: html.context_button(_("Availability"), html.makeuri([("timeline", "")]), "availability") + history_url = history_url_of(tl_site, tl_host, tl_service, range[0], range[1]) + html.context_button(_("History"), history_url, "history") html.end_context_buttons() - avoptions = render_availability_options() + html.write(avoptions_html) if not html.has_user_errors(): - range, range_title = avoptions["range"] rows = get_availability_data(datasource, filterheaders, range, only_sites, limit, timeline) what = "service" in datasource["infos"] and "service" or "host" do_render_availability(rows, what, avoptions, timeline, "") @@ -258,16 +268,13 @@ def render_availability_options(): is_open = False html.begin_form("avoptions") html.hidden_field("avoptions", "set") - html.write('<div class="view_form" id="avoptions" %s>' - % (not is_open and 'style="display: none"' or '') ) - html.write("<table border=0 cellspacing=0 cellpadding=0 class=filterform><tr><td>") - if html.var("avoptions") == "set": for name, height, vs in avoption_entries: try: avoptions[name] = vs.from_html_vars("avo_" + name) except MKUserError, e: html.add_user_error(e.varname, e.message) + is_open = True try: range, range_title = compute_range(avoptions["rangespec"]) @@ -278,6 +285,10 @@ def render_availability_options(): if html.has_user_errors(): html.show_user_errors() + html.write('<div class="view_form" id="avoptions" %s>' + % (not is_open and 'style="display: none"' or '') ) + html.write("<table border=0 cellspacing=0 cellpadding=0 class=filterform><tr><td>") + for name, height, vs in avoption_entries: html.write('<div class="floatfilter %s %s">' % (height, name)) html.write('<div class=legend>%s</div>' % vs.title()) @@ -639,6 +650,26 @@ def melt_short_intervals(entries, duration, dont_merge): merge_timeline(entries) melt_short_intervals(entries, duration, dont_merge) +def history_url_of(site, host, service, from_time, until_time): + history_url_vars = [ + ("site", site), + ("host", host), + ("logtime_from_range", "unix"), # absolute timestamp + ("logtime_until_range", "unix"), # absolute timestamp + ("logtime_from", str(int(from_time))), + ("logtime_until", str(int(until_time)))] + if service: + history_url_vars += [ + ("service", service), + ("view_name", "svcevents"), + ] + else: + history_url_vars += [ + ("view_name", "hostevents"), + ] + + return "view.py?" + htmllib.urlencode_vars(history_url_vars) + def render_availability_table(availability, from_time, until_time, range_title, what, avoptions, render_number): # Some columns might be unneeded due to state treatment options sg = avoptions["state_grouping"] @@ -651,25 +682,8 @@ def render_availability_table(availability, from_time, until_time, range_title, table.row() if what != "bi": - history_url_vars = [ - ("site", site), - ("host", host), - ("logtime_from_range", "unix"), # absolute timestamp - ("logtime_until_range", "unix"), # absolute timestamp - ("logtime_from", str(int(from_time))), - ("logtime_until", str(int(until_time)))] - if what == "service": - history_url_vars += [ - ("service", service), - ("view_name", "svcevents"), - ] - elif what == "host": - history_url_vars += [ - ("view_name", "hostevents"), - ] - table.cell("", css="buttons") - history_url = "view.py?" + htmllib.urlencode_vars(history_url_vars) + history_url = history_url_of(site, host, service, from_time, until_time) html.icon_button(history_url, _("Event History"), "history") timeline_url = html.makeuri([

11 years, 7 months

Check_MK Git: check_mk: Availability: better loliting of empty cells

by Mathias Kettner

Module: check_mk Branch: master Commit: ab5ea64254f18dfa285b3c9fa848c58ce18032c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab5ea64254f18d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 17 12:52:52 2013 +0100 Availability: better loliting of empty cells --- web/htdocs/views.css | 5 +++++ web/plugins/views/availability.py | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index d25ddd7..3a82d5a 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -480,6 +480,11 @@ table.data.availability td.number { width: 60px; } +table.data.availability td.unused { + color: #888; + text-shadow: 1px 1px 0.5px #fff; +} + table.data td.flapping, table.timeline td.flapping { /* background-image: url("images/bg_flapping.png"); background-repeat: repeat; */ diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index a40611d..088bc4e 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -706,7 +706,7 @@ def render_availability_table(availability, from_time, until_time, range_title, continue number = states.get(sid, 0) if not number: - css = "" + css = "unused" table.cell(sname, render_number(number, considered_duration), css="number " + css, help=help) table.end()

11 years, 7 months

Check_MK Git: check_mk: Availability: fix visibility of flapping column

by Mathias Kettner

Module: check_mk Branch: master Commit: 401180908a6896cac356a4b911e3664e641d1045 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=401180908a6896… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 17 12:48:56 2013 +0100 Availability: fix visibility of flapping column --- web/plugins/views/availability.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 5e24b60..a40611d 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -642,7 +642,7 @@ def melt_short_intervals(entries, duration, dont_merge): def render_availability_table(availability, from_time, until_time, range_title, what, avoptions, render_number): # Some columns might be unneeded due to state treatment options sg = avoptions["state_grouping"] - sgs = [ sg["warn"], sg["unknown"], sg["host_down"] ] + state_groups = [ sg["warn"], sg["unknown"], sg["host_down"] ] # Render the stuff availability.sort() @@ -700,7 +700,9 @@ def render_availability_table(availability, from_time, until_time, range_title, continue elif sid == "unmonitored" and not avoptions["consider"]["unmonitored"]: continue - elif sid in [ "warn", "unknown", "host_down" ] and sid not in sgs: + elif sid == "flapping" and not avoptions["consider"]["flapping"]: + continue + elif sid in [ "warn", "unknown", "host_down" ] and sid not in state_groups: continue number = states.get(sid, 0) if not number:

11 years, 7 months

Check_MK Git: check_mk: Availability: better downtime handling, configurable merging

by Mathias Kettner

Module: check_mk Branch: master Commit: 7b855f33678b0aca67044b5f82630248e0bbd325 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b855f33678b0a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 17 12:45:21 2013 +0100 Availability: better downtime handling, configurable merging --- web/htdocs/views.css | 3 +- web/plugins/views/availability.py | 57 +++++++++++++++++++++++++++++------- 2 files changed, 47 insertions(+), 13 deletions(-) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index fbf3544..d25ddd7 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -71,7 +71,6 @@ div.floatfilter { div.floatfilter.double { height: 110px; display: table-cell; - vertical-align: center; } div.floatfilter input[type=text] { @@ -94,10 +93,10 @@ div.floatfilter .content { height: 30px; margin-top: 0px; margin-left: 0px; - vertical-align: middle; display: table-cell; padding-left: 4px; text-align: left; + padding-top: 5px; } div.floatfilter.double .content { height: 82px; diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index d91e8ef..5e24b60 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -102,6 +102,30 @@ avoption_entries = [ ) ), + # How to deal with downtimes + ( "downtimes", + "double", + Dictionary( + title = _("Scheduled Downtimes"), + columns = 2, + elements = [ + ( "include", + DropdownChoice( + choices = [ + ( "honor", _("Honor scheduled downtimes") ), + ( "ignore", _("Ignore scheduled downtimes") ), + ( "exclude", _("Exclude scheduled downtimes" ) ), + ] + ) + ), + ( "exclude_ok", + Checkbox(label = _("Treat phases of UP/OK as non-downtime")) + ), + ], + optional_keys = False, + ) + ), + # How to deal with downtimes, etc. ( "consider", "double", @@ -112,9 +136,6 @@ avoption_entries = [ ( "flapping", Checkbox(label = _("Consider periods of flapping states")), ), - ( "downtime", - Checkbox(label = _("Consider scheduled downtimes")), - ), ( "host_down", Checkbox(label = _("Consider times where the host is down")), ), @@ -203,6 +224,14 @@ avoption_entries = [ label = _("Ignore intervals shorter or equal"), ), ), + + # Merging + ( "dont_merge", + "single", + Checkbox( + title = _("Phase Merging"), + label = _("Do not merge consecutive phases with equal state")), + ), ] @@ -440,8 +469,13 @@ def do_render_availability(rows, what, avoptions, timeline, timewarpcode): continue elif span["in_notification_period"] == 0 and avoptions["consider"]["notification_period"]: s = "outof_notification_period" - elif (span["in_downtime"] or span["in_host_downtime"]) and avoptions["consider"]["downtime"]: - s = "in_downtime" + elif (span["in_downtime"] or span["in_host_downtime"]) and not \ + (avoptions["downtimes"]["exclude_ok"] and state == 0) and not \ + avoptions["downtimes"]["include"] == "ignore": + if avoptions["downtimes"]["include"] == "exclude": + continue + else: + s = "in_downtime" elif span["host_down"] and avoptions["consider"]["host_down"]: s = "host_down" elif span["is_flapping"] and avoptions["consider"]["flapping"]: @@ -462,11 +496,12 @@ def do_render_availability(rows, what, avoptions, timeline, timewarpcode): timeline_rows.append((span, s)) # Now merge consecutive rows with identical state - merge_timeline(timeline_rows) + if not avoptions["dont_merge"]: + merge_timeline(timeline_rows) # Melt down short intervals if avoptions["short_intervals"]: - melt_short_intervals(timeline_rows, avoptions["short_intervals"]) + melt_short_intervals(timeline_rows, avoptions["short_intervals"], avoptions["dont_merge"]) # Condense into availability states = {} @@ -589,7 +624,7 @@ def merge_timeline(entries): else: n += 1 -def melt_short_intervals(entries, duration): +def melt_short_intervals(entries, duration, dont_merge): n = 1 need_merge = False while n < len(entries) - 1: @@ -600,9 +635,9 @@ def melt_short_intervals(entries, duration): n += 1 # Due to melting, we need to merge again - if need_merge: + if need_merge and not dont_merge: merge_timeline(entries) - melt_short_intervals(entries, duration) + melt_short_intervals(entries, duration, dont_merge) def render_availability_table(availability, from_time, until_time, range_title, what, avoptions, render_number): # Some columns might be unneeded due to state treatment options @@ -661,7 +696,7 @@ def render_availability_table(availability, from_time, until_time, range_title, for sid, css, sname, help in availability_columns: if sid == "outof_notification_period" and not avoptions["consider"]["notification_period"]: continue - elif sid == "in_downtime" and not avoptions["consider"]["downtime"]: + elif sid == "in_downtime" and avoptions["downtimes"]["include"] == "ignore": continue elif sid == "unmonitored" and not avoptions["consider"]["unmonitored"]: continue

11 years, 7 months

Check_MK Git: check_mk: Updated ChangeLog

by Mathias Kettner

Module: check_mk Branch: master Commit: aa3328d6baa6112df4b7a546007f102687633a6c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa3328d6baa611… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 17 12:45:01 2013 +0100 Updated ChangeLog --- ChangeLog | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30e30e5..50ff3a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ * Agents can send data for other hosts "piggyback". This is being used by the vSphere and SAP plugins + Multisite: + * New availability view for arbitrary host/service collections + Event Console: * New rule feature: automatically delete event after actions @@ -12,8 +15,12 @@ via vSphere interface * new special agent agent_random for creating random monitoring data + BI: + * Integrated availability computing, including nifty time warp feature + WATO: * Configuration of datasource programs via dedicated rules + * New editor for Business Intelligence rules 1.2.2b3

11 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2013