Checkmk git commits November 2015

checkmk-commits@lists.checkmk.com

8 participants
303 discussions

#2766 FIX juniper_fru: Don't discover devices reported as "empty"

by Lars Michelsen

Module: check_mk Branch: master Commit: 06dbc8263216e37305ecc10edc7a32739a372f96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06dbc8263216e3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 13 11:22:56 2015 +0100 #2766 FIX juniper_fru: Don't discover devices reported as "empty" The check was discovering empty device slots as checks and always reporting them as being critical. The discovery has been disabled for these units. --- .werks/2766 | 12 ++++++++++++ ChangeLog | 1 + checks/juniper_fru | 3 ++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/2766 b/.werks/2766 new file mode 100644 index 0000000..88c5337 --- /dev/null +++ b/.werks/2766 @@ -0,0 +1,12 @@ +Title: juniper_fru: Don't discover devices reported as "empty" +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1447410115 + +The check was discovering empty device slots as checks and always +reporting them as being critical. The discovery has been disabled +for these units. diff --git a/ChangeLog b/ChangeLog index 0bd89d1..73c43a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,7 @@ * 2835 FIX: netextreme_psu_in: fixed wrong voltage usage handling... * 2776 FIX: apache_status: fix crash for Apache versions with yet unhandled status fields * 2836 FIX: pandacom_psu: fixed handling of not available power supplies + * 2766 FIX: juniper_fru: Don't discover devices reported as "empty"... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/juniper_fru b/checks/juniper_fru index 1087862..daf802d 100644 --- a/checks/juniper_fru +++ b/checks/juniper_fru @@ -103,7 +103,8 @@ def parse_juniper_fru(info): def inventory_juniper_fru(parsed, fru_type): return [ (fru_name, None) for fru_name, fru_data in parsed.items() \ - if fru_data["fru_type"] == fru_type ] + if fru_data["fru_type"] == fru_type + and fru_data["fru_state"] != "2" ] # ignore "empty" states def check_juniper_fru(item, _no_params, parsed):

8 years, 10 months

updated manpages of isc_dhcpd and win_dhcp_pools

by Simon Betz

Module: check_mk Branch: master Commit: 453d48ff77e61394ac58b825688167bd2b5ad5f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=453d48ff77e613… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Nov 13 10:33:30 2015 +0100 updated manpages of isc_dhcpd and win_dhcp_pools --- checkman/isc_dhcpd | 3 ++- checkman/win_dhcp_pools | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/checkman/isc_dhcpd b/checkman/isc_dhcpd index a76697a..39f200a 100644 --- a/checkman/isc_dhcpd +++ b/checkman/isc_dhcpd @@ -7,7 +7,8 @@ description: This check retrieves the information about existing address pools from <tt>dhcpd.conf</tt> and about existing leases from <tt>dhcpd.leases</tt>. If outputs the number of used and free leases in each pool and allows - to set levels for free leases. + to set levels for free and used leases. These levels are configurable + as percentage or absolute values. item: The name of the DHCP pool as configured on the DHCP server. diff --git a/checkman/win_dhcp_pools b/checkman/win_dhcp_pools index 205ad83..11768b2 100644 --- a/checkman/win_dhcp_pools +++ b/checkman/win_dhcp_pools @@ -11,8 +11,9 @@ description: Each DHCP pool will result in one service on the DHCP server. - The check will raise WARNING/CRITICAL states when the thresholds of free - addresses are reached. The thresholds need to be given as percentage values. + The check will raise WARNING/CRITICAL states when the thresholds of free or + used addresses are reached. The thresholds need to be given as percentage + or absolute values. item: The name of the DHCP pool as configured on the DHCP server.

8 years, 10 months

added agent output to esx_vsphere_hostsystem.multipath

by Simon Betz

Module: check_mk Branch: master Commit: b216a2b640116f7a857600ab4cac7dfd3366da6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b216a2b640116f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Nov 12 19:36:08 2015 +0100 added agent output to esx_vsphere_hostsystem.multipath --- checks/esx_vsphere_hostsystem | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index bdb2aed..1b0e5dd 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -359,6 +359,14 @@ check_info['esx_vsphere_hostsystem.maintenance'] = { # | |_| | # +----------------------------------------------------------------------+ +# 5.1 +# fc.20000024ff2e1b4c:21000024ff2e1b4c-fc.500a098088866d7e:500a098188866d7e-naa.60a9800044314f68553f436779684544 active +# unknown.vmhba0-unknown.2:0-naa.6b8ca3a0facdc9001a2a27f8197dd718 active +# 5.5 +# fc.20000024ff3708ec:21000024ff3708ec-fc.500a098088866d7e:500a098188866d7e-naa.60a9800044314f68553f436779684544 active +# fc.500143802425a24d:500143802425a24c-fc.5001438024483280:5001438024483288-naa.5001438024483280 active +# >= version 6.0 +# vmhba32:C0:T0:L0 active def esx_vsphere_multipath_convert(info): data = esx_vsphere_hostsystem_convert(info)

8 years, 10 months

#2836 FIX pandacom_psu: fixed handling of not available power supplies

by Simon Betz

Module: check_mk Branch: master Commit: 7f701782a82d15b92fa5bda6339b91e36c615501 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f701782a82d15… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Nov 12 18:11:53 2015 +0100 #2836 FIX pandacom_psu: fixed handling of not available power supplies --- .werks/2836 | 9 +++++++++ ChangeLog | 1 + checks/pandacom_psu | 11 ++++++----- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.werks/2836 b/.werks/2836 new file mode 100644 index 0000000..85a5bca --- /dev/null +++ b/.werks/2836 @@ -0,0 +1,9 @@ +Title: pandacom_psu: fixed handling of not available power supplies +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1447348259 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 4948e93..0bd89d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,6 +77,7 @@ * 2775 FIX: omd_status: handle case where status information is incomplete due to missing cmk version * 2835 FIX: netextreme_psu_in: fixed wrong voltage usage handling... * 2776 FIX: apache_status: fix crash for Apache versions with yet unhandled status fields + * 2836 FIX: pandacom_psu: fixed handling of not available power supplies Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/pandacom_psu b/checks/pandacom_psu index 43c5414..dd6f648 100644 --- a/checks/pandacom_psu +++ b/checks/pandacom_psu @@ -53,10 +53,11 @@ def parse_pandacom_psu(info): "255" : "type not available", } map_psu_state = { - "0" : (3, "not installed"), - "1" : (2, "fail"), - "2" : (1, "temperature warning"), - "3" : (0, "pass"), + "0" : (3, "not installed"), + "1" : (2, "fail"), + "2" : (1, "temperature warning"), + "3" : (0, "pass"), + "255" : (3, "not available"), } parsed = {} for psu_nr, type_index, state_index in [ @@ -64,7 +65,7 @@ def parse_pandacom_psu(info): ("2", 6, 3), ("3", 10, 11), ]: - if info[state_index][0] != "0": + if info[state_index][0] not in [ "0", "255" ]: parsed[psu_nr] = { "type" : map_psu_type[info[type_index][0]], "state" : map_psu_state[info[state_index][0]],

8 years, 10 months

Fix: make ≠ l10nable...

by Mathias Kettner

Module: check_mk Branch: master Commit: ae8fc0073b304077ea2268d64ea6e997198b914b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae8fc0073b3040… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 12 17:55:13 2015 +0100 Fix: make ≠ l10nable... --- web/plugins/visuals/filters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index a351e33..9cb6aeb 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -966,8 +966,8 @@ class FilterHostTags(Filter): def display(self): groups = [ (e[0], e[1].lstrip("/") ) for e in config.wato_host_tags ] operators = [ - ("is", _("=")), - ("isnot", _(u"≠")), + ("is", "="), + ("isnot", u"≠"), ] # replace unicode strings, before writing out as "json"

8 years, 10 months

#2776 FIX apache_status: fix crash for Apache versions with yet unhandled status fields

by Mathias Kettner

Module: check_mk Branch: master Commit: dab8baf87e666bd0d74d8d56122e461f83895287 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dab8baf87e666b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 12 15:59:50 2015 +0100 #2776 FIX apache_status: fix crash for Apache versions with yet unhandled status fields --- .werks/2776 | 10 ++++++++++ ChangeLog | 1 + checks/apache_status | 3 +++ 3 files changed, 14 insertions(+) diff --git a/.werks/2776 b/.werks/2776 new file mode 100644 index 0000000..9741edf --- /dev/null +++ b/.werks/2776 @@ -0,0 +1,10 @@ +Title: apache_status: fix crash for Apache versions with yet unhandled status fields +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1447340362 + + diff --git a/ChangeLog b/ChangeLog index 0a9a9ed..4948e93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -76,6 +76,7 @@ * 2765 FIX: heartbeat_crm: Fixed issue detecting outdated data with daylight saving time * 2775 FIX: omd_status: handle case where status information is incomplete due to missing cmk version * 2835 FIX: netextreme_psu_in: fixed wrong voltage usage handling... + * 2776 FIX: apache_status: fix crash for Apache versions with yet unhandled status fields Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/apache_status b/checks/apache_status index 196ecd2..9d64500 100644 --- a/checks/apache_status +++ b/checks/apache_status @@ -77,6 +77,9 @@ def apache_status_parse(info): if len(line) != 4 and not (len(line) == 5 and line[2] == 'Total'): continue # Skip unexpected lines label = (' '.join(line[2:-1])).rstrip(':') + if label not in _apache_status_fields: + continue + value = _apache_status_fields[label][1](line[-1]) if port == "None": item = address

8 years, 10 months

updated netextreme_psu_in check

by Simon Betz

Module: check_mk Branch: master Commit: 48051181c1d64404223c21d7d6413b3b4b5a881c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48051181c1d644… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Nov 12 14:51:10 2015 +0100 updated netextreme_psu_in check --- .werks/2835 | 13 +++++++++++++ ChangeLog | 1 + checks/netextreme_psu_in | 9 +-------- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.werks/2835 b/.werks/2835 new file mode 100644 index 0000000..85f7cf6 --- /dev/null +++ b/.werks/2835 @@ -0,0 +1,13 @@ +Title: netextreme_psu_in: fixed wrong voltage usage handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1447335434 + +This value is not the current voltage usage, +but rather the PSU type defined in EXTREME-SYSTEM-MIB: +v110 (1), v220 (2), v48DC (3), unknown(4) +Thus we do not monitor this value any more. diff --git a/ChangeLog b/ChangeLog index d1ffe9a..0a9a9ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -75,6 +75,7 @@ * 2786 FIX: agent_netapp: now able to monitor more than 20 instances of a given type, e.g. volumes or interfaces... * 2765 FIX: heartbeat_crm: Fixed issue detecting outdated data with daylight saving time * 2775 FIX: omd_status: handle case where status information is incomplete due to missing cmk version + * 2835 FIX: netextreme_psu_in: fixed wrong voltage usage handling... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/netextreme_psu_in b/checks/netextreme_psu_in index 21b733b..f69df7f 100644 --- a/checks/netextreme_psu_in +++ b/checks/netextreme_psu_in @@ -24,10 +24,6 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# .1.3.6.1.4.1.1916.1.1.1.27.1.3.1 4 --> EXTREME-SYSTEM-MIB::extremePowerSupplyInputVoltage.1 -# .1.3.6.1.4.1.1916.1.1.1.27.1.3.2 4 --> EXTREME-SYSTEM-MIB::extremePowerSupplyInputVoltage.2 -# .1.3.6.1.4.1.1916.1.1.1.27.1.8.1 2 --> EXTREME-SYSTEM-MIB::extremePowerSupplySource.1 -# .1.3.6.1.4.1.1916.1.1.1.27.1.8.2 2 --> EXTREME-SYSTEM-MIB::extremePowerSupplySource.2 # .1.3.6.1.4.1.1916.1.1.1.27.1.9.1 52550 --> EXTREME-SYSTEM-MIB::extremePowerSupplyInputPowerUsage.1 # .1.3.6.1.4.1.1916.1.1.1.27.1.9.2 43700 --> EXTREME-SYSTEM-MIB::extremePowerSupplyInputPowerUsage.2 # .1.3.6.1.4.1.1916.1.1.1.27.1.11.1 -3 --> EXTREME-SYSTEM-MIB::extremePowerSupplyInputPowerUsageUnitMultiplier.1 @@ -35,8 +31,7 @@ # Just an assumption factory_settings["netextreme_psu_in_default_levels"] = { - "power" : (1100, 1200), # This levels a recomended by the manufactorer - "voltage" : (2, 1), + "power" : (110, 120), # This levels a recomended by the manufactorer } def parse_netextreme_psu_in(info): @@ -44,7 +39,6 @@ def parse_netextreme_psu_in(info): for psu_index, psu_voltage_str, psu_usage_str, psu_factor_str in info: parsed["Input %s" % psu_index] = { "power" : float(psu_usage_str) * pow(10, int(psu_factor_str)), - "voltage" : float(psu_voltage_str), } return parsed @@ -57,7 +51,6 @@ check_info['netextreme_psu_in'] = { 'has_perfdata' : True, 'snmp_info' : (".1.3.6.1.4.1.1916.1.1.1.27.1", [ OID_END, # Power Supply Index - "3", # extremePowerSupplyInputVoltage "9", # extremePowerSupplyInputPowerUsage "11", # extremePowerSupplyInputPowerUsageUnitMultiplier ]),

8 years, 10 months

Updated bug entries #2410

by Mathias Kettner

Module: check_mk Branch: master Commit: 9e62e5ab116823cd9d73bac09ec1ede5e6458b67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e62e5ab116823… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 12 14:41:38 2015 +0100 Updated bug entries #2410 --- .bugs/2410 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/2410 b/.bugs/2410 new file mode 100644 index 0000000..1b841c7 --- /dev/null +++ b/.bugs/2410 @@ -0,0 +1,9 @@ +Title: CHeck_MK HW/SW Inventory fails because var/check_mk/inventory exists +Component: inv +State: open +Date: 2015-11-12 14:40:55 +Targetversion: future +Class: bug + +Goes away by itself. Reason seems: race condition. Several checks at the same +time create the directory.

8 years, 10 months

Reserved 10 bug IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 27e28f4b95d972ba80cb61e5b6a4e9cf930fde4d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27e28f4b95d972… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 12 14:40:49 2015 +0100 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 20f7c8b..121140f 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2410 +2420

8 years, 10 months

removed print statement in dhcp_pools.include

by Simon Betz

Module: check_mk Branch: master Commit: 2425c18fab1a98153dd610fc5ac75d7e749a95ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2425c18fab1a98… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Nov 12 12:57:56 2015 +0100 removed print statement in dhcp_pools.include --- checks/dhcp_pools.include | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/dhcp_pools.include b/checks/dhcp_pools.include index 229a657..ecb4eac 100644 --- a/checks/dhcp_pools.include +++ b/checks/dhcp_pools.include @@ -45,7 +45,6 @@ def check_dhcp_pools_levels(free, used, pending, size, params): infotext = "%s: %d leases (%.1f%%)" % (what, value, value_perc) if params.get("%s_leases" % what, ""): warn, crit = params["%s_leases" % what] - print what, warn, crit if type(warn) == float: # here we have levels in percent value = value_perc text_format = "%.1f"

8 years, 10 months

← Newer
1
...
12
13
14
15
16
17
18
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2015