Checkmk git commits September 2017

checkmk-commits@lists.checkmk.com

11 participants
255 discussions

5134 check_http: Add the option to specify a proxy server in check_http

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 9024a5af615906db1c558419865f36cbc310140d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9024a5af615906… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Sep 19 13:46:19 2017 +0200 5134 check_http: Add the option to specify a proxy server in check_http Change-Id: I21a2dcb71642ec6f7e14f272a2d5eeb359683772 --- .werks/5134 | 10 ++++++++++ checks/check_http | 4 +++- web/plugins/wato/active_checks.py | 9 +++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.werks/5134 b/.werks/5134 new file mode 100644 index 0000000..d5d4197 --- /dev/null +++ b/.werks/5134 @@ -0,0 +1,10 @@ +Title: check_http: Add the option to specify a proxy server in check_http +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1505821515 +Class: feature + + diff --git a/checks/check_http b/checks/check_http index 5df7432..44f1a62 100644 --- a/checks/check_http +++ b/checks/check_http @@ -145,8 +145,10 @@ def check_http_arguments(params): if settings.get("urlize"): args += [ '-L' ] - if not omit_ip: + if (not omit_ip) and ("proxy" not in settings): args = [ "-I", address ] + args + elif "proxy" in settings: + args = [ "-I", settings["proxy"] ] + args return args diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 56fcfbb..520bfce 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -989,6 +989,15 @@ register_rule(group, ] ) ), + ( "proxy", + TextAscii( + title = _("Proxy host"), + help = _("To use a proxy you have to use the Port of the proxy, " + "specify the virtual host and the URL to fetch, " + "use the HTTP Method CONNECT, and use SSL/HTTPS " + "for the connection") + ), + ), ( "proxy_auth", Tuple( title = _("Proxy-Authorization"),

6 years, 9 months

Reserved 10 bug IDS

by Marcel Arentz

Module: check_mk Branch: master Commit: 95245d9d264d8a1a505035c59b1ef6ea1a02de9e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95245d9d264d8a… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Sep 19 12:07:58 2017 +0200 Reserved 10 bug IDS Change-Id: If1ac5fe7d77d87c67a8edf65558d2258373ac785 --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index af7b0ba..9fc17ed 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2970 +2980

6 years, 9 months

5230 FIX logwatch/logwatch.ec: fixed "no forwarding" option in rule " Logwatch Event Console Forwarding"

by Andreas Boesl

Module: check_mk Branch: master Commit: 70a9f187f60a028eeda50b9f172f81b4f348e856 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70a9f187f60a02… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 19 10:41:57 2017 +0200 5230 FIX logwatch/logwatch.ec: fixed "no forwarding" option in rule "Logwatch Event Console Forwarding" If you configured a "Logwatch Event Console Forwarding" rule and used the setting "No forwarding" (Messages are handled by logwatch), the logfiles weren't handled by logwatch at all. They simply got dropped. This has been fixed. If you update to this version you might see an increase in logwatch checks, if you used the "No forwarding" setting. --- .werks/5230 | 17 +++++++++++++++++ checks/logwatch | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/5230 b/.werks/5230 new file mode 100644 index 0000000..470f1bc --- /dev/null +++ b/.werks/5230 @@ -0,0 +1,17 @@ +Title: logwatch/logwatch.ec: fixed "no forwarding" option in rule "Logwatch Event Console Forwarding" +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1505810291 +Class: fix + +If you configured a "Logwatch Event Console Forwarding" rule and used the +setting "No forwarding" (Messages are handled by logwatch), the logfiles weren't handled +by logwatch at all. They simply got dropped. + +This has been fixed. If you update to this version you might see an increase +in logwatch checks, if you used the "No forwarding" setting. + + diff --git a/checks/logwatch b/checks/logwatch index ec4b69c..88434e4 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -82,7 +82,7 @@ def logwatch_select_forwarded(info): logfile_name = line[3:-3] # Is forwarding enabled in general? - if forward_settings and forward_settings[0] != None: + if forward_settings and forward_settings[0]: if logwatch_ec_forwarding_enabled(forward_settings[0], logfile_name): forwarded_logs.append(logfile_name) else:

6 years, 9 months

5132 FIX cisco_ip_sla: fix snmp scan function

by Tom Baerwinkel

Module: check_mk Branch: master Commit: d0b67d7005f1f73fba7b395a0627f6bf60cc716d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0b67d7005f1f7… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Sep 18 17:46:42 2017 +0200 5132 FIX cisco_ip_sla: fix snmp scan function Change-Id: I11aea5d7576aca4b2287424bca399e0e173f1ef5 --- .werks/5132 | 10 ++++++++++ checks/cisco_ip_sla | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/5132 b/.werks/5132 new file mode 100644 index 0000000..0e38616 --- /dev/null +++ b/.werks/5132 @@ -0,0 +1,10 @@ +Title: cisco_ip_sla: fix snmp scan function +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1505749473 +Class: fix + + diff --git a/checks/cisco_ip_sla b/checks/cisco_ip_sla index 5b1b069..9b4a5cb 100644 --- a/checks/cisco_ip_sla +++ b/checks/cisco_ip_sla @@ -179,7 +179,7 @@ check_info['cisco_ip_sla'] = { 'group': 'cisco_ip_sla', 'default_levels_variable': 'cisco_ip_sla_default_levels', 'has_perfdata': True, - 'snmp_scan_function': lambda oid: oid('1.3.6.1.2.1.1.2.0') in [ + 'snmp_scan_function': lambda oid: oid('.1.3.6.1.2.1.1.2.0') in [ '.1.3.6.1.4.1.9.1.2068', ], 'snmp_info': [('.1.3.6.1.4.1.9.9.42.1.2.2.1', [

6 years, 9 months

3919 FIX PDF: Improved handling of long words in text wrapping

by Lars Michelsen

Module: check_mk Branch: master Commit: 059ac9eb408aa20832c254be5986902d9ef1e505 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=059ac9eb408aa2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 18 16:10:32 2017 +0200 3919 FIX PDF: Improved handling of long words in text wrapping Added some word wrapping functionality to the text wrapping algorithm that is used to fit texts into areas of PDF documents. For example when adding text to table cells words may now be wrapped if needed. --- .werks/3919 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/3919 b/.werks/3919 new file mode 100644 index 0000000..cda563a --- /dev/null +++ b/.werks/3919 @@ -0,0 +1,12 @@ +Title: PDF: Improved handling of long words in text wrapping +Level: 1 +Component: reporting +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1505743729 +Class: fix + +Added some word wrapping functionality to the text wrapping algorithm +that is used to fit texts into areas of PDF documents. For example +when adding text to table cells words may now be wrapped if needed.

6 years, 9 months

5016 FIX hp_proliant_temp: Fixed crash if thresholds are set manually

by Marcel Arentz

Module: check_mk Branch: master Commit: 895412861e5f5d8dd49b0614286b74211b8d4666 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=895412861e5f5d… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Sep 18 14:51:25 2017 +0200 5016 FIX hp_proliant_temp: Fixed crash if thresholds are set manually The device delivers optionally thresholds for it's parts. If not, -99 will be that value. A service with that device threshold crashed if a user would set up thresholds for it's own. This is now fixed. Change-Id: I97b3a3a8d068453b86c66cf3a29814cb94e22cba --- .werks/5016 | 12 ++++++++++++ checks/hp_proliant_temp | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/5016 b/.werks/5016 new file mode 100644 index 0000000..6c0eadc --- /dev/null +++ b/.werks/5016 @@ -0,0 +1,12 @@ +Title: hp_proliant_temp: Fixed crash if thresholds are set manually +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1505738884 +Class: fix + +The device delivers optionally thresholds for it's parts. If not, -99 will +be that value. A service with that device threshold crashed if a user would +set up thresholds for it's own. This is now fixed. diff --git a/checks/hp_proliant_temp b/checks/hp_proliant_temp index 557094e..627fbd2 100644 --- a/checks/hp_proliant_temp +++ b/checks/hp_proliant_temp @@ -41,7 +41,7 @@ def check_hp_proliant_temp(item, params, info): # This case means no threshold available and # the devices' web interface displays "N/A" if threshold == "-99" or threshold == "0": - devlevels = (None, None) + devlevels = None else: threshold = float(threshold) devlevels = (threshold, threshold)

6 years, 9 months

5229 FIX Rename host: fixed exception when having more than 1024 users configured

by Andreas Boesl

Module: check_mk Branch: master Commit: a81eb5711d55882e5ebb57068a0dc0b9bc3ef245 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a81eb5711d5588… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 18 14:16:44 2017 +0200 5229 FIX Rename host: fixed exception when having more than 1024 users configured For each configured user, WATO kept a file open during the rename procedure. Having more than 1024 users breached the <tt>ulimit -n</tt> option and a <tt>Too many open files</tt> exception occurred. --- .werks/5229 | 12 ++++++++++++ web/htdocs/wato.py | 1 + 2 files changed, 13 insertions(+) diff --git a/.werks/5229 b/.werks/5229 new file mode 100644 index 0000000..637da3d --- /dev/null +++ b/.werks/5229 @@ -0,0 +1,12 @@ +Title: Rename host: fixed exception when having more than 1024 users configured +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1505736767 + +For each configured user, WATO kept a file open during the rename procedure. +Having more than 1024 users breached the <tt>ulimit -n</tt> option and a <tt>Too many open files</tt> exception occurred. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a05d0b8..4887948 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1971,6 +1971,7 @@ def rename_host_in_multisite(oldname, newname): store.save_data_to_file(favpath, favorites) users_changed += 1 total_changed += num_changed + store.release_lock(favpath) if users_changed: return [ "favorites" ] * total_changed

6 years, 9 months

5289 temperature.include: Allow floating point numbers in upper and lower levels in 'Temperature' ruleset

by Simon Betz

Module: check_mk Branch: master Commit: 7323b486ebf35f8ba20a633b91d3d298ec8f7f93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7323b486ebf35f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Sep 18 14:12:27 2017 +0200 5289 temperature.include: Allow floating point numbers in upper and lower levels in 'Temperature' ruleset Change-Id: I5f28ef24914f83d3eb8c1255a4c00bf882bab709 --- .werks/5289 | 10 ++++++++++ web/plugins/wato/check_parameters.py | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.werks/5289 b/.werks/5289 new file mode 100644 index 0000000..0d88fb9 --- /dev/null +++ b/.werks/5289 @@ -0,0 +1,10 @@ +Title: temperature.include: Allow floating point numbers in upper and lower levels in 'Temperature' ruleset +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1505736688 +Class: feature + + diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 0fb4ea3..f0a138f 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -12176,16 +12176,16 @@ register_check_parameters( Tuple( title = _("Upper Temperature Levels"), elements = [ - Integer(title = _("Warning at"), unit = u"°C", default_value = 26), - Integer(title = _("Critical at"), unit = u"°C", default_value = 30), + Float(title = _("Warning at"), unit = u"°C", default_value = 26), + Float(title = _("Critical at"), unit = u"°C", default_value = 30), ] )), ( "levels_lower", Tuple( title = _("Lower Temperature Levels"), elements = [ - Integer(title = _("Warning below"), unit = u"°C", default_value = 0), - Integer(title = _("Critical below"), unit = u"°C", default_value = -10), + Float(title = _("Warning below"), unit = u"°C", default_value = 0), + Float(title = _("Critical below"), unit = u"°C", default_value = -10), ] )), ( "output_unit",

6 years, 9 months

5287 FIX postfix_mailq: Fixed parameter handling

by Simon Betz

Module: check_mk Branch: master Commit: 8921c5dd319fdfe7681a6c09a689e4d7fc579460 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8921c5dd319fdf… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Sep 18 12:29:25 2017 +0200 5287 FIX postfix_mailq: Fixed parameter handling In previous check version mail and deferred queue had same parameters. Change-Id: I8547512dd7907ea9657d3dc21fb00159c71ddb4e --- .werks/5287 | 11 +++++++++++ checks/postfix_mailq | 5 +++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/5287 b/.werks/5287 new file mode 100644 index 0000000..cf7e70b --- /dev/null +++ b/.werks/5287 @@ -0,0 +1,11 @@ +Title: postfix_mailq: Fixed parameter handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1505730469 + +In previous check version mail and deferred queue had same parameters. diff --git a/checks/postfix_mailq b/checks/postfix_mailq index 99213a4..6848558 100644 --- a/checks/postfix_mailq +++ b/checks/postfix_mailq @@ -153,10 +153,11 @@ def check_postfix_mailq(item, params, parsed): params = { "deferred" : params } for what, size, length in parsed[item]: - warn, crit = params.get(what, (None, None)) + # In previous check version mail and deferred had same params + warn, crit = params.get({"mail": "deferred"}.get(what, what), (None, None)) if what in [ "active", "deferred", "mail" ]: state = 0 - infotext = "%s%s queue length: %d" % (what[0].upper(), what[1:], length) + infotext = "%s queue length: %d" % (what.title(), length) if what in [ "deferred", "mail" ]: length_var = "length"

6 years, 9 months

Added sensor names to service details

by Simon Betz

Module: check_mk Branch: master Commit: 9b7e6f923242f485da11f5583f720ab20e1824b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b7e6f923242f4… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Sep 18 11:51:00 2017 +0200 Added sensor names to service details Change-Id: I44d8ddbd24c252511ca27f10df86f1a91d2ec05c --- checks/etherbox | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/checks/etherbox b/checks/etherbox index ffdbaa7..61591e0 100644 --- a/checks/etherbox +++ b/checks/etherbox @@ -135,7 +135,8 @@ def check_etherbox_humidity(item, params, info): except Exception, error: return 3, error.message - return check_humidity(int(value) / 10.0, params) + state, infotext, perfdata = check_humidity(int(value) / 10.0, params) + return state, "[%s] %s" % (name, infotext), perfdata check_info["etherbox.humidity"] = { @@ -211,13 +212,11 @@ def check_etherbox_smoke(item, no_params, info): state = 0 perfdata = [ ("smoke", value) ] - extra_info = "" + infotext = "Status: OK" if value != "0": - extra_info = " - Smoke alarm!" + infotext = "Status: smoke alarm" state = 2 - - return (state, "[%s] Smoke sensor%s" % (name, extra_info), perfdata) - + return state, "[%s] %s" % (name, infotext), perfdata check_info["etherbox.smoke"] = { "check_function" : check_etherbox_smoke,

6 years, 9 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2017