Checkmk git commits September 2017

checkmk-commits@lists.checkmk.com

11 participants
255 discussions

5338 fileinfo: date variables can be defined in fileinfo.cfg

by Tom Baerwinkel

Module: check_mk Branch: master Commit: bff8c88142c5059ef1a92caaa618cee6925ec087 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bff8c88142c505… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Sep 29 09:59:06 2017 +0200 5338 fileinfo: date variables can be defined in fileinfo.cfg This werk adds the possibility to define date variables in the file fileinfo.cfg either directly or via the corresponding rule Count, size and age of files. Date variables can be used on linux and solaris hosts and have the form $DATE:format-spec$ where format-spec is a list of time format directives of the unix date command. Example: $DATE:%Y%m%d$ is todays date in the format YYYYMMDD. Using this option the agent will only send files containing the current date. Date variables can be used together with the rules File Grouping Patterns and Size, age count of file groups to monitor if files are created in a directory on a dayly basis. Note that the option Only check during the folling times of the day should be set. Otherwise a warning may be displayed if the file of the current day is not present yet. Change-Id: I6b8487fba3a59c704d667ade8840106165e559cd --- .werks/5338 | 22 ++++++++++++++++++++++ agents/check_mk_agent.linux | 17 +++++++++++++++++ agents/check_mk_agent.solaris | 18 ++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/.werks/5338 b/.werks/5338 new file mode 100644 index 0000000..6927dad --- /dev/null +++ b/.werks/5338 @@ -0,0 +1,22 @@ +Title: fileinfo: date variables can be defined in fileinfo.cfg +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1506670399 +Class: feature + +This werk adds the possibility to define date variables in the file +fileinfo.cfg either directly or via the corresponding rule Count, +size and age of files. Date variables can be used on linux and solaris +hosts and have the form $DATE:format-spec$ where format-spec is a list +of time format directives of the unix date command. Example: +$DATE:%Y%m%d$ is todays date in the format YYYYMMDD. +Using this option the agent will only send files containing the +current date. Date variables can be used together with the rules +File Grouping Patterns and Size, age count of file groups to monitor +if files are created in a directory on a dayly basis. Note that the +option Only check during the folling times of the day should be set. +Otherwise a warning may be displayed if the file of the current day +is not present yet. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index a3b3518..ec7af26 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -745,6 +745,22 @@ fi # Fileinfo-Check: put patterns for files into /etc/check_mk/fileinfo.cfg +function replace_datevariable() +{ + # Replace the date variable of the input, e.g. $DATE:%Y%m%d$, by + # the current date. If there's no match just return the input. + local file_name="$1" + local pattern='(\$DATE:(.*)\$)' + + if [[ ! $file_name =~ $pattern ]]; then + echo "$file_name" + else + date_variable="${BASH_REMATCH[1]}" + format_string="${BASH_REMATCH[2]}" + echo "${file_name/$date_variable/$(date +$format_string)}" + fi +} + if [ -r "$MK_CONFDIR/fileinfo.cfg" ] ; then echo '<<<fileinfo:sep(124)>>>' date +%s @@ -752,6 +768,7 @@ if [ -r "$MK_CONFDIR/fileinfo.cfg" ] ; then do # only work on lines containing files, skip e.g. comments and blank lines if [ ${line:0:1} = "/" ]; then + line="$(replace_datevariable $line)" stat -c "%n|%s|%Y" "${line}" 2>/dev/null if [ $? -ne 0 ]; then diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 57bd19c..05134d1 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -348,6 +348,22 @@ fi # Fileinfo-Check: put patterns for files into $MK_CONFDIR/fileinfo.cfg +function replace_datevariable() +{ + # Replace the date variable of the input, e.g. $DATE:%Y%m%d$, by + # the current date. If there's no match just return the input. + local file_name="$1" + local pattern='(\$DATE:(.*)\$)' + + if [[ ! $file_name =~ $pattern ]]; then + echo "$file_name" + else + date_variable="${BASH_REMATCH[1]}" + format_string="${BASH_REMATCH[2]}" + echo "${file_name/$date_variable/$(date +$format_string)}" + fi +} + if [ -f "$MK_CONFDIR/fileinfo.cfg" ] then echo '<<<fileinfo:sep(124)>>>' @@ -357,7 +373,9 @@ then do # only work on lines containing files, skip e.g. comments and blank lines if [ ${file:0:1} = "/" ]; then + file="$(replace_datevariable $file)" ls $file > /dev/null 2>&1 + if [ $? -eq 0 ]; then echo $file | \ /usr/bin/perl -e '

6 years, 8 months

