Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64518 discussions

Check_MK Git: check_mk: winperf_ts_sessions: Removed useless declaration

by Lars Michelsen

Module: check_mk Branch: master Commit: 15da33cc55566af90cc27933f1d64d5f44a66538 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15da33cc55566a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 2 08:45:39 2013 +0100 winperf_ts_sessions: Removed useless declaration --- checks/winperf_ts_sessions | 2 -- 1 file changed, 2 deletions(-) diff --git a/checks/winperf_ts_sessions b/checks/winperf_ts_sessions index dd9b6c7..0498ceb 100644 --- a/checks/winperf_ts_sessions +++ b/checks/winperf_ts_sessions @@ -62,8 +62,6 @@ def check_winperf_ts_sessions(_unused, params, info): perfdata = [ ('active', active, ), ('inactive', inactive) ] return state, ", ".join(state_txt), perfdata -check_config_variables.append("winperf_ts_sessions") - check_info["winperf_ts_sessions"] = { 'check_function': check_winperf_ts_sessions, 'inventory_function': inventory_winperf_ts_sessions,

10 years, 10 months

Check_MK Git: check_mk: check removed since the device cannot be meaningfully checked in this way

by Götz Golla

Module: check_mk Branch: master Commit: 727f0720a1872b9a621d04965fa6d55bd7b44265 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=727f0720a1872b… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Sun Dec 1 22:20:18 2013 +0100 check removed since the device cannot be meaningfully checked in this way --- checks/moxa-iologik-e2242 | 79 --------------------------------------------- 1 file changed, 79 deletions(-) diff --git a/checks/moxa-iologik-e2242 b/checks/moxa-iologik-e2242 deleted file mode 100755 index b21a962..0000000 --- a/checks/moxa-iologik-e2242 +++ /dev/null @@ -1,79 +0,0 @@ -#!/usr/bin/python -# -*- encoding: utf-8; py-indent-offset: 4 -*- -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2013 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. - -# "0=Off, 1=On in DI/DO mode or N=Count in DO counter mode" -inventory_iologik_e2242_defaults = ( 1,1 ) - -def inventory_iologik_e2242(info): - inventory = [] - for line in info: - if line[0]: - wert = int(line[0]) - inventory.append((wert, inventory_iologik_e2242_defaults)) - return inventory - - -def check_iologik_e2242(item, params, info): - for line in info: - if line[0]: - crit = params - status = int(line[0]) - infotext = "Status is: %s (warn/crit %s%s)" % ( status, warn, crit ) - perfdata = [ ("iologik_e2242.status", status, warn, crit) ] - if status >= crit: - state = 2 - elif status >= warn: - state = 1 - else: - state = 0 - return (state, infotext, perfdata ) - return (3, "UNKNOWN - Sensor not found") - - -check_info['moxa-iologik-e2242'] = { - "check_function" : check_iologik_e2242, - "inventory_function" : inventory_iologik_e2242, - "service_description" : "moxa iologik e2242 i/o unit", - "has_perfdata" : True, - "group" : "iologik_e2242", - #"snmp_scan_function" : lambda oid: "E2242-T" in oid(".1.3.6.1.4.1.8691.10.2242.2.0"), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.8691.10.2242.2.0").startswith("E2242-T"), - "snmp_info" : (".1.3.6.1.4.1.8691.10.2242.10.1.1", - [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11" ] - ) -} - -# DIOEntry -# dioIndex Integer32 (0..11) "The channel dio index." -# dioType Integer32 (0..1) "The channel dio type. 0=DI, DO=1, AI=2" -# dioMode Integer32 (0..1) "The channel dio mode. 0=DI, 1=Event Counter" -# dioStatus Unsigned32 (0..4294967295) "The channel dio(di/do) status. 0=Off, 1=On in DI/DO mode or N=Count in DO counter mode -# dioFilter Integer32 (1..65535) "The channel dio(di) counter filter. unit=0.5ms" -# dioTrigger Integer32 (0..1) "The channel dio(di) counter trigger level. 0=L2H, 1=H2L" -# dioCntStart Integer32 (0..1) "The channel dio(do) counter start/stop. 0=stop, 1=start" -# dioPulseStart Integer32 (0..1) "The channel dio(do) pulse start/stop. 0=stop, 1=start" -# dioPulseONWidth Unsigned32 (1..4294967295) "The channel dio(do) signal ON width. unit=0.5ms" -# dioPulseOFFWidth Unsigned32 (1..4294967295) "The channel dio(do) signal OFF width. unit=0.5ms"

10 years, 10 months

Check_MK Git: check_mk: veeam_client: fix for situation when backup is in progress

by Götz Golla

Module: check_mk Branch: master Commit: 6d39e7a119e873ce469bf13bbd5fa81e6b802346 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d39e7a119e873… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Sun Dec 1 22:14:46 2013 +0100 veeam_client: fix for situation when backup is in progress --- checks/veeam_client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/veeam_client b/checks/veeam_client index 53c1c1e..08625f0 100644 --- a/checks/veeam_client +++ b/checks/veeam_client @@ -87,7 +87,7 @@ def check_veeam_client(item, params, info): else: stopstate = 0 stopsym = "" - infotxt += line[0] + ":" + line[1] + stopsym + " " + infotxt += line[0] + ":" + line[1] + stopsym + " " else: infotxt += line[0] + ":" + line[1] + " "

10 years, 10 months

Check_MK Git: check_mk: veeam_jobs: when backup is stopped in warning state check is in WARN

by Götz Golla

Module: check_mk Branch: master Commit: 8fe0108d076472cce654a86ef637d90f3ac411cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fe0108d076472… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Sun Dec 1 22:16:35 2013 +0100 veeam_jobs: when backup is stopped in warning state check is in WARN state as well --- checks/veeam_jobs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checks/veeam_jobs b/checks/veeam_jobs index a64fcd9..4ed1698 100644 --- a/checks/veeam_jobs +++ b/checks/veeam_jobs @@ -39,6 +39,8 @@ def check_veeam_jobs(item, params, info): line.pop(6) elif line[3] == "Failed": state = 2 + elif line[2] == "Stopped" and line[3] == "Warning": + state = 1 else: state = 3 infotxt = "Result: %s, " % line[3]

10 years, 10 months

Check_MK Git: check_mk: modbus_value: New check and Agent to modbus devices

by Bastian Kuhn

Module: check_mk Branch: master Commit: 5c51baf41200b0a058afbf3fbc4ac31740654ea5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c51baf41200b0… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Sat Nov 30 00:01:28 2013 +0100 modbus_value: New check and Agent to modbus devices This is the first approach to monitor modbus devices. Modbus is an industry bus wich can be found for example in power devices for buildings. --- .werks/102 | 9 +++ ChangeLog | 1 + agents/special/agent_modbus | Bin 0 -> 7472 bytes agents/special/agent_modbus.cpp | 109 +++++++++++++++++++++++++++++++ checkman/modbus_value | 17 +++++ checks/agent_modbus | 38 +++++++++++ checks/modbus_value | 65 ++++++++++++++++++ web/plugins/perfometer/check_mk.py | 7 ++ web/plugins/wato/check_parameters.py | 16 +++++ web/plugins/wato/datasource_programs.py | 34 ++++++++++ 10 files changed, 296 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5c51baf412…

10 years, 10 months

Check_MK Git: check_mk: ups_checks: Addded another device to be detected by scanfunction

by Bastian Kuhn

Module: check_mk Branch: master Commit: 636496b256c833e20e88bd70db80cdd65220feb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=636496b256c833… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Nov 29 17:49:59 2013 +0100 ups_checks: Addded another device to be detected by scanfunction --- checks/ups_bat_temp | 2 +- checks/ups_capacity | 2 +- checks/ups_eaton_enviroment | 2 +- checks/ups_in_freq | 2 +- checks/ups_in_voltage | 2 +- checks/ups_out_load | 2 +- checks/ups_out_voltage | 2 +- checks/ups_power | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/checks/ups_bat_temp b/checks/ups_bat_temp index 6e84317..589b665 100644 --- a/checks/ups_bat_temp +++ b/checks/ups_bat_temp @@ -57,7 +57,7 @@ check_info['ups_bat_temp'] = { "group" : "hw_temperature", "snmp_info" : ( ".1.3.6.1.2.1.33.1", ["1.5", "2.7" ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [".1.3.6.1.4.1.818.1.100.1.1",".1.3.6.1.2.1.33",".1.3.6.1.2.1.33.2"] \ + [".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.4.1.705.1.2", ".1.3.6.1.2.1.33",".1.3.6.1.2.1.33.2"] \ or oid('.1.3.6.1.2.1.33.1.1.1.0').startswith('RPS'), } diff --git a/checks/ups_capacity b/checks/ups_capacity index 9648860..71333a3 100644 --- a/checks/ups_capacity +++ b/checks/ups_capacity @@ -99,6 +99,6 @@ check_info["ups_capacity"] = { "snmp_info" : ( ".1.3.6.1.2.1.33.1.2", [ "2.0" , "3.0" ,"4.0" ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", - ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", + ".1.3.6.1.2.1.33", ".1.3.6.1.4.1.705.1.2", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", ".1.3.6.1.4.1.476.1.42" ] } diff --git a/checks/ups_eaton_enviroment b/checks/ups_eaton_enviroment index e5907d6..15ae972 100644 --- a/checks/ups_eaton_enviroment +++ b/checks/ups_eaton_enviroment @@ -62,6 +62,6 @@ check_info['ups_eaton_enviroment'] = { "has_perfdata" : True, "group" : "eaton_enviroment", "snmp_info" : ( ".1.3.6.1.4.1.534.1.6", [1,5,6 ] ), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1"] + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.705.1.2", ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1"] } diff --git a/checks/ups_in_freq b/checks/ups_in_freq index e9ff1ab..4aca826 100644 --- a/checks/ups_in_freq +++ b/checks/ups_in_freq @@ -59,6 +59,6 @@ check_info['ups_in_freq'] = { "snmp_info" : ( ".1.3.6.1.2.1.33.1.3.3.1", [ 0, 2 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", - ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", + ".1.3.6.1.2.1.33", ".1.3.6.1.4.1.705.1.2", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", ".1.3.6.1.4.1.476.1.42" ] \ } diff --git a/checks/ups_in_voltage b/checks/ups_in_voltage index 13038e0..961f1df 100644 --- a/checks/ups_in_voltage +++ b/checks/ups_in_voltage @@ -57,7 +57,7 @@ check_info['ups_in_voltage'] = { "group" : "evolt", "snmp_info" : ( ".1.3.6.1.2.1.33.1.3.3.1", [ 0, 3 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", + [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1",".1.3.6.1.4.1.705.1.2", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", ".1.3.6.1.4.1.476.1.42" ] } diff --git a/checks/ups_out_load b/checks/ups_out_load index 031e776..04395ef 100644 --- a/checks/ups_out_load +++ b/checks/ups_out_load @@ -56,7 +56,7 @@ check_info['ups_out_load'] = { "has_perfdata" : True, "snmp_info" : ( ".1.3.6.1.2.1.33.1.4.4.1", [ 0, 5 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", + [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1",".1.3.6.1.4.1.705.1.2", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", ".1.3.6.1.4.1.476.1.42" ] } diff --git a/checks/ups_out_voltage b/checks/ups_out_voltage index 41cb751..8d84881 100644 --- a/checks/ups_out_voltage +++ b/checks/ups_out_voltage @@ -57,7 +57,7 @@ check_info['ups_out_voltage'] = { "group" : "evolt", "snmp_info" : ( ".1.3.6.1.2.1.33.1.4.4.1", [ 0, 2 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", + [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1",".1.3.6.1.4.1.705.1.2", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2", ".1.3.6.1.4.1.5491.6", ".1.3.6.1.4.1.476.1.42" ] } diff --git a/checks/ups_power b/checks/ups_power index f27b1e2..68876e1 100644 --- a/checks/ups_power +++ b/checks/ups_power @@ -60,7 +60,7 @@ check_info['ups_power'] = { "group" : "epower", "snmp_info" : ( ".1.3.6.1.2.1.33.1.4.4.1", [ 0, 4 ] ), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1", ".1.3.6.1.4.1.818.1.100.1.1", + [ ".1.3.6.1.4.1.534.1", ".1.3.6.1.4.1.705.1",".1.3.6.1.4.1.705.1.2", ".1.3.6.1.4.1.818.1.100.1.1", ".1.3.6.1.2.1.33", ".1.3.6.1.2.1.33.2" , ".1.3.6.1.4.1.5491.6", ".1.3.6.1.4.1.476.1.42" ] }

10 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0837

by Bastian Kuhn

Module: check_mk Branch: master Commit: 33c6dbdf077e9118179d759708e95d60c99f3750 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33c6dbdf077e91… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Nov 29 17:09:52 2013 +0100 Updated bug entries #0837 --- .bugs/837 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/837 b/.bugs/837 new file mode 100644 index 0000000..9b732b5 --- /dev/null +++ b/.bugs/837 @@ -0,0 +1,9 @@ +Title: Service levels are missing in gui +Component: multisite +State: open +Date: 2013-11-29 17:07:45 +Targetversion: 1.2.3i6 +Class: nastiness + +Its not possible to see the service levels on Hosts/ Services in Multisite. The Reason is, +that they are no part of the livestatus output. With cmc its not possible to looking into the configfile to see the sl.

10 years, 10 months

Check_MK Git: check_mk: FIX Fix computation of hour-of-the-day and day-of-month prediction

by Mathias Kettner

Module: check_mk Branch: master Commit: 3855b69e8559f11267929f5e190260b747085bdc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3855b69e8559f1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 29 15:55:19 2013 +0100 FIX Fix computation of hour-of-the-day and day-of-month prediction This fix addresses two problems in the implementation of the predictive levels: <ul> <li>When you selected a prediction for Hour of the day you would get 24 single predictions and 24 separated graphs. This has been replaced by one single predection for the whole day, which is much more conveniant.</li> <li>The implementation of the Day of the month was broken. It would create a prediction of just one day instead. This is fixed now.</li> </ul> --- .werks/10 | 17 +++++++++++++++++ ChangeLog | 1 + 2 files changed, 18 insertions(+) diff --git a/.werks/10 b/.werks/10 new file mode 100644 index 0000000..fb473bc --- /dev/null +++ b/.werks/10 @@ -0,0 +1,17 @@ +Title: Fix computation of hour-of-the-day and day-of-month prediction +Level: 1 +Component: core +Version: 1.2.3i7 +Date: 1385736766 +Class: fix + +This fix addresses two problems in the implementation of the predictive levels: + +<ul> +<li>When you selected a prediction for Hour of the day you would get 24 +single predictions and 24 separated graphs. This has been replaced by one single +predection for the whole day, which is much more conveniant.</li> +<li>The implementation of the Day of the month was broken. It would create +a prediction of just one day instead. This is fixed now.</li> +</ul> + diff --git a/ChangeLog b/ChangeLog index 1fb1efd..ab595e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core & Setup: * 0217 FIX: More verbose error output for SNMP errors on the command line... * 0288 FIX: Error messages of datasource programs (e.g. VSphere Agent) are now visible within WATO... + * 0010 FIX: Fix computation of hour-of-the-day and day-of-month prediction... Checks & Agents: * 0060 cisco_fantray: new check for monitoring fan trays of Cisco Nexus switches

10 years, 10 months

Check_MK Git: check_mk: Introduce optional lower limit for predicted levels

by Mathias Kettner

Module: check_mk Branch: master Commit: 4f8b24e4f84c4c07f0c89160d6f42dde5865431d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f8b24e4f84c4c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 29 15:58:03 2013 +0100 Introduce optional lower limit for predicted levels When configuring predictive levels while using relative levels or those based on the standard deviation then time periods with a very low reference (e.g. a CPU load below 1) would result in very narrow levels and lead to frequent false alarms. Now you can set a lower limit for the levels, for example such that they would never go below 5 and 10 for warn and crit - regardless of the current predicted value. --- .werks/11 | 15 +++++++++++++++ ChangeLog | 1 + modules/prediction.py | 22 ++++++++++++++++------ web/htdocs/prediction.py | 14 +++++++++----- web/htdocs/wato.py | 7 ++++--- 5 files changed, 45 insertions(+), 14 deletions(-) diff --git a/.werks/11 b/.werks/11 new file mode 100644 index 0000000..5c5cc7f --- /dev/null +++ b/.werks/11 @@ -0,0 +1,15 @@ +Title: Introduce optional lower limit for predicted levels +Level: 1 +Component: core +Version: 1.2.3i7 +Date: 1385736954 +Class: feature + +When configuring predictive levels while using relative levels or those +based on the standard deviation then time periods with a very low +reference (e.g. a CPU load below 1) would result in very narrow levels +and lead to frequent false alarms. + +Now you can set a lower limit for the levels, for example such that they +would never go below 5 and 10 for warn and crit - regardless of the +current predicted value. diff --git a/ChangeLog b/ChangeLog index ab595e6..7f0fba9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.2.3i7: Core & Setup: + * 0011 Introduce optional lower limit for predicted levels... * 0217 FIX: More verbose error output for SNMP errors on the command line... * 0288 FIX: Error messages of datasource programs (e.g. VSphere Agent) are now visible within WATO... * 0010 FIX: Fix computation of hour-of-the-day and day-of-month prediction... diff --git a/modules/prediction.py b/modules/prediction.py index db1041f..b67facb 100644 --- a/modules/prediction.py +++ b/modules/prediction.py @@ -122,25 +122,35 @@ def group_by_wday(t): def group_by_day(t): return "everyday", (t - time.timezone) % 86400 +def group_by_day_of_month(t): + broken = time.localtime(t) + mday = broken[2] + return str(mday), (t - time.timezone) % 86400 + def group_by_everyhour(t): return "everyhour", (t - time.timezone) % 3600 prediction_periods = { "wday" : { - "slice" : 86400, + "slice" : 86400, # 7 slices "groupby" : group_by_wday, "valid" : 7, }, "day" : { - "slice" : 86400, + "slice" : 86400, # 31 slices + "groupby" : group_by_day_of_month, + "valid" : 28, + }, + "hour" : { + "slice" : 86400, # 1 slice "groupby" : group_by_day, "valid" : 1, }, - "hour" : { - "slice" : 3600, + "minute" : { + "slice" : 3600, # 1 slice "groupby" : group_by_everyhour, - "valid" : 1, - } + "valid" : 24, + }, } diff --git a/web/htdocs/prediction.py b/web/htdocs/prediction.py index b7d1d9d..0f1d35e 100644 --- a/web/htdocs/prediction.py +++ b/web/htdocs/prediction.py @@ -233,15 +233,19 @@ def compute_levels(params, ref_value, stdev): if p in params: how, (warn, crit) = params[p] if how == "absolute": - levels.append((ref_value + (sig * warn), ref_value + (sig * crit))) + this_levels = (ref_value + (sig * warn), ref_value + (sig * crit)) elif how == "relative": - levels.append((ref_value + sig * (ref_value * warn / 100), - ref_value + sig * (ref_value * crit / 100))) + this_levels = (ref_value + sig * (ref_value * warn / 100), + ref_value + sig * (ref_value * crit / 100)) else: # how == "stdev": - levels.append((ref_value + sig * (stdev * warn), - ref_value + sig * (stdev * crit))) + this_levels = (ref_value + sig * (stdev * warn), + ref_value + sig * (stdev * crit)) + if what == "upper" and "levels_upper_min" in params: + limit_warn, limit_crit = params["levels_upper_min"] + this_levels = (max(limit_warn, this_levels[0]), max(limit_crit, this_levels[1])) + levels.append(this_levels) else: levels.append((None, None)) return levels diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index eb2fc5c..8a2b923 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12168,9 +12168,10 @@ def PredictiveLevels(**args): DropdownChoice( title = _("Base prediction on"), choices = [ - ( "wday", _("Day of the week (1-7, 1 is Monday)") ), - ( "day", _("Day of the month (1-31)") ), - ( "hour", _("Hour of the day (0-23)") ), + ( "wday", _("Day of the week (1-7, 1 is Monday)") ), + ( "day", _("Day of the month (1-31)") ), + ( "hour", _("Hour of the day (0-23)") ), + ( "minute", _("Minute of the hour (0-59)") ), ] )), ( "horizon",

10 years, 10 months

Check_MK Git: check_mk: FIX Inline SNMP: Check_MK check helpers are closing UDP sockets now

by Lars Michelsen

Module: check_mk Branch: master Commit: e60c59a82aad2c25887c49f50438550a7ab502ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e60c59a82aad2c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 29 15:57:51 2013 +0100 FIX Inline SNMP: Check_MK check helpers are closing UDP sockets now In previous versions, the Check-Helpers in Check_MK were opening UDP sockets for each host and caching them during their runtime. This resulted in too many open sockets with a large amount of hosts. Now closing all the sockets after an action iteration. --- .werks/292 | 11 +++++++++++ ChangeLog | 1 + modules/check_mk.py | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/.werks/292 b/.werks/292 new file mode 100644 index 0000000..bcd1cd7 --- /dev/null +++ b/.werks/292 @@ -0,0 +1,11 @@ +Title: Inline SNMP: Check_MK check helpers are closing UDP sockets now +Level: 1 +Component: core +Version: 1.2.3i7 +Date: 1385736912 +Class: fix + +In previous versions, the Check-Helpers in Check_MK were opening UDP +sockets for each host and caching them during their runtime. This resulted +in too many open sockets with a large amount of hosts. Now closing all +the sockets after an action iteration. diff --git a/ChangeLog b/ChangeLog index 1fb1efd..0bb936d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core & Setup: * 0217 FIX: More verbose error output for SNMP errors on the command line... * 0288 FIX: Error messages of datasource programs (e.g. VSphere Agent) are now visible within WATO... + * 0292 FIX: Inline SNMP: Check_MK check helpers are closing UDP sockets now... Checks & Agents: * 0060 cisco_fantray: new check for monitoring fan trays of Cisco Nexus switches diff --git a/modules/check_mk.py b/modules/check_mk.py index 24c5164..3d26e16 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5069,6 +5069,10 @@ def cleanup_globals(): global g_walk_cache g_walk_cache = {} + if 'g_snmp_sessions' in globals(): + global g_snmp_sessions + g_snmp_sessions = {} + # Diagnostic function for detecting global variables that have # changed during checking. This is slow and canno be used

10 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits