Checkmk git commits March 2013

checkmk-commits@lists.checkmk.com

3 participants
209 discussions

Check_MK Git: check_mk: Rule for NIC: better defaults and size of assumed nic speed

by Mathias Kettner

Module: check_mk Branch: master Commit: c3ed2dcc389eb8efc4bc34a1d0f6db7549938813 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3ed2dcc389eb8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 8 09:13:50 2013 +0100 Rule for NIC: better defaults and size of assumed nic speed --- web/plugins/wato/check_parameters.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index a048516..14eb462 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1266,9 +1266,11 @@ register_check_parameters( ( 1000000000, "1 GBit/s" ), ( 10000000000, "10 GBit/s" ) ], otherlabel = _("specify manually ->"), + default_value = 16000000, explicit = \ Integer(title = _("Other speed in bits per second"), - label = _("Bits per second"))) + label = _("Bits per second"), + size = 10)) ), ( "assumed_speed_out", OptionalDropdownChoice( @@ -1283,9 +1285,11 @@ register_check_parameters( ( 1000000000, "1 GBit/s" ), ( 10000000000, "10 GBit/s" ) ], otherlabel = _("specify manually ->"), + default_value = 1500000, explicit = \ Integer(title = _("Other speed in bits per second"), - label = _("Bits per second"))) + label = _("Bits per second"), + size = 12)) ), ( "unit", RadioChoice(

11 years, 3 months

Check_MK Git: check_mk: FIX: ValueSpec OptionalDropDown: fix visibility if default is "other"

by Mathias Kettner

Module: check_mk Branch: master Commit: a7ee775afaca37b908d294520a4ec36a442bd4a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7ee775afaca37… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 8 09:10:02 2013 +0100 FIX: ValueSpec OptionalDropDown: fix visibility if default is "other" --- ChangeLog | 1 + web/htdocs/valuespec.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5480b67..64a5db7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -132,6 +132,7 @@ within the group * FIX: Fixed exception when editing contactgroups without alias * FIX: Fix localization of rule options + * FIX: ValueSpec OptionalDropDown: fix visibility if default is "other" * Suggest use default value for filesystem levels that make sense * Valuespec: CascadingDropdown now able to process choice values from functions * Freshness checking for classical passive Nagios checks (custom_checks) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index d12a6f9..a114846 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1244,7 +1244,7 @@ class OptionalDropdownChoice(ValueSpec): options.append(("other", self._otherlabel)) html.select(varprefix, options, defval, # attrs={"style":"float:left;"}, onchange="valuespec_toggle_dropdown(this, '%s_ex');" % varprefix ) - if html.form_submitted(): + if html.has_var(varprefix): div_is_open = html.var(varprefix) == "other" else: div_is_open = self.value_is_explicit(value)

11 years, 3 months

Check_MK Git: check_mk: Updated changelog

by Lars Michelsen

Module: check_mk Branch: master Commit: bae9a9d97b7660e8e8546303628b75fdd49bba0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bae9a9d97b7660… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 8 08:51:25 2013 +0100 Updated changelog --- ChangeLog | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fb59c11..5480b67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,8 +2,6 @@ Core: * Agents can send data for other hosts "piggyback". This is being used by the vSphere and SAP plugins - * Checks can now omit the typical "OK - " or "WARN -". This text - will be added automatically if missing. Multisite: * New availability view for arbitrary host/service collections @@ -62,6 +60,10 @@ for each logfile on a host 1.2.2b5: + Core: + * Checks can now omit the typical "OK - " or "WARN -". This text + will be added automatically if missing. + livestatus: * FIX: possible crash with VERY long downtime comments

11 years, 3 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: c2102565d4d7e685971be71001b1fb2bcd427cb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2102565d4d7e6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 7 16:18:21 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 3 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 83a42a36d7713f42668253c3d1a07d08aeb8038c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83a42a36d7713f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 7 18:11:46 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 3 months

Check_MK Git: check_mk: FIX: f5_bigip_psu - fixed inventory function

by Lars Michelsen

Module: check_mk Branch: master Commit: c8ae6c075daf77c30afb98f81ae205a86822fa32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8ae6c075daf77… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 7 17:10:49 2013 +0100 FIX: f5_bigip_psu - fixed inventory function --- ChangeLog | 1 + checks/f5_bigip_psu | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd4af74..d2d2013 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,6 +91,7 @@ * Linux agent: limit netstat to 10 seconds * ps: Allow %1, %2, .. instead of %s in process_inventory. That allows reordering of matched groups + * FIX: f5_bigip_psu - fixed inventory function Multisite: * FIX: Fixed problem with error during localization scanning diff --git a/checks/f5_bigip_psu b/checks/f5_bigip_psu index 80b8083..419ab8e 100644 --- a/checks/f5_bigip_psu +++ b/checks/f5_bigip_psu @@ -46,7 +46,7 @@ def inventory_f5_bigip_psu(info): psu, state = line[0] # inventorize the PSU unless it's in state 2 (notpresent) if state != "2": - inventory.append(psu, None) + inventory.append((psu, None)) return inventory

11 years, 3 months

Check_MK Git: check_mk: FIX: printer_supply - fixed inventory function for some OKI printers

by Lars Michelsen

Module: check_mk Branch: master Commit: 515e65a533a7d683206660195a83a4794e516b7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=515e65a533a7d6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 7 17:23:10 2013 +0100 FIX: printer_supply - fixed inventory function for some OKI printers --- ChangeLog | 1 + checks/printer_supply | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index d2d2013..1f2e2ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -92,6 +92,7 @@ * ps: Allow %1, %2, .. instead of %s in process_inventory. That allows reordering of matched groups * FIX: f5_bigip_psu - fixed inventory function + * FIX: printer_supply - fixed inventory function for some kind of OKI printers Multisite: * FIX: Fixed problem with error during localization scanning diff --git a/checks/printer_supply b/checks/printer_supply index e5dec46..69a83c5 100644 --- a/checks/printer_supply +++ b/checks/printer_supply @@ -58,7 +58,7 @@ printer_supply_some_remaining_status = 1 def printer_supply_fix_infos(info): colors = [] new_info = [] - for line in info: + for index, line in enumerate(info): line_0 = snmp_decode_string(line[0]) # give chance for latin1->utf8 decoding if line_0.startswith('Toner Cartridge') \ or line_0.startswith('Image Drum Unit'):

11 years, 3 months

Check_MK Git: check_mk: Fixed syntax

by Lars Michelsen

Module: check_mk Branch: master Commit: e63183faae1e9cdf1c5441dbadce3481997a2f42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e63183faae1e9c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 6 17:26:35 2013 +0100 Fixed syntax --- checks/hr_fs | 3 ++- checks/hr_mem | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/checks/hr_fs b/checks/hr_fs index 6c561d8..48172d1 100644 --- a/checks/hr_fs +++ b/checks/hr_fs @@ -66,7 +66,8 @@ snmp_info["hr_fs"] = ( ".1.3.6.1.2.1.25.2.3.1", [ ] ) checkgroup_of['hr_fs'] = "filesystem" +# HOST-RESOURCES-MIB::hrSystemUptime.0 snmp_scan_functions["hr_fs"] = lambda oid: \ - not not oid('.1.3.6.1.2.1.25.1.1.0') # HOST-RESOURCES-MIB::hrSystemUptime.0 + not not oid('.1.3.6.1.2.1.25.1.1.0') check_default_levels["hr_fs"] = "filesystem_default_levels" diff --git a/checks/hr_mem b/checks/hr_mem index f883f8e..ea51ce8 100644 --- a/checks/hr_mem +++ b/checks/hr_mem @@ -101,6 +101,7 @@ snmp_info["hr_mem"] = ( ".1.3.6.1.2.1.25.2.3.1", [ 5, # hrStorageSize 6, # hrStorageUsed ] ) +# HOST-RESOURCES-MIB::hrSystemUptime.0 snmp_scan_functions["hr_mem"] = lambda oid: \ - not not oid('.1.3.6.1.2.1.25.1.1.0') # HOST-RESOURCES-MIB::hrSystemUptime.0 + not not oid('.1.3.6.1.2.1.25.1.1.0') checkgroup_of['hr_mem'] = "memory"

11 years, 3 months

Check_MK Git: check_mk: migrated to new check api

by Lars Michelsen

Module: check_mk Branch: master Commit: 6303ec1ebc7cbfb9703c3d6dc397500cf46a0c3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6303ec1ebc7cbf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 5 17:06:24 2013 +0100 migrated to new check api --- checks/drbd | 43 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 39 insertions(+), 4 deletions(-) diff --git a/checks/drbd b/checks/drbd index 7e4acba..d47643a 100644 --- a/checks/drbd +++ b/checks/drbd @@ -267,6 +267,16 @@ def check_drbd_general(item, params, info): return (3, "UNKNOWN - Undefined state") +check_info["drbd"] = {'check_function': check_drbd_general, + 'default_levels_variable': None, + 'group': 'drbd', + 'has_perfdata': True, + 'inventory_function': lambda info: inventory_drbd(info, "drbd"), + 'node_info': False, + 'service_description': 'DRBD %s status', + 'snmp_info': None, + 'snmp_scan_function': None} + def drbd_get_counters(list): now = time.time() output = '' @@ -293,6 +303,16 @@ def check_drbd_net(item, params, info): return (3, "UNKNOWN - Undefined state") +check_info["drbd.net"] = {'check_function': check_drbd_net, + 'default_levels_variable': None, + 'group': 'drbd.net', + 'has_perfdata': True, + 'inventory_function': lambda info: inventory_drbd(info, "drbd.net"), + 'node_info': False, + 'service_description': 'DRBD %s net', + 'snmp_info': None, + 'snmp_scan_function': None} + def check_drbd_disk(item, params, info): parsed = drbd_get_block(item, info, 'drbd.disk') if not parsed is None: @@ -305,6 +325,16 @@ def check_drbd_disk(item, params, info): return (3, "UNKNOWN - Undefined state") +check_info["drbd.disk"] = {'check_function': check_drbd_disk, + 'default_levels_variable': None, + 'group': 'drbd.disk', + 'has_perfdata': True, + 'inventory_function': lambda info: inventory_drbd(info, "drbd.disk"), + 'node_info': False, + 'service_description': 'DRBD %s disk', + 'snmp_info': None, + 'snmp_scan_function': None} + def check_drbd_stats(item, params, info): parsed = drbd_get_block(item, info, 'drbd.stats') if not parsed is None: @@ -326,7 +356,12 @@ def check_drbd_stats(item, params, info): return (3, "UNKNOWN - Undefined state") -check_info['drbd'] = (check_drbd_general, "DRBD %s status", 1, lambda info: inventory_drbd(info, "drbd")) -check_info['drbd.net'] = (check_drbd_net, "DRBD %s net", 1, lambda info: inventory_drbd(info, "drbd.net")) -check_info['drbd.disk'] = (check_drbd_disk, "DRBD %s disk", 1, lambda info: inventory_drbd(info, "drbd.disk")) -check_info['drbd.stats'] = (check_drbd_stats, "DRBD %s stats", 1, lambda info: inventory_drbd(info, "drbd.stats")) +check_info["drbd.stats"] = {'check_function': check_drbd_stats, + 'default_levels_variable': None, + 'group': 'drbd.stats', + 'has_perfdata': True, + 'inventory_function': lambda info: inventory_drbd(info, "drbd.stats"), + 'node_info': False, + 'service_description': 'DRBD %s stats', + 'snmp_info': None, + 'snmp_scan_function': None}

11 years, 3 months

Check_MK Git: check_mk: migrated to new check api

by Lars Michelsen

Module: check_mk Branch: master Commit: c649eab2bce8058e33df253285ab5347ed9b64da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c649eab2bce805… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 5 17:16:58 2013 +0100 migrated to new check api --- checks/j4p_performance | 71 +++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 61 insertions(+), 10 deletions(-) diff --git a/checks/j4p_performance b/checks/j4p_performance index 8a56242..4613847 100644 --- a/checks/j4p_performance +++ b/checks/j4p_performance @@ -130,6 +130,16 @@ def check_j4p_performance_mem(item, params, info): else: return (0, "OK - " + infotext, perfdata) +check_info["j4p_performance.mem"] = {'check_function': check_j4p_performance_mem, + 'default_levels_variable': None, + 'group': 'j4p_performance.mem', + 'has_perfdata': True, + 'inventory_function': lambda i: inventory_j4p_performance(i, "mem"), + 'node_info': False, + 'service_description': 'JMX %s Memory', + 'snmp_info': None, + 'snmp_scan_function': None} + def check_j4p_performance_threads(item, params, info): warn, crit = params @@ -168,6 +178,17 @@ def check_j4p_performance_threads(item, params, info): else: return (status, '%s - %s' % (nagios_state_names[status], ', '.join(output)), perfdata) +check_info["j4p_performance.threads"] = {'check_function': check_j4p_performance_threads, + 'default_levels_variable': None, + 'group': 'j4p_performance.threads', + 'has_perfdata': True, + 'inventory_function': lambda i: inventory_j4p_performance(i, "threads"), + 'node_info': False, + 'service_description': 'JMX %s Threads', + 'snmp_info': None, + 'snmp_scan_function': None} + + def check_j4p_performance_uptime(item, _unused, info): parsed = j4p_performance_parse(info) if item not in parsed: @@ -183,6 +204,16 @@ def check_j4p_performance_uptime(item, _unused, info): since = time.strftime("%c", time.localtime(now - uptime)) return (0, "OK - up since %s (%dd %02d:%02d:%02d)" % (since, days, hours, minutes, seconds), [ ("uptime", uptime) ]) +check_info["j4p_performance.uptime"] = {'check_function': check_j4p_performance_uptime, + 'default_levels_variable': None, + 'group': 'j4p_performance.uptime', + 'has_perfdata': True, + 'inventory_function': lambda i: inventory_j4p_performance(i, "uptime"), + 'node_info': False, + 'service_description': 'JMX %s Uptime', + 'snmp_info': None, + 'snmp_scan_function': None} + def check_j4p_performance_app_state(item, _unused, info): app = j4p_performance_app(info, item.split()) @@ -195,6 +226,17 @@ def check_j4p_performance_app_state(item, _unused, info): return (2, 'CRIT - application is not running (Running: %s)') +check_info["j4p_performance.app_state"] = {'check_function': check_j4p_performance_app_state, + 'default_levels_variable': None, + 'group': 'j4p_performance.app_state', + 'has_perfdata': False, + 'inventory_function': lambda i: inventory_j4p_performance_apps(i, "app_state"), + 'node_info': False, + 'service_description': 'JMX %s State', + 'snmp_info': None, + 'snmp_scan_function': None} + + def check_j4p_performance_app_sess(item, params, info): lo_crit, lo_warn, hi_warn, hi_crit = params app = j4p_performance_app(info, item.split()) @@ -220,6 +262,16 @@ def check_j4p_performance_app_sess(item, params, info): return (status, '%s - %d Sessions%s' % (nagios_state_names[status], sess, status_txt), [('sessions', sess, hi_warn, hi_crit)]) +check_info["j4p_performance.app_sess"] = {'check_function': check_j4p_performance_app_sess, + 'default_levels_variable': None, + 'group': 'j4p_performance.app_sess', + 'has_perfdata': True, + 'inventory_function': lambda i: inventory_j4p_performance_apps(i, "app_sess"), + 'node_info': False, + 'service_description': 'JMX %s Sessions', + 'snmp_info': None, + 'snmp_scan_function': None} + def check_j4p_performance_serv_req(item, params, info): lo_crit, lo_warn, hi_warn, hi_crit = params @@ -259,13 +311,12 @@ def check_j4p_performance_serv_req(item, params, info): else: return (status, '%s - %s' % (nagios_state_names[status], ', '.join(output)), perfdata) - -# General JVM checks -check_info["j4p_performance.mem"] = ( check_j4p_performance_mem, "JMX %s Memory", 1, lambda i: inventory_j4p_performance(i, "mem")) -check_info["j4p_performance.threads"] = ( check_j4p_performance_threads, "JMX %s Threads", 1, lambda i: inventory_j4p_performance(i, "threads")) -check_info["j4p_performance.uptime"] = ( check_j4p_performance_uptime, "JMX %s Uptime", 1, lambda i: inventory_j4p_performance(i, "uptime")) -# App specific checks -check_info["j4p_performance.app_state"] = ( check_j4p_performance_app_state, "JMX %s State", 0, lambda i: inventory_j4p_performance_apps(i, "app_state")) -check_info["j4p_performance.app_sess"] = ( check_j4p_performance_app_sess, "JMX %s Sessions", 1, lambda i: inventory_j4p_performance_apps(i, "app_sess")) -# Servlet specific checks -check_info["j4p_performance.serv_req"] = ( check_j4p_performance_serv_req, "JMX %s Requests", 1, lambda i: inventory_j4p_performance_serv(i, "serv_req")) +check_info["j4p_performance.serv_req"] = {'check_function': check_j4p_performance_serv_req, + 'default_levels_variable': None, + 'group': 'j4p_performance.serv_req', + 'has_perfdata': True, + 'inventory_function': lambda i: inventory_j4p_performance_serv(i, "serv_req"), + 'node_info': False, + 'service_description': 'JMX %s Requests', + 'snmp_info': None, + 'snmp_scan_function': None}

11 years, 3 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2013