5339 postfix_mailq_status: Now reports if PID file is not readable

by Tom Baerwinkel

Module: check_mk Branch: master Commit: b470765f6120c9ec815dece95a7f2b4c41e902c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b470765f6120c9… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Sep 29 15:49:26 2017 +0200 5339 postfix_mailq_status: Now reports if PID file is not readable Change-Id: I00e85f75cd1bcbd70812a3e7e2c0b02b8382fc57 --- .werks/5339 | 10 ++++++++++ agents/check_mk_agent.linux | 12 ++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.werks/5339 b/.werks/5339 new file mode 100644 index 0000000..217d13a --- /dev/null +++ b/.werks/5339 @@ -0,0 +1,10 @@ +Title: postfix_mailq_status: Now reports if PID file is not readable +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1506692807 +Class: feature + + diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 37c12de..a3b3518 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -660,11 +660,15 @@ if type postfix >/dev/null ; then for i in $(ls -d /var/spool/postfix*) do if [ -e "$i/pid/master.pid" ]; then - postfix_pid=$(cat $i/pid/master.pid | sed 's/ //g') # handle possible spaces in output - if readlink -- "/proc/$postfix_pid/exe" | grep -q ".*postfix/$sbin/$\?master.*"; then - echo "$i:the Postfix mail system is running:PID:$postfix_pid" | sed 's/\/var\/spool\///g' + if [ -r "$i/pid/master.pid" ]; then + postfix_pid=$(cat $i/pid/master.pid | sed 's/ //g') # handle possible spaces in output + if readlink -- "/proc/$postfix_pid/exe" | grep -q ".*postfix/$sbin/$\?master.*"; then + echo "$i:the Postfix mail system is running:PID:$postfix_pid" | sed 's/\/var\/spool\///g' + else + echo "$i:PID file exists but instance is not running!" | sed 's/\/var\/spool\///g' + fi else - echo "$i:PID file exists but instance is not running!" | sed 's/\/var\/spool\///g' + echo "$i:PID file exists but is not readable" fi else echo "$i:the Postfix mail system is not running" | sed 's/\/var\/spool\///g'

6 years, 8 months

Fixed typo

by Marcel Arentz

