Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64518 discussions

Check_MK Git: check_mk: Added note to inventory draft

by Mathias Kettner

Module: check_mk Branch: master Commit: 993c970897545df300850452bf3f21dc75b0687d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=993c970897545d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 29 15:27:13 2013 +0100 Added note to inventory draft --- doc/drafts/LIESMICH.hardwareinventur | 7 +++++++ modules/check_mk_base.py | 2 +- modules/prediction.py | 16 +++++++++++----- web/htdocs/wato.py | 18 ++++++++++++++---- 4 files changed, 33 insertions(+), 10 deletions(-) diff --git a/doc/drafts/LIESMICH.hardwareinventur b/doc/drafts/LIESMICH.hardwareinventur index d3c9196..efca246 100644 --- a/doc/drafts/LIESMICH.hardwareinventur +++ b/doc/drafts/LIESMICH.hardwareinventur @@ -208,3 +208,10 @@ sind ja einfach anzuzeigen. Wenn aber etwas gebraucht wird wie "Version von RPM-Paket X", dann ist das X ja variabel. Dies könnten wir evtl. lösen, in dem wir den bestehenden Mechanismus zum Anzeigen von Service-Daten in Hosttabellen verwenden. + + +------------------------------------------------------------------------------- + N O T I Z E N +------------------------------------------------------------------------------- + +- Das ganze muss natürlich auch auf Workstations funktionieren! diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index e2aed27..657749f 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1361,7 +1361,7 @@ def pnp_cleanup(s): # | These functions are used in some of the checks. | # +----------------------------------------------------------------------+ -# Generic function for checking a value against levels. This also support +# Generic function for checking a value against levels. This also supports # predictive levels. # value: currently measured value # dsname: name of the datasource in the RRD that corresponds to this value diff --git a/modules/prediction.py b/modules/prediction.py index bf114d3..db1041f 100644 --- a/modules/prediction.py +++ b/modules/prediction.py @@ -314,15 +314,21 @@ def get_predictive_levels(dsname, params, cf, levels_factor=1.0): if p in params: how, (warn, crit) = params[p] if how == "absolute": - levels.append((ref_value + (sig * warn * levels_factor), ref_value + (sig * crit * levels_factor))) + this_levels = (ref_value + (sig * warn * levels_factor), ref_value + (sig * crit * levels_factor)) 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)) + # print levels return ref_value, levels diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 24c2aca..eb2fc5c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12159,7 +12159,7 @@ def PredictiveLevels(**args): dif = args.get("default_difference", (2.0, 4.0)) return Dictionary( title = _("Predictive Levels"), - optional_keys = [ "weight", "levels_upper", "levels_lower" ], + optional_keys = [ "weight", "levels_upper", "levels_upper_min", "levels_lower", "levels_lower_max" ], default_keys = [ "levels_upper" ], columns = 1, headers = "sup", @@ -12188,7 +12188,7 @@ def PredictiveLevels(**args): # )), ( "levels_upper", CascadingDropdown( - title = _("Dynamic levels (upper bound)"), + title = _("Dynamic levels - upper bound"), choices = [ ( "absolute", _("Absolute difference from prediction"), @@ -12216,9 +12216,20 @@ def PredictiveLevels(**args): )), ] )), + ( "levels_upper_min", + Tuple( + title = _("Limit for upper bound dynamic levels"), + help = _("Regardless of how the dynamic levels upper bound are computed according to the prediction: " + "the will never be set below the following limits. This avoids false alarms " + "during times where the predicted levels would be very low."), + elements = [ + Float(title = _("Warning level is at least")), + Float(title = _("Critical level is at least")), + ] + )), ( "levels_lower", CascadingDropdown( - title = _("Dynamic levels (lower bound)"), + title = _("Dynamic levels - lower bound"), choices = [ ( "absolute", _("Absolute difference from prediction"), @@ -12246,7 +12257,6 @@ def PredictiveLevels(**args): )), ] )), - ] )

10 years, 10 months

Check_MK Git: check_mk: winperf_ts_sessions: New check to monitor Microsoft Terminal Server sessions

by Lars Michelsen

