Checkmk git commits October 2016

checkmk-commits@lists.checkmk.com

10 participants
276 discussions

3825 FIX local check: no longer cuts away any trailing "9"

by Andreas Boesl

digits in P mode Message-ID: <5804d1d0.6J4BeaX9gLf+tknR%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 9141bf8efda818998f65cc30844ea9ae0176d3b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9141bf8efda818… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Oct 17 14:18:28 2016 +0200 3825 FIX local check: no longer cuts away any trailing "9" digits in P mode --- .werks/3825 | 10 ++++++++++ ChangeLog | 1 + checks/local | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3825 b/.werks/3825 new file mode 100644 index 0000000..028d463 --- /dev/null +++ b/.werks/3825 @@ -0,0 +1,10 @@ +Title: local check: no longer cuts away any trailing "9" digits in P mode +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i2 +Date: 1476706599 + + diff --git a/ChangeLog b/ChangeLog index 943648f..98c73fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ * 3823 FIX: The windows agent were unable to execute powershell, python and pearl scripts * 3937 FIX: check_mk_agent.aix: fixed hadling of mailq command * 3824 FIX: netapp_api_snapvault: fixed duplicate service when item name contains a $ character... + * 3825 FIX: local check: no longer cuts away any trailing "9" digits in P mode Multisite: * 3959 Two new filters for the comment view: author and comment text field diff --git a/checks/local b/checks/local index 468eb97..01bf6d5 100644 --- a/checks/local +++ b/checks/local @@ -43,7 +43,7 @@ def local_compute_state(perfdata): # 16MB -> 16.0 def float_ignore_uom(value): while value: - if value[-1] not in "012345678.-": + if value[-1] not in "0123456789.-": value = value[:-1] else: return float(value)

7 years, 11 months

fixed unit conversion

by Marcel Arentz

Module: check_mk Branch: master Commit: 5727b444c80d3a3ff8cdbec8cbf432e7c4328d44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5727b444c80d3a… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Oct 17 12:13:10 2016 +0200 fixed unit conversion --- checks/mssql_blocked_sessions | 2 +- web/plugins/wato/check_parameters.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/mssql_blocked_sessions b/checks/mssql_blocked_sessions index a9d1e8d..ad43fcb 100644 --- a/checks/mssql_blocked_sessions +++ b/checks/mssql_blocked_sessions @@ -47,7 +47,7 @@ def check_mssql_blocked_sessions(_no_item, params, info): if params: state = params.get("state", 2) warn, crit = params.get("waittime", (0, 0)) - wait_duration_sec = float(wait_duration_ms) / 100 + wait_duration_sec = float(wait_duration_ms) / 1000 if wait_duration_sec >= crit and not crit == 0: state = 2 elif wait_duration_sec >= warn and not warn == 0: diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index e85b02d..71ad7e5 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -8208,8 +8208,8 @@ register_check_parameters( "overwrite the default state set above."), default_value = (0, 0), elements = [ - Float(title = _("Warning at"), unit = _("seconds")), - Float(title = _("Critical at"), unit = _("seconds")), + Float(title = _("Warning at"), unit = _("seconds"), display_format = _("%.3f")), + Float(title = _("Critical at"), unit = _("seconds"), display_format = _("%.3f")), ] )), ],

7 years, 11 months

fixed bug in helptext

by Marcel Arentz

