Checkmk git commits April 2012

checkmk-commits@lists.checkmk.com

2 participants
184 discussions

Check_MK Git: check_mk: Reworked logwatch check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 855048ebe30240f9ea5e440f98a29b8464a98f37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=855048ebe30240… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 10 10:55:40 2012 +0200 Reworked logwatch check --- checks/logwatch | 269 +++++++++++++++++++++++++++---------------------------- 1 files changed, 133 insertions(+), 136 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=855048ebe3…

12 years, 5 months

Check_MK Git: check_mk: Added new rule logwatch_rules to configure logwatch patterns using WATO

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8fe223f7fa2d92f3cb978627cf9fef94de099ce3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fe223f7fa2d92… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 16 12:44:24 2012 +0100 Added new rule logwatch_rules to configure logwatch patterns using WATO --- checks/logwatch | 24 ++++++++++++++----- web/plugins/wato/check_parameters.py | 42 ++++++++++++++++++++++++++++++--- 2 files changed, 56 insertions(+), 10 deletions(-) diff --git a/checks/logwatch b/checks/logwatch index 4aaa609..fe893ec 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -28,6 +28,7 @@ # Configuration variables in main.mk needed during the actual check logwatch_dir = var_dir + '/logwatch' logwatch_patterns = { } +logwatch_rules = [] logwatch_max_filesize = 500000 # do not save more than 500k of message (configurable) # Variables embedded in precompiled checks @@ -76,8 +77,18 @@ def inventory_logwatch(info): # 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): - patterns = logwatch_patterns.get(item) + # First load the logwatch_rules var (used by WATO) + description = check_info['logwatch']['service_description'] % item + rules = service_extra_conf(hostname, description, logwatch_rules) + + # Initialize params with these rules but remove the comment params = [] + for rule in rules: + for pattern in rule: + params.append((pattern[0], pattern[1])) + + # Now load the old logwatch_patterns var + patterns = logwatch_patterns.get(item) if patterns: for entry in patterns: hostlist = None @@ -277,10 +288,11 @@ def check_logwatch(item, params, info): return (worst, state + " - error messages present!") -check_info['logwatch'] = ( - check_logwatch, - "LOG %s", - 0, - inventory_logwatch) +check_info['logwatch'] = { + 'check_function': check_logwatch, + 'service_description': "LOG %s", + 'has_perfdata': 0, + 'inventory_function': inventory_logwatch, +} precompile_params['logwatch'] = logwatch_precompile diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 896d494..f2bb546 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -24,10 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -#!/usr/bin/python -# encoding: utf-8 - -# Rules for configuring parameters of checks (services) | +# Rules for configuring parameters of checks (services) group = _("Parameters and rules for inventorized checks") @@ -97,6 +94,43 @@ checkgroups.append(( "first" )) +register_rule(group, + "logwatch_rules", + ListOf( + Tuple( + help = _("This defines one logwatch pattern rule"), + show_titles = True, + orientation = "horizontal", + elements = [ + DropdownChoice( + title = _("State"), + choices = [ + ('C', _('CRITICAL')), + ('W', _('WARNING')), + ('I', _('IGNORE')), + ], + ), + # FIXME: Own object type (optional hidden text field for regex validation) + TextAscii( + title = _("Pattern"), + 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."), + ), + ] + ), + help = _('You can define one or several patterns in each logwatch 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.'), + add_label = _("Add pattern"), + ), + title = _("Logwatch patterns"), + itemtype = "service", +) checkgroups.append(( "brocade_fcport",

12 years, 5 months

