Checkmk git commits September 2015

checkmk-commits@lists.checkmk.com

8 participants
275 discussions

Check_MK Git: check_mk: This is when using Nagios/Icinga as core.

by Mathias Kettner

Module: check_mk Branch: master Commit: b0401ef5fdb08fc657a39a4d35a1b6d3367f2f12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0401ef5fdb08f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 3 14:09:46 2015 +0200 This is when using Nagios/Icinga as core. Conflicts: ChangeLog web/plugins/views/commands.py --- .werks/2580 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/commands.py | 7 ++++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/2580 b/.werks/2580 new file mode 100644 index 0000000..b747823 --- /dev/null +++ b/.werks/2580 @@ -0,0 +1,10 @@ +Title: Remove bogus ;0 in comment of problem acknowledgements +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1441281880 + +This is when using Nagios/Icinga as core. diff --git a/ChangeLog b/ChangeLog index 73ab280..700435c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -202,6 +202,7 @@ * 2426 FIX: pnptemplate: fixed template for netapp_api_volumes * 2578 FIX: Fix exception in case a user has a non-existant role... * 2556 FIX: Availability: Fixed exception when trying to group BI aggregations by host/service-groups + * 2580 FIX: Remove bogus ;0 in comment of problem acknowledgements... WATO: * 2365 Removed old deprecated notification global options for plain emails... diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 42b7cdd..88321ea 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -290,13 +290,14 @@ def command_acknowledgement(cmdtag, spec, row): expire_secs = Age().from_html_vars("_ack_expire") if expire_secs: expire = int(time.time()) + expire_secs + expire_text = ";%d" % expire else: - expire = 0 + expire_text = "" def make_command(spec, cmdtag): return "ACKNOWLEDGE_" + cmdtag + "_PROBLEM;%s;%d;%d;%d;%s" % \ (spec, sticky, sendnot, perscomm, config.user_id) + (";%s" % lqencode(comment)) \ - + (";%d" % expire) + + expire_text if "aggr_tree" in row: # BI mode commands = [(site, make_command(spec, cmdtag)) for (site, spec, cmdtag) in specs ] @@ -304,7 +305,7 @@ def command_acknowledgement(cmdtag, spec, row): commands = [ make_command(spec, cmdtag) ] title = _("<b>acknowledge the problems%s</b> of") % \ - (expire and (_(" for a period of %s") % Age().value_to_text(expire_secs)) or "") + (expire_text and (_(" for a period of %s") % Age().value_to_text(expire_secs)) or "") return commands, title elif html.var("_remove_ack"):

9 years

Check_MK Git: check_mk: Conflicts:

by Lars Michelsen

