Checkmk git commits September 2015

checkmk-commits@lists.checkmk.com

8 participants
275 discussions

Check_MK Git: check_mk: levels --> warn/crit

by Simon Betz

9 years

Check_MK Git: check_mk: In previous versions it might occur that users experience exceptions about non

by Lars Michelsen

Module: check_mk Branch: master Commit: ae49c4c2a26fa392ae2fdeca78db926694b84bf4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae49c4c2a26fa3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 2 13:51:34 2015 +0200 In previous versions it might occur that users experience exceptions about non parsable user_dashboards.mk files when editing dashboards. This was caused by non existant file locking during editing of dashboards. Conflicts: ChangeLog web/htdocs/visuals.py --- .werks/2551 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/config.py | 3 ++- web/htdocs/dashboard.py | 18 +++++++++--------- web/htdocs/visuals.py | 10 +++++++--- 5 files changed, 31 insertions(+), 13 deletions(-) diff --git a/.werks/2551 b/.werks/2551 new file mode 100644 index 0000000..b4cccec --- /dev/null +++ b/.werks/2551 @@ -0,0 +1,12 @@ +Title: Fixed locking issues when editing dashboards +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1441194578 + +In previous versions it might occur that users experience exceptions about non +parsable user_dashboards.mk files when editing dashboards. This was caused by +non existant file locking during editing of dashboards. diff --git a/ChangeLog b/ChangeLog index 55a4275..0f9c8d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -184,6 +184,7 @@ * 2531 FIX: Fixed graph hover for services containing backslashes... * 2532 FIX: Fixed undefined variable exception in prediction in rare cases... * 1289 FIX: Fixed missing table headers in hostgroup view + * 2551 FIX: Fixed locking issues when editing dashboards... WATO: * 2365 Removed old deprecated notification global options for plain emails... diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 0915a9b..88b103b 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -432,7 +432,8 @@ def save_user_file(name, content, unlock=False, user=None): make_nagios_directory(dirname) path = dirname + "/" + name + ".mk" try: - write_settings_file(path, content) + write_settings_file(path+".new", content) + os.rename(path+".new", path) if unlock: release_lock(path) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index c42dcdd..9eda7b4 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -87,10 +87,10 @@ def load_plugins(): # Make sure that custom views also have permissions config.declare_dynamic_permissions(lambda: visuals.declare_custom_permissions('dashboards')) -def load_dashboards(): +def load_dashboards(lock=False): global dashboards, available_dashboards transform_builtin_dashboards() - dashboards = visuals.load('dashboards', builtin_dashboards) + dashboards = visuals.load('dashboards', builtin_dashboards, lock=lock) transform_dashboards(dashboards) available_dashboards = visuals.available('dashboards', dashboards) @@ -695,7 +695,7 @@ def ajax_dashlet(): # '----------------------------------------------------------------------' def page_edit_dashboards(): - load_dashboards() + load_dashboards(lock=html.is_transaction()) visuals.page_list('dashboards', _("Edit Dashboards"), dashboards) #. @@ -729,7 +729,7 @@ def page_create_dashboard(): global vs_dashboard def page_edit_dashboard(): - load_dashboards() + load_dashboards(lock=html.is_transaction()) # This is not defined here in the function in order to be l10n'able global vs_dashboard @@ -826,7 +826,7 @@ def choose_view(name): view_name = vs_view.from_html_vars('view') vs_view.validate_value(view_name, 'view') - load_dashboards() + load_dashboards(lock=True) dashboard = available_dashboards[name] # Add the dashlet! @@ -878,7 +878,7 @@ def page_edit_dashlet(): if ident == None and not ty: raise MKGeneralException(_('The ID of the dashlet is missing.')) - load_dashboards() + load_dashboards(lock=html.is_transaction()) if board not in available_dashboards: raise MKGeneralException(_('The requested dashboard does not exist.')) @@ -1054,7 +1054,7 @@ def page_delete_dashlet(): except ValueError: raise MKGeneralException(_('Invalid dashlet id')) - load_dashboards() + load_dashboards(lock=True) if board not in available_dashboards: raise MKGeneralException(_('The requested dashboard does not exist.')) @@ -1113,7 +1113,7 @@ def check_ajax_update(): ident = int(html.var('id')) - load_dashboards() + load_dashboards(lock=True) if board not in available_dashboards: raise MKGeneralException(_('The requested dashboard does not exist.')) @@ -1175,7 +1175,7 @@ def popup_add_dashlet(dashboard_name, dashlet_type, context, params): # Exceptions do not work here. return - load_dashboards() + load_dashboards(lock=True) if dashboard_name not in available_dashboards: return diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index f6bc014..e497645 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -104,10 +104,11 @@ def save(what, visuals, user_id = None): for (owner_id, name), visual in visuals.items(): if user_id == owner_id: uservisuals[name] = visual - config.save_user_file('user_' + what, uservisuals, user = user_id) + config.save_user_file('user_' + what, uservisuals, user = user_id, unlock=True) - -def load(what, builtin_visuals, skip_func = None): +# FIXME: Currently all user visual files of this type are locked. We could optimize +# this not to lock all files but only lock the files the user is about to modify. +def load(what, builtin_visuals, skip_func = None, lock=False): visuals = {} # first load builtins. Set username to '' @@ -141,6 +142,9 @@ def load(what, builtin_visuals, skip_func = None): if not os.path.exists(path): continue + if lock: + aquire_lock(path) + user_visuals = eval(file(path).read()) for name, visual in user_visuals.items(): visual["owner"] = user

9 years

Check_MK Git: check_mk: levels --> warn/crit

by Simon Betz

Module: check_mk Branch: master Commit: f4887496a402546ba11ef296cda2f62bebc50555 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4887496a40254… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 2 13:01:10 2015 +0200 levels --> warn/crit --- checks/ucs_bladecenter_psu | 8 ++++---- checks/win_dhcp_pools | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/checks/ucs_bladecenter_psu b/checks/ucs_bladecenter_psu index db2bdbc..1dd4777 100644 --- a/checks/ucs_bladecenter_psu +++ b/checks/ucs_bladecenter_psu @@ -88,15 +88,15 @@ def check_ucs_bladecenter_psu(item, params, parsed): if key in psu.keys(): warn_lower, crit_lower = params[param_key + "lower"] if voltage <= crit_lower: - yield 2, "too low (levels at %.2f/%.2f V)" % params[param_key + "lower"] + yield 2, "too low (warn/crit below %.2f/%.2f V)" % params[param_key + "lower"] elif voltage <= warn_lower: - yield 1, "too low (levels at %.2f/%.2f V)" % params[param_key + "lower"] + yield 1, "too low (warn/crit below %.2f/%.2f V)" % params[param_key + "lower"] warn_upper, crit_upper = params[param_key + "upper"] if voltage >= crit_upper: - yield 2, "too high (levels at %.2f/%.2f V)" % params[param_key + "upper"] + yield 2, "too high (warn/crit at %.2f/%.2f V)" % params[param_key + "upper"] elif voltage >= warn_upper: - yield 1, "too high (levels at %.2f/%.2f V)" % params[param_key + "upper"] + yield 1, "too high (warn/crit at %.2f/%.2f V)" % params[param_key + "upper"] check_info["ucs_bladecenter_psu"] = { diff --git a/checks/win_dhcp_pools b/checks/win_dhcp_pools index d74653f..46e3fa9 100644 --- a/checks/win_dhcp_pools +++ b/checks/win_dhcp_pools @@ -140,7 +140,7 @@ def check_win_dhcp_pools(item, params, info): infotext = 'Addresses Free: %d, Used: %d, Pending: %d' % (free, used, pending) if status: - infotext += " (levels at %d/%d)" % (warn_abs, crit_abs) + infotext += " (warn/crit at %d/%d)" % (warn_abs, crit_abs) return status, infotext, perfdata else: return (3, 'Pool information not found')

9 years

Check_MK Git: check_mk: #2573 FIX Fix influance of service period to the availability of BI aggregates

by Mathias Kettner

Module: check_mk Branch: master Commit: 5b05cde3da2adc8a2bd4b76ad5967bce976ab913 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b05cde3da2adc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 2 11:16:32 2015 +0200 #2573 FIX Fix influance of service period to the availability of BI aggregates When computing the availability the influence of the service period of BI aggregates was simply ignored. This has been fixed. --- .werks/2573 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/availability.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/2573 b/.werks/2573 new file mode 100644 index 0000000..67ba247 --- /dev/null +++ b/.werks/2573 @@ -0,0 +1,11 @@ +Title: Fix influance of service period to the availability of BI aggregates +Level: 2 +Component: bi +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1441185337 + +When computing the availability the influence of the service period of BI +aggregates was simply ignored. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 8c896b2..e8281ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -224,6 +224,7 @@ * 2369 FIX: Fix exception in BI availability via table "Hostname Aggregations" * 2370 FIX: Fix computation of "in downtime" and "acknownledged" of hosts in BI aggregations... * 2485 FIX: Fix Icon "BI Aggregations containing this service", also avoid BI compilation without need... + * 2573 FIX: Fix influance of service period to the availability of BI aggregates... Event Console: * 2411 Check check_mkevents: Now able to look for events matching the host alias... diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index ff7b149..28f8e01 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -1355,7 +1355,7 @@ def get_bi_spans(tree, aggr_group, avoptions, timewarp): "host_name" : aggr_group, "service_description" : tree['title'], "in_notification_period" : 1, - "in_service_period" : True, + "in_service_period" : tree_state[0]['in_service_period'], "in_downtime" : tree_state[0]['in_downtime'], "in_host_downtime" : 0, "host_down" : 0,

9 years

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: fa67d292ceda24d9023058618cfe2b8560658889 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa67d292ceda24… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 2 11:15:27 2015 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index aa1bbf6..7d0553d 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2573 +2583

9 years

Check_MK Git: check_mk: #2542 FIX Fix segmentation fault when filtering for service columns in log table

by Mathias Kettner

Module: check_mk Branch: master Commit: 453d4e2dd7d59bc178a1cd34aae61708e7d4ce89 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=453d4e2dd7d59b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 2 10:54:43 2015 +0200 #2542 FIX Fix segmentation fault when filtering for service columns in log table The crash occurred when you filtered for a text type service column in the log table while entries did not have service information (host alerts). --- .werks/2542 | 10 ++++++++++ ChangeLog | 1 + livestatus/src/StringColumnFilter.cc | 3 +++ 3 files changed, 14 insertions(+) diff --git a/.werks/2542 b/.werks/2542 new file mode 100644 index 0000000..75670d3 --- /dev/null +++ b/.werks/2542 @@ -0,0 +1,10 @@ +Title: Fix segmentation fault when filtering for service columns in log table +Level: 2 +Component: livestatus +Compatible: compat +Version: 1.2.7i3 +Date: 1441184018 +Class: fix + +The crash occurred when you filtered for a text type service column in the +log table while entries did not have service information (host alerts). diff --git a/ChangeLog b/ChangeLog index 990ff03..8c896b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -235,6 +235,7 @@ Livestatus: * 2493 FIX: Fixed wrong JSON format when using stats queries together with header columns... + * 2542 FIX: Fix segmentation fault when filtering for service columns in log table... HW/SW-Inventory: * 2128 mk_inventory.vbs: inventory plugin for Windows now available as vbs script... diff --git a/livestatus/src/StringColumnFilter.cc b/livestatus/src/StringColumnFilter.cc index 6a3923e..4dde056 100644 --- a/livestatus/src/StringColumnFilter.cc +++ b/livestatus/src/StringColumnFilter.cc @@ -68,6 +68,9 @@ bool StringColumnFilter::accepts(void *data) { bool pass = true; char *act_string = _column->getValue(data); + if (!act_string) + act_string = ""; // e.g. current_service_perf_data in host entry in log table + switch (_opid) { case OP_EQUAL: pass = _ref_string == act_string; break;

9 years

Check_MK Git: check_mk: adapted man page

by Simon Betz

Module: check_mk Branch: master Commit: c07cb1afebb9f21c07d87115314aba0dd2fb7b4b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c07cb1afebb9f2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 2 07:53:26 2015 +0200 adapted man page --- checkman/cisco_srst_state | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/cisco_srst_state b/checkman/cisco_srst_state index b6dbe7d..1d43842 100644 --- a/checkman/cisco_srst_state +++ b/checkman/cisco_srst_state @@ -6,7 +6,7 @@ distribution: check_mk description: This check monitors the status of the Cisco Unified SRST feature of a Cisco device which supports that feature. - There are two possible states: active (WARN) or inactive (OK). + There are two possible states: active (CRIT) or inactive (OK). Moreover the check displays the time (in minutes) since the SRST feature switched to active mode.

9 years

Check_MK Git: check_mk: fixed default levels on new ipr400 checks

by Sebastian Herbord

Module: check_mk Branch: master Commit: e8f737b670d2e6f32c67344b99de820fefe1d0fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8f737b670d2e6… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Sep 1 16:06:20 2015 +0200 fixed default levels on new ipr400 checks --- checks/ipr400_in_voltage | 6 +++--- checks/ipr400_temp | 22 ++++++++++++++-------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/checks/ipr400_in_voltage b/checks/ipr400_in_voltage index 5eb878f..e1d0d19 100644 --- a/checks/ipr400_in_voltage +++ b/checks/ipr400_in_voltage @@ -25,8 +25,8 @@ # Boston, MA 02110-1301 USA. -ipr400_in_voltage_default_levels = (12.0, 11.5) # 11.5-13.8V is the operational voltage according - # to the manual +ipr400_in_voltage_default_levels = (12, 11) # 11.5-13.8V is the operational voltage according + # to the manual def inventory_ipr400_in_voltage(info): if len(info) > 0: @@ -37,7 +37,7 @@ def check_ipr400_in_voltage(item, params, info): power = int(info[0][0]) / 1000.0 # appears to be in mV perfdata = [ ( "in_voltage", power, warn, crit ) ] infotext = "in voltage: %.1fV" % power - limitstext = "(warn/crit below %.1fV/%.1fV)" % (warn, crit) + limitstext = "(warn/crit below %dV/%dV)" % (warn, crit) if power <= crit: return 2, infotext + ", " + limitstext, perfdata diff --git a/checks/ipr400_temp b/checks/ipr400_temp index 3c6593a..6f71f23 100644 --- a/checks/ipr400_temp +++ b/checks/ipr400_temp @@ -25,6 +25,11 @@ # Boston, MA 02110-1301 USA. +factory_settings["ipr400_temp_default_levels"] = { + "levels": (30, 40), # reported temperature seems to be near room temperature usually +} + + def inventory_ipr400_temp(info): if len(info) > 0: yield "Ambient", None @@ -33,13 +38,14 @@ def check_ipr400_temp(item, params, info): return check_temperature(int(info[0][0]), params) check_info["ipr400_temp"] = { - "check_function" : check_ipr400_temp, - "inventory_function" : inventory_ipr400_temp, - "service_description" : "Temperature %s ", - "has_perfdata" : True, - "group" : "temperature", - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").lower().startswith("ipr voip device ipr400"), - "snmp_info" : ( ".1.3.6.1.4.1.27053.1.4.5", [ 9 ] ), - "includes" : [ "temperature.include" ], + "check_function" : check_ipr400_temp, + "inventory_function" : inventory_ipr400_temp, + "default_levels_variable" : "ipr400_temp_default_levels", + "service_description" : "Temperature %s ", + "has_perfdata" : True, + "group" : "temperature", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").lower().startswith("ipr voip device ipr400"), + "snmp_info" : ( ".1.3.6.1.4.1.27053.1.4.5", [ 9 ] ), + "includes" : [ "temperature.include" ], }

9 years

Check_MK Git: check_mk: #2563 ipr400_temp, ipr400_in_voltage:

by Sebastian Herbord

New checks for the Omnitronics IPR400 Message-ID: <55e5a190.JK5K+K84sntFtwSZ%sh(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: ba087dc9ed3527785f75898fcfead131720f3945 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba087dc9ed3527… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Sep 1 15:00:50 2015 +0200 #2563 ipr400_temp, ipr400_in_voltage: New checks for the Omnitronics IPR400 --- .werks/2563 | 9 +++++++ ChangeLog | 1 + checkman/ipr400_in_voltage | 10 ++++++++ checkman/ipr400_temp | 10 ++++++++ checks/ipr400_in_voltage | 58 ++++++++++++++++++++++++++++++++++++++++++++ checks/ipr400_temp | 45 ++++++++++++++++++++++++++++++++++ 6 files changed, 133 insertions(+) diff --git a/.werks/2563 b/.werks/2563 new file mode 100644 index 0000000..6e51780 --- /dev/null +++ b/.werks/2563 @@ -0,0 +1,9 @@ +Title: ipr400_temp, ipr400_in_voltage: New checks for the Omnitronics IPR400 +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1441112436 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 55a4275..990ff03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,7 @@ * 2424 esx_vsphere_counters: improved handling when data is missing... * 1288 cisco_vpn_tunnel: Added Metrics for trafic, please beware:... * 2425 agent_hp_msa: New special agent to monitor "HP MSA Storage" devices... + * 2563 ipr400_temp, ipr400_in_voltage: New checks for the Omnitronics IPR400 * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... diff --git a/checkman/ipr400_in_voltage b/checkman/ipr400_in_voltage new file mode 100644 index 0000000..021424b --- /dev/null +++ b/checkman/ipr400_in_voltage @@ -0,0 +1,10 @@ +title: Omnitronics IPR400 VoIP Device: Input Voltage +agents: snmp +catalog: hw/phone +license: GPL +distribution: check_mk +description: + The check monitors the input voltage on Omnitronics IPR400 VoIP devices. + +inventory: + Creates exactly one service diff --git a/checkman/ipr400_temp b/checkman/ipr400_temp new file mode 100644 index 0000000..0ec3b0b --- /dev/null +++ b/checkman/ipr400_temp @@ -0,0 +1,10 @@ +title: Omnitronics IPR400 VoIP Device: Temperature +agents: snmp +catalog: hw/phone +license: GPL +distribution: check_mk +description: + The check monitors the temperature on Omnitronics IPR400 VoIP devices. + +inventory: + Creates exactly one service diff --git a/checks/ipr400_in_voltage b/checks/ipr400_in_voltage new file mode 100644 index 0000000..5eb878f --- /dev/null +++ b/checks/ipr400_in_voltage @@ -0,0 +1,58 @@ +#!/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. + + +ipr400_in_voltage_default_levels = (12.0, 11.5) # 11.5-13.8V is the operational voltage according + # to the manual + +def inventory_ipr400_in_voltage(info): + if len(info) > 0: + yield "1", "ipr400_in_voltage_default_levels" + +def check_ipr400_in_voltage(item, params, info): + warn, crit = params + power = int(info[0][0]) / 1000.0 # appears to be in mV + perfdata = [ ( "in_voltage", power, warn, crit ) ] + infotext = "in voltage: %.1fV" % power + limitstext = "(warn/crit below %.1fV/%.1fV)" % (warn, crit) + + if power <= crit: + return 2, infotext + ", " + limitstext, perfdata + elif power <= warn: + return 1, infotext + ", " + limitstext, perfdata + else: + return 0, infotext, perfdata + +check_info["ipr400_in_voltage"] = { + "check_function" : check_ipr400_in_voltage, + "inventory_function" : inventory_ipr400_in_voltage, + "service_description" : "IN Voltage %s", + "has_perfdata" : True, + "group" : "evolt", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").lower().startswith("ipr voip device ipr400"), + "snmp_info" : ( ".1.3.6.1.4.1.27053.1.4.5.10", [ "0" ] ), +} + diff --git a/checks/ipr400_temp b/checks/ipr400_temp new file mode 100644 index 0000000..3c6593a --- /dev/null +++ b/checks/ipr400_temp @@ -0,0 +1,45 @@ +#!/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 inventory_ipr400_temp(info): + if len(info) > 0: + yield "Ambient", None + +def check_ipr400_temp(item, params, info): + return check_temperature(int(info[0][0]), params) + +check_info["ipr400_temp"] = { + "check_function" : check_ipr400_temp, + "inventory_function" : inventory_ipr400_temp, + "service_description" : "Temperature %s ", + "has_perfdata" : True, + "group" : "temperature", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").lower().startswith("ipr voip device ipr400"), + "snmp_info" : ( ".1.3.6.1.4.1.27053.1.4.5", [ 9 ] ), + "includes" : [ "temperature.include" ], +} +

9 years

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Sebastian Herbord

Module: check_mk Branch: master Commit: 78ab5aebcf25fef7fad6894c11da05054dfa2212 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78ab5aebcf25fe… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Sep 1 14:53:13 2015 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index f9aadb0..aa1bbf6 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2563 +2573

9 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2015