Module: check_mk Branch: master Commit: 1070a172040ba633325af5e439c212bed043842a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1070a172040ba6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 29 15:24:40 2013 +0100 winperf_ts_sessions: New check to monitor Microsoft Terminal Server sessions This check can be used to monitor the number of active and inactive user sessions. --- .werks/291 | 8 ++++ ChangeLog | 1 + checkman/winperf_ts_sessions | 27 +++++++++++++ checks/winperf_ts_sessions | 73 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 33 +++++++++++++++ 5 files changed, 142 insertions(+) diff --git a/.werks/291 b/.werks/291 new file mode 100644 index 0000000..22303e8 --- /dev/null +++ b/.werks/291 @@ -0,0 +1,8 @@ +Title: winperf_ts_sessions: New check to monitor Microsoft Terminal Server sessions +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1385735024 +Class: feature + +This check can be used to monitor the number of active and inactive user sessions. diff --git a/ChangeLog b/ChangeLog index 5c16105..7d0a106 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ * 0101 liebert_chiller_status: New check for Liebert Chiller devices * 0083 brocade_mlx: Temperature sensors of one module now in one common check... * 0008 df: Solaris agent now also supports samfs + * 0291 winperf_ts_sessions: New check to monitor Microsoft Terminal Server sessions... * 0024 FIX: cisco_wlc: removed check configuration parameter ap_model... * 0003 FIX: ps: Remove exceeding [ and ] in service description when using process inventory... * 0037 FIX: checkman browser (cmk -m) was not working properly in network subtree... diff --git a/checkman/winperf_ts_sessions b/checkman/winperf_ts_sessions new file mode 100644 index 0000000..f55db18 --- /dev/null +++ b/checkman/winperf_ts_sessions @@ -0,0 +1,27 @@ +title: Microsoft Terminal Server Sessions +agents: linux +catalog: os/kernel +license: GPL +distribution: check_mk +description: + This check monitors the number of active and inactive Microsoft Terminal + Server Sessions using the windows performance counters (agent section + {<<<winperf_ts_sessions>>>}). + + To make this check work, you need to configure the agent via it's .ini + file to forward the terminal service session related counters. Take a + look at the windows monitoring documentation for details. + + It allows to set {WARN} and {CRIT} tresholds on the active and idle session. + +inventory: + The check generates service per host. + +perfdata: + The check generates perfdata for the active and inactive sessions. + +[parameters] +paramaeters(dict): A dictionary with the following optional keys: + + {"active"}: A tuple of warn and crit thresholds + {"inactive"}: A tuple of warn and crit thresholds diff --git a/checks/winperf_ts_sessions b/checks/winperf_ts_sessions new file mode 100644 index 0000000..dd9b6c7 --- /dev/null +++ b/checks/winperf_ts_sessions @@ -0,0 +1,73 @@ +#!/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. + +# Example output from agent: +# <<<winperf_ts_sessions>>> +# 1385714515.93 2102 +# 2 1 rawcount +# 4 1 rawcount +# 6 0 rawcount + +# Counters, relative to the base ID (2102) +# 2 Total number of Terminal Services sessions. +# 4 Number of active Terminal Services sessions. +# 6 Number of inactive Terminal Services sessions. + +def inventory_winperf_ts_sessions(info): + if len(info) > 1: + return [ (None, {}) ] + +def check_winperf_ts_sessions(_unused, params, info): + if not info or len(info) == 1: + return 3, "Performance counters not available" + total, active, inactive = [ int(l[0]) for l in info[1:4] ] + + state = 0 + state_txt = [] + for val, key, title in [ (active, 'active', 'Active'), + (inactive, 'inactive', 'Inactive') ]: + txt = '%d %s' % (val, title) + if key in params: + if val > params[key][0]: + state = max(state, 2) + txt += ' (!!)' + elif val > params[key][1]: + state = max(state, 1) + txt += ' (!)' + state_txt.append(txt) + + 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, + 'service_description': 'Sessions', + 'has_perfdata': True, + 'group': 'winperf_ts_sessions', +} diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 8cac46e..7ffd889 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3139,6 +3139,39 @@ register_check_parameters( ) register_check_parameters( + subgroup_applications, + "winperf_ts_sessions", + _("Windows Terminal Server Sessions"), + Dictionary( + help = _("This check monitors number of active and inactive terminal " + "server sessions."), + elements = [ + ( "active", + Tuple( + title = _("Number of active sessions"), + elements = [ + Integer(title = _("Warning if above"), unit = _("sessions"), default_value = 100), + Integer(title = _("Critical if above"), unit = _("sessions"), default_value = 200), + ], + ), + ), + ( "inactive", + Tuple( + title = _("Number of inactive sessions"), + help = _("Levels for the number of sessions that are currently inactive"), + elements = [ + Integer(title = _("Warning if above"), unit = _("sessions"), default_value = 10), + Integer(title = _("Critical if above"), unit = _("sessions"), default_value = 20), + ], + ), + ), + ] + ), + None, + None +) + +register_check_parameters( subgroup_storage, "raid", _("RAID: overall state"),

