Checkmk git commits March 2016

checkmk-commits@lists.checkmk.com

7 participants
275 discussions

Do not let perfometers overlap the reload pause overlay

by Lars Michelsen

Module: check_mk Branch: master Commit: 9ed0a54fc7e465d83a6812628458a8dc03779bc6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ed0a54fc7e465… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 2 16:48:01 2016 +0100 Do not let perfometers overlap the reload pause overlay --- web/htdocs/pages.css | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index e56dd60..8eab2ed 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -207,6 +207,7 @@ div#foot_refresh, div#foot_refresh_time { border-radius: 5px; padding: 10px; text-decoration: none; + z-index: 40; } .pause_bar {

8 years, 6 months

Zooming/panning graphs pauses page updates now

by Lars Michelsen

Module: check_mk Branch: master Commit: addabd6ec991f92875d9b11464d68a2d3af67a36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=addabd6ec991f9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 2 16:41:45 2016 +0100 Zooming/panning graphs pauses page updates now --- web/htdocs/js/checkmk.js | 101 +++++++++++++++++++++++++++++++++++++++++--- web/htdocs/js/dashboard.js | 4 +- web/htdocs/pages.css | 49 ++++++++++++++++++++- 3 files changed, 145 insertions(+), 9 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 496659c..ae2ac9f 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -936,8 +936,11 @@ function performAction(oLink, action, site, host, service, wait_svc) { //# | | //# '--------------------------------------------------------------------' -// Stores the reload timer object +// Stores the reload timer object (of views and also dashboards) var g_reload_timer = null; +// Stores the reload pause timer object once the regular reload has +// been paused e.g. by modifying a graphs timerange or vertical axis. +var g_reload_pause_timer = null; // This stores the refresh time of the page (But never 0) var g_reload_interval = 0; // seconds // This flag tells the handle_content_reload_error() function to add an @@ -994,8 +997,7 @@ function update_header_timer() // When called with two parmeters the 2nd one is used as new url. function set_reload(secs, url) { - if (g_reload_timer) - clearTimeout(g_reload_timer); + stop_reload_timer(); update_foot_refresh(secs); @@ -1005,6 +1007,7 @@ function set_reload(secs, url) } } + // Issues the timer for the next page reload. If some timer is already // running, this timer is terminated and replaced by the new one. function schedule_reload(url, milisecs) @@ -1015,14 +1018,14 @@ function schedule_reload(url, milisecs) if (typeof milisecs === 'undefined') milisecs = parseFloat(g_reload_interval) * 1000; // use default reload interval - if (g_reload_timer) - clearTimeout(g_reload_timer); + stop_reload_timer(); g_reload_timer = setTimeout(function() { do_reload(url); }, milisecs); } + function handle_content_reload(_unused, code) { g_reload_error = false; var o = document.getElementById('data_container'); @@ -1035,6 +1038,7 @@ function handle_content_reload(_unused, code) { schedule_reload(); } + function handle_content_reload_error(_unused, status_code, error_msg) { if(!g_reload_error) { @@ -1048,6 +1052,16 @@ function handle_content_reload_error(_unused, status_code, error_msg) schedule_reload(); } + +function stop_reload_timer() +{ + if (g_reload_timer) { + clearTimeout(g_reload_timer); + g_reload_timer = null; + } +} + + function do_reload(url) { // Nicht mehr die ganze Seite neu laden, wenn es ein DIV "data_container" gibt. @@ -1098,11 +1112,86 @@ function do_reload(url) call_ajax(makeuri(params), { response_handler : handle_content_reload, error_handler : handle_content_reload_error, - method : 'POST' + method : 'GET' }); } } + +// Sets the reload timer in pause mode for X seconds. This is shown to +// the user with a pause overlay icon. The icon also shows the time when +// the pause ends. Once the user clicks on the pause icon or the time +// is reached, the whole page is reloaded. +function pause_reload(seconds) +{ + stop_reload_timer(); + draw_reload_pause_overlay(seconds); + set_reload_pause_timer(seconds); +} + + +function set_reload_pause_timer(seconds) +{ + if (g_reload_pause_timer) + clearTimeout(g_reload_pause_timer); + + g_reload_pause_timer = setTimeout(function () { + update_reload_pause_timer(seconds); + }, 1000); +} + + +function update_reload_pause_timer(seconds_left) +{ + seconds_left -= 1; + + if (seconds_left <= 0) { + window.location.reload(false); + } + else { + // update the pause counter + var counter = document.getElementById("reload_pause_counter"); + if (counter) { + counter.innerHTML = seconds_left; + } + + g_reload_pause_timer = setTimeout(function() { + update_reload_pause_timer(seconds_left); + }, 1000); + } +} + +function draw_reload_pause_overlay(seconds) +{ + var container = document.getElementById("reload_pause"); + if (container) { + // only render once. Just update the counter. + var counter = document.getElementById("reload_pause_counter"); + counter.innerHTML = seconds; + return; + } + + var container = document.createElement("a"); + container.setAttribute("id", "reload_pause"); + container.href = "javascript:window.location.reload(false)"; + // FIXME: Localize + container.title = "Page update paused. Click for reload."; + + var p1 = document.createElement("div"); + p1.className = "pause_bar p1"; + container.appendChild(p1); + + var p2 = document.createElement("div"); + p2.className = "pause_bar p2"; + container.appendChild(p2); + + var counter = document.createElement("div"); + counter.setAttribute("id", "reload_pause_counter"); + container.appendChild(counter); + + document.body.appendChild(container); +} + //#. //# .-Foldable Container-------------------------------------------------. //# | _____ _ _ _ _ ____ _ | diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index 90557af..33f85a9 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -343,7 +343,9 @@ function dashboard_scheduler(initial) { if (timestamp % 60 == 0) update_header_timer(); - setTimeout(function() { dashboard_scheduler(0); }, 1000); + g_reload_timer = setTimeout(function() { + dashboard_scheduler(0); + }, 1000); } function dashboard_update_contents(id, response_text) { diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index f4b9fba..e56dd60 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -194,6 +194,51 @@ div#foot_refresh, div#foot_refresh_time { display: inline-block; } +#reload_pause { + display: block; + position: fixed; + right: 20px; + top: 20px; + width: 90px; + height: 90px; + background-color: #111; + opacity: 0.8; + filter: alpha(opacity=80); /* For IE8 and earlier */ + border-radius: 5px; + padding: 10px; + text-decoration: none; +} + +.pause_bar { + display: inline-block; + width: 20px; + height: 60px; + margin-top: 5px; + margin-bottom: 5px; + background-color: #fff; + opacity: 0.9; + filter: alpha(opacity=90); /* For IE8 and earlier */ + border-radius: 5px; +} + +.pause_bar.p1 { + margin-left: 20px; + margin-right: 5px; +} + +.pause_bar.p2 { + margin-left: 5px; + margin-right: 10px; +} + +#reload_pause_counter { + font-weight: bold; + color: #fff; + width: 100%; + text-align: center; + font-size: 120%; +} + /*-------------------------------------------------------------------------. | ____ _ _ _ _ _ | @@ -506,7 +551,7 @@ tr.groupheader a:hover { /* state in group header must have fixed width */ .groupheader td.state { border: 1px solid #000000; - border-radius: 5px 5px 5px 5px; + border-radius: 5px; box-shadow: 1px 1px 2px #444444; padding: 2px 5px; width: 50px; @@ -974,7 +1019,7 @@ a#helpbutton.passive { div.help { background-image: url("images/helpbackground.jpg"); background-color: #FFFFCC; - border-radius: 5px 5px 5px 5px; + border-radius: 5px; box-shadow: 0 0 10px #fff; margin: 6px 3px 10px 3px; padding: 5px;

8 years, 6 months

Compile unixcat with -std=c99 for consistency, too.

by Sven Panne

Module: check_mk Branch: master Commit: bb328b25530da20ca0f47ec922d9e59de43721ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb328b25530da2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Mar 2 15:50:26 2016 +0100 Compile unixcat with -std=c99 for consistency, too. --- livestatus/src/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 5f3ceef..a9747c1 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -23,7 +23,9 @@ # Boston, MA 02110-1301 USA. bin_PROGRAMS = unixcat + unixcat_SOURCES = unixcat.c +unixcat_CFLAGS = -std=c99 unixcat_LDADD = -lpthread pkglib_LIBRARIES = livestatus.so

8 years, 6 months

Trial balloon: Enable C++14.

by Sven Panne

Module: check_mk Branch: master Commit: 349079509ff028222f2a309b7fd1c0a828516829 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=349079509ff028… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Mar 2 15:40:15 2016 +0100 Trial balloon: Enable C++14. --- livestatus/src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 4cc5099..5f3ceef 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -50,7 +50,7 @@ livestatus_so_SOURCES = \ global_counters.c module.c logger.c waittriggers.cc TimeperiodsCache.cc pnp4nagios.cc mk_inventory.cc \ ContactgroupsColumn.cc CustomTimeperiodColumn.cc HostServiceState.cc opids.cc auth.cc -livestatus_so_CXXFLAGS = -std=c++11 -fPIC +livestatus_so_CXXFLAGS = -std=c++14 -fPIC livestatus_so_CFLAGS = -std=c99 -fPIC livestatus.o: $(livestatus_so_OBJECTS) $(livestatus_so_DEPENDENCIES)

8 years, 6 months

Removed old code

by Lars Michelsen

Module: check_mk Branch: master Commit: 52f00c33a685874e25d387ffb65a5fb69eadc45d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52f00c33a68587… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 2 14:55:18 2016 +0100 Removed old code --- web/htdocs/js/checkmk.js | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 3fb9e67..496659c 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1048,24 +1048,6 @@ function handle_content_reload_error(_unused, status_code, error_msg) schedule_reload(); } -function get_content_reload_data() -{ - var data = {}; - - if (has_graphing()) - data = merge_args(data, get_modified_graph_contextes()); - - // now urlencode the data - var params = []; - for (var name in data) - params.push(name + '=' + encodeURIComponent(data[name])); - - if (params) - return params.join('&'); - else - return null; -} - function do_reload(url) { // Nicht mehr die ganze Seite neu laden, wenn es ein DIV "data_container" gibt. @@ -1116,8 +1098,7 @@ function do_reload(url) call_ajax(makeuri(params), { response_handler : handle_content_reload, error_handler : handle_content_reload_error, - method : 'POST', - post_data : get_content_reload_data() + method : 'POST' }); } }

8 years, 6 months

#3229 FIX lnx_distro: SLES based systems have now an OS name inventorized\

by Lars Michelsen

Module: check_mk Branch: master Commit: fd8c092e5924bed73d76f676fce62c2795cbdd67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd8c092e5924be… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 2 14:36:03 2016 +0100 #3229 FIX lnx_distro: SLES based systems have now an OS name inventorized\ --- .werks/3229 | 10 ++++++++++ ChangeLog | 1 + inventory/lnx_distro | 26 ++++++++++++++++---------- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/.werks/3229 b/.werks/3229 new file mode 100644 index 0000000..b75de45 --- /dev/null +++ b/.werks/3229 @@ -0,0 +1,10 @@ +Title: lnx_distro: SLES based systems have now an OS name inventorized\ +Level: 1 +Component: inv +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1456925668 + + diff --git a/ChangeLog b/ChangeLog index 66b7ebe..47a09e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,6 +103,7 @@ HW/SW-Inventory: * 3192 snmp_extended_info: now inventorizes all physical components of devices which support the ENTITY-MIB * 3219 FIX: lnx_distro: Now detecting Oracle VM Server correctly + * 3229 FIX: lnx_distro: SLES based systems have now an OS name inventorized\ 1.2.8b1: diff --git a/inventory/lnx_distro b/inventory/lnx_distro index d647dbe..2cbd73b 100644 --- a/inventory/lnx_distro +++ b/inventory/lnx_distro @@ -62,24 +62,30 @@ def inv_lnx_distro(info): def inv_lnx_parse_suse_release(node, line): node["type"] = "linux" node["vendor"] = "SuSE" + + version = line[1].split()[-1] + if len(line) == 3: - version = "%s.%s" % (line[1].split()[-1], line[2].split()[-1]) + patchlevel = line[2].split()[-1] else: - version = "%s.0" % line[1].split()[-1] - node["version"] = version - if version == "11.2": + patchlevel = "0" + + node["version"] = "%s.%s" % (version, patchlevel) + node["name"] = "%s.%s" % (line[0].split('(')[0].strip(), patchlevel) + + if node["version"] == "11.2": node["code_name"] = "Emerald" - elif version == "11.3": + elif node["version"] == "11.3": node["code_name"] = "Teal" - elif version == "11.4": + elif node["version"] == "11.4": node["code_name"] = "Celadon" - elif version == "12.1": + elif node["version"] == "12.1": node["code_name"] = "Asparagus" - elif version == "12.2": + elif node["version"] == "12.2": node["code_name"] = "Mantis" - elif version == "12.3": + elif node["version"] == "12.3": node["code_name"] = "Darthmouth" - elif version == "13.1": + elif node["version"] == "13.1": node["code_name"] = "Bottle"

8 years, 6 months

Updated bug entries #2426

by Mathias Kettner

Module: check_mk Branch: master Commit: 8132610c99d93ae46476ced685de22522ae65175 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8132610c99d93a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 2 13:11:52 2016 +0100 Updated bug entries #2426 --- .bugs/2426 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/2426 b/.bugs/2426 new file mode 100644 index 0000000..a1bae94 --- /dev/null +++ b/.bugs/2426 @@ -0,0 +1,11 @@ +Title: Monitoring UP switchports for WARN sometimes breaks +Component: checks +State: open +Date: 2016-03-02 13:10:47 +Targetversion: 1.2.8 +Class: bug + +If you setup Interfacemmonitoring (SNMP) in a way that an UP port +will be warned then sometimes the check will not detect this and +stay OK - even in the port UP. Might or might not be due to +counter wraps.

8 years, 6 months

Avoid endless recursion in crash dump report

by Mathias Kettner

Module: check_mk Branch: master Commit: 14cfafa915ff24e2b67db0a22a69f96af9a3ad4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14cfafa915ff24… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 2 13:07:15 2016 +0100 Avoid endless recursion in crash dump report This can happen in case of recursive datastructures. --- web/htdocs/crash_reporting.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/web/htdocs/crash_reporting.py b/web/htdocs/crash_reporting.py index 9aabd6e..5239c2f 100644 --- a/web/htdocs/crash_reporting.py +++ b/web/htdocs/crash_reporting.py @@ -398,19 +398,22 @@ def get_local_vars_of_last_exception(): return base64.b64encode(pprint.pformat(local_vars)) -def format_var_for_export(val): +def format_var_for_export(val, maxdepth=4): + if maxdepth == 0: + return "Max recursion depth reached" + if isinstance(val, dict): for item_key, item_val in val.items(): - val[item_key] = format_var_for_export(item_val) + val[item_key] = format_var_for_export(item_val, maxdepth-1) elif isinstance(val, list): for index, item in enumerate(val): - val[index] = format_var_for_export(item) + val[index] = format_var_for_export(item, maxdepth-1) elif isinstance(val, tuple): new_val = () for item in val: - new_val += (format_var_for_export(item),) + new_val += (format_var_for_export(item, maxdepth-1),) val = new_val # Check and limit size

8 years, 6 months

#3085 fortigate_signatures: new check to monitor av and ips signatures on fortigate firewalls

by Sebastian Herbord

Module: check_mk Branch: master Commit: 43bf758bec26cfe9b304f0a0297c40f9d50075fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43bf758bec26cf… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Mar 2 11:28:32 2016 +0100 #3085 fortigate_signatures: new check to monitor av and ips signatures on fortigate firewalls This new check monitors the age and version of Signatures of the Anti-Virus and Intrusion Prevention System. --- .werks/3085 | 10 ++++ ChangeLog | 1 + checkman/fortigate_signatures | 16 ++++++ checks/fortigate_signatures | 92 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 24 +++++++++ 5 files changed, 143 insertions(+) diff --git a/.werks/3085 b/.werks/3085 new file mode 100644 index 0000000..568549f --- /dev/null +++ b/.werks/3085 @@ -0,0 +1,10 @@ +Title: fortigate_signatures: new check to monitor av and ips signatures on fortigate firewalls +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1456914423 +Class: feature + +This new check monitors the age and version of Signatures of the Anti-Virus and Intrusion +Prevention System. diff --git a/ChangeLog b/ChangeLog index e58171f..66b7ebe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * 3081 mk_jolokia: plugin now supports setting custom CAs for verifying server certificate as well as sending a client certificate... * 3191 cisco_redundancy: new check which monitors the status of the redundant unit of Cisco devices supporting the CISCO-RF-MIB * 3083 mk_jolokia: The plugin can now be configured with a service url to treat the jolokia server as a jmx proxy + * 3085 fortigate_signatures: new check to monitor av and ips signatures on fortigate firewalls... * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checkman/fortigate_signatures b/checkman/fortigate_signatures new file mode 100644 index 0000000..6bc63d7 --- /dev/null +++ b/checkman/fortigate_signatures @@ -0,0 +1,16 @@ +title: FortiGate firewalls: Age and version of AV and IPS signatures +agents: snmp +catalog: hw/network/fortinet +license: GPL +distribution: check_mk +description: + This check monitors the version of Antivirus and Intrusion Protection Signature + checks. + If the last signature update is too long ago, it will go into {WARN} or {CRIT} state. + + Please note: There is no documentation on which timezone the signature date is stored in + and whether it reports the date the signature file was published or when it was installed. + If you know these details, please let us know. + +inventory: + One service is discovered on supported devices. diff --git a/checks/fortigate_signatures b/checks/fortigate_signatures new file mode 100644 index 0000000..93777b2 --- /dev/null +++ b/checks/fortigate_signatures @@ -0,0 +1,92 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2016 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- +# tails. 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. + + +# .1.3.6.1.4.1.12356.101.4.2.1.0 27.00768(2015-09-01 15:10) +# .1.3.6.1.4.1.12356.101.4.2.2.0 6.00689(2015-09-01 00:15) + + +# signature ages (defaults are 1/2 days) +factory_settings['fortigate_signature_default_levels'] = { + 'av_age': (86400, 172800), + 'ips_age': (86400, 172800) +} + + +def inventory_fortigate_signatures(info): + if info: + return [(None, {})] + else: + return [] + +def check_fortigate_signatures(_no_item, params, info): + def parse_version(ver): + # sample: 27.00768(2015-09-01 15:10) + ver_regex = regex("([0-9.]*)$([0-9-: ]*)$") + match = ver_regex.match(ver) + if match is None: + return None, None + # what timezone is this in? + t = time.strptime(match.group(2), "%Y-%m-%d %H:%S") + ts = time.mktime(t) + return match.group(1), time.time() - ts + + def age_status(age, levels): + if age >= levels[1]: + return 2 + elif age >= levels[0]: + return 1 + else: + return 0 + + def output_status(typ, signature_info, levels): + version, age = parse_version(signature_info) + status = age_status(age, levels) + + if status != 0: + return status, "%s Signature %s is %s old (warn/crit at %s/%s)" %\ + (typ, version, + get_age_human_readable(age), + get_age_human_readable(levels[0]), + get_age_human_readable(levels[1])) + else: + return 0, "%s Signature %s is current" % (typ, version) + + if info: + yield output_status("AV", info[0][0], params['av_age']) + yield output_status("IPS", info[0][1], params['ips_age']) + + +check_info['fortigate_signatures'] = { + 'inventory_function' : inventory_fortigate_signatures, + 'check_function' : check_fortigate_signatures, + 'service_description' : "Signatures", + 'snmp_scan_function' : lambda oid: ".1.3.6.1.4.1.12356.101.1" in oid(".1.3.6.1.2.1.1.2.0"), + 'snmp_info' : (".1.3.6.1.4.1.12356.101.4.2", [1, 2]), + 'default_levels_variable' : "fortigate_signature_default_levels", + 'group' : 'fortinet_signatures' +} + diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 7c4a2bb..c99ad00 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -94,6 +94,30 @@ register_check_parameters( "dict" ) +register_check_parameters( + subgroup_networking, + "fortinet_signatures", + "Fortigate Signatures", + Dictionary( + elements = [ + ('av_age', + Tuple(title = "Age of Anti-Virus signature", + elements = [ + Age(title=_("Warning at"), default_value = 86400), + Age(title=_("Critical at"), default_value = 2*86400), + ])), + ('ips_age', + Tuple(title = "Age of Intrusion Prevention signature", + elements = [ + Age(title=_("Warning at"), default_value = 86400), + Age(title=_("Critical at"), default_value = 2*86400), + ])), + ] + ), + None, + "dict" +) + #. # .--Inventory-----------------------------------------------------------. # | ___ _ |

8 years, 6 months

#3256 FIX blade_bx_powerfan: fixed wrong levels handling and minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: 39138e0eb9b6a6a071ca3dd12969e14791bdab94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39138e0eb9b6a6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Mar 2 10:39:43 2016 +0100 #3256 FIX blade_bx_powerfan: fixed wrong levels handling and minor cleanup --- .werks/3256 | 10 +++++ ChangeLog | 1 + checks/blade_bx_powerfan | 112 +++++++++++++++++++++++++++------------------- 3 files changed, 78 insertions(+), 45 deletions(-) diff --git a/.werks/3256 b/.werks/3256 new file mode 100644 index 0000000..c2a5c36 --- /dev/null +++ b/.werks/3256 @@ -0,0 +1,10 @@ +Title: blade_bx_powerfan: fixed wrong levels handling and minor cleanup +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1456911545 + + diff --git a/ChangeLog b/ChangeLog index 9eb63df..e58171f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,6 +52,7 @@ * 3252 FIX: ntp.time: better handling of temporary synchronization loss... * 3254 FIX: haproxy: fixed wrong type handling * 3255 FIX: apc_inrow_temp: fixed wrong discovery handling of available sensors + * 3256 FIX: blade_bx_powerfan: fixed wrong levels handling and minor cleanup Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/blade_bx_powerfan b/checks/blade_bx_powerfan index fc59d56..09f47f1 100644 --- a/checks/blade_bx_powerfan +++ b/checks/blade_bx_powerfan @@ -27,54 +27,78 @@ # For legacy reasons blade_bx_fan_default_error_levels = (20, 10) # percentages or errors! + factory_settings['blade_bx_powerfan_default_levels'] = { "levels_lower" : ( 20, 10 ), - "levels" : ( 80, 90 ), + "levels" : ( 80, 90 ), +} + +blade_bx_status = { + "1" : "unknown", + "2" : "disabled", + "3" : "ok", + "4" : "fail", + "5" : "prefailure-predicted", + "6" : "redundant-fan-failed", + "7" : "not-manageable", + "8" : "not-present", + "9" : "not-available" } -blade_bx_status = { "1" : "unknow", - "2" : "disabled", - "3" : "ok", - "4" : "fail", - "5" : "prefailure-predicted", - "6" : "redundant-fan-failed", - "7" : "not-manageable", - "8" : "not-present", - "9" : "not-available" } def inventory_blade_bx_powerfan(info): - for line in info: - if line[1] != "8": - yield line[2],{} + for status, descr, rpm, max_speed, speed, ctrlstate in info: + if status != "8": + yield descr, {} + def check_blade_bx_powerfan(item, params, info): if type(params) == dict: - warn_perc, crit_perc = params['levels'] - warn_perc_up, crit_perc_up = params['levels_lower'] + warn_perc_lower, crit_perc_lower = params['levels_lower'] + warn_perc, crit_perc = params['levels'] else: - warn_perc, crit_perc = params - warn_perc_up, crit_perc_up = None, None - - for index, status, descr, rpm, max_speed, speed, ctrlstate in info: - if descr != item: continue - he = 1 - speedperc = (int(rpm) * 100) / int(max_speed) - perfdata=[ ('perc', speedperc, warn_perc, crit_perc, "0", "100" ), - ('rpm', rpm ) ] - speedperc_int = saveint(speedperc) - - if ctrlstate != "2": - return (2, "Fan not present or poweroff", perfdata) - elif status != "3": - return (2, "Status not OK (Status %s)" % blade_bx_status[status] , perfdata) - elif speedperc_int <= crit_perc or (crit_perc_up and speedperc_int >= crit_perc_up): - return 2, "Speed at %d%% of max (crit at < %d%% or > %d%%)" % (speedperc_int, crit_perc, crit_perc_up ), perfdata - elif speedperc_int <= warn_perc or (warn_perc and speedperc_int >= warn_perc_up): - return 1, "Speed at %d%% of max (warning at < %d%% > %d%%)" % (speedperc_int, warn_perc, warn_perc_up), perfdata - else: - return (0, "Speed at %s RPM (%d%% of max)" % (rpm, speedperc_int), perfdata) + warn_perc_lower, crit_perc_lower = params + warn_perc, crit_perc = None, None + + for status, descr, rpm, max_speed, speed, ctrlstate in info: + if descr == item: + speed_perc = float(rpm) * 100 / float(max_speed) + perfdata = [ + ('perc', speed_perc, warn_perc_lower, crit_perc_lower, "0", "100" ), + ('rpm', rpm )] + if ctrlstate != "2": + return 2, "Fan not present or poweroff", perfdata + elif status != "3": + return 2, "Status: %s" % blade_bx_status[status], perfdata + else: + state = 0 + infotext = "Speed at %s RPM, %.1f%% of max" % (rpm, speed_perc) + levels_text = "" + if speed_perc < crit_perc_lower: + state = 2 + levels_text = " (warn/crit below %.1f%%/%.1f%%)" % \ + (warn_perc_lower, crit_perc_lower) + elif speed_perc < warn_perc_lower: + state = 1 + levels_text = " (warn/crit below %.1f%%/%.1f%%)" % \ + (warn_perc_lower, crit_perc_lower) + + if warn_perc: + if speed_perc >= crit_perc: + state = 2 + levels_text = " (warn/crit at %.1f%%/%.1f%%)" % \ + (warn_perc, crit_perc) + elif speed_perc >= warn_perc: + state = 1 + levels_text = " (warn/crit at %.1f%%/%.1f%%)" % \ + (warn_perc, crit_perc) + + if state > 0: + infotext += levels_text + + return state, infotext, perfdata check_info['blade_bx_powerfan'] = { @@ -84,15 +108,13 @@ check_info['blade_bx_powerfan'] = { "has_perfdata" : True, "group" : "hw_fans_perc", "default_levels_variable" : "blade_bx_powerfan_default_levels", - "snmp_info" : (".1.3.6.1.4.1.7244.1.1.1.3.3.1.1", [ - 1, #index - 2, #status - 3, #desc - 4, #rpm - 5, #max_speed - 6, #speed - 7 # ctrlstate - + "snmp_info" : (".1.3.6.1.4.1.7244.1.1.1.3.3.1.1", [ + "2", #status + "3", #desc + "4", #rpm + "5", #max_speed + "6", #speed + "7", # ctrlstate ]), "snmp_scan_function" : lambda oid: "BX600" in oid(".1.3.6.1.2.1.1.1.0") \ or oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.7244.1.1.1",

8 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2016