Module: check_mk Branch: master Commit: 64581ab50227e2f4889cb8d53cc3d92c9bd743cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64581ab50227e2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 3 14:01:15 2015 +0200 Conflicts: ChangeLog checks/cmciii_lcp_waterin checks/cmciii_lcp_waterout --- .werks/2557 | 10 ++++++++++ ChangeLog | 1 + checks/cmciii.include | 36 ++++++++++++++++++++++++++++++++++++ checks/cmciii_lcp_airin | 11 +++-------- checks/cmciii_lcp_airout | 11 +++-------- 5 files changed, 53 insertions(+), 16 deletions(-) diff --git a/.werks/2557 b/.werks/2557 new file mode 100644 index 0000000..414b4af --- /dev/null +++ b/.werks/2557 @@ -0,0 +1,10 @@ +Title: cmciii_lcp_airin cmciii_lcp_airout cmciii_lcp_waterin cmciii_lcp_waterout: Fixed exception parsing data from some devices +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1441281589 + + diff --git a/ChangeLog b/ChangeLog index 509e1de..73ab280 100644 --- a/ChangeLog +++ b/ChangeLog @@ -161,6 +161,7 @@ * 2577 FIX: printer_input, printer_output: Fix exception on Brother NC-340h * 2554 FIX: oracle_recovery_status: Fixed exception when files have no checkpoints * 2568 FIX: apache_status: fixed computation of bytes and requests per second... + * 2557 FIX: cmciii_lcp_airin cmciii_lcp_airout cmciii_lcp_waterin cmciii_lcp_waterout: Fixed exception parsing data from some devices Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/cmciii.include b/checks/cmciii.include new file mode 100644 index 0000000..d99d233 --- /dev/null +++ b/checks/cmciii.include @@ -0,0 +1,36 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +def cmciii_extract_temps(liste): + miste = [] + for l in liste: + try: + miste.append(float(l.split(" ")[0])) + except ValueError: + # Dirty hack fix for a dirty check. Ignore all values that can not be + # converted to floats + pass + return miste diff --git a/checks/cmciii_lcp_airin b/checks/cmciii_lcp_airin index 040c980..6e069ea 100644 --- a/checks/cmciii_lcp_airin +++ b/checks/cmciii_lcp_airin @@ -28,15 +28,9 @@ def inventory_cmciii_lcp_airin(info): if info: return [( None, None )] -def extract_temps(liste): - miste = [] - for l in liste: - miste.append(float(l.split(" ")[0])) - return miste - def check_cmciii_lcp_airin(item, params, info): unit_desc, unit_status, desc, status = info[0][0:4] - temps = extract_temps(info[0][4:]) + temps = cmciii_extract_temps(info[0][4:]) state = 0 sym = "" @@ -73,7 +67,8 @@ check_info['cmciii_lcp_airin'] = { oid(".1.3.6.1.4.1.2606.7.4.2.2.1.3.2.6").startswith("Air.Temperature.DescName"), "snmp_info" : ( '.1.3.6.1.4.1.2606.7.4.2.2.1.10', [ '2.6', '2.13', '2.15', '2.23', '2.21', '2.20', '2.19', '2.18', '2.17', '2.7', '2.8', '2.9' ] - ), + ), + "includes" : [ 'cmciii.include' ], } # # .1.3.6.1.4.1.2606.7.4.2.2.1.3.2.6 Air.Temperature.DescName diff --git a/checks/cmciii_lcp_airout b/checks/cmciii_lcp_airout index c6ba80a..8e20521 100644 --- a/checks/cmciii_lcp_airout +++ b/checks/cmciii_lcp_airout @@ -28,15 +28,9 @@ def inventory_cmciii_lcp_airout(info): if info: return [( None, None )] -def extract_temps(liste): - miste = [] - for l in liste: - miste.append(float(l.split(" ")[0])) - return miste - def check_cmciii_lcp_airout(item, params, info): unit_desc, unit_status, desc, status = info[0][0:4] - temps = extract_temps(info[0][4:]) + temps = cmciii_extract_temps(info[0][4:]) state = 0 sym = "" @@ -73,5 +67,6 @@ check_info['cmciii_lcp_airout'] = { oid(".1.3.6.1.4.1.2606.7.4.2.2.1.3.2.6").startswith("Air.Temperature.DescName"), "snmp_info" : ( '.1.3.6.1.4.1.2606.7.4.2.2.1.10', [ '2.6', '2.13', '2.25', '2.32', '2.30', '2.29', '2.28', '2.27', '2.26', '2.10', '2.11', '2.12' ] - ), + ), + "includes" : [ 'cmciii.include' ], }

9 years

Check_MK Git: check_mk: cmciii_lcp_airin/cmciii_lcp_airout:

by Lars Michelsen