10 years, 10 months

Check_MK Git: check_mk: brocade_mlx checks: added perfometers

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 19fdbb0ab3022c754dfd0740b37ec02fa709fc04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19fdbb0ab3022c… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Nov 29 15:22:14 2013 +0100 brocade_mlx checks: added perfometers --- web/plugins/perfometer/check_mk.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index d6e482f..2e4fa6a 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -277,6 +277,25 @@ perfometers["check_mk-hwg_temp"] = perfometer_temperature perfometers["check_mk-sensatronics_temp"] = perfometer_temperature perfometers["check_mk-apc_inrow_temperature"] = perfometer_temperature +def perfometer_temperature_multi(row, check_command, perf_data): + display_value = -1 + display_color = "#60f020" + + for sensor, value, uom, warn, crit, min, max in perf_data: + value=saveint(value) + if value > display_value: + display_value=value + + if display_value > saveint(warn): + display_color = "#FFC840" + if display_value > saveint(crit): + display_color = "#FF0000" + + display_string = "%s °C" % display_value + return display_string, perfometer_linear(display_value, display_color) + +perfometers["check_mk-brocade_mlx_temp"] = perfometer_temperature_multi + def perfometer_blower(row, check_command, perf_data): rpm = saveint(perf_data[0][1]) perc = rpm / 10000.0 * 100.0 @@ -409,6 +428,7 @@ perfometers["check_mk-winperf_processor.util"] = perfometer_cpu_utilization perfometers["check_mk-netapp_cpu"] = perfometer_cpu_utilization perfometers["check_mk-cisco_cpu"] = perfometer_cpu_utilization perfometers["check_mk-juniper_cpu"] = perfometer_cpu_utilization +perfometers["check_mk-brocade_mlx.module_cpu"] = perfometer_cpu_utilization def perfometer_ps_perf(row, check_command, perf_data): perf_dict = dict([(p[0], float(p[1])) for p in perf_data]) @@ -700,6 +720,7 @@ def perfometer_simple_mem_usage(row, command, perf): perfometers['check_mk-db2_mem'] = perfometer_simple_mem_usage perfometers['check_mk-esx_vsphere_hostsystem.mem_usage'] = perfometer_simple_mem_usage +perfometers['check_mk-brocade_mlx.module_mem'] = perfometer_simple_mem_usage def perfometer_vmguest_mem_usage(row, command, perf): used = float(perf[0][1])

10 years, 10 months

Check_MK Git: check_mk: Automatically schedule inventory check after service config change

by Mathias Kettner

