Checkmk git commits September 2015

checkmk-commits@lists.checkmk.com

8 participants
275 discussions

Check_MK Git: check_mk: #2609 FIX mysql_capacity: Can now handle sizes reported being NULL

by Lars Michelsen

Module: check_mk Branch: master Commit: 1e54c102f085505b1e6013ee19b9b94475eaf25f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e54c102f08550… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 17 15:42:49 2015 +0200 #2609 FIX mysql_capacity: Can now handle sizes reported being NULL The discovery is now skipping all databases reported with a size or capacity of 'NULL'. The check function can also deal with this situation to prevent crash reports. Users experiencing this situation should update and rediscover the services of the affected hosts to remove the useless database checks. --- .werks/2609 | 13 +++++++++++++ ChangeLog | 1 + checks/mysql_capacity | 5 ++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/2609 b/.werks/2609 new file mode 100644 index 0000000..65abfb1 --- /dev/null +++ b/.werks/2609 @@ -0,0 +1,13 @@ +Title: mysql_capacity: Can now handle sizes reported being NULL +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1442497282 +Class: fix + +The discovery is now skipping all databases reported with a size +or capacity of 'NULL'. The check function can also deal with this +situation to prevent crash reports. Users experiencing this situation +should update and rediscover the services of the affected hosts to +remove the useless database checks. diff --git a/ChangeLog b/ChangeLog index a9c49d3..e15c45b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -191,6 +191,7 @@ * 2606 FIX: cisco_temperature: Reduced SNMP overhead for large devices... * 2428 FIX: "Clustered services for overlapping cluster": Improved rule matching... * 2608 FIX: kemp_loadmaster_ha: Fixed wrong discovery on snmp monitored linux systems + * 2609 FIX: mysql_capacity: Can now handle sizes reported being NULL... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/mysql_capacity b/checks/mysql_capacity index 3f42989..760a885 100644 --- a/checks/mysql_capacity +++ b/checks/mysql_capacity @@ -64,7 +64,8 @@ def parse_mysql_capacity(info): def inventory_mysql_size(parsed): for instance, values in parsed.items(): for dbname, used, avail in values: - if dbname not in [ "information_schema", "mysql", "performance_schema" ]: + if dbname not in [ "information_schema", "mysql", "performance_schema" ] \ + and used != 'NULL' and avail != 'NULL': yield "%s:%s" % (instance, dbname), None @@ -75,6 +76,8 @@ def check_mysql_size(item, params, parsed): # size and avail are given as bytes for db, size, avail in dbs: if db == dbname: + if size == 'NULL': + return 3, "Missing information - Size is reported as 'NULL'" size = int(size) infotext = "Size is %s" % get_bytes_human_readable(size) if params:

9 years

Check_MK Git: check_mk: #2608 FIX kemp_loadmaster_ha: Fixed wrong discovery on snmp monitored linux systems

by Lars Michelsen

Module: check_mk Branch: master Commit: 534d204be0fddf3af693ba518a56150d0f51b10f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=534d204be0fddf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 17 14:09:56 2015 +0200 #2608 FIX kemp_loadmaster_ha: Fixed wrong discovery on snmp monitored linux systems --- .werks/2608 | 9 +++++++++ ChangeLog | 1 + checks/kemp_loadmaster_ha | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2608 b/.werks/2608 new file mode 100644 index 0000000..ec6d166 --- /dev/null +++ b/.werks/2608 @@ -0,0 +1,9 @@ +Title: kemp_loadmaster_ha: Fixed wrong discovery on snmp monitored linux systems +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1442491773 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 4c66ef9..a9c49d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -190,6 +190,7 @@ * 2605 FIX: mbg_lantime_ng_fan: Fixed exception in check / added missing man page * 2606 FIX: cisco_temperature: Reduced SNMP overhead for large devices... * 2428 FIX: "Clustered services for overlapping cluster": Improved rule matching... + * 2608 FIX: kemp_loadmaster_ha: Fixed wrong discovery on snmp monitored linux systems Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/kemp_loadmaster_ha b/checks/kemp_loadmaster_ha index f1a5fa2..a199401 100644 --- a/checks/kemp_loadmaster_ha +++ b/checks/kemp_loadmaster_ha @@ -40,7 +40,8 @@ check_info["kemp_loadmaster_ha"] = { "inventory_function" : inventory_kemp_loadmaster_ha, "service_description" : "HA State", "has_perfdata" : False, - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.12196.250.10" or oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.2021.250.10", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.12196.250.10", ".1.3.6.1.4.1.2021.250.10" ] \ + and oid(".1.3.6.1.4.1.12196.13.0.9.*"), "snmp_info" : ( ".1.3.6.1.4.1.12196.13.0", [ 9, 10 ] ), }

