Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

Check_MK Git: check_mk: Availability: fix exception for new users

by Mathias Kettner

Module: check_mk Branch: master Commit: 3fa097917d404fd9a60a741f1150619144b5555f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fa097917d404f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 19 14:31:32 2013 +0100 Availability: fix exception for new users --- web/plugins/views/availability.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 9e9ba3f..17c90a0 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -248,9 +248,12 @@ avoption_entries = [ def render_availability_options(): avoptions = config.load_user_file("avoptions", { "range" : (time.time() - 86400, time.time()), + "downtimes" : { + "include" : "honor", + "exclude_ok" : False, + }, "consider" : { "flapping" : True, - "downtime" : True, "host_down" : True, "notification_period" : True, "unmonitored" : True, @@ -263,6 +266,7 @@ def render_availability_options(): "host_down" : "host_down", }, "short_intervals" : 0, + "dont_merge" : False, }) is_open = False

11 years, 8 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: c9d623daa6203d6520e809477a6f74878f7b8a81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9d623daa6203d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 19 14:31:34 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 8 months

Check_MK Git: check_mk: cisco_qos: adhere bandwidth limits for qos policies

by Andreas Boesl

Module: check_mk Branch: master Commit: 66d5dce23afeb54e268513e48051a997a1c78964 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66d5dce23afeb5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 19 13:56:56 2013 +0100 cisco_qos: adhere bandwidth limits for qos policies --- ChangeLog | 1 + checks/cisco_qos | 27 +++++++++++++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index ffdff9e..c7618ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ via vSphere interface * new special agent agent_random for creating random monitoring data * New checks: windows_intel_bonding / windows_broadcom_bonding + * cisco_qos: adhere qos-bandwidth policies BI: * Integrated availability computing, including nifty time warp feature diff --git a/checks/cisco_qos b/checks/cisco_qos index 2bc5269..73c78c9 100644 --- a/checks/cisco_qos +++ b/checks/cisco_qos @@ -113,6 +113,10 @@ # Parent ID: # .1.3.6.1.4.1.9.9.166.1.5.1.1.4.258.6184 258 + +# get cbQosQueueingCfgBandwidth +# .1.3.6.1.4.1.9.9.166.1.9.1.1.1.1608 3094 + # post_warn, post_crit, drop warn, drop crit cisco_qos_default_levels = (None, None, 0.01, 0.01) @@ -120,7 +124,7 @@ def cisco_qos_get_ifs_by_class_id(config, class_id): return [ if_index.split('.') for if_index, value in config.iteritems() if value == class_id ] def inventory_cisco_qos(info): - if len(info) == 8: + if len(info) == 11: ifs = dict(info[0]) config = dict([ ('.'.join(oid.split('.')[-2:]), value) for oid, value in info[3] ]) if_names = dict(info[6]) @@ -137,7 +141,7 @@ def inventory_cisco_qos(info): def check_cisco_qos(item, params, info): post_warn, post_crit, drop_warn, drop_crit = params - + # Load values and format them ifs = dict(info[0]) policies= dict(info[1]) @@ -147,7 +151,10 @@ def check_cisco_qos(item, params, info): drop_bytes = dict([ ('.'.join(oid.split('.')[-2:]), value) for oid, value in info[5] ]) if_names = dict(info[6]) if_speeds = dict(info[7]) - + parents = dict(info[8]) + if_qos_bandwidth = dict(info[9]) + parents_type = dict(info[10]) + if_name, class_name = item.split(': ') # Gather the class id by class_name @@ -174,9 +181,15 @@ def check_cisco_qos(item, params, info): post_b = post_bytes[policy_if_id+'.'+policy_if_id2] drop_b = drop_bytes[policy_if_id+'.'+policy_if_id2] speed = saveint(if_speeds[if_id]) - # Bandwidth needs to be in bytes for later calculations - bw = speed / 8.0 + for key, value in parents.items(): + if value == policy_if_id2: + if parents_type[key] == "4": + speed = saveint(if_qos_bandwidth[config[key]]) * 1000 + + # Bandwidth needs to be in bytes for later calculations + bw = speed / 8.0 + # Handle counter values state = 0 infotext = '' @@ -186,7 +199,6 @@ def check_cisco_qos(item, params, info): perfdata = [] for name, counter, warn, crit, min, max in [ ( "post", post_b, post_warn, post_crit, 0, bw), ( "drop", drop_b, drop_warn, drop_crit, 0, bw) ]: - try: timedif, rate = get_counter("cisco_qos.%s.%s" % (name, item), this_time, saveint(counter)) rates.append(rate) @@ -221,6 +233,9 @@ snmp_info['cisco_qos'] = [ ( '.1.3.6.1.4.1.9.9.166.1', [ OID_END, '1.1.1.4' ( '.1.3.6.1.4.1.9.9.166.1', [ OID_STRING, '15.1.1.16' ] ), # qosDropBytes ( '.1.3.6.1.2.1.2.2.1', [ OID_END, '2' ]), # ifNames ( '.1.3.6.1.2.1.2.2.1', [ OID_END, '5' ]), # ifSpeeds + ( '.1.3.6.1.4.1.9.9.166.1', [ OID_END, '5.1.1.4' ]), # cbQosParentObjectsIndex + ( '.1.3.6.1.4.1.9.9.166.1', [ OID_END, '9.1.1.1' ]), # qosQueueingConfigBandwidth + ( '.1.3.6.1.4.1.9.9.166.1', [ OID_END, '5.1.1.3' ]), # cbQosObjectsType ] snmp_scan_functions['cisco_qos'] = lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() and \ oid(".1.3.6.1.4.1.9.9.166.1.1.1.1.4.*")

11 years, 8 months

Check_MK Git: check_mk: fixed syntax error: windows_broadcom_bonding

by Andreas Boesl

Module: check_mk Branch: master Commit: 2d1d4972b6b127b4aa8bf61ca67f6d9f7431878c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d1d4972b6b127… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 19 13:23:25 2013 +0100 fixed syntax error: windows_broadcom_bonding --- checks/windows_broadcom_bonding | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/windows_broadcom_bonding b/checks/windows_broadcom_bonding index fbb1509..12a16ba 100644 --- a/checks/windows_broadcom_bonding +++ b/checks/windows_broadcom_bonding @@ -33,7 +33,7 @@ def inventory_windows_broadcom_bonding(info): inventory = [] - for line in info[1:] + for line in info[1:]: inventory.append( (" ".join(line[:-1]), "", None) ) return inventory

11 years, 8 months

Check_MK Git: check_mk: windows_broadcom_bonding: checkman update

by Andreas Boesl

Module: check_mk Branch: master Commit: f51e3b03ec6b80c56059cb321a2ff1bb7d6db717 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f51e3b03ec6b80… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 19 13:14:50 2013 +0100 windows_broadcom_bonding: checkman update --- checkman/windows_broadcom_bonding | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checkman/windows_broadcom_bonding b/checkman/windows_broadcom_bonding index c121ef0..41f8fa8 100644 --- a/checkman/windows_broadcom_bonding +++ b/checkman/windows_broadcom_bonding @@ -1,10 +1,10 @@ -title: Check state of intel Bonding network interface on windows +title: Check state of broadcom Bonding network interface on windows agents: linux author: Andreas Boesl <ab(a)mathias-kettner.de> license: GPL distribution: check_mk description: - This check checks the current state of a Windows intel bonding interface. + This check checks the current state of a Windows broadcom bonding interface. If the total bonding state of the interface is down, then the check gets critical. If at least one slave interface is down or not the expected slave is currently active, then the check

11 years, 8 months

Check_MK Git: check_mk: new checks: windows_intel_bonding /

by Andreas Boesl

windows_broadcom_bonding Message-ID: <51236c4d.pXovd5kh+5FVO5t3%ab(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: c5de48f24a3b42ab0acf1329c17012ce10690530 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5de48f24a3b42… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 19 13:12:56 2013 +0100 new checks: windows_intel_bonding / windows_broadcom_bonding --- ChangeLog | 1 + .../windows/plugins/windows_broadcom_bonding.bat | 5 + agents/windows/plugins/windows_intel_bonding.bat | 14 +++ checkman/windows_broadcom_bonding | 37 ++++++ checkman/windows_intel_bonding | 37 ++++++ checks/windows_broadcom_bonding | 58 +++++++++ checks/windows_intel_bonding | 122 ++++++++++++++++++++ 7 files changed, 274 insertions(+), 0 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c5de48f24a…

11 years, 8 months

Check_MK Git: check_mk: FIX: fix unplugging in htmllib when not plugged

by Mathias Kettner

Module: check_mk Branch: master Commit: 271c137a40d2876ed3800df1b4544c890a56113a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=271c137a40d287… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 19 10:46:23 2013 +0100 FIX: fix unplugging in htmllib when not plugged --- web/htdocs/htmllib.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index dee2564..2128ad4 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -248,8 +248,9 @@ class html: self.plugged_text = '' def flush(self): - self.lowlevel_write(self.plugged_text) - self.plugged_text = '' + if self.plugged: + self.lowlevel_write(self.plugged_text) + self.plugged_text = '' def drain(self): if self.plugged:

11 years, 8 months

Check_MK Git: check_mk: ipmi_sensors: checkman update

by Andreas Boesl

Module: check_mk Branch: master Commit: 268d9fed3f791193c3f6831f81d86e5eb0ef096e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=268d9fed3f7911… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Feb 18 17:21:35 2013 +0100 ipmi_sensors: checkman update --- checkman/ipmi_sensors | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checkman/ipmi_sensors b/checkman/ipmi_sensors index 442b345..a5b7398 100644 --- a/checkman/ipmi_sensors +++ b/checkman/ipmi_sensors @@ -17,8 +17,8 @@ item: {Fan_FAN2_CPU} for a sensor of the group {Fan} with the name {FAN2 CPU}. perfdata: - One variable: the current value of the sensor. Only temperature and - fan sensors send performance data. + One variable: the current value of the sensor. Only temperature sensors + send performance data. inventory: All sensors that are not in the state {[Unknown]} are automatically

11 years, 8 months

Check_MK Git: check_mk: diskstat.include: fixed crash with mysql check

by Andreas Boesl

Module: check_mk Branch: master Commit: 8200391d1a0dd837255bab1dc569c4545fb34db6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8200391d1a0dd8… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Feb 18 17:05:19 2013 +0100 diskstat.include: fixed crash with mysql check --- ChangeLog | 1 + checks/diskstat.include | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index a1ee131..fd6307c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ * Linux agent: limit netstat to 10 seconds * ps: Allow %1, %2, .. instead of %s in process_inventory. That allows reordering of matched groups + * mysql: fixed crash on computing IO information BI: * FIX: fixed invalid links to hosts and services in BI tree view diff --git a/checks/diskstat.include b/checks/diskstat.include index 37da609..758f04f 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -131,7 +131,7 @@ def check_diskstat_line(this_time, item, params, line): perfdata = [ perfdata[0], perfdata[2], perfdata[1], perfdata[3] ] # Process IOs when available - if line[3] >= 0 and line[4] > 0: + if len(line) >= 5 and line[3] >= 0 and line[4] > 0: reads, writes = map(int, line[3:5]) ios = reads + writes timedif, ios_per_sec = get_counter(countername + ".ios", this_time, ios)

11 years, 8 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 2853187435f4bdad0d459f51f41647d70f14f1c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2853187435f4bd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 18 14:24:01 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk Conflicts: ChangeLog ---

11 years, 8 months

← Newer
1
...
8
9
10
11
12
13
14
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2013