Module: check_mk Branch: master Commit: 1be408dcd181c3b84453048cf2d4809d055fd66a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1be408dcd181c3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 29 14:24:55 2013 +0100 Automatically schedule inventory check after service config change Now after each change of the service configuration of a host via WATO - may it be via manual changes or a bulk inventory - the inventory check is automatically rescheduled in order to reflect the new service state correctly immediately. You can switch off this behaviour via a new global option called Inventory triggers inventory check. The default setting is on. --- .werks/9 | 14 ++++++++++++++ ChangeLog | 1 + modules/automation.py | 15 +++++++++++++++ modules/check_mk.py | 1 + web/plugins/wato/check_mk_configuration.py | 14 ++++++++++++++ 5 files changed, 45 insertions(+) diff --git a/.werks/9 b/.werks/9 new file mode 100644 index 0000000..be7f088 --- /dev/null +++ b/.werks/9 @@ -0,0 +1,14 @@ +Title: Automatically schedule inventory check after service config change +Level: 2 +Component: wato +Version: 1.2.3i7 +Date: 1385731404 +Class: feature + +Now after each change of the service configuration of a host via WATO - +may it be via manual changes or a bulk inventory - the inventory check +is automatically rescheduled in order to reflect the new service state +correctly immediately. + +You can switch off this behaviour via a new global option called Inventory +triggers inventory check. The default setting is on. diff --git a/ChangeLog b/ChangeLog index 660f019..580014d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,7 @@ * 0053 New rule for configuring the display_name of a service... * 0216 Supporting float values as SNMP timeout value now... * 0082 Improved online help for LDAP connections... + * 0009 Automatically schedule inventory check after service config change... * 0048 FIX: Tests on host diagnose page are executed parallel now... * 0033 FIX: Fixed problem when saving settings in WATOs host diagnostic page... * 0205 FIX: NagVis related permissions of roles can be edited again... diff --git a/modules/automation.py b/modules/automation.py index 94dc497..6b4da4a 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -465,6 +465,21 @@ def automation_write_autochecks_file(hostname, table): for ct, item, paramstring in table: f.write(" (%r, %r, %r, %s),\n" % (hostname, ct, item, paramstring)) f.write("]\n") + if inventory_check_autotrigger and inventory_check_interval: + schedule_inventory_check(hostname) + +def schedule_inventory_check(hostname): + try: + import socket + s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + s.connect(livestatus_unix_socket) + now = int(time.time()) + command = "SCHEDULE_FORCED_SVC_CHECK;%s;Check_MK inventory;%d" % (hostname, now) + s.send("COMMAND [%d] %s\n" % (now, command)) + except Exception, e: + if opt_debug: + raise + def automation_parse_autochecks_file(hostname): def split_python_tuple(line): diff --git a/modules/check_mk.py b/modules/check_mk.py index c1113cd..24c5164 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -246,6 +246,7 @@ inventory_check_interval = None # Nagios intervals (4h = 240) inventory_check_severity = 1 # warning inventory_check_do_scan = True # include SNMP scan for SNMP devices inventory_max_cachefile_age = 120 # secs. +inventory_check_autotrigger = True # Automatically trigger inv-check after automation-inventory always_cleanup_autochecks = True # Nagios templates and other settings concerning generation diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index f07a86f..9162b01 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1064,6 +1064,20 @@ register_configvar(group, ] )) +register_configvar(group, + "inventory_check_autotrigger", + Checkbox( + title = _("Inventory triggers inventory check"), + label = _("Automatically schedule inventory check after service configuration changes"), + help = _("When this option is enabled then after each change of the service " + "configuration of a host via WATO - may it be via manual changes or a bulk " + "inventory - the inventory check is automatically rescheduled in order " + "to reflect the new service state correctly immediately."), + default_value = True, + )) + + + _if_portstate_choices = [ ( '1', 'up(1)'),

10 years, 10 months

Check_MK Git: check_mk: brocade_mlx: single checks now instead of sub checks

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: d5ab5b406691d0c3c442f3e0334537555c2b5ceb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5ab5b406691d0… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Nov 29 14:17:00 2013 +0100 brocade_mlx: single checks now instead of sub checks Checks for Brocade MLX devices are now split into single checks. Up to now they had been realized as sub checks. This step improves performance and maintainability. --- .werks/84 | 10 ++ ChangeLog | 1 + checkman/{brocade_mlx.fan => brocade_mlx_fan} | 0 checkman/{brocade_mlx.power => brocade_mlx_power} | 0 .../{brocade_mlx.temperature => brocade_mlx_temp} | 0 checks/brocade_mlx | 142 ++------------------ checks/brocade_mlx_fan | 66 +++++++++ checks/brocade_mlx_power | 66 +++++++++ checks/brocade_mlx_temp | 101 ++++++++++++++ ...mperature.php => check_mk-brocade_mlx_temp.php} | 0 10 files changed, 252 insertions(+), 134 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d5ab5b4066…

10 years, 10 months

Check_MK Git: check_mk: FIX winperf_processor mem.win: Handling no/ empty agent responses correctly now

by Lars Michelsen

