Checkmk git commits October 2016

checkmk-commits@lists.checkmk.com

10 participants
276 discussions

by Sven Rueß

Module: check_mk Branch: master Commit: b5cecba59e05486c1f10d8787ebb100614c23cef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5cecba59e0548… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Thu Oct 20 20:59:23 2016 +0200 Reserved 1 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index b1f48fb..6357d64 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2521 +2522

7 years, 11 months

3829 FIX Skype for Business checks: refactored most of the checks

by Andreas Boesl

Module: check_mk Branch: master Commit: 1b7d7ff6cb002acf0c0b443ec2d9253865d07900 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b7d7ff6cb002a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 20 12:56:30 2016 +0200 3829 FIX Skype for Business checks: refactored most of the checks Note: Due to a bug in the windows agent these check weren't discovered, anyway. --- .werks/3829 | 9 + ChangeLog | 1 + checks/skype | 95 ++++---- web/plugins/wato/check_parameters.py | 437 ++++++++++++++++++++--------------- 4 files changed, 315 insertions(+), 227 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1b7d7ff6cb…

7 years, 11 months

Added comment for not forgetting matching rules

by Mathias Kettner

Module: check_mk Branch: master Commit: 1d5db82fe188d38e26adb8fe8057da25315ed146 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d5db82fe188d3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 20 14:30:12 2016 +0200 Added comment for not forgetting matching rules --- web/htdocs/wato.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d9e70c5..08d0f17 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7354,6 +7354,8 @@ def generic_rule_match_conditions(): orientation = "horizontal", ) ), + # BEWARE: If you add further match conditions here, you might have to adjust + # the the number in the_alert_handlers.py:ModeAlertHandlerRule._alert_handler_conditions ( "match_checktype", CheckTypeSelection( title = _("Match the following check types"),

7 years, 11 months

Fetched Livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: e24215749eab73e1ddfb63e9ece5031127a7e086 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e24215749eab73… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Oct 20 14:29:19 2016 +0200 Fetched Livestatus from downstream. --- livestatus/src/module.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index a3501a7..bb54708 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -90,7 +90,7 @@ int g_num_queued_connections = 0; /* current number of queued connections (for statistics) */ int g_num_active_connections = 0; /* current number of active connections (for statistics) */ -size_t g_thread_stack_size = 65536; /* stack size of threads */ +size_t g_thread_stack_size = 1024 * 1024; /* stack size of threads */ extern int g_disable_statehist_filtering; #define false 0

7 years, 11 months

Added missing import.

by Sven Panne

Module: check_mk Branch: master Commit: e7e67e862153811f14511ee603427742905853be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7e67e86215381… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Oct 20 14:10:52 2016 +0200 Added missing import. --- modules/check_mk_base.py | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 1f2ed57..13aaba0 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -63,6 +63,7 @@ import cmk.paths import cmk_base.agent_simulator import cmk_base.utils import cmk_base.prediction +import cmk_base.console as console # PLANNED CLEANUP: # - central functions for outputting verbose information and bailing

7 years, 11 months

3968 FIX Notifications / Alert handling: Fixed configuring nth notifications without state changes

by Lars Michelsen