Fixed unicode exception Message-ID: <55e83406.uUOKC/hx0qBygPvd%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Module: check_mk Branch: master Commit: 0350553e00d50774c92508c34cde246854f4c608 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0350553e00d507… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 3 13:50:21 2015 +0200 cmciii_lcp_airin/cmciii_lcp_airout: Fixed unicode exception --- checks/cmciii_lcp_airin | 2 +- checks/cmciii_lcp_airout | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/cmciii_lcp_airin b/checks/cmciii_lcp_airin index 30c1651..040c980 100644 --- a/checks/cmciii_lcp_airin +++ b/checks/cmciii_lcp_airin @@ -55,7 +55,7 @@ def check_cmciii_lcp_airin(item, params, info): else: state = max(state, 0) - info_text = "%s %s %s %s, Temp.Average: %.1f°C%s, Top/Mid/Bottom: %.1f/%.1f/%.1f" % \ + info_text = u"%s %s %s %s, Temp.Average: %.1f°C%s, Top/Mid/Bottom: %.1f/%.1f/%.1f" % \ (unit_desc, unit_status, desc, status, temps[4], sym, temps[5], temps[6], temps[7]) levels_text = ", lowcrit/lowwarn/highwarn/highcrit: %.1f/%.1f/%.1f/%.1f" % ( temps[0], temps[1], temps[2], temps[3] ) diff --git a/checks/cmciii_lcp_airout b/checks/cmciii_lcp_airout index f8f409d..c6ba80a 100644 --- a/checks/cmciii_lcp_airout +++ b/checks/cmciii_lcp_airout @@ -55,7 +55,7 @@ def check_cmciii_lcp_airout(item, params, info): else: state = max(state, 0) - info_text = "%s %s %s %s, Temp.Average: %.1f°C%s, Top/Mid/Bottom: %.1f/%.1f/%.1f" % \ + info_text = u"%s %s %s %s, Temp.Average: %.1f°C%s, Top/Mid/Bottom: %.1f/%.1f/%.1f" % \ (unit_desc, unit_status, desc, status, temps[4], sym, temps[5], temps[6], temps[7]) levels_text = ", lowcrit/lowwarn/highwarn/highcrit: %.1f/%.1f/%.1f/%.1f" % ( temps[0], temps[1], temps[2], temps[3] )

9 years

Check_MK Git: check_mk: #2568 FIX apache_status: fixed computation of bytes and requests per second

by Sebastian Herbord

Module: check_mk Branch: master Commit: d44140a219112bcf88adc79c84ed99239866f08b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d44140a219112b… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Sep 3 13:37:37 2015 +0200 #2568 FIX apache_status: fixed computation of bytes and requests per second Bytes/second and Requests/second were previously averages since the start of the server and did therefore not hold useful information about the current server load. Now these values are "live" rates, calculated based on changes in Total Accesses and Total kBytes. --- .werks/2568 | 12 ++++++++++++ ChangeLog | 1 + checks/apache_status | 14 +++++++++++++- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/.werks/2568 b/.werks/2568 new file mode 100644 index 0000000..de65a2a --- /dev/null +++ b/.werks/2568 @@ -0,0 +1,12 @@ +Title: apache_status: fixed computation of bytes and requests per second +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1441279892 + +Bytes/second and Requests/second were previously averages since the start of the server and did +therefore not hold useful information about the current server load. +Now these values are "live" rates, calculated based on changes in Total Accesses and Total kBytes. diff --git a/ChangeLog b/ChangeLog index 7535d8f..509e1de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -160,6 +160,7 @@ * 2567 FIX: jolokia_metrics: fixed crash if agent output is missing memory metrics * 2577 FIX: printer_input, printer_output: Fix exception on Brother NC-340h * 2554 FIX: oracle_recovery_status: Fixed exception when files have no checkpoints + * 2568 FIX: apache_status: fixed computation of bytes and requests per second... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/apache_status b/checks/apache_status index 344a5d9..14c2109 100644 --- a/checks/apache_status +++ b/checks/apache_status @@ -74,7 +74,7 @@ def apache_status_parse(info): data = {} for line in info: address, port = line[:2] - if len(line) != 4: + if len(line) != 4 and not (len(line) == 5 and line[2] == 'Total'): continue # Skip unexpected lines label = (' '.join(line[2:-1])).rstrip(':') value = _apache_status_fields[label][1](line[-1]) @@ -115,6 +115,18 @@ def check_apache_status(item, params, info): if item not in all_data: return (3, 'Unable to find instance in agent output') data_dict = all_data[item] + + this_time = int(time.time()) + + if "Total Accesses" in data_dict: + data_dict["ReqPerSec"] = get_rate("apache_status_%s_accesses" % item, this_time, + data_dict["Total Accesses"]) + del(data_dict["Total Accesses"]) + if "Total kBytes" in data_dict: + data_dict["BytesPerSec"] = get_rate("apache_status_%s_bytes" % item, this_time, + data_dict["Total kBytes"] * 1024) + del(data_dict["Total kBytes"]) + data = data_dict.items() worst_state = 0

