Checkmk git commits November 2012

checkmk-commits@lists.checkmk.com

3 participants
219 discussions

Check_MK Git: check_mk: Cleaned up ChangeLog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 91d5791cadd3d043d4fa19360d41fd382ff28f83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91d5791cadd3d0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 19 14:48:48 2012 +0100 Cleaned up ChangeLog --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4f77bdb..f6121e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.1i3: Core: * added HOST/SERVICEPROBLEMID to notification macros + Event Console: * New performance counter for client request processing time * FIX: fixed bug in rule optimizer with ranges of syslog priorities

11 years, 7 months

Check_MK Git: check_mk: FIX: allow email addresses like test@test.test-test .com

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0dffc7d2557ea07c4787c4c92e47693f8703450a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0dffc7d2557ea0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 19 14:48:16 2012 +0100 FIX: allow email addresses like test(a)test.test-test.com --- ChangeLog | 1 + web/htdocs/wato.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index d37a685..4f77bdb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -127,6 +127,7 @@ 1.2.0p4: WATO: * FIX: fixed detection of existing groups when creating new groups + * FIX: allow email addresses like test(a)test.test-test.com 1.2.0p3: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b8604bc..7a19795 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7976,7 +7976,7 @@ def mode_edit_user(phase): # Email address email = html.var("email").strip() - regex_email = '^[-a-zäöüÄÖÜA-Z0-9_.]+(a)xn--[-a-za-z0-9]+(\-4kba73ab2jc.[a-zA-Z]+)*$' + regex_email = '^[-a-zäöüÄÖÜA-Z0-9_.]+(a)xn--[-a-za-z0-9]+(\-4kba73ab2jc.xn--[-a-za-z0-9]+)*$-znba55ab8jc' if email and not re.match(regex_email, email): raise MKUserError("email", _("'%s' is not a valid email address." % email)) new_user["email"] = email

11 years, 7 months

Check_MK Git: check_mk: Fixed typo in docu

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ba0c2ba9addb461c8e8b5d0785dcdaece9657de9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba0c2ba9addb46… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 19 14:12:50 2012 +0100 Fixed typo in docu --- checkman/hpux_if | 2 +- checkman/if | 2 +- checkman/if64 | 2 +- checkman/if_lancom | 2 +- checkman/lnx_if | 2 +- checkman/mcdata_fcport | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/checkman/hpux_if b/checkman/hpux_if index a8344c0..c82e74d 100644 --- a/checkman/hpux_if +++ b/checkman/hpux_if @@ -82,7 +82,7 @@ parameters (dict): Due to its complexity, this check now uses a dictionary as time range are - to a low degree - represented in the average. If you configure an average, then the traffic levels are applied to the averaged values. - {"state"} - the expected operstatus of the interface (as string or list of strings. If this + {"state"} - the expected operational status of the interface (as string or list of strings. If this is {None} then the state is not checked. Possible values for the state are {"1"}(up), {"2"}(down), {"3"}(testing), {"4"}(unknown), {"5"}(dormant), {"6"}(notPresent) and {"7"}(lowerLayerDown). The default is to diff --git a/checkman/if b/checkman/if index f65ab36..646060e 100644 --- a/checkman/if +++ b/checkman/if @@ -84,7 +84,7 @@ parameters (dict): Due to its complexity, this check now uses a dictionary as time range are - to a low degree - represented in the average. If you configure an average, then the traffic levels are applied to the averaged values. - {"state"} - the expected operstatus of the interface (as string or list of strings. If this + {"state"} - the expected operational status of the interface (as string or list of strings. If this is {None} then the state is not checked. Possible values for the state are {"1"}(up), {"2"}(down), {"3"}(testing), {"4"}(unknown), {"5"}(dormant), {"6"}(notPresent) and {"7"}(lowerLayerDown). The default is to diff --git a/checkman/if64 b/checkman/if64 index 23c3666..c449edf 100644 --- a/checkman/if64 +++ b/checkman/if64 @@ -85,7 +85,7 @@ parameters (dict): Due to its complexity, this check now uses a dictionary as time range are - to a low degree - represented in the average. If you configure an average, then the traffic levels are applied to the averaged values. - {"state"} - the expected operstatus of the interface (as string or list of strings. If this + {"state"} - the expected operational status of the interface (as string or list of strings. If this is {None} then the state is not checked. Possible values for the state are {"1"}(up), {"2"}(down), {"3"}(testing), {"4"}(unknown), {"5"}(dormant), {"6"}(notPresent) and {"7"}(lowerLayerDown). The default is to diff --git a/checkman/if_lancom b/checkman/if_lancom index f3addfd..387bfa8 100644 --- a/checkman/if_lancom +++ b/checkman/if_lancom @@ -87,7 +87,7 @@ parameters (dict): Due to its complexity, this check now uses a dictionary as time range are - to a low degree - represented in the average. If you configure an average, then the traffic levels are applied to the averaged values. - {"state"} - the expected operstatus of the interface (as string or list of strings. If this + {"state"} - the expected operational status of the interface (as string or list of strings. If this is {None} then the state is not checked. Possible values for the state are {"1"}(up), {"2"}(down), {"3"}(testing), {"4"}(unknown), {"5"}(dormant), {"6"}(notPresent) and {"7"}(lowerLayerDown). The default is to diff --git a/checkman/lnx_if b/checkman/lnx_if index a524125..df8f992 100644 --- a/checkman/lnx_if +++ b/checkman/lnx_if @@ -87,7 +87,7 @@ parameters (dict): Due to its complexity, this check now uses a dictionary as time range are - to a low degree - represented in the average. If you configure an average, then the traffic levels are applied to the averaged values. - {"state"} - the expected operstatus of the interface (as string or list of strings. If this + {"state"} - the expected operational status of the interface (as string or list of strings. If this is {None} then the state is not checked. Possible values for the state are {"1"}(up), {"2"}(down), {"3"}(testing), {"4"}(unknown), {"5"}(dormant), {"6"}(notPresent) and {"7"}(lowerLayerDown). The default is to diff --git a/checkman/mcdata_fcport b/checkman/mcdata_fcport index 300b270..6b54a6a 100644 --- a/checkman/mcdata_fcport +++ b/checkman/mcdata_fcport @@ -82,7 +82,7 @@ parameters (dict): Due to its complexity, this check now uses a dictionary as time range are - to a low degree - represented in the average. If you configure an average, then the traffic levels are applied to the averaged values. - {"state"} - the expected operstatus of the interface (as string or list of strings. If this + {"state"} - the expected operational status of the interface (as string or list of strings. If this is {None} then the state is not checked. Possible values for the state are {"1"}(up), {"2"}(down), {"3"}(testing), {"4"}(unknown), {"5"}(dormant), {"6"}(notPresent) and {"7"}(lowerLayerDown). The default is to

11 years, 7 months

Check_MK Git: check_mk: lnx_if ist jetzt default

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 09af9e0bc5c0383df52e99743749b561c47b1ab0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09af9e0bc5c038… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 19 14:11:10 2012 +0100 lnx_if ist jetzt default --- checkman/lnx_if | 6 ------ checkman/netctr.combined | 5 +---- checkman/netif.link | 5 +---- checkman/netif.params | 5 +---- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/checkman/lnx_if b/checkman/lnx_if index 020e273..a524125 100644 --- a/checkman/lnx_if +++ b/checkman/lnx_if @@ -17,10 +17,6 @@ description: link speed setting and link status if {ethtool} is installed and supported by the NIC. - Please also note, that the inventory of this check is currently still - turned off per default. Please set {linux_nic_check = "lnx_if"} in order - to turn it on. This will change in some day in the future. - Depending on the check parameters this check can go WARN or CRIT when the port status changes (i.e. is down), when the link speed changes (e.g. a port expected to be set to 1GBit/s operates only at 100MBit/s), when the @@ -143,5 +139,3 @@ if_default_traffic_levels (float/int, float/int): Default levels for checking tr if_default_average (int): Default time range for averaging in minutes. This is preset to {None}, which disables averaging of port traffic. -linux_nic_check(string): Set this to {"lnx_if"} if you want inventory this find this check - instead of the old check {"netif.link"}, {"netif.params"} and {"netctr"}. diff --git a/checkman/netctr.combined b/checkman/netctr.combined index a7d94ce..7918a77 100644 --- a/checkman/netctr.combined +++ b/checkman/netctr.combined @@ -10,10 +10,7 @@ description: is the number of errors and collisions compared to the number of packets transmitted during one check interval. - Note: this check is deprecated. Better use {lnx_if}. Set {linux_nic_check = "lnx_if"} - in your configuration in order to turn on inventory of {lnx_if} and turn it - of for this check. - + Note: this check is deprecated. Better use {lnx_if}. item: The name of the network interface as shown by {ifconfig}, for example {"eth0"} diff --git a/checkman/netif.link b/checkman/netif.link index 6357056..2a5b27b 100644 --- a/checkman/netif.link +++ b/checkman/netif.link @@ -6,7 +6,4 @@ distribution: check_mk description: This check monitors the link status of Linux network interfaces. - Note: this check is deprecated. Better use {lnx_if}. Set {linux_nic_check = - "lnx_if"} in your configuration in order to turn on inventory of {lnx_if} - and turn it of for this check. - + Note: this check is deprecated. Better use {lnx_if}. diff --git a/checkman/netif.params b/checkman/netif.params index 176c2c1..6385603 100644 --- a/checkman/netif.params +++ b/checkman/netif.params @@ -6,8 +6,5 @@ distribution: check_mk description: This check monitors the link status of Linux network interfaces. - Note: this check is deprecated. Better use {lnx_if}. Set {linux_nic_check = - "lnx_if"} in your configuration in order to turn on inventory of {lnx_if} - and turn it of for this check. - + Note: this check is deprecated. Better use {lnx_if}.

11 years, 7 months

Check_MK Git: check_mk: logwatch: Fixed confusion with ignore/

by git＠mathias-kettner.de

ok states of log messages 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: adb19c226a7c3852a159ec64e180c620ca1cab07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=adb19c226a7c38… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 19 12:23:18 2012 +0100 logwatch: Fixed confusion with ignore/ok states of log messages --- ChangeLog | 3 +++ checks/logwatch | 24 ++++++------------------ web/plugins/wato/check_parameters.py | 5 ----- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d60a59..d37a685 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,9 @@ WATO: * Cloning of contact/host/service groups (without members) + Checks: + * logwatch: Fixed confusion with ignore/ok states of log messages + 1.2.1i2: Core: diff --git a/checks/logwatch b/checks/logwatch index 57e1c9a..dd94dca 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -71,7 +71,7 @@ def inventory_logwatch(info): # appearance. # # PATTERN is a list like: -# [ ( 'I', ".*ssh.*" ), # Make informational (OK) messages from these +# [ ( 'O', ".*ssh.*" ), # Make informational (OK) messages from these # ( (10, 20), "login" ), # Warning at 10 messages, Critical at 20 # ( 'C', "bad" ), # Always critical # ( 'W', "not entirely bad" ), # Always warning @@ -88,15 +88,13 @@ def logwatch_state(state): return "OK" def logwatch_level_name(level): - if level == 'I': return 'OK' - elif level == 'O': return 'OK' + if level == 'O': return 'OK' elif level == 'W': return 'WARN' elif level == 'C': return 'CRIT' else: return 'IGN' def logwatch_level_worst(worst, level): - if level == 'I': return max(worst, 0) - elif level == 'O': return max(worst, 0) + if level == 'O': return max(worst, 0) elif level == 'W': return max(worst, 1) elif level == 'C': return max(worst, 2) else: return worst @@ -112,17 +110,7 @@ def logwatch_precompile(hostname, item, _unused): rules = service_extra_conf(hostname, item, logwatch_rules) for rule in rules: for pattern in rule: - # The specification of "O" -> OK and "I" -> IGNORE is not equal to the. - # states reported by the logwatch agent. The agent sends "I" for OK messages. - # This is really a nastiness. We do not change the valuespec for th moment but - # only modify the levels taken from the defined rules. - # FIXME: Oneday we should clean it up. Maybe via hint in migration nodes or - # some mor inteligent valuespec, ... - if pattern[0] == 'I': # Fix "IGNORE" declaration - level = 'S' - else: - level = pattern[0] - params.append((level, pattern[1])) + params.append((pattern[0], pattern[1])) # Now load the old logwatch_patterns var patterns = logwatch_patterns.get(item) @@ -247,7 +235,7 @@ def check_logwatch(item, params, info): for line in loglines: worst = logwatch_level_worst(worst, logwatch_parse_line(line)[0]) - # Ignore log lines which result in an "S" -> "Skip / Ignore" state + # Ignore log lines which result in an "I" -> "Ignore" state if worst > -1: try: logarch = file(logfile, "a+") @@ -412,7 +400,7 @@ def logwatch_to_prio(level): return 4 elif level == 'C': return 2 - elif level == 'I': + elif level == '0': return 5 def syslog_time(): diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 08cbe12..030bc03 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -103,11 +103,6 @@ register_rule(group + '/' + subgroup_applications, elements = [ DropdownChoice( title = _("State"), - # The specification of "O" -> OK and "I" -> IGNORE is not equal to the. - # states reported by the logwatch agent. The agent sends "I" for OK messages. - # This is really a nastiness here. Since this rule definition is already part - # of a released version we don't change it here, instead we clean it up in - # the logwatch check before applying the rules. choices = [ ('C', _('CRITICAL')), ('W', _('WARNING')),

11 years, 7 months

Check_MK Git: check_mk: check_http: Added a missing option

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c154d13b4c88b73cbb580288c9c950013800cb3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c154d13b4c88b7… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Nov 19 10:41:11 2012 +0100 check_http: Added a missing option --- checks/check_http | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/checks/check_http b/checks/check_http index 935591b..8e3dce6 100644 --- a/checks/check_http +++ b/checks/check_http @@ -46,13 +46,14 @@ def check_http_arguments(params): if settings.get("ssl"): args += ' --ssl' - if "cert_days" in settings: - args += ' -C %d' % settings["cert_days"] - if "cert_host" in settings: omit_ip = True + args += '-H $HOSTADDRESS$' args += ' -I %s' % quote_shell_string(settings['cert_host']) + if "cert_days" in settings: + args += ' -C %d' % settings["cert_days"] + if settings.get("sni"): args += ' --sni'

11 years, 7 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: 18cd0c5b61b7d30fcef63dacba89e516c8045218 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18cd0c5b61b7d3… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Sun Nov 18 20:11:36 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: Fix localize #2

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d837579c9024bd9ead0d6993b700a7d19d9dbebd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d837579c9024bd… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Nov 16 18:04:08 2012 +0100 Fix localize #2 --- modules/localize.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/modules/localize.py b/modules/localize.py index 43d6014..c79b185 100755 --- a/modules/localize.py +++ b/modules/localize.py @@ -49,7 +49,12 @@ if local_locale_dir: else: locale_base = locale_dir -pot_file = locale_base + '/multisite.pot' + +if local_locale_dir and os.path.exists(local_locale_dir + '/multisite.pot'): + pot_file = local_locale_dir + '/multisite.pot' +else: + pot_file = locale_base + '/multisite.pot' + try: os.makedirs(locale_base)

11 years, 7 months

Check_MK Git: check_mk: added HOST/SERVICEPROBLEMID to notification macros

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a2d6c548b9dcb5dbab773f42185a0aecbf5ff4a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2d6c548b9dcb5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 18 14:59:11 2012 +0100 added HOST/SERVICEPROBLEMID to notification macros --- ChangeLog | 2 ++ check_mk_templates.cfg | 2 ++ web/plugins/wato/globals_notification.py | 6 +++++- 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 88d1d14..4d60a59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ 1.2.1i3: + Core: + * added HOST/SERVICEPROBLEMID to notification macros Event Console: * New performance counter for client request processing time * FIX: fixed bug in rule optimizer with ranges of syslog priorities diff --git a/check_mk_templates.cfg b/check_mk_templates.cfg index 8e7686c..c99bd1e 100644 --- a/check_mk_templates.cfg +++ b/check_mk_templates.cfg @@ -313,6 +313,8 @@ define command { NOTIFY_NOTIFICATIONTYPE='$NOTIFICATIONTYPE$' \ NOTIFY_HOSTNOTIFICATIONNUMBER='$HOSTNOTIFICATIONNUMBER$' \ NOTIFY_SERVICENOTIFICATIONNUMBER='$SERVICENOTIFICATIONNUMBER$' \ + NOTIFY_HOSTPROBLEMID='$HOSTPROBLEMID$' \ + NOTIFY_SERVICEPROBLEMID='$SERVICEPROBLEMID$' \ NOTIFY_HOSTNAME='$HOSTNAME$' \ NOTIFY_HOSTALIAS='$HOSTALIAS$' \ NOTIFY_HOSTADDRESS='$HOSTADDRESS$' \ diff --git a/web/plugins/wato/globals_notification.py b/web/plugins/wato/globals_notification.py index d66af2d..67cba82 100644 --- a/web/plugins/wato/globals_notification.py +++ b/web/plugins/wato/globals_notification.py @@ -115,7 +115,11 @@ register_configvar(group, "<tt>$SERVICEOUTPUT$</tt>: the output of the check command , " "<tt>$LONGSERVICEOUTPUT$</tt>: the long output of the check command, " "<tt>$SERVICEPERFDATA$</tt>: the performance data of the check, " - "<tt>$SERVICECHECKCOMMAND$</tt>: the name of the service check command" + "<tt>$SERVICECHECKCOMMAND$</tt>: the name of the service check command, " + "<tt>HOSTPROBLEMID</tt>: a unique ID of the host problem this notification is about, " + "<tt>SERVICEPROBLEMID</tt>: the same for service problems, " + "<tt>HOSTNOTIFICATIONNUMBER</tt>: the number of notification of this host problem (begins with 1), " + "<tt>SERVICENOTIFICATIONNUMBER</tt>: same for service problems, " " " "<tt>$MONITORING_HOST$</tt>: the host name of the monitoring server " "<tt>$OMD_ROOT$</tt>: the home directory of the OMD site (only on OMD) "

11 years, 7 months

Check_MK Git: check_mk: mkeventd: fixed Python syntax for older Python versions

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5d9f89cff24f629108689f7f17db0ed914b5549b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d9f89cff24f62… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 18 14:41:56 2012 +0100 mkeventd: fixed Python syntax for older Python versions --- mkeventd/bin/mkeventd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 11fd3a5..5c97162 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -203,7 +203,7 @@ def format_exception(): # Class for debugging locking. Beware: This does not really # implement a true locking! It's just for detecting deadlocks! -class VerboseLock(): +class VerboseLock: def __init__(self, name): self._depth = 0 self._name = name

11 years, 7 months

← Newer
1
...
9
10
11
12
13
14
15
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2012