Module: check_mk Branch: master Commit: 5af07e344bb19e1aadafc9a753508b322413e158 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5af07e344bb19e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 20 12:52:51 2016 +0200 3968 FIX Notifications / Alert handling: Fixed configuring nth notifications without state changes This is especially important for the Enterprise Edition specific alert handling when constructing rules matching on the nth check attempt. But it has been added as generic option for notifications and alert handling. --- .werks/3968 | 12 ++++++++++++ ChangeLog | 1 + modules/notify.py | 3 ++- web/htdocs/wato.py | 13 ++++++++++++- 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/.werks/3968 b/.werks/3968 new file mode 100644 index 0000000..6917c79 --- /dev/null +++ b/.werks/3968 @@ -0,0 +1,12 @@ +Title: Notifications / Alert handling: Fixed configuring nth notifications without state changes +Level: 1 +Component: notifications +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i2 +Date: 1476960641 + +This is especially important for the Enterprise Edition specific alert handling when constructing +rules matching on the nth check attempt. But it has been added as generic option for notifications +and alert handling. diff --git a/ChangeLog b/ChangeLog index 8c5e40c..86bd489 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,7 @@ Notifications: * 3957 mail: now allows extra HTML section between body and table * 3900 FIX: Notification analysis: Fixed wrong color for host notification states + * 3968 FIX: Notifications / Alert handling: Fixed configuring nth notifications without state changes... BI: * 3955 BI rule ID can now be renamed diff --git a/modules/notify.py b/modules/notify.py index a17de66..d0555e2 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -685,7 +685,8 @@ def rbn_match_event(context, state, last_state, events, allowed_events): # Now go through the allowed events. Handle '?' has matching all types! for allowed in allowed_events: if event == allowed or \ - event[0] == '?' and len(allowed) > 1 and event[1] == allowed[1]: + (allowed[0] == '?' and len(event) > 1 and event[1] == allowed[1]) or \ + (event[0] == '?' and len(allowed) > 1 and event[1] == allowed[1]): return return "Event type '%s' not handled by this rule. Allowed are: %s" % ( diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7174435..d9e70c5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7433,11 +7433,17 @@ def event_rule_match_conditions(flavour): "types then this rule will never hold for service notifications!"), choices = [ ( 'rd', _("UP") + u" ➤ " + _("DOWN")), - ( 'dr', _("DOWN") + u" ➤ " + _("UP")), ( 'ru', _("UP") + u" ➤ " + _("UNREACHABLE")), + + ( 'dr', _("DOWN") + u" ➤ " + _("UP")), ( 'du', _("DOWN") + u" ➤ " + _("UNREACHABLE")), + ( 'ud', _("UNREACHABLE") + u" ➤ " + _("DOWN")), ( 'ur', _("UNREACHABLE") + u" ➤ " + _("UP")), + + ( '?r', _("any") + u" ➤ " + _("UP")), + ( '?d', _("any") + u" ➤ " + _("DOWN")), + ( '?u', _("any") + u" ➤ " + _("UNREACHABLE")), ] + add_choices, default_value = [ 'rd', 'dr', ] + add_default, ) @@ -7467,6 +7473,11 @@ def event_rule_match_conditions(flavour): ( 'uw', _("UNKNOWN") + u" ➤ " + _("WARN")), ( 'uc', _("UNKNOWN") + u" ➤ " + _("CRIT")), + ( '?r', _("any") + u" ➤ " + _("OK")), + ( '?w', _("any") + u" ➤ " + _("WARN")), + ( '?c', _("any") + u" ➤ " + _("CRIT")), + ( '?u', _("any") + u" ➤ " + _("UNKNOWN")), + ] + add_choices, default_value = [ 'rw', 'rc', 'ru', 'wc', 'wu', 'uc', ] + add_default, )

7 years, 11 months

updated werk

by Simon Betz

Module: check_mk Branch: master Commit: 896f6df48064ce19069739f9ebfccd38737e8101 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=896f6df48064ce… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 20 11:03:41 2016 +0200 updated werk --- .werks/3905 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.werks/3905 b/.werks/3905 index 1140bed..b70ad7c 100644 --- a/.werks/3905 +++ b/.werks/3905 @@ -9,7 +9,9 @@ Class: feature If postfix is configured with multi directories then the linux agent provides information about deferred and active mail queue length of these directories. -Note: existing ruleset mailqueue length is now deprecated. These checks will -work further on but the related ruleset won't be applied any more except default levels. -Please use new service descriptions for these checks below global settings, rediscover the -affected hosts and use new mail queue length ruleset. +Note: The existing ruleset mailqueue length is now deprecated. These checks will +work further on but the related ruleset won't be applied any more except the default levels. +To make these new checks work, please +1. rediscover the affected hosts +2. use new mail queue length ruleset and +3. enable "use new service description" for these checks below global settings.

7 years, 11 months

3966 FIX apc_symmetra raritan_emx: Fixed wrong include "

by Lars Michelsen