Check_MK Git: check_mk: logwatch check: Reclassifying present log messages on each check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 051917b418566de69d492491a6befda35ba6674e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=051917b418566d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 16 14:55:01 2012 +0100 logwatch check: Reclassifying present log messages on each check --- checks/logwatch | 112 +++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 81 insertions(+), 31 deletions(-) diff --git a/checks/logwatch b/checks/logwatch index fe893ec..2dbdbbb 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -227,39 +227,92 @@ def check_logwatch(item, params, info): else: patterns = logwatch_precompile(g_hostname, item, None) + state = "OK" + worst = 0 + + def parse_line(line): + parts = line.split(None, 1) + level = parts[0] + if len(parts) > 1: + text = parts[1] + else: + text = "" + return level, text + + def reclassify_line(counts, patterns, text, level): + if patterns: + newlevel = logwatch_reclassify(counts, patterns, text) + if newlevel != None: + level = newlevel + return level + + def logwatch_state(worst): + if worst == 1: + return "WARN" + elif worst != 0: + return "CRIT" + else: + return "OK" + + def logwatch_level_worst(worst, level): + if level == 'W': return max(worst, 1) + elif level == 'C': return max(worst, 2) + else: return worst + + # Read old messages and reclassify + if had_old_messages: + # Scan old archive log messages for state. But also reclassify the lines + reclassified_lines = [] + counts = {} # for counting number of matches of a certain pattern + block_header = None + block_worst = 0 + block_lines = [] + + def finish_section(header, block_worst, block_lines): + start = header.split(' ')[0] + return [ start + ' %s>>>' % logwatch_state(block_worst) ] + block_lines + + for line in file(logfile): + line = line.rstrip('\n') + if line.startswith('<<<') and line.endswith('>>>'): + if block_header: + # The last section is finished here. Save it! + reclassified_lines += finish_section(block_header, block_worst, block_lines) + worst = max(worst, block_worst) + block_lines = [] + block_worst = 0 + block_header = line + counts = {} + else: + level, text = parse_line(line) + level = reclassify_line(counts, patterns, text, level) + block_worst = logwatch_level_worst(block_worst, level) + block_lines.append(level + ' ' + text) + if block_header: + reclassified_lines += finish_section(block_header, block_worst, block_lines) + worst = max(worst, block_worst) + file(logfile, 'w').write('\n'.join(reclassified_lines)) + + # + # Now handle the new logs + # counts = {} # for counting number of matches of a certain pattern if len(loglines) > 0: worst = 0 newloglines = [] for line in loglines: - parts = line.split(None, 1) - level = parts[0] - if len(parts) > 1: - text = parts[1] - else: - text = "" - if patterns and level != '.': # do never reclassify informational context messages - newlevel = logwatch_reclassify(counts, patterns, text) - if newlevel != None: - level = newlevel - - if level == 'W': worst = max(worst, 1) - elif level == 'C': worst = max(worst, 2) - newloglines.append(level + ' ' + text) + level, text = parse_line(line) + level = reclassify_line(counts, patterns, text, level) - if worst == 1: - state = "WARN" - elif worst != 0: - state = "CRIT" - else: - state = "OK" + worst = logwatch_level_worst(worst, level) + newloglines.append(level + ' ' + text) # Append new logfile lines to archive file. If state is "OK, do not # write anything if worst > 0: try: logarch = file(logfile, "a+") - logarch.write(time.strftime("<<<%Y-%m-%d %H:%M:%S " + state + ">>>\n")) + logarch.write(time.strftime("<<<%Y-%m-%d %H:%M:%S " + logwatch_state(worst) + ">>>\n")) logarch.write("\n".join(newloglines) + "\n") except Exception, e: raise MKGeneralException("User %s cannot create logfile: %s" % \ @@ -267,25 +320,22 @@ def check_logwatch(item, params, info): else: logfiles = [] # appearently all logfiles reclassified to "I" + # + # Render output + # + + state = logwatch_state(worst) + # Determine current state by scanning logarch for status if not had_old_messages and len(loglines) == 0: return (0, "OK - no old or new error messages") elif not had_old_messages and len(loglines) > 0: return (worst, state + " - %d new messages!" % len(newloglines)) else: - # had old messages. Scan old archive log messages for state - logarch = file(logfile) - state = "WARN" - worst = 1 - for line in logarch: - if line.endswith("CRIT>>>\n"): - state = "CRIT" - worst = 2 - break if len(loglines) > 0: return (worst, state + " - some old and %d new messages present!" % len(newloglines)) else: - return (worst, state + " - error messages present!") + return (worst, state + " - messages present!") check_info['logwatch'] = {

12 years, 5 months

Check_MK Git: check_mk: Removed duplicate code in wato/config code

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0e8d26231e7260bf8c8a845ae4dc33922efbc2d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e8d26231e7260… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 10 12:36:12 2012 +0200 Removed duplicate code in wato/config code --- web/htdocs/wato.py | 4 +--- web/plugins/icons/builtin.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4876b55..b24b0f3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6523,9 +6523,7 @@ def encrypt_password(password, salt = None): return md5crypt.md5crypt(password, salt, '$1$') def site_is_local(siteid): - site = config.sites[siteid] - return "socket" not in site \ - or site["socket"] == "unix:" + defaults.livestatus_unix_socket + return config.site_is_local(siteid) # Returns the ID of our site. This function only works in replication # mode and looks for an entry connecting to the local socket. diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 09cc393..ddc7a5a 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -244,7 +244,7 @@ multisite_icons.append({ def logwatch_url(sitename, notes_url): i = notes_url.index("check_mk/logwatch.py") site = html.site_status[sitename]["site"] - return site["url_prefix"] + notes_url[i:] + return site["url_prefix"] + notes_url[i:] + '&master_url=&' def paint_notes(what, row, tags, custom_vars): if 'X' in html.display_options:

12 years, 5 months

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

← Newer
1
...
11
12
13
14
15
16
17
18
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2012