Module: check_mk Branch: master Commit: 9f884235710859eeb52879985e540819456b558b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f884235710859… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 29 14:06:11 2013 +0100 FIX winperf_processor mem.win: Handling no/empty agent responses correctly now When a host where these checks were running on was checked, both checks went in an UNKNOWN state and created an invalid plugin output. Now the check handles this situation with a nicer error message. --- .werks/290 | 10 ++++++++++ ChangeLog | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/290 b/.werks/290 new file mode 100644 index 0000000..13fcd6d --- /dev/null +++ b/.werks/290 @@ -0,0 +1,10 @@ +Title: winperf_processor mem.win: Handling no/empty agent responses correctly now +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1385730268 +Class: fix + +When a host where these checks were running on was checked, both checks went in +an UNKNOWN state and created an invalid plugin output. Now the check handles this +situation with a nicer error message. diff --git a/ChangeLog b/ChangeLog index 4926984..d72ef48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,14 +26,15 @@ * 0099 apc_mod_pdu_modules: New check for APC Modular Power Distribution Unit * 0072 cmciii_pu_access cmciii_pu_canbus cmciii_pu_io cmciii_pu_temp: New checks for the Rittal CMC-III PU Unit * 0100 juniper_cpu: New check for CPU utilization on Juniper switches - * 0101 liebert_chiller_status: New check for Liebert Chiller devices * 0236 windows_agent: each script can now be configured to run sync / async... + * 0101 liebert_chiller_status: New check for Liebert Chiller devices * 0024 FIX: cisco_wlc: removed check configuration parameter ap_model... * 0003 FIX: ps: Remove exceeding [ and ] in service description when using process inventory... * 0037 FIX: checkman browser (cmk -m) was not working properly in network subtree... * 0283 FIX: Interface Checks: ignore invalid error counts while interface is down... * 0081 FIX: Fixed corruption in SNMP walks created with cmk --snmpwalk... * 0286 FIX: esx_vsphrere_counters.ramdisk: Better handling for non existant ramdisks... + * 0290 FIX: winperf_processor mem.win: Handling no/empty agent responses correctly now... Multisite: * 0001 New filters for selecting several host/service-groups at once...

10 years, 10 months

Check_MK Git: check_mk: winperf_processor mem: Dealing with no/

by Lars Michelsen

empty agent response now Message-ID: <5298918a.at7Whs/p6UqOnl3b%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: dd13b03574f2dd820166fbbae831032aa2eddec0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd13b03574f2dd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 29 14:04:11 2013 +0100 winperf_processor mem: Dealing with no/empty agent response now --- checks/mem | 3 +++ checks/winperf_processor | 2 ++ 2 files changed, 5 insertions(+) diff --git a/checks/mem b/checks/mem index da6efdd..e97e3d9 100644 --- a/checks/mem +++ b/checks/mem @@ -86,6 +86,9 @@ def inventory_mem_win(info): def check_mem_windows(item, params, info): meminfo = parse_proc_meminfo(info) + if "MemTotal" not in meminfo or \ + "PageTotal" not in meminfo: + return 3, "Got no information from agent" perfdata = [] infotxts = [] MB = 1024.0 * 1024 diff --git a/checks/winperf_processor b/checks/winperf_processor index 75fd9e8..6c05c3c 100644 --- a/checks/winperf_processor +++ b/checks/winperf_processor @@ -41,6 +41,8 @@ def inventory_winperf_util(info): # params: levels for warn / crit in percentage def check_winperf_util(_no_item, params, info): + if not info: + return 3, "Got no information from agent" this_time = int(float(info[0][0])) for line in info[1:]:

10 years, 10 months

Check_MK Git: check_mk: brocade_mlx: removing debug code

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: f45fb0531a662a5e3ba0c12261c73fe0ace9ae20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f45fb0531a662a… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Nov 29 12:56:39 2013 +0100 brocade_mlx: removing debug code --- checks/brocade_mlx | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/brocade_mlx b/checks/brocade_mlx index 104d1bc..e578f92 100644 --- a/checks/brocade_mlx +++ b/checks/brocade_mlx @@ -286,7 +286,6 @@ def compose_item(name): def inventory_brocade_mlx_temp(info): inventory = [] - import pprint; pprint.pprint(info[4]) for temp_descr, temp_id, temp_value in info[4]: temp_descr = compose_item(temp_descr) if ((temp_descr, "brocade_mlx_temperature_default_levels") not in inventory):

10 years, 10 months

