Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64242 discussions

Check_MK Git: check_mk: Updated changelog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 442fcaad41835dc952c5119144b5fa465a55ba0c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=442fcaad41835d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 13 15:01:01 2012 +0200 Updated changelog --- ChangeLog | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 72e121f..0ea1d0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,10 @@ * New main overview for rule editor * New multisite.mk option wato_hide_varnames for hiding Check_MK configuration variable names from the user + * New module "Logwatch Pattern Analyzer" to verify logwatch rules + * Added new variable logwatch_rules which can also be managed through the + WATO ruleset editor (Host/Service Parameters > Parameters and rules for + inventorized checks > Various applications > Logwatch Patterns) Multisite * Added config option default_ts_format to configure default timestamp

12 years, 5 months

Check_MK Git: check_mk: Fixed logwatch patterns spec

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f1d55d4b5ca2eadebfcd6080040a9ac27c6b3d23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1d55d4b5ca2ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 13 12:19:39 2012 +0200 Fixed logwatch patterns spec --- checks/logwatch | 9 ++--- web/htdocs/wato.py | 6 ++-- web/plugins/wato/check_parameters.py | 55 ++++++++++++++++----------------- 3 files changed, 34 insertions(+), 36 deletions(-) diff --git a/checks/logwatch b/checks/logwatch index a0194a7..7714d87 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -93,12 +93,11 @@ def logwatch_level_worst(worst, level): # Extracts patterns that are relevant for the current host and item. # Constructs simple list of pairs: [ ('W', 'crash.exe'), ('C', 'sshd.*test') ] -def logwatch_precompile(hostname, item, params): - # First load the logwatch_rules var (used by WATO) - rules = get_checkgroup_parameters(hostname, 'logwatch', item) - - # Initialize params with these rules but remove the comment +def logwatch_precompile(hostname, item, _unused): + # Initialize the patterns list with the logwatch_rules params = [] + description = check_info['logwatch']['service_description'] % item + rules = service_extra_conf(hostname, description, logwatch_rules) for rule in rules: for pattern in rule: params.append((pattern[0], pattern[1])) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9d9a229..1b3a234 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9936,7 +9936,7 @@ def mode_pattern_editor(phase): html.context_button(_('Edit Logfile Rules'), make_link([ ('mode', 'edit_ruleset'), - ('varname', 'checkgroup_parameters:logwatch') + ('varname', 'logwatch_rules') ]), 'edit' ) @@ -9989,7 +9989,7 @@ def mode_pattern_editor(phase): html.show_user_errors() return - varname = 'checkgroup_parameters:logwatch' + varname = 'logwatch_rules' rulespec = g_rulespecs[varname] all_rulesets = load_all_rulesets() ruleset = all_rulesets.get(varname) @@ -10001,7 +10001,7 @@ def mode_pattern_editor(phase): + _('There are no logfile patterns defined. You may create ' 'logfile patterns using the <a href="%s">Rule Editor</a>.') % make_link([ ('mode', 'edit_ruleset'), - ('varname', 'checkgroup_parameters:logwatch') + ('varname', 'logwatch_rules') ]) + "</div>" ) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index dc738b1..0ee56cc 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -91,31 +91,10 @@ register_rule(group + "/" + subgroup_networking, ]), match="dict") -checkgroups = [] - -checkgroups.append(( - subgroup_windows, - "ad_replication", - _("Active Directory Replication"), - Tuple( - help = _("The number of replication failures"), - elements = [ - Integer(title = _("Warning at"), unit = _("failures")), - Integer(title = _("Critical at"), unit = _("failures")), - ] - ), - TextAscii( - title = _("Replication Partner"), - help = _("The name of the replication partner (Destination DC Site/Destination DC)."), - ), - "first" -)) - -checkgroups.append(( - subgroup_applications, - "logwatch", - _("Logfile patterns"), - ListOf( +register_rule(group + '/' + subgroup_applications, + varname = "logwatch_rules", + title = _('Logwatch Patterns'), + valuespec = ListOf( Tuple( help = _("This defines one logfile pattern rule"), show_titles = True, @@ -146,11 +125,31 @@ checkgroups.append(( 'to test the rules you defined here.'), add_label = _("Add pattern"), ), + itemtype = 'item', + itemname = 'logfile', + itemhelp = _("One or several regular expressions for matching logfile lines."), + match = 'list', +) + + +checkgroups = [] + +checkgroups.append(( + subgroup_windows, + "ad_replication", + _("Active Directory Replication"), + Tuple( + help = _("The number of replication failures"), + elements = [ + Integer(title = _("Warning at"), unit = _("failures")), + Integer(title = _("Critical at"), unit = _("failures")), + ] + ), TextAscii( - title = _("logfile"), - help = _("One or several regular expressions for matching logfile lines."), + title = _("Replication Partner"), + help = _("The name of the replication partner (Destination DC Site/Destination DC)."), ), - 'first', + "first" )) checkgroups.append((