temperature.includes" Message-ID: <58086b80.9Mvad9atucmGbP+t%lm(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: 5a59d4194f159d95e5478af5f704ae62fe0e8cff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a59d4194f159d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 20 08:59:12 2016 +0200 3966 FIX apc_symmetra raritan_emx: Fixed wrong include "temperature.includes" The checks were including non existant check include files which lead to an error: IOError: [Errno 2] No such file or directory: '/omd/sites/test/share/check_mk/checks/temperature.includes' When using nagios core, this made the whole compilation of the configuration fail in case the checks are used. --- .werks/3966 | 15 +++++++++++++++ ChangeLog | 1 + checks/apc_symmetra | 2 +- checks/raritan_emx | 2 +- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.werks/3966 b/.werks/3966 new file mode 100644 index 0000000..853adf8 --- /dev/null +++ b/.werks/3966 @@ -0,0 +1,15 @@ +Title: apc_symmetra raritan_emx: Fixed wrong include "temperature.includes" +Level: 2 +Component: checks +Compatible: compat +Version: 1.4.0i2 +Date: 1476946657 +Class: fix + +The checks were including non existant check include files which lead to an +error: + +IOError: [Errno 2] No such file or directory: '/omd/sites/test/share/check_mk/checks/temperature.includes' + +When using nagios core, this made the whole compilation of the configuration +fail in case the checks are used. diff --git a/ChangeLog b/ChangeLog index 13d5533..8c5e40c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,7 @@ * 3650 FIX: Fixed bash versionitis, unbreaking cached check results.... * 3960 FIX: if.include: fixed wrong order if interface groups are configured * 3828 FIX: agent_netapp: improved error reporting. fixed exception when snapmirror-get-status returns no values + * 3966 FIX: apc_symmetra raritan_emx: Fixed wrong include "temperature.includes"... Multisite: * 3959 Two new filters for the comment view: author and comment text field diff --git a/checks/apc_symmetra b/checks/apc_symmetra index c42f483..1e63112 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -296,7 +296,7 @@ check_info['apc_symmetra.temp'] = { 'default_levels_variable' : 'apc_symmetra_temp_default_levels', 'has_perfdata' : True, 'group' : 'temperature', - 'includes' : [ 'temperature.includes' ], + 'includes' : [ 'temperature.include' ], } diff --git a/checks/raritan_emx b/checks/raritan_emx index 625e046..7741e8d 100644 --- a/checks/raritan_emx +++ b/checks/raritan_emx @@ -121,7 +121,7 @@ check_info['raritan_emx'] = { ]), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [".1.3.6.1.4.1.13742.8"], "group" : "temperature", - "includes" : [ "temperature.includes", "raritan.include" ], + "includes" : [ "temperature.include", "raritan.include" ], } #.

7 years, 11 months

Added missing import module

by Lars Michelsen

Module: check_mk Branch: master Commit: f0749a8f1a12a493a137fc541b0f29606bb35570 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0749a8f1a12a4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 20 08:52:05 2016 +0200 Added missing import module --- cmk_base/console.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmk_base/console.py b/cmk_base/console.py index 7db75dc..8ead6cd 100644 --- a/cmk_base/console.py +++ b/cmk_base/console.py @@ -29,6 +29,7 @@ of console input / output""" import sys +import cmk.tty as tty import cmk.log logger = cmk.log.get_logger("base") @@ -75,4 +76,4 @@ def warning(text, *args): text = "%s%s%sWARNING:%s %s\n" % (indent, tty.bold, tty.yellow, tty.normal, stripped) - console.output(text, *args, stream=sys.stderr) + output(text, *args, stream=sys.stderr)

7 years, 11 months

Fixed issue in yesterdays commit

by Lars Michelsen

Module: check_mk Branch: master Commit: af91ae3d96180f5fa520226481c6df70062f47c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af91ae3d96180f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 20 07:56:37 2016 +0200 Fixed issue in yesterdays commit --- cmk_base/console.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk_base/console.py b/cmk_base/console.py index af66b41..7db75dc 100644 --- a/cmk_base/console.py +++ b/cmk_base/console.py @@ -70,8 +70,8 @@ def vverbose(text, *args, **kwargs): # TODO: Inconsistent -> Adds newline and other functions don't def warning(text, *args): - stripped = reason.lstrip() - indent = reason[:len(reason) - len(stripped)] + stripped = text.lstrip() + indent = text[:len(text) - len(stripped)] text = "%s%s%sWARNING:%s %s\n" % (indent, tty.bold, tty.yellow, tty.normal, stripped)

7 years, 11 months

← 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 October 2016