9 years

Check_MK Git: check_mk: Added code todo

by Lars Michelsen

Module: check_mk Branch: master Commit: b60e5ad84d0792ee26cdee1c1da077b44972b20b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b60e5ad84d0792… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 3 13:30:20 2015 +0200 Added code todo --- web/htdocs/sidebar.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index a094e22..4f47587 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -226,6 +226,7 @@ def page_side(): 'onunload="storeScrollPos()">\n' % interval) html.write('<div id="check_mk_sidebar">\n') + # FIXME: Move this to the code where views are needed (snapins?) views.load_views() sidebar_head() user_config = load_user_config()

9 years

Check_MK Git: check_mk: #2556 FIX Availability: Fixed exception when trying to group BI aggregations by host/ service-groups

by Lars Michelsen

Module: check_mk Branch: master Commit: b144c2ff4ff7f8cb64f657f585031db56b4567e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b144c2ff4ff7f8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 3 13:25:23 2015 +0200 #2556 FIX Availability: Fixed exception when trying to group BI aggregations by host/service-groups --- .werks/2556 | 9 +++++++++ ChangeLog | 1 + web/htdocs/availability.py | 24 ++++++++++++++++-------- web/plugins/views/availability.py | 25 +++++++++++++------------ 4 files changed, 39 insertions(+), 20 deletions(-) diff --git a/.werks/2556 b/.werks/2556 new file mode 100644 index 0000000..6980aec --- /dev/null +++ b/.werks/2556 @@ -0,0 +1,9 @@ +Title: Availability: Fixed exception when trying to group BI aggregations by host/service-groups +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i3 +Date: 1441279512 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 988783f..7535d8f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -199,6 +199,7 @@ * 2551 FIX: Fixed locking issues when editing dashboards... * 2426 FIX: pnptemplate: fixed template for netapp_api_volumes * 2578 FIX: Fix exception in case a user has a non-existant role... + * 2556 FIX: Availability: Fixed exception when trying to group BI aggregations by host/service-groups WATO: * 2365 Removed old deprecated notification global options for plain emails... diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index 28f8e01..65dc147 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -111,8 +111,21 @@ statistics_headers = { # 2. show in single or double height box # 3. use this in reporting # 4. the valuespec +def get_avoption_entries(what): + if what == "bi": + grouping_choices = [ + ( None, _("Do not group") ), + ( "host", _("By Aggregation Group") ), + ] + else: + grouping_choices = [ + ( None, _("Do not group") ), + ( "host", _("By Host") ), + ( "host_groups", _("By Host group") ), + ( "service_groups", _("By Service group") ), + ] -avoption_entries = [ + return [ # Time range selection ( "rangespec", "double", @@ -357,12 +370,7 @@ avoption_entries = [ True, DropdownChoice( title = _("Grouping"), - choices = [ - ( None, _("Do not group") ), - ( "host", _("By Host") ), - ( "host_groups", _("By Host group") ), - ( "service_groups", _("By Service group") ), - ], + choices = grouping_choices, default_value = None, ) ), @@ -617,7 +625,7 @@ def compute_availability(what, av_rawdata, avoptions): considered_duration = 0 for span in service_entry: # Information about host/service groups are in the actual entries - if grouping and grouping != "host": + if grouping and grouping != "host" and what != "bi": group_ids.update(span[grouping]) # List of host/service groups display_name = span.get("service_display_name", service) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 76c54dd..58b291f 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -46,15 +46,15 @@ from valuespec import * # '----------------------------------------------------------------------' # Get availability options without rendering the valuespecs -def get_availability_options_from_url(): +def get_availability_options_from_url(what): html.plug() - avoptions = render_availability_options() + avoptions = render_availability_options(what) html.drain() html.unplug() return avoptions -def render_availability_options(): +def render_availability_options(what): if html.var("_reset") and html.check_transaction(): config.save_user_file("avoptions", {}) for varname in html.vars.keys(): @@ -71,8 +71,9 @@ def render_availability_options(): is_open = False html.begin_form("avoptions") html.hidden_field("avoptions", "set") + avoption_entries = availability.get_avoption_entries(what) if html.var("avoptions") == "set": - for name, height, show_in_reporting, vs in availability.avoption_entries: + for name, height, show_in_reporting, vs in avoption_entries: try: avoptions[name] = vs.from_html_vars("avo_" + name) except MKUserError, e: @@ -80,7 +81,7 @@ def render_availability_options(): is_open = True range_vs = None - for name, height, show_in_reporting, vs in availability.avoption_entries: + for name, height, show_in_reporting, vs in avoption_entries: if name == 'rangespec': range_vs = vs @@ -97,7 +98,7 @@ def render_availability_options(): % (not is_open and 'style="display: none"' or '') ) html.write("<table border=0 cellspacing=0 cellpadding=0 class=filterform><tr><td>") - for name, height, show_in_reporting, vs in availability.avoption_entries: + for name, height, show_in_reporting, vs in avoption_entries: html.write('<div class="floatfilter %s %s">' % (height, name)) html.write('<div class=legend>%s</div>' % vs.title()) html.write('<div class=content>') @@ -157,9 +158,6 @@ def render_availability_page(view, datasource, filterheaders, display_options, o if handle_edit_annotations(): return - avoptions = get_availability_options_from_url() - time_range, range_title = avoptions["range"] - # We make reports about hosts, services or BI aggregates if "service" in datasource["infos"]: what = "service" @@ -168,6 +166,9 @@ def render_availability_page(view, datasource, filterheaders, display_options, o else: what = "host" + avoptions = get_availability_options_from_url(what) + time_range, range_title = avoptions["range"] + # We have two display modes: # - Show availability table (stats) "table" # - Show timeline "timeline" @@ -244,7 +245,7 @@ def render_availability_page(view, datasource, filterheaders, display_options, o # Render the avoptions again to get the HTML code, because the HTML vars have changed # above (anno_ and editanno_ has been removed, which must not be part of the form - avoptions = render_availability_options() + avoptions = render_availability_options(what) if not html.has_user_errors(): do_render_availability(what, av_rawdata, av_data, av_mode, av_object, avoptions) @@ -469,7 +470,7 @@ def render_timeline_bar(timeline_layout, style): def render_bi_availability(title, aggr_rows): av_mode = html.var("av_mode", "availability") - avoptions = get_availability_options_from_url() + avoptions = get_availability_options_from_url("bi") time_range, range_title = avoptions["range"] if av_mode == "timeline": @@ -498,7 +499,7 @@ def render_bi_availability(title, aggr_rows): html.context_button(_("Timeline"), timeline_url, "timeline") html.end_context_buttons() - avoptions = render_availability_options() + avoptions = render_availability_options("bi") if not html.has_user_errors():

