Checkmk git commits July 2014

checkmk-commits@lists.checkmk.com

7 participants
221 discussions

Check_MK Git: check_mk: Fixed yesterdays broken tcp_conn_stats-Check

by Lars Michelsen

Module: check_mk Branch: master Commit: ac8b36b6dce2c63f97e343f3c61c3b16cc95550b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac8b36b6dce2c6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 23 08:36:26 2014 +0200 Fixed yesterdays broken tcp_conn_stats-Check --- checks/tcp_conn_stats | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/checks/tcp_conn_stats b/checks/tcp_conn_stats index 64ab3cc..032afcc 100644 --- a/checks/tcp_conn_stats +++ b/checks/tcp_conn_stats @@ -47,12 +47,13 @@ def inventory_tcp_conn_stats(info): def check_tcp_conn_stats(item, params, info): stats = dict(info) - for state, hex in tcp_conn_stats_states: - num = int(stats.get(state, stats.get(hex, 0))) + for stat_state, hex in tcp_conn_stats_states: + num = int(stats.get(stat_state, stats.get(hex, 0))) if num > 0: # Only check positive counts - infotext = "%s: %d" % (state, num) + infotext = "%s: %d" % (stat_state, num) + state = 0 perf = [state, num] - levels = params.get(state) + levels = params.get(stat_state) if levels: warn, crit = levels perf.append(warn) @@ -63,8 +64,6 @@ def check_tcp_conn_stats(item, params, info): elif num >= warn: state = 1 infotext += " (warning at %d)" % warn - else: - state = 0 yield state, infotext, [perf]

10 years, 4 months

Check_MK Git: check_mk: Small code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: a24c9cb3e00443253abf75d08039d839a6f2197b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a24c9cb3e00443… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 22 16:28:20 2014 +0200 Small code cleanup --- modules/check_mk_base.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 679a20c..2494e02 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1595,15 +1595,15 @@ def pnp_cleanup(s): # case the factor is 1.0 / 1048576. def check_levels(value, dsname, params, unit = "", factor = 1.0, statemarkers=False): + perfdata = [] + infotext = "" + # None or (None, None) -> do not check any levels if params == None or params == (None, None): return 0, "", [] - perfdata = [] - infotext = "" - # Pair of numbers -> static levels - if type(params) == tuple: + elif type(params) == tuple: warn_upper, crit_upper = params[0] * factor, params[1] * factor, warn_lower, crit_lower = None, None ref_value = None

10 years, 4 months

Check_MK Git: check_mk: bintec_brrp_status: New Check for BRRP States on Bintec Routers

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 2f40457c2822445b543e9ffc42c8194d5532fb8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f40457c282244… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Jul 22 16:42:28 2014 +0200 bintec_brrp_status: New Check for BRRP States on Bintec Routers --- .werks/1136 | 8 ++++++ ChangeLog | 1 + checkman/bintec_brrp_status | 16 +++++++++++ checks/bintec_brrp_status | 67 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 92 insertions(+) diff --git a/.werks/1136 b/.werks/1136 new file mode 100644 index 0000000..deeda0e --- /dev/null +++ b/.werks/1136 @@ -0,0 +1,8 @@ +Title: bintec_brrp_status: New Check for BRRP States on Bintec Routers +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1406040116 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 2d735fa..9f75e31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ * 1133 qlogic_sanbox_fabric_element: New Check for Fabric Elements in QLogic SANbox Fibre Channel Switches * 1134 bintec_sensors.fan: New Check for Fan Speed of Bintec Routers * 1135 bintec_sensors.voltage, bintec_sensors.temp: New Checks for Voltage and Temperature Sensors of Bintec Routers + * 1136 bintec_brrp_status: New Check for BRRP States on Bintec Routers * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... diff --git a/checkman/bintec_brrp_status b/checkman/bintec_brrp_status new file mode 100644 index 0000000..88c7448 --- /dev/null +++ b/checkman/bintec_brrp_status @@ -0,0 +1,16 @@ +title: Bintec Routers: BRRP Status +agents: snmp +catalog: hw/network/bintec +license: GPL +distribution: check_mk +description: + Checks the Status of BRRP Connections of Bintec Routers. + + If biboBrrpOperState is master or backup the check returns {OK}. + On status initialize it returns {WARN}. + +item: + The ID of the BRRP connection from SNMP. + +inventory: + Creates one check for every BRRP connection. diff --git a/checks/bintec_brrp_status b/checks/bintec_brrp_status new file mode 100644 index 0000000..abf36fe --- /dev/null +++ b/checks/bintec_brrp_status @@ -0,0 +1,67 @@ +#!/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. + +def bintec_brrp_status_compose_item(brrp_id): + return re.sub("\..*", "", brrp_id) + +def inventory_bintec_brrp_status(info): + inventory = [] + for brrp_id, brrp_status in info: + inventory.append( (bintec_brrp_status_compose_item(brrp_id), None ) ) + return inventory + +def check_bintec_brrp_status(item, _no_params, info): + for brrp_id, brrp_status in info: + brrp_id = bintec_brrp_status_compose_item(brrp_id) + if brrp_id == item: + if brrp_status == "1": + message = "Status for %s is initialize" % brrp_id + status = 1 + elif brrp_status == "2": + message = "Status for %s is backup" % brrp_id + status = 0 + elif brrp_status == "3": + message = "Status for %s is master" % brrp_id + status = 0 + else: + message = "Status for %s is at unknown value %s" % (brrp_id, brrp_status) + status = 3 + + return status, message + + return 3, "Status for %s not found" % item + +check_info["bintec_brrp_status"] = { + "check_function" : check_bintec_brrp_status, + "inventory_function" : inventory_bintec_brrp_status, + "service_description" : "BRRP Status %s", + "has_perfdata" : False, + "snmp_info" : ( ".1.3.6.1.4.1.272.4.40.1.1", [ + OID_END, + 4, # biboBrrpOperState + ]), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.272.4") +}