Module: check_mk Branch: master Commit: 5fa4ddd775ea30c6e49722e8120287eb4428c936 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fa4ddd775ea30… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Oct 17 11:11:07 2016 +0200 fixed bug in helptext --- web/htdocs/wato.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7174435..0205f46 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7429,8 +7429,8 @@ def event_rule_match_conditions(flavour): ListChoice( title = _("Match host event type"), help = _("Select the host event types and transitions this rule should handle. Note: " - "If you activate this option and do not also specify service event " - "types then this rule will never hold for service notifications!"), + "If you activate this option and do not also specify host event " + "types then this rule will never hold for host notifications!"), choices = [ ( 'rd', _("UP") + u" ➤ " + _("DOWN")), ( 'dr', _("DOWN") + u" ➤ " + _("UP")), @@ -7446,8 +7446,8 @@ def event_rule_match_conditions(flavour): ListChoice( title = _("Match service event type"), help = _("Select the service event types and transitions this rule should handle. Note: " - "If you activate this option and do not also specify host event " - "types then this rule will never hold for host notifications!"), + "If you activate this option and do not also specify service event " + "types then this rule will never hold for service notifications!"), choices = [ ( 'rw', _("OK") + u" ➤ " + _("WARN")), ( 'rr', _("OK") + u" ➤ " + _("OK")),

7 years, 11 months

3947 mssql_blocked_sessions: thresholds for wait time can be set now

by Marcel Arentz

Module: check_mk Branch: master Commit: 0d5e17103eb818a9cc8c0d5fb14776ab5b569e8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d5e17103eb818… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Oct 17 10:15:44 2016 +0200 3947 mssql_blocked_sessions: thresholds for wait time can be set now Thresholds for wait_duration_ms can be set now. The value will be a floating point in seconds to provide a better usability. --- .werks/3947 | 10 ++++++++++ ChangeLog | 1 + checkman/mssql_blocked_sessions | 11 +++++++++-- checks/mssql_blocked_sessions | 17 +++++++++++++---- web/plugins/wato/check_parameters.py | 18 +++++++++++++++--- 5 files changed, 48 insertions(+), 9 deletions(-) diff --git a/.werks/3947 b/.werks/3947 new file mode 100644 index 0000000..c7cde7c --- /dev/null +++ b/.werks/3947 @@ -0,0 +1,10 @@ +Title: mssql_blocked_sessions: thresholds for wait time can be set now +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i2 +Date: 1476691606 +Class: feature + +Thresholds for wait_duration_ms can be set now. The value will be a floating point +in seconds to provide a better usability. diff --git a/ChangeLog b/ChangeLog index 092eee0..943648f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ * 3954 postfix_mailq_status: new check which monitors the status of postfix mail instances * 3945 fortigate_node: Memory on fortigate clusters are now configurable by WATO... * 3956 fileinfo.groups: now allows regular expressions within include and exclude patterns each beginning with a tilde + * 3947 mssql_blocked_sessions: thresholds for wait time can be set now... * 3894 FIX: mkeventd_status: Fixed bug in case Event Console is not running * 3907 FIX: oracle_tablespaces: simplyfied free space calculation depending on version... * 3819 FIX: windows agent: fixed 2 bugs related to mrpe... diff --git a/checkman/mssql_blocked_sessions b/checkman/mssql_blocked_sessions index 26a8f2a..076f75d 100644 --- a/checkman/mssql_blocked_sessions +++ b/checkman/mssql_blocked_sessions @@ -4,8 +4,15 @@ catalog: app/mssql license: GPL distribution: check_mk description: - This check lists all blocked sessions on a MSSQL Server. As long at least one session is blocked, - it will be {CRITICAL}. This state is configurable. The default value is {CRITICAL}. + This check lists all blocked sessions on a MSSQL Server. As + long at least one session is blocked, it will be {CRITICAL}. + This state is configurable with a default value of {CRITICAL}. + + Alternatively you can configure thresholds for the SQL output + "wait_duration_ms". + + These two options can {not} be combined. If thresholds are set, + they will have precedence. This check needs the Check_MK mssql.vbs -plugin installed in the agent. Please refer to the online documentation diff --git a/checks/mssql_blocked_sessions b/checks/mssql_blocked_sessions index e874081..a9d1e8d 100644 --- a/checks/mssql_blocked_sessions +++ b/checks/mssql_blocked_sessions @@ -39,21 +39,30 @@ def inventory_mssql_blocked_sessions(info): def check_mssql_blocked_sessions(_no_item, params, info): if not info: - yield 0, "No blocked sessions" + yield 0, "No blocked sessions" return state = 2 - if params: - state = params.get("state", 2) for session_id, wait_duration_ms, wait_type, blocking_session_id in info[1:]: + if params: + state = params.get("state", 2) + warn, crit = params.get("waittime", (0, 0)) + wait_duration_sec = float(wait_duration_ms) / 100 + if wait_duration_sec >= crit and not crit == 0: + state = 2 + elif wait_duration_sec >= warn and not warn == 0: + state = 1 + elif warn > 0 or crit > 0: + state = 0 + yield state, \ "Session %s blocked by %s (Wait %s ms, Type: %s)" % \ ( session_id, blocking_session_id, wait_duration_ms, wait_type ) check_info['mssql_blocked_sessions'] = { - 'check_function' : check_mssql_blocked_sessions, 'inventory_function' : inventory_mssql_blocked_sessions, + 'check_function' : check_mssql_blocked_sessions, 'service_description' : "MSSQL Blocked Sessions", 'group' : "mssql_blocked_sessions", } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 21254f0..e85b02d 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -8195,10 +8195,22 @@ register_check_parameters( _("MSSQL Blocked Sessions"), Dictionary( elements = [ - ( "state", + ( "state", MonitoringState( - title = _("State of MSSQL Blocked Sessions is treated as"), - default_value = 2, + title = _("State of MSSQL Blocked Sessions is treated as"), + help = _("The default state if there is at least one " + "blocked session."), + default_value = 2, + )), + ( "waittime", Tuple( + title = _("Levels for wait"), + help = _("The threshholds for wait_duration_ms. Will " + "overwrite the default state set above."), + default_value = (0, 0), + elements = [ + Float(title = _("Warning at"), unit = _("seconds")), + Float(title = _("Critical at"), unit = _("seconds")), + ] )), ], ),

7 years, 11 months

3959 Two new filters for the comment view: author and comment text field

by Simon Betz

Module: check_mk Branch: master Commit: c5828cab01a2ed936bf6e28eff3bf4e78695c367 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5828cab01a2ed… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Oct 17 09:25:18 2016 +0200 3959 Two new filters for the comment view: author and comment text field --- .werks/3959 | 9 +++++++++ ChangeLog | 3 ++- web/plugins/visuals/filters.py | 4 ++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/3959 b/.werks/3959 new file mode 100644 index 0000000..898039c --- /dev/null +++ b/.werks/3959 @@ -0,0 +1,9 @@ +Title: Two new filters for the comment view: author and comment text field +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i2 +Date: 1476689081 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index c122b16..092eee0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,10 +22,11 @@ * 3649 FIX: Added a workaround for an escaping-related bug in old bash versions... * 3958 FIX: netapp_qtree_quota: fixed graph scaling * 3823 FIX: The windows agent were unable to execute powershell, python and pearl scripts - * 3824 FIX: netapp_api_snapvault: fixed duplicate service when item name contains a $ character... * 3937 FIX: check_mk_agent.aix: fixed hadling of mailq command + * 3824 FIX: netapp_api_snapvault: fixed duplicate service when item name contains a $ character... Multisite: + * 3959 Two new filters for the comment view: author and comment text field * 3897 FIX: Fixed possible exception in raw edition when rendering graphs * 3898 FIX: Unmonitored services: Fixed possible bug in case discovery service produces unexpected output * 3902 FIX: Graph search view: Changing painter options made page empty diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 872ddff..abedb8c 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -837,6 +837,10 @@ declare_filter(251, FilterTime("service", "svc_last_check", _("Last service chec declare_filter(250, FilterTime("host", "host_last_state_change", _("Last host state change"), "host_last_state_change")) declare_filter(251, FilterTime("host", "host_last_check", _("Last host check"), "host_last_check")) declare_filter(253, FilterTime("comment", "comment_entry_time", _("Time of comment"), "comment_entry_time" )) + +declare_filter(258, FilterText("comment_comment", _("Comment"), "comment", "comment_comment", "comment_comment", "~~" , True)) +declare_filter(259, FilterText("comment_author", _("Author comment"), "comment", "comment_author", "comment_author", "~~" , True)) + declare_filter(253, FilterTime("downtime", "downtime_entry_time", _("Time when downtime was created"), "downtime_entry_time" )) declare_filter(254, FilterText("downtime_comment", _("Downtime comment"), "downtime", "downtime_comment", "downtime_comment", "~")) declare_filter(255, FilterTime("downtime", "downtime_start_time", _("Start of downtime"), "downtime_start_time" ))

7 years, 11 months

removed default levels

by Simon Betz

Module: check_mk Branch: master Commit: adda8c43104d3eb504361c23a687849a42149921 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=adda8c43104d3e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Oct 14 16:54:15 2016 +0200 removed default levels --- checks/gude_powerbanks | 1 - checks/gude_relayport | 1 - 2 files changed, 2 deletions(-) diff --git a/checks/gude_powerbanks b/checks/gude_powerbanks index 1c061a3..428b14d 100644 --- a/checks/gude_powerbanks +++ b/checks/gude_powerbanks @@ -33,7 +33,6 @@ factory_settings["gude_powerbank_default_levels"] = { "voltage" : ( 220, 210 ), "current" : ( 15, 16 ), - "energy" : ( 3500, 3600 ), } diff --git a/checks/gude_relayport b/checks/gude_relayport index e07412a..a53ab5e 100644 --- a/checks/gude_relayport +++ b/checks/gude_relayport @@ -37,7 +37,6 @@ factory_settings["gude_relayport_default_levels"] = { "voltage" : ( 220, 210 ), "current" : ( 15, 16 ), - "energy" : ( 3500, 3600 ), }

7 years, 11 months

Added test cases

by Roland Halbig

Module: check_mk Branch: master Commit: ef91a673770a372af69710c1031ce8f0d0afa792 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef91a673770a37… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Fri Oct 14 16:19:21 2016 +0200 Added test cases Removed import config statement from htmllib. Moved footnotelinks back to sidebar. Bugfix of previous commmit Fixed tests --- tests/web/classes.py | 472 ++++++++++++++++++++++++++++++++++ tests/web/test_htmllib_integration.py | 217 ++++++++++++++++ tests/web/tools.py | 232 +++++++++++++++++ web/htdocs/html_mod_python.py | 6 + web/htdocs/htmllib.py | 26 +- web/htdocs/sidebar.py | 11 +- 6 files changed, 942 insertions(+), 22 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ef91a67377…

7 years, 11 months

3937 FIX check_mk_agent.aix: fixed hadling of mailq command

by Marcel Schulte

Module: check_mk Branch: master Commit: 8a792574723ad193eaaf355cc6fa5f22708b0ec9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a792574723ad1… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Fri Oct 14 15:48:51 2016 +0200 3937 FIX check_mk_agent.aix: fixed hadling of mailq command --- .werks/3937 | 10 ++++++++++ ChangeLog | 1 + agents/check_mk_agent.aix | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/3937 b/.werks/3937 new file mode 100644 index 0000000..71e26d3 --- /dev/null +++ b/.werks/3937 @@ -0,0 +1,10 @@ +Title: check_mk_agent.aix: fixed hadling of mailq command +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i2 +Date: 1476452143 + + diff --git a/ChangeLog b/ChangeLog index a002661..c122b16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * 3958 FIX: netapp_qtree_quota: fixed graph scaling * 3823 FIX: The windows agent were unable to execute powershell, python and pearl scripts * 3824 FIX: netapp_api_snapvault: fixed duplicate service when item name contains a $ character... + * 3937 FIX: check_mk_agent.aix: fixed hadling of mailq command Multisite: * 3897 FIX: Fixed possible exception in raw edition when rendering graphs diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 194a017..2b6bd44 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -27,7 +27,7 @@ # force load of environment if [ -e $HOME/.profile ] then - . $HOME/.profile + . $HOME/.profile >/dev/null 2>&1 fi # Remove locale settings to eliminate localized outputs where possible @@ -221,7 +221,7 @@ fi if [ -x /usr/sbin/sendmail ] ; then echo '<<<postfix_mailq>>>'; - mailq 2>&1 | sed 's/^[^:]*: $.*$/\1/' | tail -n 6 + mailq 2>&1 | tail -n 6 fi # uptime formats

7 years, 11 months

Removed testing try-catch-block in htmllib

by Roland Halbig

Module: check_mk Branch: master Commit: 745385c98ea898946408b6bb96c11fbfb0aa05f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=745385c98ea898… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Fri Oct 14 15:53:46 2016 +0200 Removed testing try-catch-block in htmllib --- web/htdocs/htmllib.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index dd21200..42faf9a 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -75,12 +75,7 @@ from lib import MKUserError # TODO: REMOVE (JUST FOR TESTING) __builtin__._ = lambda x: x -try: - import config -except: - os.environ["OMD_SITE"] = "OMD" - import config - +import config

7 years, 11 months

3824 FIX netapp_api_snapvault: fixed duplicate service when item name contains a $ character

by Andreas Boesl

Module: check_mk Branch: master Commit: 72e294e054dd758e922b0cbae89b7b6e6889926c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72e294e054dd75… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 14 15:45:36 2016 +0200 3824 FIX netapp_api_snapvault: fixed duplicate service when item name contains a $ character $ characters are now replaced with _. --- .werks/3824 | 9 +++++++++ ChangeLog | 1 + checks/netapp_api.include | 5 ++++- checks/netapp_api_snapvault | 4 ++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/3824 b/.werks/3824 new file mode 100644 index 0000000..54aa118 --- /dev/null +++ b/.werks/3824 @@ -0,0 +1,9 @@ +Title: netapp_api_snapvault: fixed duplicate service when item name contains a $ character +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i2 +Date: 1476452646 +Class: fix + +$ characters are now replaced with _. diff --git a/ChangeLog b/ChangeLog index a0cf2e8..a002661 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * 3649 FIX: Added a workaround for an escaping-related bug in old bash versions... * 3958 FIX: netapp_qtree_quota: fixed graph scaling * 3823 FIX: The windows agent were unable to execute powershell, python and pearl scripts + * 3824 FIX: netapp_api_snapvault: fixed duplicate service when item name contains a $ character... Multisite: * 3897 FIX: Fixed possible exception in raw edition when rendering graphs diff --git a/checks/netapp_api.include b/checks/netapp_api.include index b313467..2310e17 100644 --- a/checks/netapp_api.include +++ b/checks/netapp_api.include @@ -27,7 +27,7 @@ # Transforms all lines into a dictionary. # The first key is the dictionary key, unless modified by the custom_keys -def netapp_api_parse_lines(info, custom_keys = [], as_dict_list = False): +def netapp_api_parse_lines(info, custom_keys = [], as_dict_list = False, item_func = None): instances = {} for line in info: instance = {} @@ -43,6 +43,9 @@ def netapp_api_parse_lines(info, custom_keys = [], as_dict_list = False): custom_name.append(instance[key]) name = ".".join(custom_name) + if item_func: + name = item_func(name) + if as_dict_list: instances.setdefault(name, []) instances[name].append(instance) diff --git a/checks/netapp_api_snapvault b/checks/netapp_api_snapvault index d84f46d..957d134 100644 --- a/checks/netapp_api_snapvault +++ b/checks/netapp_api_snapvault @@ -72,8 +72,12 @@ def check_netapp_api_snapvault(item, params, parsed): yield state, "Lag-Time: %s" % get_age_human_readable(lag_time) +def netapp_api_snapvault_item(name): + return name.replace("$", "_") + check_info["netapp_api_snapvault"] = { 'parse_function' : netapp_api_parse_lines, + 'parse_function' : lambda x: netapp_api_parse_lines(x, item_func = netapp_api_snapvault_item), 'check_function' : check_netapp_api_snapvault, 'inventory_function' : inventory_netapp_api_snapvault, 'group' : "snapvault",

7 years, 11 months

← Newer
1
...
14
15
16
17
18
19
20
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2016