9 years

Check_MK Git: check_mk: Conflicts:

by Lars Michelsen

Module: check_mk Branch: master Commit: 4c158fe1b7f7389999640df8b52cacf4173651a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c158fe1b7f738… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 3 12:02:28 2015 +0200 Conflicts: ChangeLog checks/oracle_recovery_status --- .werks/2554 | 10 ++++++++++ ChangeLog | 1 + checks/oracle_recovery_status | 8 +++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/2554 b/.werks/2554 new file mode 100644 index 0000000..a28ed12 --- /dev/null +++ b/.werks/2554 @@ -0,0 +1,10 @@ +Title: oracle_recovery_status: Fixed exception when files have no checkpoints +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1441274480 + + diff --git a/ChangeLog b/ChangeLog index 5a5a327..988783f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -159,6 +159,7 @@ * 2576 FIX: symantec_av_updates: fix crash due to missing datetime module, also handle DD.MM.YYYY date format * 2567 FIX: jolokia_metrics: fixed crash if agent output is missing memory metrics * 2577 FIX: printer_input, printer_output: Fix exception on Brother NC-340h + * 2554 FIX: oracle_recovery_status: Fixed exception when files have no checkpoints Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/oracle_recovery_status b/checks/oracle_recovery_status index 0c6b100..3f100ff 100644 --- a/checks/oracle_recovery_status +++ b/checks/oracle_recovery_status @@ -34,6 +34,12 @@ # TUX2|tux2|PRIMARY|READ WRITE|1|1419771465|317|ONLINE|NO|YES|8149107|NOT ACTIVE|489 # TUX2|tux2|PRIMARY|READ WRITE|2|1419771465|317|ONLINE|NO|YES|8149107|NOT ACTIVE|489 +# Databases seem to also report lines with some data missing: +# PV|PV|PRIMARY|READ WRITE|397|1433251398|7297|ONLINE|NO|YES|10740614283 +# PV|PV|PRIMARY|READ WRITE|398|1433251398|7297|ONLINE|NO|YES|10740614283 +# PV|PV|PRIMARY|READ WRITE|399|||ONLINE|||0 +# PV|PV|PRIMARY|READ WRITE|400|||ONLINE|||0 +# PV|PV|PRIMARY|READ WRITE|401|||ONLINE|||0 def inventory_oracle_recovery_status(info): return [ ( line[0], {} ) for line in info ] @@ -76,7 +82,7 @@ def check_oracle_recovery_status(item, params, info): if datafilestatus == 'ONLINE': if backup_state == 'FILE MISSING': filemissingcount += 1 - else: + elif checkpoint_age: checkpoint_age = int(checkpoint_age) if oldest_checkpoint_age is None:

9 years

Check_MK Git: check_mk: in case of printer-ricoh-c7417 there is no 'RICOH' in sysDescr

by Simon Betz

Module: check_mk Branch: master Commit: 73e2bf1ade5c3dc3cd698a4c7e78b8bc1de2a25f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73e2bf1ade5c3d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 3 11:57:02 2015 +0200 in case of printer-ricoh-c7417 there is no 'RICOH' in sysDescr --- checks/printer_supply | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checks/printer_supply b/checks/printer_supply index 2831917..6c4ed20 100644 --- a/checks/printer_supply +++ b/checks/printer_supply @@ -178,7 +178,8 @@ check_info["printer_supply"] = { ), 'snmp_scan_function': \ lambda oid: oid(".1.3.6.1.2.1.43.11.1.1.6.1.1") != None \ - and "RICOH" not in oid(".1.3.6.1.2.1.1.1.0"), + # exclude ricoh printer + and oid(".1.3.6.1.2.1.1.2.0") != ".1.3.6.1.4.1.367.1.1", 'group': 'printer_supply', 'default_levels_variable' : "printer_supply_default_levels", }

9 years

Check_MK Git: check_mk: #2578 FIX Fix exception in case a user has a non-existant role

by Mathias Kettner

Module: check_mk Branch: master Commit: 634d2521edd944a98a89adbf7f6672ec7fcfde93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=634d2521edd944… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 3 11:56:50 2015 +0200 #2578 FIX Fix exception in case a user has a non-existant role Such a situation might be caused by manual configurations or other non-standard operation. --- .werks/2578 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/config.py | 14 +++++++++++--- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.werks/2578 b/.werks/2578 new file mode 100644 index 0000000..f78497a --- /dev/null +++ b/.werks/2578 @@ -0,0 +1,11 @@ +Title: Fix exception in case a user has a non-existant role +Level: 2 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1441274165 + +Such a situation might be caused by manual configurations or other non-standard +operation. diff --git a/ChangeLog b/ChangeLog index 8c4ffcf..5a5a327 100644 --- a/ChangeLog +++ b/ChangeLog @@ -197,6 +197,7 @@ * 1289 FIX: Fixed missing table headers in hostgroup view * 2551 FIX: Fixed locking issues when editing dashboards... * 2426 FIX: pnptemplate: fixed template for netapp_api_volumes + * 2578 FIX: Fix exception in case a user has a non-existant role... WATO: * 2365 Removed old deprecated notification global options for plain emails... diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 88b103b..ad0e2d0 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -299,7 +299,7 @@ def roles_of_user(user): roles[br] = {} if user in multisite_users: - return multisite_users[user]["roles"] + return existing_role_ids(multisite_users[user]["roles"]) elif user in admin_users: return [ "admin" ] elif user in guest_users: @@ -309,12 +309,20 @@ def roles_of_user(user): elif os.path.exists(config_dir + "/" + user + "/automation.secret"): return [ "guest" ] # unknown user with automation account elif 'roles' in default_user_profile: - return default_user_profile['roles'] + return existing_role_ids(default_user_profile['roles']) elif default_user_role: - return [ default_user_role ] + return existing_role_ids([ default_user_role ]) else: return [] + +def existing_role_ids(role_ids): + return [ + role_id for role_id in role_ids + if role_id in roles + ] + + def alias_of_user(user): if user in multisite_users: return multisite_users[user].get("alias", user)