10 years, 4 months

Check_MK Git: check_mk: manually resolved merge conflicts on ChangeLog

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 03818708809e74fda0c6d6ae74157b553d3d0805 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03818708809e74… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Jul 22 16:43:29 2014 +0200 manually resolved merge conflicts on ChangeLog ---

10 years, 4 months

Check_MK Git: check_mk: mem.win: converted to yield

by Mathias Kettner

Module: check_mk Branch: master Commit: bbe5123afa87598e5b5bf594755cbcfeabbee2ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbe5123afa8759… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 22 15:41:21 2014 +0200 mem.win: converted to yield --- checks/mem | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/checks/mem b/checks/mem index 2e26709..1870e50 100644 --- a/checks/mem +++ b/checks/mem @@ -85,18 +85,12 @@ factory_settings["memory_win_default_levels"] = { def inventory_mem_win(info): meminfo = parse_proc_meminfo(info) - if "PageTotal" in meminfo: + if "MemTotal" in meminfo and "PageTotal" in meminfo: return [(None, {})] 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 - worststate = 0 now = time.time() for title, what, paramname in [ @@ -109,8 +103,8 @@ def check_mem_windows(item, params, info): free_mb = free_kb / 1024.0 perc = 100.0 * used_kb / total_kb - infotxts.append("%s usage: %.1f%% (%.1f/%.1f GB)" % - (title, perc, used_kb / MB, total_kb / MB)) + infotext = "%s usage: %.1f%% (%.1f/%.1f GB)" % \ + (title, perc, used_kb / MB, total_kb / MB) warn, crit = params[paramname] @@ -125,7 +119,7 @@ def check_mem_windows(item, params, info): else: crit_kb = crit * 1024 - perfdata.append((paramname, used_kb / 1024.0, warn_kb, crit_kb, 0, total_kb / 1024.0)) + perfdata = [(paramname, used_kb / 1024.0, warn_kb, crit_kb, 0, total_kb / 1024.0)] # Do averaging, if configured, just for matching the levels if "average" in params: @@ -141,19 +135,15 @@ def check_mem_windows(item, params, info): # Now check the levels if (type(crit) == int and free_mb <= crit) or \ (type(crit) == float and perc >= crit): - worststate = 2 - state_code = '(!!)' + state = 2 elif (type(warn) == int and free_mb <= warn) or \ (type(warn) == float and perc >= warn): - worststate = max(worststate, 1) - state_code = '(!)' + state = 1 else: - state_code = "" - - infotxts[-1] += state_code + state = 0 + yield state, infotext, perfdata - return (worststate, ", ".join(infotxts), perfdata) check_info["mem.win"] = { 'check_function': check_mem_windows,

10 years, 4 months

Check_MK Git: check_mk: Merge brancl 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: 7e88c2891bdcefd9588b05f5e807b563522b80f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e88c2891bdcef… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 22 16:15:44 2014 +0200 Merge brancl 'master' of ssh://mathias-kettner.de/check_mk ---

10 years, 4 months

Check_MK Git: check_mk: mem.win: support predictive levels

by Mathias Kettner

Module: check_mk Branch: master Commit: c866592b5ef7ec736dff211186d7ac2b9b430c7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c866592b5ef7ec… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 22 16:15:40 2014 +0200 mem.win: support predictive levels The check for Windows memory and pagefile now supports preditive monitoring in addition to percentual and absolute levels. --- .werks/1048 | 9 ++++++ ChangeLog | 1 + checks/mem | 57 ++++++++++++++++++++++------------ modules/check_mk_base.py | 1 + web/htdocs/wato.py | 20 ++++++++---- web/plugins/wato/check_parameters.py | 16 ++++++++-- 6 files changed, 77 insertions(+), 27 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c866592b5e…

10 years, 4 months

Check_MK Git: check_mk: qlogic_fcport: Changing Port IDs in a way to directly match port IDs from the management interface of the device

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: b543c7a8dfe900abc9c8c2040dbd6d6c7693852e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b543c7a8dfe900… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Jul 22 15:28:24 2014 +0200 qlogic_fcport: Changing Port IDs in a way to directly match port IDs from the management interface of the device --- checks/qlogic_fcport | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/checks/qlogic_fcport b/checks/qlogic_fcport index 5198cce..17279d6 100644 --- a/checks/qlogic_fcport +++ b/checks/qlogic_fcport @@ -29,6 +29,14 @@ qlogic_fcport_inventory_opstates = [ "1", "3" ] qlogic_fcport_inventory_admstates = [ "1", "3" ] +# this function is needed to have the same port IDs in Check_MK +# as within the Management interface of the device +def qlogic_fcport_generate_port_id(port_id): + major, minor = port_id.split(".", 1) + minor = int(minor) - 1 + port_id = "%s.%s" % (major, minor) + return port_id + def inventory_qlogic_fcport(info): inventory = [] @@ -41,7 +49,7 @@ def inventory_qlogic_fcport(info): if admin_status in qlogic_fcport_inventory_admstates and \ oper_status in qlogic_fcport_inventory_opstates: - inventory.append( (port_id, None) ) + inventory.append( (qlogic_fcport_generate_port_id(port_id), None) ) return inventory @@ -54,6 +62,7 @@ def check_qlogic_fcport(item, params, info): c2_discards, c2_fbsy_frames, c2_frjt_frames, c3_in_frames, \ c3_out_frames, c3_in_octets, c3_out_octets, c3_discards in info: + port_id = qlogic_fcport_generate_port_id(port_id) if port_id == item: status = 0 perfdata = []

10 years, 4 months

Check_MK Git: check_mk: Fix chaos display in inline timeline

by Mathias Kettner

Module: check_mk Branch: master Commit: 52d9b114a3fe0f8e0ded4023da28b9703cc6ba7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52d9b114a3fe0f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 22 14:47:33 2014 +0200 Fix chaos display in inline timeline --- web/plugins/views/availability.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 96183f7..58b48c5 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -885,6 +885,9 @@ def render_timeline(timeline_rows, from_time, until_time, considered_duration, if row["log_output"]: title += " - " + row["log_output"] width = rest_percentage * row["duration"] / considered_duration + + # If the width is very small then we group several phases into + # one single "chaos period". if style == "inline" and width < 0.05: if not chaos_begin: chaos_begin = row["from"] @@ -892,12 +895,16 @@ def render_timeline(timeline_rows, from_time, until_time, considered_duration, chaos_count += 1 chaos_end = row["until"] continue - elif chaos_begin and chaos_count > 1: - output_chaos_period(chaos_begin, chaos_end, chaos_count, chaos_width) + + # Chaos period has ended? One not-small phase: + elif chaos_begin: + # Only output chaos phases with a certain length + if chaos_count >= 4: + output_chaos_period(chaos_begin, chaos_end, chaos_count, chaos_width) + chaos_begin = None chaos_count = 0 chaos_width = 0 - continue width += min_percentage html.write('<td onmouseover="timeline_hover(%d, 1);" onmouseout="timeline_hover(%d, 0);" '

10 years, 4 months

Check_MK Git: check_mk: bintec_sensors.voltage, bintec_sensors.temp: New Checks for Voltage and Temperature Sensors of Bintec Routers

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: d6267b709e644f8c6c5218a22e4d995acccf7f41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6267b709e644f… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Jul 22 14:38:12 2014 +0200 bintec_sensors.voltage, bintec_sensors.temp: New Checks for Voltage and Temperature Sensors of Bintec Routers --- .werks/1135 | 8 ++ ChangeLog | 1 + checkman/bintec_sensors.temp | 35 ++++++++ checkman/bintec_sensors.voltage | 18 +++++ checks/bintec_sensors | 88 ++++++++++++++++++++- pnp-templates/check_mk-bintec_sensors.temp.php | 1 + pnp-templates/check_mk-bintec_sensors.voltage.php | 38 +++++++++ pnp-templates/check_mk-hitachi_hnas_temp.php | 2 +- web/plugins/perfometer/check_mk.py | 7 ++ 9 files changed, 195 insertions(+), 3 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d6267b709e…

10 years, 4 months

← Newer
1
...
5
6
7
8
9
10
11
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2014