Checkmk git commits March 2016

checkmk-commits@lists.checkmk.com

7 participants
275 discussions

by Sven Panne

Module: check_mk Branch: master Commit: c33cfee0c458b4d92b4ba95cad9910c205911403 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c33cfee0c458b4… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Mar 17 09:39:24 2016 +0100 3236 FIX Fixed host page of pnp4nagios Fixed PHP error when opening host page of pnp4nagios, the error was: "cannot redeclare replace_cmk_expression()..." --- .werks/3236 | 13 +++++++++++++ ChangeLog | 1 + pnp-templates/default.php | 24 +++++++++++++----------- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/.werks/3236 b/.werks/3236 new file mode 100644 index 0000000..e688ff3 --- /dev/null +++ b/.werks/3236 @@ -0,0 +1,13 @@ +Title: Fixed host page of pnp4nagios +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458203813 + +Fixed PHP error when opening host page of pnp4nagios, the error was: + + "cannot redeclare replace_cmk_expression()..." + diff --git a/ChangeLog b/ChangeLog index ff54d15..fb13c64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -107,6 +107,7 @@ * 3285 FIX: Fixed exception when editing large bookmark lists * 3287 FIX: Fixed broken crash reporting (Submission of crashes did not work) * 3290 FIX: Fixed broken event quick delete icon when used in dashlets + * 3236 FIX: Fixed host page of pnp4nagios... WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/pnp-templates/default.php b/pnp-templates/default.php index af16c6e..66a909f 100644 --- a/pnp-templates/default.php +++ b/pnp-templates/default.php @@ -79,18 +79,20 @@ if ($cache_state != "uptodate") } } -function replace_cmk_expression($NAME, $MIN, $MAX, $WARN, $CRIT, $text) -{ - # Replace expressions in the title. This not a full implementation of - # the complete RPN expression syntax of Check_MK - but sufficient for - # all used cases. - foreach ($NAME as $i => $n) { - $text = str_replace("%($n:min@count)", "$MIN[$i]", $text); - $text = str_replace("%($n:max@count)", "$MAX[$i]", $text); - $text = str_replace("%($n:warn@count)", "$WARN[$i]", $text); - $text = str_replace("%($n:crit@count)", "$CRIT[$i]", $text); +if (!function_exists("replace_cmk_expression")) { + function replace_cmk_expression($NAME, $MIN, $MAX, $WARN, $CRIT, $text) + { + # Replace expressions in the title. This not a full implementation of + # the complete RPN expression syntax of Check_MK - but sufficient for + # all used cases. + foreach ($NAME as $i => $n) { + $text = str_replace("%($n:min@count)", "$MIN[$i]", $text); + $text = str_replace("%($n:max@count)", "$MAX[$i]", $text); + $text = str_replace("%($n:warn@count)", "$WARN[$i]", $text); + $text = str_replace("%($n:crit@count)", "$CRIT[$i]", $text); + } + return $text; } - return $text; } # Now read template information from cache file, if present

8 years, 6 months

3012 jolokia_metrics.threads: Improved check output, now showing the actual problem and levels

by Andreas Boesl

Module: check_mk Branch: master Commit: e66840b0f5adbef9bea7c2a2edbec824c3c32231 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e66840b0f5adbe… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 16 16:35:19 2016 +0100 3012 jolokia_metrics.threads: Improved check output, now showing the actual problem and levels --- .werks/3012 | 9 +++++++++ ChangeLog | 1 + checks/jolokia_metrics | 5 ++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/3012 b/.werks/3012 new file mode 100644 index 0000000..5925568 --- /dev/null +++ b/.werks/3012 @@ -0,0 +1,9 @@ +Title: jolokia_metrics.threads: Improved check output, now showing the actual problem and levels +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1458142474 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 4943e3d..ff54d15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ * 3101 zpool: new check to monitor usage of zfs pools... * 3103 brocade_optical: new check to monitor signal strength of optical network ports on Brocade switches * 3303 cisco_fru_module_status: new check which monitors the operational status of FRU modules of Cisco devices which support the CISCO-ENTITY-FRU-CONTROL-MIB + * 3012 jolokia_metrics.threads: Improved check output, now showing the actual problem and levels * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 0ad4b34..b1c3921 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -396,12 +396,15 @@ def check_jolokia_metrics_threads(item, params, info): continue # The keys might be optional (saw jboss only sending ThreadCount) val = int(d[key]) + status_info = "" if key == 'ThreadCount': # Thread count might lead to a warn/crit state if val >= crit: status = 2 + status_info = "(!!) (Levels at %d/%d)" % (warn, crit) elif val >= warn: status = 1 + status_info = "(!) (Levels at %d/%d)" % (warn, crit) # Calculate the thread increase rate try: @@ -412,7 +415,7 @@ def check_jolokia_metrics_threads(item, params, info): wrapped = True perfdata.append((key, val)) - output.append('%s: %d' % (key, val)) + output.append('%s: %d%s' % (key, val, status_info)) # Only process the perfdata when no wrap occured if wrapped: return (status, ', '.join(output))

8 years, 6 months

3011 FIX WATO host diagnostic page: prevent incorrectly filled input fields

by Andreas Boesl

Module: check_mk Branch: master Commit: 5a6bee489a7c874ce1d3576e44a5a9e7f4792498 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a6bee489a7c87… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 16 16:18:42 2016 +0100 3011 FIX WATO host diagnostic page: prevent incorrectly filled input fields Certain browser automatically fill in username and password formulars. The IP address and the SNMP community were on of them... This has been fixed. --- .werks/3011 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 1 + 3 files changed, 12 insertions(+) diff --git a/.werks/3011 b/.werks/3011 new file mode 100644 index 0000000..57431f3 --- /dev/null +++ b/.werks/3011 @@ -0,0 +1,10 @@ +Title: WATO host diagnostic page: prevent incorrectly filled input fields +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.9i1 +Date: 1458141368 +Class: fix + +Certain browser automatically fill in username and password formulars. +The IP address and the SNMP community were on of them... This has been fixed. diff --git a/ChangeLog b/ChangeLog index d6d0a80..4943e3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -137,6 +137,7 @@ * 3284 FIX: Bulk import of hosts: Fixed disabling of reading first line as header... * 3270 FIX: Fix button [Deprecated Rulesets] within deprecated manual checks rulesets * 3100 FIX: fixed exception when trying to create a wato folder when that folder already exists + * 3011 FIX: WATO host diagnostic page: prevent incorrectly filled input fields... Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b3cd181..7f36e1f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2484,6 +2484,7 @@ def mode_diag_host(phase): forms.header(_('Host Properties')) forms.section(legend = False) + html.prevent_password_auto_completion() vs_host.render_input("vs_host", host.attributes()) html.help(vs_host.help())

8 years, 6 months

brocade_optical: fixed handling of unsupported reading format

by Sebastian Herbord

Module: check_mk Branch: master Commit: 613ac6ada3c66c057d15629908d9d841764fb0db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=613ac6ada3c66c… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Mar 16 15:41:59 2016 +0100 brocade_optical: fixed handling of unsupported reading format --- checks/brocade_optical | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/checks/brocade_optical b/checks/brocade_optical index 3597238..25a3784 100644 --- a/checks/brocade_optical +++ b/checks/brocade_optical @@ -97,8 +97,11 @@ def parse_brocade_optical(info): if value_string == 'N/A' or value_string.lower() == "not supported": return None, None - val, unit, status = value_string.split() - return float(val), status + try: + val, unit, status = value_string.split() + return float(val), status + except ValueError: + return None, None result = {}

8 years, 6 months

3010 FIX Fixed vanished snmp subchecks for snmp hosts

by Andreas Boesl

Module: check_mk Branch: master Commit: ba770bf7bced4f83eed65e84b81551d4f593e45b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba770bf7bced4f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 16 14:55:16 2016 +0100 3010 FIX Fixed vanished snmp subchecks for snmp hosts SNMP subchecks for snmp hosts did not work when the host did not have the host tag 'snmp'. --- .werks/3010 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3010 b/.werks/3010 new file mode 100644 index 0000000..f55732b --- /dev/null +++ b/.werks/3010 @@ -0,0 +1,10 @@ +Title: Fixed vanished snmp subchecks for snmp hosts +Level: 2 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1458135856 + +SNMP subchecks for snmp hosts did not work when the host did not have the host tag 'snmp'. diff --git a/ChangeLog b/ChangeLog index 317f7b0..d6d0a80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -84,6 +84,7 @@ * 3098 FIX: isc_dhcpd: fixed handling of leases that never expire * 3099 FIX: mk_mysql: worked around problems where running instances can't be discovered * 3009 FIX: ESX agent: fixed exception with utf-8 encoded strings... + * 3010 FIX: Fixed vanished snmp subchecks for snmp hosts... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/modules/check_mk.py b/modules/check_mk.py index 9d98341..2274b0b 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -508,7 +508,7 @@ def active_check_service_description(act_info, params): def is_snmp_check(check_name): - return check_name in snmp_info + return check_name.split(".")[0] in snmp_info def is_tcp_check(check_name):

8 years, 6 months

3009 FIX ESX agent: fixed exception with utf-8 encoded strings

by Andreas Boesl

Module: check_mk Branch: master Commit: c36fc186375c86dea347475aceeb212e4b39553a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c36fc186375c86… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 16 13:51:53 2016 +0100 3009 FIX ESX agent: fixed exception with utf-8 encoded strings The agent tried to encode and already utf-8 encoded string. --- .werks/3009 | 10 ++++++++++ ChangeLog | 1 + agents/special/agent_vsphere | 9 ++++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.werks/3009 b/.werks/3009 new file mode 100644 index 0000000..8b7a235 --- /dev/null +++ b/.werks/3009 @@ -0,0 +1,10 @@ +Title: ESX agent: fixed exception with utf-8 encoded strings +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1458132586 +Class: fix + +The agent tried to encode and already utf-8 encoded string. + diff --git a/ChangeLog b/ChangeLog index eec0fae..317f7b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -83,6 +83,7 @@ * 3007 FIX: Interface groups: fixed exception when port type or interface items were not set in the WATO rule... * 3098 FIX: isc_dhcpd: fixed handling of leases that never expire * 3099 FIX: mk_mysql: worked around problems where running instances can't be discovered + * 3009 FIX: ESX agent: fixed exception with utf-8 encoded strings... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 64d34cc6..85da7df 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -1675,7 +1675,14 @@ if not error: raise error = "Error while processing received data" -print "\n".join(vsphere_output) + +def make_utf8(line): + if type(line) == unicode: + return line.encode("utf-8") + else: + return line + +print "\n".join(map(make_utf8, vsphere_output)) if opt_agent: sys.stdout.write(get_agent_info_tcp(host_address))

8 years, 6 months

3303 cisco_fru_module_status: new check which monitors the operational status of FRU modules of Cisco devices which support the CISCO-ENTITY-FRU-CONTROL-MIB

by Simon Betz

Module: check_mk Branch: master Commit: 05e6ab2199a16a51367e58924c0d53f66966eed6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05e6ab2199a16a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Mar 16 10:58:41 2016 +0100 3303 cisco_fru_module_status: new check which monitors the operational status of FRU modules of Cisco devices which support the CISCO-ENTITY-FRU-CONTROL-MIB --- .werks/3303 | 9 +++ ChangeLog | 1 + checkman/cisco_fru_module_status | 18 +++++ checks/cisco_fru_module_status | 155 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 183 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=05e6ab2199…

8 years, 6 months

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 02fa57306d3b8a4a078acd79f787f94d4fb4664b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02fa57306d3b8a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Mar 16 10:57:18 2016 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index b798a67..996928c 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3303 +3313

8 years, 6 months

3103 brocade_optical: new check to monitor signal strength of optical network ports on Brocade switches

by Sebastian Herbord

Module: check_mk Branch: master Commit: 76a195f619e8e44ff853e1584d0d744e9fd775ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76a195f619e8e4… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Mar 16 10:33:34 2016 +0100 3103 brocade_optical: new check to monitor signal strength of optical network ports on Brocade switches --- .werks/3103 | 9 ++ ChangeLog | 1 + checkman/brocade_optical | 16 ++ checks/brocade_optical | 267 ++++++++++++++++++++++++++++++++++ web/plugins/metrics/check_mk.py | 47 ++++++ web/plugins/wato/check_parameters.py | 29 ++++ 6 files changed, 369 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=76a195f619…

8 years, 6 months

zpool: renamed service description

by Sebastian Herbord

Module: check_mk Branch: master Commit: 589ba0973cae711b4387e4d668d77d264cca0956 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=589ba0973cae71… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Mar 16 09:22:51 2016 +0100 zpool: renamed service description --- checks/zpool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/zpool b/checks/zpool index d4b995b..b89af3d 100644 --- a/checks/zpool +++ b/checks/zpool @@ -65,7 +65,7 @@ check_info['zpool'] = { "check_function" : check_zpool, "inventory_function" : inventory_zpool, "parse_function" : parse_zpool, - "service_description" : "Pool %s", + "service_description" : "Storage Pool %s", "has_perfdata" : True, "group" : "filesystem", }

8 years, 6 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2016