Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

Check_MK Git: check_mk: Updated bug entries #0905

by Lars Michelsen

Module: check_mk Branch: master Commit: 5487f00a6e4fe9b2b302150e482a3cfff7d58147 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5487f00a6e4fe9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 12 14:03:27 2013 +0100 Updated bug entries #0905 --- .bugs/905 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/905 b/.bugs/905 index de05983..bdb8103 100644 --- a/.bugs/905 +++ b/.bugs/905 @@ -1,9 +1,9 @@ Title: We need an option to make "expect messages" based on subregexes possible Component: ec -State: open +Class: feature +State: done Date: 2013-01-31 11:18:44 Targetversion: 1.2.2 -Class: feature For example, when having several logentries which are sent regularly, like @@ -31,3 +31,6 @@ autoamtisch eine neue EC-Regel direkt vor der Generator-Regel ein, die dann auf den speziellen Host wartet. Danach muss die EC neu geladen werden. Frage ist, ob das aus einer Aktion heraus sauber geht. Wahrscheinlich ja. + +2013-02-12 13:40:26: changed state open -> done +solved.

11 years, 7 months

Check_MK Git: check_mk: FIX: Fixed several minor IE7 related layout bugs

by Lars Michelsen

Module: check_mk Branch: master Commit: 0ef49ad93d28c0f5bac45f35331e4235959247db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ef49ad93d28c0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 12 14:26:42 2013 +0100 FIX: Fixed several minor IE7 related layout bugs --- ChangeLog | 3 +++ web/htdocs/htmllib.py | 2 +- web/htdocs/status.css | 1 + web/htdocs/wato.css | 6 ++++++ 4 files changed, 11 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 332ae45..ae08c6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ Event Console: * FIX: Fixed exception when logging actions exectuted by mkeventd + Multisite: + * FIX: Fixed several minor IE7 related layout bugs + 1.2.2b1: Core: * cmk --notify: added notification script to generate HTML mails including diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 9803702..da03f6d 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -859,7 +859,7 @@ class html: self.write('<a href="#" onfocus="if (this.blur) this.blur();" ' 'onclick="this.innerHTML=\'%s\'; document.location.reload();">%s</a></td>' % (_("Reloading..."), title)) - self.write('<td width=240 class=right>%s   %s' % + self.write('<td style="min-width:240px" class=right>%s   %s' % (login_text, time.strftime("%H:%M"))) try: self.help_visible = config.load_user_file("help", False) # cache for later usage diff --git a/web/htdocs/status.css b/web/htdocs/status.css index ed94ca2..25282da 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -172,6 +172,7 @@ td.perfometer img.glass { height: 22px; margin-bottom: 1px; z-index: 30; + display: block; } diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 3dedc13..ac384b5 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -69,6 +69,12 @@ Boston, MA 02110-1301 USA. width: 1px; } +.wato table.data td.buttons, +.wato table.data td.buttons a, +.wato table.data td.buttons img { + white-space: nowrap; +} + .wato th.right { border-right-style: none; border-radius: 0px 4px 0px 0px;

11 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0903

by Mathias Kettner

Module: check_mk Branch: master Commit: ed13385d7f98071edcae3e4a2d863391bfbd7939 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed13385d7f9807… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 12 16:51:04 2013 +0100 Updated bug entries #0903 --- .bugs/903 | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/903 b/.bugs/903 index 0016731..90acabf 100644 --- a/.bugs/903 +++ b/.bugs/903 @@ -1,9 +1,9 @@ Title: Umlauts in regexes never match Component: ec -State: open +Class: bug +State: done Date: 2013-01-31 11:14:47 Targetversion: 1.2.2 -Class: bug When adding umlauts like ä to regex patterns, they do never match. @@ -22,3 +22,7 @@ try: except: text = text.decode(conifg.ec_fallback_encoding) + +2013-02-12 16:51:02: changed state open -> done +Die mit dem try/except war eh schon drin. Allerdings hart-kodiert +auf latin1.Denke wir lassen das vorerst so.

11 years, 7 months

Check_MK Git: check_mk: Merge branch '1.2.2'

by Mathias Kettner

Module: check_mk Branch: master Commit: 7012708316b99f6f0ac01a39d08154e5d810ee51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7012708316b99f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 12 16:51:53 2013 +0100 Merge branch '1.2.2' Conflicts: ChangeLog ---

11 years, 7 months

Check_MK Git: check_mk: oracle_tablespaces helptext update

by Andreas Boesl

Module: check_mk Branch: master Commit: 1baa3356910134dcbdf2a661fb5547b1077d8ab3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1baa3356910134… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 12 15:01:21 2013 +0100 oracle_tablespaces helptext update --- web/plugins/wato/check_parameters.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index a0ac722..1868e5d 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -679,7 +679,6 @@ checkgroups.append(( "first" )) - register_rule(group + '/' + subgroup_storage, varname = "filesystem_groups", title = _('Filesystem grouping patterns'), @@ -1419,7 +1418,7 @@ checkgroups.append(( elements = [ ( "levels", Alternative( - title = _("Total Memory Levels"), + title = _("Total tablespace size"), elements = [ Tuple( title = _("Percentage levels of free maximum space"), @@ -1462,7 +1461,8 @@ checkgroups.append(( help = _(""))), ]), TextAscii( - title = _("Service descriptions"), + title = _("Explicit tablespaces"), + help = _("Here you can set explicit tablespaces by defining them via SID and the tablespace name, separated by a dot, for example pengt.TEMP"), allow_empty = False), None))

11 years, 7 months

Check_MK Git: check_mk: Fixed problem with new oracle_tablespaces parameters with old inventorized tuple format

by Lars Michelsen

Module: check_mk Branch: master Commit: 7c5aff044b7537e0a307bbf626df6c1eafc68c6e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c5aff044b7537… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 12 15:55:43 2013 +0100 Fixed problem with new oracle_tablespaces parameters with old inventorized tuple format --- checkman/oracle_tablespaces | 4 ++-- checks/oracle_tablespaces | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/checkman/oracle_tablespaces b/checkman/oracle_tablespaces index 4139c57..6d2162c 100644 --- a/checkman/oracle_tablespaces +++ b/checkman/oracle_tablespaces @@ -55,7 +55,7 @@ examples: # of maximum tablespace size and deactivate check of autoextend - oracle_tablespaces_default_levels = { + oracle_tablespaces_defaults = { "levels" : (20.0, 10.0), "autoextend" : None } @@ -106,4 +106,4 @@ oracle_tablespaces_check_default_increment(bool): This setting does not {True}. That way the check will warn if the table space has its increment size set to {1} (the ORACLE default value). -oracle_tablespaces_default_levels(dict): A dictionary with the optional keys mentioned in parameters +oracle_tablespaces_defaults(dict): A dictionary with the optional keys mentioned in parameters diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index 273fa0f..1ecca0d 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -55,7 +55,7 @@ # integer: MB. oracle_tablespaces_default_levels = (10.0, 5.0) -factory_settings["oracle_tablespaces_default_levels"] = { +factory_settings["oracle_tablespaces_defaults"] = { "levels" : (10.0, 5.0), "magic_normsize" : 1000, "levels_low" : (0.0, 0.0) @@ -263,7 +263,7 @@ check_info['oracle_tablespaces'] = { "inventory_function" : inventory_oracle_tablespaces, "has_perfdata" : True, "group" : "oracle_tablespaces", - "default_levels_variable" : "oracle_tablespaces_default_levels", + "default_levels_variable" : "oracle_tablespaces_defaults", "includes" : [ "oracle.include" ] } check_config_variables.append("oracle_tablespaces_check_default_increment")

11 years, 7 months

Check_MK Git: check_mk: Fixed another IE7 layout bug

by Lars Michelsen

Module: check_mk Branch: master Commit: d445cf5ad55dde80409d6db036b14887ea52a66d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d445cf5ad55dde… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 12 14:42:50 2013 +0100 Fixed another IE7 layout bug --- web/htdocs/wato.css | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index ac384b5..d53ef28 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -646,9 +646,10 @@ form#form_timeperiod td.vlof_content { } /* main menu */ -.wato div.mainmenu { - display: table-cell; - margin-bottom: 10px; + +form.search { + padding-top: 10px; + clear: both; } .wato div.mainmenu a {

11 years, 7 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: b788d95c98348116352d96f43cc484ace072e48c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b788d95c983481… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 12 16:50:22 2013 +0100 Merge branch '1.2.2' of ssh://mathias-kettner.de/check_mk into 1.2.2 Conflicts: ChangeLog ---

11 years, 7 months

Check_MK Git: check_mk: Fixed problem with invalid check items for oracle_tablespaces

by Lars Michelsen

Module: check_mk Branch: master Commit: 4ae395fe0c0d9cb0bef2f406c0546d78ae56965f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ae395fe0c0d9c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 12 16:02:11 2013 +0100 Fixed problem with invalid check items for oracle_tablespaces --- checks/oracle_tablespaces | 7 +++++-- web/plugins/wato/check_parameters.py | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index 1ecca0d..04e943d 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -142,7 +142,11 @@ def get_tablespace_levels_in_bytes(size_bytes, params): def check_oracle_tablespaces(item, params, info): - sid, tbsname = item.split('.') + try: + sid, tbsname = item.split('.') + except ValueError: + return (3, 'UNKNOWN - Invalid check item given (must be <SID>.<tablespace>)') + ts_status = None num_files = 0 num_avail = 0 @@ -199,7 +203,6 @@ def check_oracle_tablespaces(item, params, info): if ts_status == None: return (3, "UNKNOWN - Tablespace not found") - infotext = " - %s, size %s, used %s" % \ diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 1868e5d..f646e6c 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1463,6 +1463,7 @@ checkgroups.append(( TextAscii( title = _("Explicit tablespaces"), help = _("Here you can set explicit tablespaces by defining them via SID and the tablespace name, separated by a dot, for example pengt.TEMP"), + regex = '.+\..+', allow_empty = False), None))

11 years, 7 months

Check_MK Git: check_mk: FIX: support non-Ascii characters in matching expressions

by Mathias Kettner

Module: check_mk Branch: master Commit: 01a225a8aac369013465a5a20edfdde344cc1e66 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01a225a8aac369… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 12 16:49:41 2013 +0100 FIX: support non-Ascii characters in matching expressions Note: you need to edit and save each affected rule once in order to make the fix work. --- ChangeLog | 5 ++++ mkeventd/bin/mkeventd | 13 +++++++--- mkeventd/web/plugins/wato/mkeventd.py | 8 +++--- web/htdocs/valuespec.py | 43 +++++++++++++++++++++----------- 4 files changed, 46 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index f7d89d1..b76cebd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,11 @@ BI: * FIX: fix exception in BI-Boxes views of host groups + Event Console: + * FIX: support non-Ascii characters in matching expressions. Note: + you need to edit and save each affected rule once in order + to make the fix work. + 1.2.2b1: Core: * cmk --notify: added notification script to generate HTML mails including diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index fa58bff..d020bb5 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -171,12 +171,15 @@ def regex(reg): # neccessary to use regular expression logic in order # to match it. def is_regex(text): - return text != text.translate(None, ".*?[](){}\\^$+|") + for c in text: + if c in ".*?[](){}\\^$+|": + return True + return False def match(pattern, text, complete = True): if pattern == None: return True - elif type(pattern) == str: + elif type(pattern) in [ str, unicode ]: if complete: return pattern == text.lower() else: @@ -1135,9 +1138,11 @@ class EventServer: else: rule[key] = rule[key].lower() except Exception, e: + if opt_debug: + raise rule["disabled"] = True count_disabled += 1 - log("Ignoring rule %s because of an invalid regex (%s)." % + log("Ignoring rule '%s' because of an invalid regex (%s)." % (rule["id"], e)) if g_config["rule_optimizer"]: @@ -1231,7 +1236,7 @@ class EventServer: g_event_status.count_rule_match(rule["id"]) if g_config["log_rulehits"]: - log("Rule %s hit by message %s/%s - '%s'." % ( + log("Rule '%s' hit by message %s/%s - '%s'." % ( rule["id"], syslog_facilities[event["facility"]], syslog_priorities[event["priority"]], event["text"])) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 6f59953..a622e7d 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -465,7 +465,7 @@ vs_mkeventd_rule = Dictionary( ), ), ( "match", - RegExp( + RegExpUnicode( title = _("Text to match"), help = _("The rules does only apply when the given regular expression matches " "the message text (infix search)."), @@ -473,7 +473,7 @@ vs_mkeventd_rule = Dictionary( ) ), ( "match_host", - RegExp( + RegExpUnicode( title = _("Match host"), help = _("The rules does only apply when the given regular expression matches " "the host name the message originates from. Note: in some cases the " @@ -481,7 +481,7 @@ vs_mkeventd_rule = Dictionary( ) ), ( "match_application", - RegExp( + RegExpUnicode( title = _("Match syslog application (tag)"), help = _("Regular expression for matching the syslog tag (case insenstive)"), ) @@ -521,7 +521,7 @@ vs_mkeventd_rule = Dictionary( ), ), ( "match_ok", - RegExp( + RegExpUnicode( title = _("Text to cancel event"), help = _("If a matching message appears with this text, then an event created " "by this rule will automatically be cancelled (if host, application and match groups match). "), diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 9b8794b..00b5d0c 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -341,6 +341,20 @@ class TextAscii(ValueSpec): if not self._regex.match(value): raise MKUserError(varprefix, self._regex_error) +class TextUnicode(TextAscii): + def __init__(self, **kwargs): + TextAscii.__init__(self, **kwargs) + + def render_input(self, varprefix, value): + html.text_input(varprefix, value, size = self._size) + + def from_html_vars(self, varprefix): + return html.var_utf8(varprefix, "").strip() + + def validate_datatype(self, value, varprefix): + if type(value) not in [ str, unicode ]: + raise MKUserError(varprefix, _("The value must be of type str or unicode, but it has type %s") % type(value)) + # Internal ID as used in many places (for contact names, group name, # an so on) class ID(TextAscii): @@ -360,7 +374,20 @@ class RegExp(TextAscii): try: re.compile(value) except sre_constants.error, e: - raise MKUserError(varprefix, _('Invalid regex: %s') % e) + raise MKUserError(varprefix, _('Invalid regular expression: %s') % e) + +class RegExpUnicode(TextUnicode): + def __init__(self, **kwargs): + TextUnicode.__init__(self, attrencode = True, **kwargs) + + def validate_value(self, value, varprefix): + TextUnicode.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 regular expression: %s') % e) class EmailAddress(TextAscii): def __init__(self, **kwargs): @@ -466,20 +493,6 @@ class HTTPUrl(TextAscii): url, text) -class TextUnicode(TextAscii): - def __init__(self, **kwargs): - TextAscii.__init__(self, **kwargs) - - def render_input(self, varprefix, value): - html.text_input(varprefix, value, size = self._size) - - def from_html_vars(self, varprefix): - return html.var_utf8(varprefix, "").strip() - - def validate_datatype(self, value, varprefix): - if type(value) not in [ str, unicode ]: - raise MKUserError(varprefix, _("The value must be of type str or unicode, but it has type %s") % type(value)) - class TextAreaUnicode(TextUnicode): def __init__(self, **kwargs): TextUnicode.__init__(self, **kwargs)

11 years, 7 months

← Newer
1
...
18
19
20
21
22
23
24
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2013