12 years, 5 months

Check_MK Git: check_mk: Logwatch: Fixed handling when no patterns/ rules are defined

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: aaa0acd5353296514b95b27cb60ff2e906cef10e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aaa0acd5353296… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 13 11:37:41 2012 +0200 Logwatch: Fixed handling when no patterns/rules are defined --- checks/logwatch | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/checks/logwatch b/checks/logwatch index 81a8d48..a0194a7 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -235,7 +235,10 @@ def check_logwatch(item, params, info): (username(), e)) # Get the patterns (either compile or reuse the precompiled ones) - if params: + # Check_MK creates an empty string if the precompile function has + # not been exectued yet. The precomile function creates an empty + # list when no rules/patterns are defined. + if params != '': patterns = params # patterns already precompiled else: patterns = logwatch_precompile(g_hostname, item, None)

12 years, 5 months

Check_MK Git: check_mk: Fixed broken link to pattern editor;

by git＠mathias-kettner.de

Fixed pattern loading in logwatch check User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 49da647c4af7eea5044e720319a28d43bc910921 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49da647c4af7ee… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 13 11:02:16 2012 +0200 Fixed broken link to pattern editor; Fixed pattern loading in logwatch check --- checks/logwatch | 4 ++-- web/htdocs/wato.py | 6 +++--- web/plugins/wato/check_parameters.py | 7 ++++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/checks/logwatch b/checks/logwatch index fabd134..81a8d48 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -95,8 +95,7 @@ def logwatch_level_worst(worst, level): # Constructs simple list of pairs: [ ('W', 'crash.exe'), ('C', 'sshd.*test') ] def logwatch_precompile(hostname, item, params): # First load the logwatch_rules var (used by WATO) - description = check_info['logwatch']['service_description'] % item - rules = service_extra_conf(hostname, description, logwatch_rules) + rules = get_checkgroup_parameters(hostname, 'logwatch', item) # Initialize params with these rules but remove the comment params = [] @@ -340,6 +339,7 @@ check_info['logwatch'] = { 'service_description': "LOG %s", 'has_perfdata': 0, 'inventory_function': inventory_logwatch, + 'group': 'logwatch', } precompile_params['logwatch'] = logwatch_precompile diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3833af5..9d9a229 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9936,7 +9936,7 @@ def mode_pattern_editor(phase): html.context_button(_('Edit Logfile Rules'), make_link([ ('mode', 'edit_ruleset'), - ('varname', 'checkgroup_parameters:logwatch_rules') + ('varname', 'checkgroup_parameters:logwatch') ]), 'edit' ) @@ -9989,7 +9989,7 @@ def mode_pattern_editor(phase): html.show_user_errors() return - varname = 'checkgroup_parameters:logwatch_rules' + varname = 'checkgroup_parameters:logwatch' rulespec = g_rulespecs[varname] all_rulesets = load_all_rulesets() ruleset = all_rulesets.get(varname) @@ -10001,7 +10001,7 @@ def mode_pattern_editor(phase): + _('There are no logfile patterns defined. You may create ' 'logfile patterns using the <a href="%s">Rule Editor</a>.') % make_link([ ('mode', 'edit_ruleset'), - ('varname', 'checkgroup_parameters:logwatch_rules') + ('varname', 'checkgroup_parameters:logwatch') ]) + "</div>" ) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 4950f13..dc738b1 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -113,7 +113,7 @@ checkgroups.append(( checkgroups.append(( subgroup_applications, - "logwatch_rules", + "logwatch", _("Logfile patterns"), ListOf( Tuple( @@ -141,8 +141,9 @@ checkgroups.append(( help = _('You can define one or several patterns (regular expressions) in each logfile pattern rule. ' 'These patterns are applied to the selected logfiles to reclassify the ' 'matching log messages. The first pattern which matches a line will ' - 'be used for reclassifying a message. You can use the <a href="%s">Logfile Pattern Analyzer</a> ' - 'to test the rules you defined here.') % html.makeuri([('mode', 'pattern_editor')]), + 'be used for reclassifying a message. You can use the ' + '<a href="wato.py?mode=pattern_editor">Logfile Pattern Analyzer</a> ' + 'to test the rules you defined here.'), add_label = _("Add pattern"), ), TextAscii(