9 years

Check_MK Git: check_mk: Additional fix for snmp exception

by Lars Michelsen

Module: check_mk Branch: master Commit: 6e5ff7eaf68420b0e58a6ce0563a532e89f6a625 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e5ff7eaf68420… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 17 13:48:41 2015 +0200 Additional fix for snmp exception --- modules/snmp.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/snmp.py b/modules/snmp.py index 008c265..86c8e8d 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -156,7 +156,7 @@ def get_snmp_table(hostname, ip, check_type, oid_info, use_snmpwalk_cache): index_format = column continue - rowinfo = get_snmpwalk(hostname, check_type, oid, fetchoid, column, use_snmpwalk_cache) + rowinfo = get_snmpwalk(hostname, ip, check_type, oid, fetchoid, column, use_snmpwalk_cache) columns.append((fetchoid, rowinfo)) number_of_rows = len(rowinfo) @@ -207,7 +207,7 @@ def get_snmp_table(hostname, ip, check_type, oid_info, use_snmpwalk_cache): return info -def get_snmpwalk(hostname, check_type, oid, fetchoid, column, use_snmpwalk_cache): +def get_snmpwalk(hostname, ip, check_type, oid, fetchoid, column, use_snmpwalk_cache): is_cachable = is_snmpwalk_cachable(column) rowinfo = None if is_cachable and use_snmpwalk_cache:

9 years

Check_MK Git: check_mk: missing changes for werk 2469

by Andreas Boesl

Module: check_mk Branch: master Commit: 94b3d99bd46074a02d263c21b81925f9c7613772 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94b3d99bd46074… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 17 13:38:27 2015 +0200 missing changes for werk 2469 --- checks/emc_vplex_cpu | 2 +- checks/emc_vplex_director_stats | 2 +- checks/emc_vplex_if | 2 +- checks/emc_vplex_volumes | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/checks/emc_vplex_cpu b/checks/emc_vplex_cpu index b910e80..fc49105 100644 --- a/checks/emc_vplex_cpu +++ b/checks/emc_vplex_cpu @@ -46,6 +46,6 @@ check_info["emc_vplex_cpu"] = { "has_perfdata" : True, "includes" : [ "cpu_util.include" ], "group" : "cpu_utilization_multiitem", - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == None and oid(".1.3.6.1.4.1.1139.21.2.2.8.1.*") + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == "" and oid(".1.3.6.1.4.1.1139.21.2.2.8.1.*") } diff --git a/checks/emc_vplex_director_stats b/checks/emc_vplex_director_stats index 3e9129c..7eba7d7 100644 --- a/checks/emc_vplex_director_stats +++ b/checks/emc_vplex_director_stats @@ -66,7 +66,7 @@ check_info["emc_vplex_director_stats"] = { "check_function" : check_emc_director_stats, "inventory_function" : inventory_emc_director_stats, "service_description" : "Disk IO Director %s", - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == None and\ + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == "" and\ oid(".1.3.6.1.4.1.1139.21.2.2.8.1.*"), "snmp_info" : (".1.3.6.1.4.1.1139.21.2.2", [ "1.1.3", # vplexDirectorName diff --git a/checks/emc_vplex_if b/checks/emc_vplex_if index 8f5d2b3..decdf79 100644 --- a/checks/emc_vplex_if +++ b/checks/emc_vplex_if @@ -74,7 +74,7 @@ check_info["emc_vplex_if"] = { "check_function" : check_emc_vplex_if, "inventory_function" : inventory_emc_vplex_if, "service_description" : "Interface %s", - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == None and\ + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == "" and\ oid(".1.3.6.1.4.1.1139.21.2.2.8.1.*"), "snmp_info" : [ (".1.3.6.1.4.1.1139.21.2.2", [ diff --git a/checks/emc_vplex_volumes b/checks/emc_vplex_volumes index f59c28d..387d637 100644 --- a/checks/emc_vplex_volumes +++ b/checks/emc_vplex_volumes @@ -75,7 +75,7 @@ check_info["emc_vplex_volumes"] = { "check_function" : check_emc_vplex_volumes, "inventory_function" : inventory_emc_vplex_volumes, "service_description" : "Disk IO Volume %s", - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == None and\ + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == "" and\ oid(".1.3.6.1.4.1.1139.21.2.2.8.1.*"), "snmp_info" : (".1.3.6.1.4.1.1139.21.2.2.8.1", [

9 years

Check_MK Git: check_mk: adapted status details description in cpu_load.include: only % has no space

by Simon Betz

Module: check_mk Branch: master Commit: 38a7343ed9307c000e081cd186fe40d7616dfa88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38a7343ed9307c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 17 13:32:17 2015 +0200 adapted status details description in cpu_load.include: only % has no space --- checks/cpu_load.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/cpu_load.include b/checks/cpu_load.include index 85107c2..b4698e6 100644 --- a/checks/cpu_load.include +++ b/checks/cpu_load.include @@ -43,7 +43,7 @@ def check_cpu_load_generic(params, load, num_cpus=1): state, text, perf = check_levels(load[2], 'load15', params, factor = num_cpus) perfdata += perf - infotext = "15min load %.2f" % load[2] + infotext = "15 min load %.2f" % load[2] if num_cpus > 1: infotext += " at %d Cores (%.2f per Core)" % (num_cpus, load[2]/num_cpus) if text:

9 years

Check_MK Git: check_mk: Fixed exception since yesterdays changes ( NameError: global name ip is not defined

by Lars Michelsen

Module: check_mk Branch: master Commit: 001c6f1b6df5bbe5cebc9b6998253c566330167a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=001c6f1b6df5bb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 17 13:26:43 2015 +0200 Fixed exception since yesterdays changes (NameError: global name ip is not defined ) --- modules/snmp.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/snmp.py b/modules/snmp.py index c454fce..008c265 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -218,7 +218,7 @@ def get_snmpwalk(hostname, check_type, oid, fetchoid, column, use_snmpwalk_cache if opt_use_snmp_walk or is_usewalk_host(hostname): rowinfo = get_stored_snmpwalk(hostname, fetchoid) else: - rowinfo = perform_snmpwalk(hostname, check_type, oid, fetchoid) + rowinfo = perform_snmpwalk(hostname, ip, check_type, oid, fetchoid) if is_cachable: save_snmpwalk_cache(hostname, fetchoid, rowinfo) @@ -226,7 +226,7 @@ def get_snmpwalk(hostname, check_type, oid, fetchoid, column, use_snmpwalk_cache return rowinfo -def perform_snmpwalk(hostname, check_type, base_oid, fetchoid): +def perform_snmpwalk(hostname, ip, check_type, base_oid, fetchoid): added_oids = set([]) rowinfo = [] if is_snmpv3_host(hostname):

9 years

Check_MK Git: check_mk: fortigate_cpu, fortigate_cpu_base used same code - > fortigate_cpu.include

by Simon Betz

Module: check_mk Branch: master Commit: 434d78bbd4dce5a026c7c6bf6a8bde79fda6adf9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=434d78bbd4dce5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 17 10:02:18 2015 +0200 fortigate_cpu, fortigate_cpu_base used same code -> fortigate_cpu.include --- checks/fortigate_cpu | 25 ++++------------------- checks/fortigate_cpu.include | 46 ++++++++++++++++++++++++++++++++++++++++++ checks/fortigate_cpu_base | 27 +++++-------------------- 3 files changed, 55 insertions(+), 43 deletions(-) diff --git a/checks/fortigate_cpu b/checks/fortigate_cpu index 2dde69a..cfbdb21 100644 --- a/checks/fortigate_cpu +++ b/checks/fortigate_cpu @@ -24,37 +24,20 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -fortigate_cpu_default_levels = (80.0, 90.0) - -def inventory_fortigate_cpu(info): - return [(None, "fortigate_cpu_default_levels")] - -def check_fortigate_cpu(item, params, info): - num_cpus = 0 - util = 0 - for line in info: - util += int(line[0]) - num_cpus += 1 - if num_cpus == 0: - return - util = float(util) / num_cpus - - state, infotext, perfdata = check_cpu_util(util, params).next() - infotext += " at %d CPUs" % num_cpus +fortigate_cpu_default_levels = (80.0, 90.0) - return state, infotext, perfdata check_info["fortigate_cpu"] = { - "inventory_function" : inventory_fortigate_cpu, + "inventory_function" : lambda info: inventory_fortigate_cpu(info, "fortigate_cpu_default_levels"), "check_function" : check_fortigate_cpu, "service_description" : "CPU utilization", "has_perfdata" : True, "group" : "cpu_utilization", # uses mib FORTINET-MIB-280 - "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.12356.101.1" in oid(".1.3.6.1.2.1.1.2.0") and\ + "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.12356.101.1" in oid(".1.3.6.1.2.1.1.2.0") and \ oid(".1.3.6.1.4.1.12356.1.8.0"), "snmp_info" : ( ".1.3.6.1.4.1.12356.1", [ 8 ]), - "include" : [ "cpu_util.include" ], + "includes" : [ "cpu_util.include", "fortigate_cpu.include" ], } diff --git a/checks/fortigate_cpu.include b/checks/fortigate_cpu.include new file mode 100644 index 0000000..a224468 --- /dev/null +++ b/checks/fortigate_cpu.include @@ -0,0 +1,46 @@ +#!/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_fortigate_cpu(info, default_levels): + return [(None, default_levels)] + + +def check_fortigate_cpu(item, params, info): + num_cpus = 0 + util = 0 + for line in info: + util += int(line[0]) + num_cpus += 1 + if num_cpus == 0: + return + + util = float(util) / num_cpus + + state, infotext, perfdata = check_cpu_util(util, params).next() + infotext += " at %d CPUs" % num_cpus + + return state, infotext, perfdata diff --git a/checks/fortigate_cpu_base b/checks/fortigate_cpu_base index 8f0c35b..535de7b 100644 --- a/checks/fortigate_cpu_base +++ b/checks/fortigate_cpu_base @@ -24,37 +24,20 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -fortigate_cpu_base_default_levels = (80.0, 90.0) - -def inventory_fortigate_cpu_base(info): - return [(None, "fortigate_cpu_base_default_levels")] - -def check_fortigate_cpu_base(item, params, info): - num_cpus = 0 - util = 0 - for line in info: - util += int(line[0]) - num_cpus += 1 - if num_cpus == 0: - return - util = float(util) / num_cpus - - state, infotext, perfdata = check_cpu_util(util, params).next() - infotext += " at %d CPUs" % num_cpus +fortigate_cpu_base_default_levels = (80.0, 90.0) - return state, infotext, perfdata check_info["fortigate_cpu_base"] = { - "inventory_function" : inventory_fortigate_cpu_base, - "check_function" : check_fortigate_cpu_base, + "inventory_function" : lambda info: (inventory_fortigate_cpu, "fortigate_cpu_base_default_levels"), + "check_function" : check_fortigate_cpu, "service_description" : "CPU utilization", "has_perfdata" : True, "group" : "cpu_utilization", # uses mib FORTINET-FORTIGATE-MIB - "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.12356.101.1" in oid(".1.3.6.1.2.1.1.2.0") and\ + "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.12356.101.1" in oid(".1.3.6.1.2.1.1.2.0") and \ oid(".1.3.6.1.4.1.12356.101.4.1.3.0"), "snmp_info" : ( ".1.3.6.1.4.1.12356.101.4.1", [ 3 ]), - "includes" : [ "cpu_util.include" ], + "includes" : [ "cpu_util.include", "fortigate_cpu.include" ], }

9 years

Check_MK Git: check_mk: esx_vsphere_hostsystem fortigate_cpu fortigate_cpu_base netapp_api_cpu netapp_api_vf_stats : Fixed broken cpu checks after check_cpu_util API change

by Lars Michelsen

Module: check_mk Branch: master Commit: 398fcebb9138eb693a044b406f79c4c9773b6ec2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=398fcebb9138eb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 17 09:46:57 2015 +0200 esx_vsphere_hostsystem fortigate_cpu fortigate_cpu_base netapp_api_cpu netapp_api_vf_stats: Fixed broken cpu checks after check_cpu_util API change --- checks/esx_vsphere_hostsystem | 6 +++--- checks/fortigate_cpu | 2 +- checks/fortigate_cpu_base | 2 +- checks/netapp_api_cpu | 2 +- checks/netapp_api_vf_stats | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index 9f361e0..bdb2aed 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -73,7 +73,7 @@ def check_esx_vsphere_hostsystem_cpu(item, params, info): # Convert legacy parameters this_time = time.time() - state, infotext, perfdata = check_cpu_util(usage, params) + state, infotext, perfdata = check_cpu_util(usage, params).next() infotext += ", %.2fGHz/%.2fGHz" % (used_mhz / 1024.0, total_mhz / 1024.0) infotext += ", %d sockets, %d cores/socket, %d threads" % ( @@ -201,10 +201,10 @@ def check_esx_vsphere_hostsystem_cpu_util_cluster(item, params, info): sorted_params = sorted(params, reverse = True) for count, levels in sorted_params: if node_count >= count: - state, infotext, perfdata = check_cpu_util(usage, levels) + state, infotext, perfdata = check_cpu_util(usage, levels).next() break else: - state, infotext, perfdata = check_cpu_util(usage, None) + state, infotext, perfdata = check_cpu_util(usage, None).next() yield 0, "%d Nodes" % node_count yield 0, "%.2fGHz/%.2fGHz" % (sum_used / 1024.0, sum_total / 1024.0) diff --git a/checks/fortigate_cpu b/checks/fortigate_cpu index 3265a93..2dde69a 100644 --- a/checks/fortigate_cpu +++ b/checks/fortigate_cpu @@ -40,7 +40,7 @@ def check_fortigate_cpu(item, params, info): util = float(util) / num_cpus - state, infotext, perfdata = check_cpu_util(util, params) + state, infotext, perfdata = check_cpu_util(util, params).next() infotext += " at %d CPUs" % num_cpus return state, infotext, perfdata diff --git a/checks/fortigate_cpu_base b/checks/fortigate_cpu_base index e198863..8f0c35b 100644 --- a/checks/fortigate_cpu_base +++ b/checks/fortigate_cpu_base @@ -40,7 +40,7 @@ def check_fortigate_cpu_base(item, params, info): util = float(util) / num_cpus - state, infotext, perfdata = check_cpu_util(util, params) + state, infotext, perfdata = check_cpu_util(util, params).next() infotext += " at %d CPUs" % num_cpus return state, infotext, perfdata diff --git a/checks/netapp_api_cpu b/checks/netapp_api_cpu index 133666c..eb85a86 100644 --- a/checks/netapp_api_cpu +++ b/checks/netapp_api_cpu @@ -52,7 +52,7 @@ def check_netapp_api_cpu_utilization(item, params, info): elif used_perc > 100: used_perc = 100 - state, infotext, perfdata = check_cpu_util(used_perc, params, now) + state, infotext, perfdata = check_cpu_util(used_perc, params, now).next() perfdata[0] = perfdata[0][:5] + (num_cpus,) infotext += ", %d CPUs" % num_cpus return state, infotext, perfdata diff --git a/checks/netapp_api_vf_stats b/checks/netapp_api_vf_stats index b1323b6..3e5243e 100644 --- a/checks/netapp_api_vf_stats +++ b/checks/netapp_api_vf_stats @@ -52,7 +52,7 @@ def check_netapp_api_vf_stats_cpu_util(item, params, info): elif used_perc > 100: used_perc = 100 - state, infotext, perfdata = check_cpu_util(used_perc, params, now) + state, infotext, perfdata = check_cpu_util(used_perc, params, now).next() perfdata[0] = perfdata[0][:5] return state, infotext, perfdata

9 years

Check_MK Git: check_mk: #2428 FIX " Clustered services for overlapping cluster": Improved rule matching

by Andreas Boesl

Module: check_mk Branch: master Commit: 13c6b3b8425baecc8f8135f429aa2deac6598b66 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13c6b3b8425bae… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 17 09:37:02 2015 +0200 #2428 FIX "Clustered services for overlapping cluster": Improved rule matching The matching algorhytm for this rules did not check if the matched cluster did actually belong to the node. For example if you had the following clusters <pre> ClusterA: Host1, Host2 ClusterB: Host3, Host4 </pre> And these "Clustered services for overlapping cluster" rules <pre> Rule 1) Service1 -> ClusterA Rule 2) Service1 -> ClusterB </pre> If Host3 has a Service1, the rule number one would match and assign this service to ClusterA, ignoring the fact that this host is actually a part of ClusterB. This has been fixed. --- .werks/2428 | 27 +++++++++++++++++++++++++++ ChangeLog | 1 + modules/check_mk.py | 6 ++++-- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/.werks/2428 b/.werks/2428 new file mode 100644 index 0000000..e1b17f6 --- /dev/null +++ b/.werks/2428 @@ -0,0 +1,27 @@ +Title: "Clustered services for overlapping cluster": Improved rule matching +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1442474788 +Class: fix + +The matching algorhytm for this rules did not check if the matched +cluster did actually belong to the node. + +For example if you had the following clusters +<pre> +ClusterA: Host1, Host2 +ClusterB: Host3, Host4 +</pre> +And these "Clustered services for overlapping cluster" rules +<pre> +Rule 1) Service1 -> ClusterA +Rule 2) Service1 -> ClusterB +</pre> + +If Host3 has a Service1, the rule number one would match and +assign this service to ClusterA, ignoring the fact that this +host is actually a part of ClusterB. + +This has been fixed. diff --git a/ChangeLog b/ChangeLog index 88182ce..4c66ef9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -189,6 +189,7 @@ * 2594 FIX: mem.linux: Remove several bogus exceeding time graphs * 2605 FIX: mbg_lantime_ng_fan: Fixed exception in check / added missing man page * 2606 FIX: cisco_temperature: Reduced SNMP overhead for large devices... + * 2428 FIX: "Clustered services for overlapping cluster": Improved rule matching... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/modules/check_mk.py b/modules/check_mk.py index 1402143..bfe067d 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -931,8 +931,10 @@ def host_of_clustered_service(hostname, servicedesc): return hostname cluster_mapping = service_extra_conf(hostname, servicedesc, clustered_services_mapping) - if cluster_mapping: - return cluster_mapping[0] + for cluster in cluster_mapping: + # Check if the host is in this cluster + if cluster in the_clusters: + return cluster # 1. New style: explicitly assigned services for cluster, conf in clustered_services_of.items():

9 years

Check_MK Git: check_mk: esx_vsphere_counters: Fixed " NoneType object has no attribute" exception in vsphere check and discovery

by Lars Michelsen

Module: check_mk Branch: master Commit: f0da6aad0edc33996841056d0fcaa2394293d735 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0da6aad0edc33… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 17 09:36:48 2015 +0200 esx_vsphere_counters: Fixed "NoneType object has no attribute" exception in vsphere check and discovery --- checks/esx_vsphere_counters | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/esx_vsphere_counters b/checks/esx_vsphere_counters index 6cf392e..2267738 100644 --- a/checks/esx_vsphere_counters +++ b/checks/esx_vsphere_counters @@ -138,7 +138,7 @@ def esx_vsphere_counters_get_item_mapping(parsed): for instance in parsed.get("datastore.read", {}).keys(): map_instance_to_item[instance] = instance - for instance, values in parsed.get("datastore.name").items(): + for instance, values in parsed.get("datastore.name", {}).items(): if instance in map_instance_to_item and values[0][0] != "": map_instance_to_item[instance] = values[0][0].replace(" ", "_") return map_instance_to_item

9 years

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2015