Checkmk git commits April 2015

checkmk-commits@lists.checkmk.com

7 participants
246 discussions

Check_MK Git: check_mk: Fixed spelling error in help text

by Mathias Kettner

Module: check_mk Branch: master Commit: 99a5973e5c515a6bcbf31dd65474ccedf71116db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99a5973e5c515a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 9 12:23:49 2015 +0200 Fixed spelling error in help text --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 653a55f..ac3f526 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15753,7 +15753,7 @@ def user_profile_async_replication_dialog(): sort_sites(sites) repstatus = load_replication_status() - html.message(_('For make your changes available on all remote sites, your user profile needs ' + html.message(_('In order to activate your changes available on all remote sites, your user profile needs ' 'to be replicated to the remote sites. This is done on this page now. Each site ' 'is being represented by a single image which is first shown gray and then fills ' 'to green during synchronisation.'))

9 years, 5 months

Check_MK Git: check_mk: Updated bug entries #2312

by Lars Michelsen

Module: check_mk Branch: master Commit: c1e8ba11706ad86ddd1533f87046947456b7988d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1e8ba11706ad8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 9 10:10:06 2015 +0200 Updated bug entries #2312 --- .bugs/2312 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.bugs/2312 b/.bugs/2312 new file mode 100644 index 0000000..3827b33 --- /dev/null +++ b/.bugs/2312 @@ -0,0 +1,7 @@ +Title: Notifications: on exception send a notification mail to fallback address +Component: notifcation +State: open +Date: 2015-04-09 10:09:22 +Targetversion: 1.2.7 +Class: bug +

9 years, 5 months

Check_MK Git: check_mk: Reserved 20 bug IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: dad23ee5e9deb2ae40e04051a50796e2692b5fc2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dad23ee5e9deb2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 9 10:09:15 2015 +0200 Reserved 20 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index ebc926e..862a8b3 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2312 +2332

9 years, 5 months

Check_MK Git: check_mk: siemens_plc.duration: Producing perfdata even when in critical state

by Lars Michelsen

Module: check_mk Branch: master Commit: 45a3271d093c0ce0088a68b37000b78e824c7f32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45a3271d093c0c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 9 09:34:57 2015 +0200 siemens_plc.duration: Producing perfdata even when in critical state --- checks/siemens_plc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/checks/siemens_plc b/checks/siemens_plc index db8dad6..6f59479 100644 --- a/checks/siemens_plc +++ b/checks/siemens_plc @@ -144,13 +144,14 @@ def check_siemens_plc_duration(item, params, info): else: seconds = int(line[-1]) + perfdata = [(line[1], seconds)] + key = 'siemens_plc.duration.%s' % item if key in g_counters and g_counters[key] < seconds: - g_counters[key] = seconds return 2, 'Reduced from %s to %s' % (get_age_human_readable(g_counters[key]), - get_age_human_readable(seconds)) - else: - g_counters[key] = seconds + get_age_human_readable(seconds)), perfdata + + g_counters[key] = seconds state = 0 warn, crit = params.get('duration', (None, None)) @@ -159,7 +160,7 @@ def check_siemens_plc_duration(item, params, info): elif warn != None and seconds >= warn: state = 1 - return state, get_age_human_readable(seconds), [(line[1], seconds)] + return state, get_age_human_readable(seconds), perfdata check_info['siemens_plc.duration'] = {

9 years, 5 months

Check_MK Git: check_mk: Removed todo notes

by Lars Michelsen

Module: check_mk Branch: master Commit: 1e766a183833f5d075a8bba3831f48da8b04c840 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e766a183833f5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 9 09:01:07 2015 +0200 Removed todo notes --- modules/check_mk.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 4b43fd0..e7c3a6f 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1721,7 +1721,6 @@ def convert_pattern(pattern): elif is_prefix_match(pattern): # prefix match with tailing .* pattern = pattern[:-2] - # TODO: Should we not rather use startswith()? return negate, lambda txt: txt[:len(pattern)] == pattern elif is_regex(pattern): @@ -1730,7 +1729,6 @@ def convert_pattern(pattern): else: # prefix match without any regex chars - # TODO: Should we not rather use startswith()? return negate, lambda txt: txt[:len(pattern)] == pattern

9 years, 5 months

Check_MK Git: check_mk: #2172 FIX Allowing OIDs in checks not starting with a dot again

by Lars Michelsen

Module: check_mk Branch: master Commit: 5deccba2d5127d1c755b3024dbe29e5c038057b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5deccba2d5127d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 9 08:54:13 2015 +0200 #2172 FIX Allowing OIDs in checks not starting with a dot again Within Check_MK it is not allowed to use SNMP OIDs not starting with a ".". The last release introduced a check which forced all users to fix the SNMP OID declarations which don't start with a dot. Because many users had problems with this error, e decided to make this check less restrictive. The check accepts the missing dots now and adds it silently for internal processing. Only in debug mode such OID definitions leads to an exception. --- .werks/2172 | 16 ++++++++++++++++ ChangeLog | 1 + modules/check_mk.py | 5 ++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/2172 b/.werks/2172 new file mode 100644 index 0000000..6bed646 --- /dev/null +++ b/.werks/2172 @@ -0,0 +1,16 @@ +Title: Allowing OIDs in checks not starting with a dot again +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1428562298 + +Within Check_MK it is not allowed to use SNMP OIDs not starting with a ".". +The last release introduced a check which forced all users to fix the SNMP OID +declarations which don't start with a dot. + +Because many users had problems with this error, e decided to make this check less +restrictive. The check accepts the missing dots now and adds it silently for +internal processing. Only in debug mode such OID definitions leads to an exception. diff --git a/ChangeLog b/ChangeLog index ddb963c..ee65b76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -312,6 +312,7 @@ * 2111 FIX: hitachi_hnas_volume: fix for cases when size information of volumes is not available * 2190 FIX: jolokia_metrics.gc: Fixed exception in check if no warn/crit levels are defined * 2192 FIX: check_notify_count": Fix exception in PNP template in case of explit email addresses... + * 2172 FIX: Allowing OIDs in checks not starting with a dot again... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/modules/check_mk.py b/modules/check_mk.py index 2a89fc3..41ac616 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -785,7 +785,10 @@ def get_single_oid(hostname, ipaddress, oid): # in question. The *cache* is working including the X, however. if oid[0] != '.': - raise MKGeneralException("OID definition '%s' does not begin with ." % oid) + if opt_debug: + raise MKGeneralException("OID definition '%s' does not begin with a '.'" % oid) + else: + oid = '.' + oid global g_single_oid_hostname global g_single_oid_cache

9 years, 5 months

Check_MK Git: check_mk: Fixed fix in ChangeLog

by Mathias Kettner

Module: check_mk Branch: master Commit: 6672d53d96f72dd60ab4c6059f013f2a6a6666f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6672d53d96f72d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 8 18:17:05 2015 +0200 Fixed fix in ChangeLog --- .werks/1239 | 5 ++--- ChangeLog | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.werks/1239 b/.werks/1239 index 2c7a869..21466cd 100644 --- a/.werks/1239 +++ b/.werks/1239 @@ -1,10 +1,9 @@ -Title: Fixed /treasures/downtime script to work with the new visuals +Title: Fixed doc/treasures/downtime script to work with current GUI version Level: 1 Component: multisite -Class: feature +Class: fix Compatible: compat State: unknown Version: 1.2.7i1 Date: 1427115417 - diff --git a/ChangeLog b/ChangeLog index 30ae717..ddb963c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -327,7 +327,6 @@ * 2040 Allow commands for setting downtimes and acknowledging on BI aggregates... * 2042 Services are now sorted in a natural way, this affects services containing numbers... * 2140 Remove PNP Timeranges from range selection, put these ranges directly into the list... - * 1239 Fixed /treasures/downtime script to work with the new visuals * 2166 LDAP: Multiple LDAP groups can be configured for assigning single roles to users... * 1781 FIX: Fix broken grouping by host/service group in availability * 1783 FIX: Finish the view "History of Scheduled Downtimes"... @@ -370,6 +369,7 @@ * 2149 FIX: LDAP: The diagnostic log has been changed to use a fixed path... * 2150 FIX: Reworked internal logging mechanism... * 1953 FIX: Fixed processing of html processing in input fields... + * 1239 FIX: Fixed doc/treasures/downtime script to work with current GUI version * 2157 FIX: LDAP: Fixed group-to-role/group-to-contactgroup sync with OpenLDAP (using posixGroup) * 2141 FIX: Fix computation of explicit time ranges with time of day... * 2142 FIX: Fix non-working option for disabling column headers in grouped boxed views...

9 years, 5 months

Check_MK Git: check_mk: #2193 FIX Remove duplicate performance data from host notifications

by Mathias Kettner

Module: check_mk Branch: master Commit: 2b4168a3c33ba6e5ec0fe0b040ee9152f4d71a16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b4168a3c33ba6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 8 18:11:42 2015 +0200 #2193 FIX Remove duplicate performance data from host notifications In HTML emails for host notifications the row for the host performance data appeared twice. The second appearance was now moved to the services notification - for which it originally was intended. --- .werks/2193 | 12 ++++++++++++ ChangeLog | 1 + notifications/mail | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/2193 b/.werks/2193 new file mode 100644 index 0000000..59cf202 --- /dev/null +++ b/.werks/2193 @@ -0,0 +1,12 @@ +Title: Remove duplicate performance data from host notifications +Level: 2 +Component: notifications +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1428509406 + +In HTML emails for host notifications the row for the host performance +data appeared twice. The second appearance was now moved to the services +notification - for which it originally was intended. diff --git a/ChangeLog b/ChangeLog index 54ff2fb..30ae717 100644 --- a/ChangeLog +++ b/ChangeLog @@ -439,6 +439,7 @@ * 2015 FIX: Fixed sending notifications for services with umlauts in names... * 2038 FIX: Log complete Email address into monitoring history when notifying explicity addresses * 2081 FIX: Improved logging of mkeventd in error cases + * 2193 FIX: Remove duplicate performance data from host notifications... BI: * 1784 FIX: Fix exception in BI Boxes when parents are being used diff --git a/notifications/mail b/notifications/mail index d4aad2e..5aa984b 100755 --- a/notifications/mail +++ b/notifications/mail @@ -280,7 +280,7 @@ body_elements = [ "$SERVICEACKCOMMENT$", "$SERVICEACKCOMMENT$",), - ( "perfdata", "host", False, "Performance Data", + ( "perfdata", "service", False, "Performance Data", "$HOSTPERFDATA$", "$HOSTPERFDATA$",),

9 years, 5 months

Check_MK Git: check_mk: #2192 FIX check_notify_count": Fix exception in PNP template in case of explit email addresses

by Mathias Kettner

Module: check_mk Branch: master Commit: a239d76eb76a2f415f1fb4e2469a1a4fe6074ca5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a239d76eb76a2f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 8 17:44:00 2015 +0200 #2192 FIX check_notify_count": Fix exception in PNP template in case of explit email addresses When you use an explicit email address as a target destination (via the rule based notification) then RRD Tool would be unhappy because of the @ in the variable name. This has been fixed. --- .werks/2192 | 12 ++++++++++++ ChangeLog | 1 + pnp-templates/check_mk_active-notify_count.php | 9 ++++++--- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.werks/2192 b/.werks/2192 new file mode 100644 index 0000000..6e08e33 --- /dev/null +++ b/.werks/2192 @@ -0,0 +1,12 @@ +Title: check_notify_count": Fix exception in PNP template in case of explit email addresses +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1428507779 + +When you use an explicit email address as a target destination (via the rule +based notification) then RRD Tool would be unhappy because of the @ in the +variable name. This has been fixed. diff --git a/ChangeLog b/ChangeLog index b87c608..54ff2fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -311,6 +311,7 @@ * 1954 FIX: fileinfo / fileinfo.groups: Fixed discovery function for fileinfo groups and equalize agent output of fileinfo agents... * 2111 FIX: hitachi_hnas_volume: fix for cases when size information of volumes is not available * 2190 FIX: jolokia_metrics.gc: Fixed exception in check if no warn/crit levels are defined + * 2192 FIX: check_notify_count": Fix exception in PNP template in case of explit email addresses... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/pnp-templates/check_mk_active-notify_count.php b/pnp-templates/check_mk_active-notify_count.php index be989ad..aed1397 100644 --- a/pnp-templates/check_mk_active-notify_count.php +++ b/pnp-templates/check_mk_active-notify_count.php @@ -33,12 +33,15 @@ $minutes = $parts[1]; $opt[1] = "--vertical-label 'Notifications' -l0 --title \"$title (in last $minutes min)\" "; $def[1] = ""; +$nr = 0; foreach ($DS AS $i => $ds_val) { $contact_name = substr($NAME[$i], 0, strpos($NAME[$i], '_')); - $def[1] .= "DEF:$contact_name=".$RRDFILE[$i].":$ds_val:MAX " ; + $varname = "notto$nr"; + $def[1] .= "DEF:$varname=".$RRDFILE[$i].":$ds_val:MAX " ; - $def[1] .= "LINE1:$contact_name#".$line_colors[$i % 8].":\"".sprintf("%-20s", $contact_name)."\" "; - $def[1] .= "GPRINT:$contact_name:MAX:\"%3.lf\\n\" "; + $def[1] .= "LINE1:$varname#".$line_colors[$i % 8].":\"".sprintf("%-20s", $contact_name)."\" "; + $def[1] .= "GPRINT:$varname:MAX:\"%3.lf\\n\" "; + $nr += 1; } ?>

9 years, 5 months

Check_MK Git: check_mk: Important fix, that fixes exception in notification module

by Mathias Kettner

Module: check_mk Branch: master Commit: 0fc55fcb4a171d9f84698e5341dd6cdb048fce1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fc55fcb4a171d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 8 17:39:04 2015 +0200 Important fix, that fixes exception in notification module The exception caused notification not being delivered in case of the presence of certain rules that match for service names --- modules/check_mk.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index a221c57..2a89fc3 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -34,7 +34,7 @@ import os, sys, socket, time, getopt, glob, re, stat, py_compile, urllib, inspect import subprocess -# Hack needed to fix UnicodeWarning in in_extraconf_servicelist(). This +# Hack needed to fix UnicodeWarning in in_servicematcher_list(). This # can be removed once the encoding of autocheck's items are handled correctly # as unicode strings import warnings @@ -1805,7 +1805,7 @@ def service_extra_conf(hostname, service, ruleset): try: match = g_extraconf_servicelist_cache[cache_id] except: - match = in_extraconf_servicelist(service_matchers, service) + match = in_servicematcher_list(service_matchers, service) g_extraconf_servicelist_cache[cache_id] = match if match: @@ -1857,7 +1857,7 @@ def in_boolean_serviceconf_list(hostname, service_description, ruleset): try: match = g_extraconf_servicelist_cache[cache_id] except: - match = in_extraconf_servicelist(service_matchers, service_description) + match = in_servicematcher_list(service_matchers, service_description) g_extraconf_servicelist_cache[cache_id] = match if match: @@ -1918,8 +1918,13 @@ def in_extraconf_hostlist(hostlist, hostname): return False +# Slow variant of checking wether a service is matched by a list +# of regexes - used e.g. by cmk --notify +def in_extraconf_servicelist(servicelist, service): + return in_servicematcher_list(convert_pattern_list(servicelist), service) -def in_extraconf_servicelist(service_matchers, item): + +def in_servicematcher_list(service_matchers, item): for negate, func in service_matchers: try: result = func(item)

9 years, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2015