9 years

Check_MK Git: check_mk: #2567 FIX jolokia_metrics: fixed crash if agent output is missing memory metrics

by Sebastian Herbord

Module: check_mk Branch: master Commit: f6d8275447ecc5b15d81d6bd29a30b0b9144f9ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6d8275447ecc5… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Sep 3 11:34:09 2015 +0200 #2567 FIX jolokia_metrics: fixed crash if agent output is missing memory metrics --- .werks/2567 | 10 ++++++++++ ChangeLog | 1 + checks/jolokia_metrics | 9 +++++++++ 3 files changed, 20 insertions(+) diff --git a/.werks/2567 b/.werks/2567 new file mode 100644 index 0000000..39d3a09 --- /dev/null +++ b/.werks/2567 @@ -0,0 +1,10 @@ +Title: jolokia_metrics: fixed crash if agent output is missing memory metrics +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1441272789 + + diff --git a/ChangeLog b/ChangeLog index a818cc6..8c4ffcf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -157,6 +157,7 @@ * 2566 FIX: ups_modulys_battery.temp: fixed missing manpage * 2585 FIX: include file for elecritcal phases handles warn/crit levels correct * 2576 FIX: symantec_av_updates: fix crash due to missing datetime module, also handle DD.MM.YYYY date format + * 2567 FIX: jolokia_metrics: fixed crash if agent output is missing memory metrics * 2577 FIX: printer_input, printer_output: Fix exception on Brother NC-340h Multisite: diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 2f06d7f..f0c22a9 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -142,6 +142,10 @@ def inventory_jolokia_metrics(info, what): for instance, data in parsed.items(): if what == 'uptime' and "Uptime" not in data: continue + if what == 'mem' and ("HeapMemoryUsage" not in data or "NonHeapMemoryUsage" not in data + or "HeapMemoryMax" not in data or "NonHeapMemoryMax" not in data): + # don't add memory check if we don't have the necessary data + continue yield instance, levels @@ -259,6 +263,11 @@ def check_jolokia_metrics_mem(item, params, info): d = parsed[item] mb = 1024 * 1024.0 + + if "HeapMemoryUsage" not in d or "NonHeapMemoryUsage" not in d\ + or "HeapMemoryMax" not in d or "NonHeapMemoryMax" not in d: + return 3, "data in agent output incomplete" + heap = saveint(d["HeapMemoryUsage"]) / mb heapmax = saveint(d.get("HeapMemoryMax",-1)) / mb nonheap = saveint(d["NonHeapMemoryUsage"]) / mb

9 years

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2015