Check_MK Git: check_mk: brocade_mlx: updating manpages according to werk 0083

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: f0893f2c64b74eb02248122f9a8b940ae0fad403 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0893f2c64b74e… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Nov 29 12:48:30 2013 +0100 brocade_mlx: updating manpages according to werk 0083 --- checkman/brocade_mlx.module_mem | 4 +++- checkman/brocade_mlx.temperature | 25 +++++++++++++------------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/checkman/brocade_mlx.module_mem b/checkman/brocade_mlx.module_mem index bca713b..bf20e69 100644 --- a/checkman/brocade_mlx.module_mem +++ b/checkman/brocade_mlx.module_mem @@ -38,7 +38,9 @@ inventory: [parameters] parameters (dict): with the element -{"levels"}: (float, float): levels of memory usage for {WARN} and {CRIT} in percent +{"levels"}: (int or float, int or float): Levels of memory usage for {WARN} and {CRIT}. + If a value is given as float, it is interpreted as percentage. + If a value is given as int, it is interpreted as an absolute value in megabytes. [configuration] brocade_mlx_mem_default_levels(dict): The standard levels for {WARN} and diff --git a/checkman/brocade_mlx.temperature b/checkman/brocade_mlx.temperature index 113e389..3f89697 100644 --- a/checkman/brocade_mlx.temperature +++ b/checkman/brocade_mlx.temperature @@ -4,39 +4,40 @@ catalog: hw/network/brocade license: GPL distribution: check_mk description: - Checks the temperature sensors in Brocade NetIron MLX switching / routing - devices. + Checks the temperature sensors of one module in Brocade NetIron MLX switching / + routing devices. - {WARN} or {CRIT} is returned, if the temperature is above given thresholds. + {WARN} or {CRIT} is returned, if at least one of the temperatures is above given + thresholds. {OK} is returned otherwise. item: - The description of the temperature sensor as provided by SNMP. + The description of the module as provided by SNMP. examples: # set default levels to 30°C and 40°C: brocade_mlx_temperature_default_levels = (30, 40) - # Check a sensor with description Switch Fabric module 0, sensor 1 temperature - # on a box called my-mlx-device with default levels + # Check sensors of Switch Fabric module 0 on a box called my-mlx-device with + # default levels checks += [ - ("my-mlx-device", "brocade_mlx.temperature", 'Switch Fabric module 0, sensor 1 temperature', brocade_mlx_temperature_default_levels) + ("my-mlx-device", "brocade_mlx.temperature", 'Switch Fabric module 0', brocade_mlx_temperature_default_levels) ] # or use individual levels for warn and crit checks += [ - ("my-mlx-device", "brocade_mlx.temperature", 'Switch Fabric module 0, sensor 1 temperature', (40, 50) + ("my-mlx-device", "brocade_mlx.temperature", 'Switch Fabric module 0', (40, 50) ] perfdata: - one value is returned: The temperature in °C, together with warn and crit levels + one value per sensor is returned: The temperature in °C, together with warn and crit levels inventory: - Finds one item per temperature sensor + Finds one item per module [parameters] -warn(int): {WARN} state is triggered, if the temperature is higher than this. -crit(int): {CRIT} state is triggered, if the temperature is higher than this. +warn(int): {WARN} state is triggered, if at least one temperature is higher than this. +crit(int): {CRIT} state is triggered, if at least one temperature is higher than this. [configuration] brocade_mlx_temperature_default_levels(int, int): The standard levels for {WARN}

10 years, 10 months

Check_MK Git: check_mk: df: Solaris agent now also supports samfs

by Mathias Kettner

Module: check_mk Branch: master Commit: 2778a525fe1d1f063c458831dbbe64c59ad25447 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2778a525fe1d1f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 29 12:38:39 2013 +0100 df: Solaris agent now also supports samfs --- .werks/8 | 8 ++++++++ ChangeLog | 1 + agents/check_mk_agent.solaris | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.werks/8 b/.werks/8 new file mode 100644 index 0000000..7b307ac --- /dev/null +++ b/.werks/8 @@ -0,0 +1,8 @@ +Title: df: Solaris agent now also supports samfs +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1385725089 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index cf3af12..660f019 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * 0236 windows_agent: each script can now be configured to run sync / async... * 0101 liebert_chiller_status: New check for Liebert Chiller devices * 0083 brocade_mlx: Temperature sensors of one module now in one common check... + * 0008 df: Solaris agent now also supports samfs * 0024 FIX: cisco_wlc: removed check configuration parameter ap_model... * 0003 FIX: ps: Remove exceeding [ and ] in service description when using process inventory... * 0037 FIX: checkman browser (cmk -m) was not working properly in network subtree... diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 58cd083..4244213 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -67,7 +67,7 @@ fi # Filesystem usage for UFS and VXFS echo '<<<df>>>' -for fs in ufs vxfs +for fs in ufs vxfs samfs do df -l -k -F $fs 2>/dev/null | sed 1d | \ while read Filesystem kbytes used avail capacity Mountedon

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