12 years, 5 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk into logwatch

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dff07df8801fc13893d04d094fb02f5f27e22595 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dff07df8801fc1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 12 12:00:42 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk into logwatch ---

12 years, 5 months

Check_MK Git: check_mk: Added new analyze icon

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b9c27e38faceb122c97cd412a91ca7656242f691 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9c27e38faceb1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 12 12:06:16 2012 +0200 Added new analyze icon --- ...button_analyse_hi.png => button_analyze_hi.png} | Bin 3260 -> 3260 bytes ...button_analyse_lo.png => button_analyze_lo.png} | Bin 3963 -> 3963 bytes .../images/{icon_analyse.png => icon_analyze.png} | Bin 3963 -> 3963 bytes web/htdocs/wato.py | 11 ++++++----- web/plugins/wato/builtin_modules.py | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/web/htdocs/images/button_analyse_hi.png b/web/htdocs/images/button_analyze_hi.png similarity index 100% rename from web/htdocs/images/button_analyse_hi.png rename to web/htdocs/images/button_analyze_hi.png diff --git a/web/htdocs/images/button_analyse_lo.png b/web/htdocs/images/button_analyze_lo.png similarity index 100% rename from web/htdocs/images/button_analyse_lo.png rename to web/htdocs/images/button_analyze_lo.png diff --git a/web/htdocs/images/icon_analyse.png b/web/htdocs/images/icon_analyze.png similarity index 100% rename from web/htdocs/images/icon_analyse.png rename to web/htdocs/images/icon_analyze.png diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 93c8803..f5d2d70 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9923,8 +9923,12 @@ def mode_pattern_editor(phase): title = _("Show Logfile") else: title = _("Host Logfiles") - html.context_button(title, "logwatch.py?host=%s&file=%s" % - (htmllib.urlencode(hostname), htmllib.urlencode(item)), 'logwatch') + + master_url = '' + if config.is_multisite(): + master_url = '&master_url=' + defaults.checkmk_web_uri + '/' + html.context_button(title, "logwatch.py?host=%s&file=%s%s" % + (htmllib.urlencode(hostname), htmllib.urlencode(item), master_url), 'logwatch') html.context_button(_('Edit Logfile Rules'), make_link([ ('mode', 'edit_ruleset'), @@ -10040,9 +10044,6 @@ def mode_pattern_editor(phase): match_title = reason html.begin_foldable_container("rule", str(rulenr), True, "<b>Rule #%d</b>" % (rulenr + 1), indent = False) - - #html.write('<tr class="data %s0 %s">' % (odd, reason_class)) - #html.write('<td rowspan="%d" class=number>%d</td>' % (len(pattern_list), rulenr + 1)) html.write('<table style="width:100%" class="data logwatch"><tr>') html.write('<th style="width:30px;">' + _('Match') + '</th>') html.write('<th style="width:50px;">' + _('State') + '</th>') diff --git a/web/plugins/wato/builtin_modules.py b/web/plugins/wato/builtin_modules.py index e4176ab..c534b56 100644 --- a/web/plugins/wato/builtin_modules.py +++ b/web/plugins/wato/builtin_modules.py @@ -72,7 +72,7 @@ modules = [ ( "snapshot", _("Backup & Restore"), "backup", "snapshots", _("Make snapshots of your current configuration, download, upload and restore snapshots.")), - ( "pattern_editor", _("Logfile Pattern Analyzer"), "logwatch", "pattern_editor", + ( "pattern_editor", _("Logfile Pattern Analyzer"), "analyze", "pattern_editor", _("Analyze logfile pattern rules and validate logfile patterns against custom text.")), ]

12 years, 5 months

Check_MK Git: check_mk: Processed with logwatch pattern analyzer

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d600d010eec4a36e1608b4f1474e9e32d603c5e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d600d010eec4a3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 12 12:00:36 2012 +0200 Processed with logwatch pattern analyzer --- web/htdocs/logwatch.css | 6 +- web/htdocs/logwatch.py | 54 ++++++-- web/htdocs/wato.css | 36 ++--- web/htdocs/wato.py | 254 ++++++++++++++++++++++++---------- web/plugins/wato/builtin_modules.py | 12 +- web/plugins/wato/check_parameters.py | 9 +- 6 files changed, 252 insertions(+), 119 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d600d010ee…

12 years, 5 months

Check_MK Git: check_mk: Renamed logwatch editor to logwatch analyzer, Made dialog usable without hostname/filename

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0844df449f0445275013d5920898803e132ee57a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0844df449f0445… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 12 16:29:16 2012 +0200 Renamed logwatch editor to logwatch analyzer, Made dialog usable without hostname/filename --- web/htdocs/wato.py | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f5d2d70..3833af5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9913,8 +9913,12 @@ def mode_pattern_editor(phase): if phase == "title": if not hostname and not item: return _("Logfile Pattern Analyzer") + elif not hostname: + return _("Logfile Patterns of Logfile %s on all Hosts") % (item) + elif not item: + return _("Logfile Patterns of Host %s") % (hostname) else: - return _("Logfile Patterns of Host %s: %s") % (hostname, item) + return _("Logfile Patterns of Logfile %s on Host %s") % (item, hostname) elif phase == "buttons": html.context_button(_("Home"), make_link([("mode", "main")]), "home") @@ -9940,24 +9944,8 @@ def mode_pattern_editor(phase): return if phase == "action": - if not hostname: - raise MKUserError('host', _('The mandatory parameter "host" is missing.')) - - if not host: - raise MKUserError('host', _('The given host does not exist.')) - - if not item: - raise MKUserError('file', _('The mandatory parameter "file" is missing.')) - return - if not host: - html.add_user_error('host', _('The given host does not exist.')) - hostname = '' - else: - # FIXME: Check if item exists - pass - html.write( '<div class=info> ' + _('On this page you can test the defined logfile patterns against a custom text, ' @@ -9995,6 +9983,12 @@ def mode_pattern_editor(phase): html.hidden_fields() html.end_form() + # Bail out if the given hostname does not exist + if hostname and not host: + html.add_user_error('host', _('The given host does not exist.')) + html.show_user_errors() + return + varname = 'checkgroup_parameters:logwatch_rules' rulespec = g_rulespecs[varname] all_rulesets = load_all_rulesets() @@ -10027,10 +10021,19 @@ def mode_pattern_editor(phase): # Check if this rule applies to the given host/service if hostname: + # If hostname (and maybe filename) try match it reason = rule_matches_host_and_item( rulespec, tag_specs, host_list, item_list, folder, g_folder, hostname, item) + elif item: + # If only a filename is given + reason = False + for i in item_list: + if re.match(i, str(item)): + reason = True + break else: - reason = _('No hostname given.') + # If no host/file given match all rules + reason = True match_img = '' if reason == True:

12 years, 5 months

Check_MK Git: check_mk: Processed with logfile pattern editor

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2377924375e0701144ed720246b2477389910734 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2377924375e070… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 11 11:39:19 2012 +0200 Processed with logfile pattern editor --- web/htdocs/logwatch.py | 32 +++++++-- web/htdocs/wato.css | 31 ++++++++ web/htdocs/wato.py | 125 +++++++++++++++++++++++++++++++++- web/plugins/icons/builtin.py | 10 +++- web/plugins/pages/shipped.py | 2 +- web/plugins/wato/builtin_modules.py | 3 + web/plugins/wato/check_parameters.py | 17 +++-- 7 files changed, 204 insertions(+), 16 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2377924375…

12 years, 5 months

Check_MK Git: check_mk: Added simple regexp valuespec\

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 940427655e05e0636cb398f5640f0703066d1d4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=940427655e05e0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 13 10:27:27 2012 +0200 Added simple regexp valuespec\ --- web/htdocs/valuespec.py | 14 +++++++++++++- web/plugins/wato/check_parameters.py | 5 +---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index e43bc0d..dba3c36 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import math, os, time, re, urlparse +import math, os, time, re, sre_constants, urlparse from lib import * # Abstract base class of all value declaration classes. @@ -319,6 +319,18 @@ class TextAscii(ValueSpec): if not self._regex.match(value): raise MKUserError(varprefix, self._regex_error) +class RegExp(TextAscii): + def __init__(self, **kwargs): + TextAscii.__init__(self, **kwargs) + + def validate_value(self, value, varprefix): + TextAscii.validate_value(self, value, varprefix) + + # Check if the string is a valid regex + try: + re.compile(value) + except sre_constants.error, e: + raise MKUserError(varprefix, _('Invalid regex: %s') % e) class EmailAddress(TextAscii): def __init__(self, **kwargs): diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 4a06bd0..4950f13 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -129,15 +129,12 @@ checkgroups.append(( ('I', _('IGNORE')), ], ), - # FIXME: Own object type (optional hidden text field for regex validation) - TextAscii( + RegExp( title = _("Pattern (Regex)"), size = 20, - #help = _("The regular expression to match the log lines."), ), TextAscii( title = _("Comment"), - #help = _("You can insert a log line or a part of a log line to test the pattern stated left."), ), ] ),

12 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits