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.")),
]