Module: check_mk Branch: master Commit: 23845942bf7500d91db09965d121ea3f07a3b772 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23845942bf7500… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri Sep 29 15:31:23 2017 +0200 Fixed typo Change-Id: I4a7fcc86991749ce3d15f3ce18d76dfa03dcd2e9 --- inventory/dell_idrac_info | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inventory/dell_idrac_info b/inventory/dell_idrac_info index 188baef..19d4749 100644 --- a/inventory/dell_idrac_info +++ b/inventory/dell_idrac_info @@ -31,7 +31,7 @@ -def inv_snmp_extended_info(info): +def inv_dell_idrac_info(info): serial, expresscode, bios_date, bios_version, \ bios_vendor, raid_name, raid_version = info[0] @@ -49,7 +49,7 @@ def inv_snmp_extended_info(info): node['name'] = raid_name inv_info['dell_hw_info'] = { - 'inv_function' : inv_snmp_extended_info, + 'inv_function' : inv_dell_idrac_info, 'snmp_info' : ('.1.3.6.1.4.1.674.10892.5', [ "1.3.2.0", # IDRAC-MIB::systemServiceTag "1.3.3.0", # IDRAC-MIB::systemExpressServiceCode

6 years, 8 months

fixed typo

by Marcel Arentz

Module: check_mk Branch: master Commit: be4dd4c1a660cfcb820c24c592357d2fd5b1e613 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be4dd4c1a660cf… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri Sep 29 14:56:50 2017 +0200 fixed typo Change-Id: I01e6b2eb11c2c198b05155c7094174373f8b1fb5 --- checks/dell_om_fans | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/dell_om_fans b/checks/dell_om_fans index 52fc196..25d741b 100644 --- a/checks/dell_om_fans +++ b/checks/dell_om_fans @@ -79,6 +79,6 @@ check_info["dell_om_fans"] = { "13", # MIB-Dell-10892::coolingDeviceLowerCriticalThreshold ]), "includes" : [ "fan.include", "dell_om.include" ], - "has_perdata" : True, + "has_perfdata" : True, "group" : "hw_fans", }

6 years, 8 months

5300 dell_idrac_fans, dell_idrac_power dell_idrac_power.unit,

by Marcel Arentz

dell_idrac raid, dell_idrac_raid.bbu: New checks for Dell iDRAC Message-ID: <59ce3b2a.CXgcvMfpnUjmg77b%ma(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: bb36473a5765eb7244ca570fd61d334de403374d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb36473a5765eb… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Sep 25 10:06:11 2017 +0200 5300 dell_idrac_fans, dell_idrac_power dell_idrac_power.unit, dell_idrac raid, dell_idrac_raid.bbu: New checks for Dell iDRAC These new check plugins create services if a Dell hardware is checked by the idrac snmp interface. Please see the manpages for more information. Change-Id: I7ac993adf334cf8c7f7f79179248f111a5e61514 --- .werks/5300 | 11 ++++ checkman/dell_idrac_fans | 18 +++++++ checkman/dell_idrac_power | 12 +++++ checkman/dell_idrac_power.unit | 13 +++++ checkman/dell_idrac_raid | 13 +++++ checkman/dell_idrac_raid.bbu | 13 +++++ checks/dell_idrac_fans | 82 ++++++++++++++++++++++++++++++ checks/dell_idrac_power | 113 +++++++++++++++++++++++++++++++++++++++++ checks/dell_idrac_raid | 95 ++++++++++++++++++++++++++++++++++ 9 files changed, 370 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bb36473a57…

6 years, 8 months

5299 dell_idrac_info: Added Dell HW information to inventory

by Marcel Arentz

Module: check_mk Branch: master Commit: 16ed2ff5960164d44eb806fe5e3b6dd2b046a08d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16ed2ff5960164… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Sep 25 09:26:36 2017 +0200 5299 dell_idrac_info: Added Dell HW information to inventory The new information will be provided if got by idrac and includes: - Serial number - Express Service Code - Bios version, vendor and date of version - Raid controller name and version Change-Id: Ifb9fabdd982eece104c5f4121cb3aa5846485742 --- .werks/5299 | 14 ++++++++++ inventory/dell_idrac_info | 63 ++++++++++++++++++++++++++++++++++++++++++ web/plugins/views/inventory.py | 3 ++ 3 files changed, 80 insertions(+) diff --git a/.werks/5299 b/.werks/5299 new file mode 100644 index 0000000..33825fe --- /dev/null +++ b/.werks/5299 @@ -0,0 +1,14 @@ +Title: dell_idrac_info: Added Dell HW information to inventory +Level: 1 +Component: inv +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1506324149 +Class: feature + +The new information will be provided if got by idrac and includes: +- Serial number +- Express Service Code +- Bios version, vendor and date of version +- Raid controller name and version diff --git a/inventory/dell_idrac_info b/inventory/dell_idrac_info new file mode 100644 index 0000000..188baef --- /dev/null +++ b/inventory/dell_idrac_info @@ -0,0 +1,63 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2017 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +# .1.3.6.1.4.1.674.10892.5.4.300.50.1.8.1.1 2.5.2 +# .1.3.6.1.4.1.674.10892.5.5.1.20.130.3.1.26.1 1.03 +# .1.3.6.1.4.1.674.10892.5.1.3.2.0 JG2NS12 +# .1.3.6.1.4.1.674.10892.5.1.3.3.0 42330791846 + + + +def inv_snmp_extended_info(info): + serial, expresscode, bios_date, bios_version, \ + bios_vendor, raid_name, raid_version = info[0] + + node = inv_tree("hardware.system.") + node['serial'] = serial + node['expresscode'] = expresscode + + node = inv_tree("hardware.bios.") + node['version'] = bios_version + node['vendor'] = bios_vendor + node['date'] = time.mktime(time.strptime(bios_date, "%m/%d/%Y")) + + node = inv_tree("hardware.storage.controller.") + node['version'] = raid_version + node['name'] = raid_name + +inv_info['dell_hw_info'] = { + 'inv_function' : inv_snmp_extended_info, + 'snmp_info' : ('.1.3.6.1.4.1.674.10892.5', [ + "1.3.2.0", # IDRAC-MIB::systemServiceTag + "1.3.3.0", # IDRAC-MIB::systemExpressServiceCode + "4.300.50.1.7.1.1", # IDRAC-MIB::systemBIOSReleaseDateName + "4.300.50.1.8.1.1", # IDRAC-MIB::systemBIOSVersionName + "4.300.50.1.11.1.1", # IDRAC-MIB::systemBIOSManufacturerName + "5.1.20.130.1.1.2.1", # IDRAC-MIB::controllerName + "5.1.20.130.1.1.8.1", # IDRAC-MIB::controllerFWVersion + ]), + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.4.1.674.10892.5.1.1.1.0"), +} diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index b6c50bf..d777561 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -614,6 +614,7 @@ inventory_displayhints.update({ ".hardware.system." : { "title" : _("System") }, ".hardware.system.product" : { "title" : _("Product") }, ".hardware.system.serial" : { "title" : _("Serial Number") }, + ".hardware.system.expresscode" : { "title" : _("Express Servicecode") }, ".hardware.system.model" : { "title" : _("Model Name") }, # Legacy ones. Kept to not break existing views - DON'T use these values for new plugins @@ -729,6 +730,8 @@ inventory_displayhints.update({ ".hardware.components.stacks:*.location" : { "title" : _("Location") }, ".hardware.storage." : { "title" : _("Storage") }, + ".hardware.storage.controller." : { "title" : _("Controller") }, + ".hardware.storage.controller.version" : { "title" : _("Version") }, ".hardware.storage.disks:" : { "title" : _("Block Devices"), "render" : render_inv_dicttable }, ".hardware.storage.disks:*." : { "title" : _("Block Device %d") }, ".hardware.storage.disks:*.signature" : { "title" : _("Disk ID") },

6 years, 8 months

minor fix regarding missing perfdata

by Marcel Arentz

Module: check_mk Branch: master Commit: 9eab3727b934a0e2f9bca8470a26ccfbe59802cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9eab3727b934a0… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Fri Sep 29 13:38:54 2017 +0200 minor fix regarding missing perfdata Change-Id: If6a112fa3d20f92ec85c495dbb54e4661b9b48bf --- checks/dell_om_fans | 1 + 1 file changed, 1 insertion(+) diff --git a/checks/dell_om_fans b/checks/dell_om_fans index 2096e87..52fc196 100644 --- a/checks/dell_om_fans +++ b/checks/dell_om_fans @@ -79,5 +79,6 @@ check_info["dell_om_fans"] = { "13", # MIB-Dell-10892::coolingDeviceLowerCriticalThreshold ]), "includes" : [ "fan.include", "dell_om.include" ], + "has_perdata" : True, "group" : "hw_fans", }

6 years, 8 months

5216 FIX Failed notification checking is now limited to 7 days

by Lars Michelsen

Module: check_mk Branch: master Commit: 979cd19e97b0ff473c23bd5918a5500ba9b3c7d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=979cd19e97b0ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 29 12:20:56 2017 +0200 5216 FIX Failed notification checking is now limited to 7 days This change fixes a GUI (sidebar) rendering performance issue which was caused by the check for failed notifications. For individual admin users the GUI could be very slow because the core was searching far in the past of the monitoring history. The failed notification checking is now being limited by a configurable "Failed notification horizon" which is set to 7 days be default. You can configure this value according to your needs in the Global settings. Change-Id: If372bc9560343432c00376a3f983ec1df68c0a33 --- .werks/5216 | 18 ++++++++++++++++++ web/htdocs/default_permissions.py | 8 ++++---- web/htdocs/notifications.py | 12 ++++++++++-- web/plugins/config/builtin.py | 2 ++ web/plugins/wato/globals_notification.py | 13 +++++++++++++ 5 files changed, 47 insertions(+), 6 deletions(-) diff --git a/.werks/5216 b/.werks/5216 new file mode 100644 index 0000000..0c8a0bb --- /dev/null +++ b/.werks/5216 @@ -0,0 +1,18 @@ +Title: Failed notification checking is now limited to 7 days +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1506680272 + +This change fixes a GUI (sidebar) rendering performance issue which +was caused by the check for failed notifications. For individual +admin users the GUI could be very slow because the core was searching +far in the past of the monitoring history. + +The failed notification checking is now being limited by a configurable +"Failed notification horizon" which is set to 7 days be default. You can +configure this value according to your needs in the Global settings. diff --git a/web/htdocs/default_permissions.py b/web/htdocs/default_permissions.py index 4fe4b53..fe89f56 100644 --- a/web/htdocs/default_permissions.py +++ b/web/htdocs/default_permissions.py @@ -150,7 +150,7 @@ def load_plugins(force): config.declare_permission("general.see_failed_notifications_24h", _("See failed Notifications (last 24 hours)"), - _("If check_mk is unable to notify users about problems, the site will warn about this situation " + _("If Check_MK is unable to notify users about problems, the site will warn about this situation " "very visibly inside the UI (both in the Tactical Overview and the Dashboard). This affects only " "users with this permission. Users with this permission will only see failed notifications " "that occured within the last 24 hours."), @@ -158,10 +158,10 @@ def load_plugins(force): config.declare_permission("general.see_failed_notifications", _("See failed Notifications (all)"), - _("If check_mk is unable to notify users about problems, the site will warn about this situation " + _("If Check_MK is unable to notify users about problems, the site will warn about this situation " "very visibly inside the UI (both in the Tactical Overview and the Dashboard). This affects only " - "users with this permission. Users with this permission will also see failed notifications " - "older than 24 hours."), + "users with this permission. Users with this permission will see failed notifications between now " + "and the configured <a href=\"wato.py?mode=edit_configvar&varname=failed_notification_horizon\">Failed notification horizon</a>."), [ "admin" ]) loaded_with_language = current_language diff --git a/web/htdocs/notifications.py b/web/htdocs/notifications.py index 65386e5..d6e217b 100644 --- a/web/htdocs/notifications.py +++ b/web/htdocs/notifications.py @@ -106,8 +106,14 @@ def load_failed_notifications(before=None, after=None, stat_only=False, extra_he query_filters.append("time <= %d" % before) if after is not None: query_filters.append("time >= %d" % after) - if may_see_notifications and not config.user.may("general.see_failed_notifications"): - query_filters.append("time > %d" % (int(time.time()) - 86400)) + + if may_see_notifications: + if config.user.may("general.see_failed_notifications"): + horizon = config.failed_notification_horizon + else: + horizon = 86400 + + query_filters.append("time > %d" % (int(time.time()) - horizon)) query = ["GET log"] if stat_only: @@ -119,6 +125,8 @@ def load_failed_notifications(before=None, after=None, stat_only=False, extra_he query = "\n".join(query) + html.debug(query) + if extra_headers is not None: query += extra_headers diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index 32e6963..e66a917 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -87,6 +87,8 @@ quicksearch_dropdown_limit = 80 # Quicksearch search order quicksearch_search_order = [("h", "continue"), ("al", "continue"), ("ad", "continue"), ("s", "continue")] +failed_notification_horizon = 7 * 60 * 60 * 24 + # _ _ _ _ # | | (_)_ __ ___ (_) |_ ___ # | | | | '_ ` _ \| | __/ __| diff --git a/web/plugins/wato/globals_notification.py b/web/plugins/wato/globals_notification.py index 3f8e3ef..abcaa76 100644 --- a/web/plugins/wato/globals_notification.py +++ b/web/plugins/wato/globals_notification.py @@ -150,3 +150,16 @@ register_configvar(group, allow_reset = False, ) + +register_configvar(group, + "failed_notification_horizon", + Age( + title = _("Failed notification horizon"), + help = _("The tactical overview snapin is reporing about notifications that could not be sent " + "by Check_MK. Users with the permission \"See failed Notifications (all)\" get the number " + "of failed notification within the configured horizon."), + default_value = 60*60*24*7, + display = ["days"], + minvalue = 60*60*24, + ), + domain = "multisite")

6 years, 8 months

added WK5232

by Andreas Boesl

Module: check_mk Branch: master Commit: c36b3531eb7ac9eca8ddf9c8f8bd3f109d100f76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c36b3531eb7ac9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 29 12:15:43 2017 +0200 added WK5232 Change-Id: I5e4dba904adabaa069c9eee40873b99e26761a78 --- .werks/5232 | 11 +++++++++++ cmk_base/checking.py | 3 +++ 2 files changed, 14 insertions(+) diff --git a/.werks/5232 b/.werks/5232 new file mode 100644 index 0000000..582b505 --- /dev/null +++ b/.werks/5232 @@ -0,0 +1,11 @@ +Title: Agent version check: fixed exception when an offcial release is expected and the agents version is a daily build +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1506678406 + + diff --git a/cmk_base/checking.py b/cmk_base/checking.py index c8c4196..7bad059 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -212,6 +212,9 @@ def _is_expected_agent_version(agent_version, expected_version): return False elif 'release' in spec: + if cmk_base.utils.is_daily_build_version(agent_version): + return False + if cmk_base.utils.parse_check_mk_version(agent_version) \ < cmk_base.utils.parse_check_mk_version(spec['release']): return False

6 years, 8 months

Removed debug code

by Lars Michelsen

Module: check_mk Branch: master Commit: ab4bc1e39da6ca6f6a20764c7fa5d83c5bcb539d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab4bc1e39da6ca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 29 12:23:02 2017 +0200 Removed debug code Change-Id: I64c5d8b4f8ad3de1981acc36a38a6092a1f0557c --- web/htdocs/notifications.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/htdocs/notifications.py b/web/htdocs/notifications.py index d6e217b..ff4ee85 100644 --- a/web/htdocs/notifications.py +++ b/web/htdocs/notifications.py @@ -125,8 +125,6 @@ def load_failed_notifications(before=None, after=None, stat_only=False, extra_he query = "\n".join(query) - html.debug(query) - if extra_headers is not None: query += extra_headers

6 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2017