Checkmk git commits April 2012

checkmk-commits@lists.checkmk.com

2 participants
184 discussions

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

Check_MK Git: check_mk: Merge branch 'master', remote-tracking branch ' origin' into logwatch

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e0ad6c6b3ecda8762f58e7d6f2866ff0d16af417 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0ad6c6b3ecda8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 11 08:39:11 2012 +0200 Merge branch 'master', remote-tracking branch 'origin' into logwatch ---

12 years, 5 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ebea9315503d264509e6dbf064380cde231ba538 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebea9315503d26… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 12 12:00:07 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 5 months

Check_MK Git: check_mk: New icon for logfile analyser

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6d1de4343f30431700240fa2a14ff8fc385ecf9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d1de4343f3043… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 12 11:59:44 2012 +0200 New icon for logfile analyser --- web/htdocs/images/button_analyse_hi.png | Bin 0 -> 3260 bytes web/htdocs/images/button_analyse_lo.png | Bin 0 -> 3963 bytes web/htdocs/images/icon_analyse.png | Bin 0 -> 3963 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/button_analyse_hi.png b/web/htdocs/images/button_analyse_hi.png new file mode 100644 index 0000000..bfe8321 Binary files /dev/null and b/web/htdocs/images/button_analyse_hi.png differ diff --git a/web/htdocs/images/button_analyse_lo.png b/web/htdocs/images/button_analyse_lo.png new file mode 100644 index 0000000..8517c1d Binary files /dev/null and b/web/htdocs/images/button_analyse_lo.png differ diff --git a/web/htdocs/images/icon_analyse.png b/web/htdocs/images/icon_analyse.png new file mode 100644 index 0000000..8517c1d Binary files /dev/null and b/web/htdocs/images/icon_analyse.png differ

12 years, 5 months

Check_MK Git: check_mk: diskstat: fix warn/crit marker in output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a79e77bd8ae2862d74f3702a023657e69adae152 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a79e77bd8ae286… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 12 12:00:05 2012 +0200 diskstat: fix warn/crit marker in output --- checks/diskstat.include | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/diskstat.include b/checks/diskstat.include index c380fe7..4af6557 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -74,10 +74,10 @@ def check_diskstat_line(this_time, item, params, line): mb_per_sec = bytes_per_sec / 1048576 if mb_per_sec >= crit: status = 2 - infos[-1] += "!!" + infos[-1] += "(!!)" elif mb_per_sec >= warn: status = max(status, 1) - infos[-1] += "!" + infos[-1] += "(!)" if average_range != None: perfdata = [ perfdata[0], perfdata[2], perfdata[1], perfdata[3] ]

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0691

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 80594ad3a328c6e8dddc3a75d28df6fdfc81cf08 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80594ad3a328c6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 11 11:43:54 2012 +0200 Updated bug entries #0691 --- .bugs/691 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/691 b/.bugs/691 new file mode 100644 index 0000000..0f37013 --- /dev/null +++ b/.bugs/691 @@ -0,0 +1,9 @@ +Title: Remove/Secure eval() on html.var() +Component: wato +State: open +Date: 2012-04-11 11:39:35 +Targetversion: 1.2.0 +Class: nastiness + +It is VERY insecure and VERY easy to do bad things at these places. They must be +secured/removed in some way.

12 years, 5 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f29d62f05ff69488a22ed3a86b1ffae87ded88fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f29d62f05ff694… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 11 11:39:32 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 5 months

← Newer
1
...
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