Checkmk git commits June 2017

checkmk-commits@lists.checkmk.com

13 participants
266 discussions

4634 FIX aix_if: Make check work with different ifconfig output format

by Konstantin Büttner

Module: check_mk Branch: master Commit: 9ded52ec6cc3f7e747533830bee6a8fcba265a4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ded52ec6cc3f7… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Jun 8 10:57:05 2017 +0200 4634 FIX aix_if: Make check work with different ifconfig output format On some systems, the operational status information is listed under "KIM Driver Flags" instead of simply "Driver Flags", which previously could not be parsed correctly by the check. This has been fixed. Change-Id: I474b58f9df8496cb271578049b8e3b9e1f05324d --- .werks/4634 | 13 +++++++++++++ checks/aix_if | 2 ++ 2 files changed, 15 insertions(+) diff --git a/.werks/4634 b/.werks/4634 new file mode 100644 index 0000000..0a587e0 --- /dev/null +++ b/.werks/4634 @@ -0,0 +1,13 @@ +Title: aix_if: Make check work with different ifconfig output format +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1496911872 + +On some systems, the operational status information is listed under +"KIM Driver Flags" instead of simply "Driver Flags", which previously +could not be parsed correctly by the check. This has been fixed. diff --git a/checks/aix_if b/checks/aix_if index 9f305af..6b3de09 100644 --- a/checks/aix_if +++ b/checks/aix_if @@ -85,6 +85,8 @@ def parse_aix_if(info): nic_info[nic]["ifSpeed"] = int(line[3]) * 1000000 elif " ".join(line[0:2]) == "Driver Flags:": nic_info[nic]["flags"] = line[2:] + elif " ".join(line[0:3]) == "KIM Driver Flags:": + nic_info[nic]["flags"] = line[3:] elif len(line) and ":" not in " ".join(line) and "flags" in nic_info[nic]: nic_info[nic]["flags"] += line

7 years

4790 FIX Fixed scaling for the average in interface services of pnp4nagios graphs

by Marcel Arentz

Module: check_mk Branch: master Commit: dbb2777f346183ed1813f41aa872efb92a8dcdbe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dbb2777f346183… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Thu Jun 8 10:41:50 2017 +0200 4790 FIX Fixed scaling for the average in interface services of pnp4nagios graphs If an interface provides a bandwidth, scaling for the average value was not bandwidth but hard coded. This is now fixed thanks to Jonathan Vogt. Change-Id: I0b0b00aa9935c4d3d7246e6c088875335c2acc69 --- .werks/4790 | 10 ++++++++++ pnp-templates/check_mk-if.php | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/4790 b/.werks/4790 new file mode 100644 index 0000000..cd02505 --- /dev/null +++ b/.werks/4790 @@ -0,0 +1,10 @@ +Title: Fixed scaling for the average in interface services of pnp4nagios graphs +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1496911178 +Class: fix + +If an interface provides a bandwidth, scaling for the average value was not bandwidth but hard coded. This is now fixed thanks to Jonathan Vogt. diff --git a/pnp-templates/check_mk-if.php b/pnp-templates/check_mk-if.php index 375871d..d836384 100644 --- a/pnp-templates/check_mk-if.php +++ b/pnp-templates/check_mk-if.php @@ -143,8 +143,8 @@ if (isset($DS[12])) { "DEF:outbytesa=$RRDFILE[13]:$DS[13]:MAX ". "CDEF:intraffica=inbytesa,$unit_multiplier,* ". "CDEF:outtraffica=outbytesa,$unit_multiplier,* ". - "CDEF:inmba=intraffica,1048576,/ ". - "CDEF:outmba=outtraffica,1048576,/ ". + "CDEF:inmba=intraffica,$scale,/ ". + "CDEF:outmba=outtraffica,$scale,/ ". "CDEF:minusoutmba=0,outmba,- ". "LINE:inmba#00a060:\"in (avg) \" ". "GPRINT:intraffica:LAST:\"%6.1lf %s$unit/s last\" ".

7 years

4772 FIX cisco_wlc, cisco_wlc_clients: Added support for Cisco 1850 devices

by Simon Betz

Module: check_mk Branch: master Commit: 2c87ad8121a00c9f7d6abad1efee71b19341f773 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c87ad8121a00c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jun 8 10:32:31 2017 +0200 4772 FIX cisco_wlc, cisco_wlc_clients: Added support for Cisco 1850 devices Change-Id: Ie73cbb4422f78f16e96128b22fb8e87cd6a56d95 --- .werks/4772 | 11 +++++++++++ checks/cisco_wlc | 4 +++- checks/cisco_wlc_clients | 4 +++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/4772 b/.werks/4772 new file mode 100644 index 0000000..7885604 --- /dev/null +++ b/.werks/4772 @@ -0,0 +1,11 @@ +Title: cisco_wlc, cisco_wlc_clients: Added support for Cisco 1850 devices +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1496910713 + + diff --git a/checks/cisco_wlc b/checks/cisco_wlc index 1e3d10c..732d830 100644 --- a/checks/cisco_wlc +++ b/checks/cisco_wlc @@ -62,14 +62,16 @@ check_info["cisco_wlc"] = { "service_description" : "AP %s", "node_info" : True, "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0') in [ - ".1.3.6.1.4.1.9.1.1069", ".1.3.6.1.4.1.14179.1.1.4.3", + ".1.3.6.1.4.1.9.1.1069", ".1.3.6.1.4.1.9.1.1615", ".1.3.6.1.4.1.9.1.1645", ".1.3.6.1.4.1.9.1.1631", ".1.3.6.1.4.1.9.1.1279", ".1.3.6.1.4.1.9.1.1293", ".1.3.6.1.4.1.9.1.2170", + ".1.3.6.1.4.1.9.1.2371", + ".1.3.6.1.4.1.9.1.2250", ], "snmp_info" : (".1.3.6.1.4.1.14179.2.2.1.1", [ "3", diff --git a/checks/cisco_wlc_clients b/checks/cisco_wlc_clients index 79386f9..f609a06 100644 --- a/checks/cisco_wlc_clients +++ b/checks/cisco_wlc_clients @@ -67,14 +67,16 @@ check_info["cisco_wlc_clients"] = { "group" : "wlc_clients", "has_perfdata" : True, "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0') in [ + ".1.3.6.1.4.1.14179.1.1.4.3", ".1.3.6.1.4.1.9.1.1069", ".1.3.6.1.4.1.9.1.1615", ".1.3.6.1.4.1.9.1.1645", ".1.3.6.1.4.1.9.1.1631", - ".1.3.6.1.4.1.14179.1.1.4.3", ".1.3.6.1.4.1.9.1.1279", ".1.3.6.1.4.1.9.1.1293", ".1.3.6.1.4.1.9.1.2170", + ".1.3.6.1.4.1.9.1.2371", + ".1.3.6.1.4.1.9.1.2250", ], "snmp_info" : ( ".1.3.6.1.4.1.14179.2.1.1.1", [ "2",

7 years

Updated bug entries #2555

by Mathias Kettner

Module: check_mk Branch: master Commit: 8713f154832c22cff249e5f1596bb6b29a090675 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8713f154832c22… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 8 08:12:10 2017 +0200 Updated bug entries #2555 Change-Id: I329260d24ecc85e909c961e8f2290866611ad037 --- .bugs/2555 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/2555 b/.bugs/2555 new file mode 100644 index 0000000..f3c39e5 --- /dev/null +++ b/.bugs/2555 @@ -0,0 +1,11 @@ +Title: Match for contact groups when core = Nagios does not work +Component: notification +State: open +Date: 2017-06-08 08:10:56 +Targetversion: 1.4.0 +Class: bug + +When doing notification rules with matching on contact groups +we need the list of contactgroups from the core. These doe +not seem to be present when the core is Nagios so we need +to fetch them via Livestatus. This is not yet implemented.

7 years

Revert " 4796 FIX Fixed standard setting for rule based notification in new sites"

by Sven Rueß

Module: check_mk Branch: master Commit: f61b279e204802778654fea1d1557388cc2e5b7b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f61b279e204802… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Wed Jun 7 19:42:09 2017 +0200 Revert "4796 FIX Fixed standard setting for rule based notification in new sites" This reverts commit cd9b0fd06c357be03cf505e231f8de48548ed258. Change-Id: I0580fd8f6c285c5ec8def41e23eee2cfacd37012 --- .werks/4796 | 11 ----------- modules/notify.py | 2 +- web/htdocs/wato.py | 1 + web/plugins/wato/globals_notification.py | 2 +- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/.werks/4796 b/.werks/4796 deleted file mode 100644 index e2bcebf..0000000 --- a/.werks/4796 +++ /dev/null @@ -1,11 +0,0 @@ -Title: Fixed standard setting for rule based notification in new sites -Level: 1 -Component: notifications -Class: fix -Compatible: compat -Edition: cre -State: unknown -Version: 1.5.0i1 -Date: 1496773819 - -Rule based notifications is new standard setting for new created sites. diff --git a/modules/notify.py b/modules/notify.py index 37cfa40..2b8d67d 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -61,7 +61,7 @@ notification_logging = 1 notification_backlog = 10 # keep the last 10 notification contexts for reference # Settings for new rule based notifications -enable_rulebased_notifications = True +enable_rulebased_notifications = False notification_fallback_email = "" notification_rules = [] notification_bulk_interval = 10 # Check every 10 seconds for ripe bulks diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3ea48d4..e3857c7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14386,6 +14386,7 @@ def create_sample_config(): "barracuda_mailqueues", "qmail_stats", ], + "enable_rulebased_notifications": True, } ) diff --git a/web/plugins/wato/globals_notification.py b/web/plugins/wato/globals_notification.py index 900dcf3..aab54b4 100644 --- a/web/plugins/wato/globals_notification.py +++ b/web/plugins/wato/globals_notification.py @@ -42,7 +42,7 @@ register_configvar(group, help = _("If you enable the new rule based notifications then the current plain text email and " ""flexible notifications" will become inactive. Instead notificatios will " "be configured with the WATO module Notifications on a global base."), - default_value = True, + default_value = False, ), domain = "check_mk", need_restart = True)

7 years

Revert "Fixed rule base notification from werk 4796"

by Sven Rueß

Module: check_mk Branch: master Commit: f92990bde7120a4f4a11b5e0e1422e216cf7583c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f92990bde7120a… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Wed Jun 7 19:40:51 2017 +0200 Revert "Fixed rule base notification from werk 4796" This reverts commit 0a69e78acb663d702a99ac5f522cf0aed42538a7. --- web/htdocs/wato.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5c9e84b..3ea48d4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8322,7 +8322,8 @@ def mode_notifications(phase): # Check setting of global notifications. Are they enabled? If not, display # a warning here. Note: this is a main.mk setting, so we cannot access this # directly. - if not load_configuration_settings().get("enable_rulebased_notifications", True): + current_settings = load_configuration_settings() + if not current_settings.get("enable_rulebased_notifications"): url = 'wato.py?mode=edit_configvar&varname=enable_rulebased_notifications' html.show_warning( _("Warning Rule based notifications are disabled in your global settings. " @@ -10271,7 +10272,7 @@ def mode_users(phase): html.icon_button(delete_url, _("Delete"), "delete") notifications_url = folder_preserving_link([("mode", "user_notifications"), ("user", id)]) - if load_configuration_settings().get("enable_rulebased_notifications", True): + if load_configuration_settings().get("enable_rulebased_notifications"): html.icon_button(notifications_url, _("Custom notification table of this user"), "notifications") # ID @@ -10352,7 +10353,7 @@ def mode_users(phase): html.i(_("none")) # notifications - if not load_configuration_settings().get("enable_rulebased_notifications", True): + if not load_configuration_settings().get("enable_rulebased_notifications"): table.cell(_("Notifications")) if not cgs: html.i(_("not a contact")) @@ -10417,7 +10418,7 @@ def bulk_delete_users_after_confirm(users): def mode_edit_user(phase): # Check if rule based notifications are enabled (via WATO) - rulebased_notifications = load_configuration_settings().get("enable_rulebased_notifications", True) + rulebased_notifications = load_configuration_settings().get("enable_rulebased_notifications") users = userdb.load_users(lock = phase == 'action') user_id = html.get_unicode_input("edit") # missing -> new user @@ -14178,7 +14179,7 @@ def page_user_profile(change_pw=False): # WATO module due to WATO permission issues. So we cannot show this button # right now. if not change_pw: - rulebased_notifications = load_configuration_settings().get("enable_rulebased_notifications", True) + rulebased_notifications = load_configuration_settings().get("enable_rulebased_notifications") if rulebased_notifications and config.user.may('general.edit_notifications'): html.begin_context_buttons() url = "wato.py?mode=user_notifications_p"

7 years

Fixed rule base notification from werk 4796

by Sven Rueß

Module: check_mk Branch: master Commit: 0a69e78acb663d702a99ac5f522cf0aed42538a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a69e78acb663d… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Wed Jun 7 18:31:35 2017 +0200 Fixed rule base notification from werk 4796 Change-Id: I03b44cc77cce51fc5c548361a219b65a56cf7512 --- web/htdocs/wato.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3ea48d4..5c9e84b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8322,8 +8322,7 @@ def mode_notifications(phase): # Check setting of global notifications. Are they enabled? If not, display # a warning here. Note: this is a main.mk setting, so we cannot access this # directly. - current_settings = load_configuration_settings() - if not current_settings.get("enable_rulebased_notifications"): + if not load_configuration_settings().get("enable_rulebased_notifications", True): url = 'wato.py?mode=edit_configvar&varname=enable_rulebased_notifications' html.show_warning( _("Warning Rule based notifications are disabled in your global settings. " @@ -10272,7 +10271,7 @@ def mode_users(phase): html.icon_button(delete_url, _("Delete"), "delete") notifications_url = folder_preserving_link([("mode", "user_notifications"), ("user", id)]) - if load_configuration_settings().get("enable_rulebased_notifications"): + if load_configuration_settings().get("enable_rulebased_notifications", True): html.icon_button(notifications_url, _("Custom notification table of this user"), "notifications") # ID @@ -10353,7 +10352,7 @@ def mode_users(phase): html.i(_("none")) # notifications - if not load_configuration_settings().get("enable_rulebased_notifications"): + if not load_configuration_settings().get("enable_rulebased_notifications", True): table.cell(_("Notifications")) if not cgs: html.i(_("not a contact")) @@ -10418,7 +10417,7 @@ def bulk_delete_users_after_confirm(users): def mode_edit_user(phase): # Check if rule based notifications are enabled (via WATO) - rulebased_notifications = load_configuration_settings().get("enable_rulebased_notifications") + rulebased_notifications = load_configuration_settings().get("enable_rulebased_notifications", True) users = userdb.load_users(lock = phase == 'action') user_id = html.get_unicode_input("edit") # missing -> new user @@ -14179,7 +14178,7 @@ def page_user_profile(change_pw=False): # WATO module due to WATO permission issues. So we cannot show this button # right now. if not change_pw: - rulebased_notifications = load_configuration_settings().get("enable_rulebased_notifications") + rulebased_notifications = load_configuration_settings().get("enable_rulebased_notifications", True) if rulebased_notifications and config.user.may('general.edit_notifications'): html.begin_context_buttons() url = "wato.py?mode=user_notifications_p"

7 years

update for WK4709

by Andreas Boesl

Module: check_mk Branch: master Commit: c9b8e1554128e749f1850294e457b36f8d7a7399 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9b8e1554128e7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 7 18:02:21 2017 +0200 update for WK4709 Change-Id: Icb48692c61943af5b05519ca4b1c92c3a3cca1a2 --- modules/events.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/events.py b/modules/events.py index fdc6170..3aa9832 100644 --- a/modules/events.py +++ b/modules/events.py @@ -517,8 +517,8 @@ def event_match_contactgroups(rule, context): if required_groups != None: if cgn == None: - event_log("Warning: No information about contact groups in the context. " \ - "Seems that you don't use the Check_MK Microcore. ") + #event_log("Warning: No information about contact groups in the context. " \ + # "Seems that you don't use the Check_MK Microcore. ") return if cgn:

7 years

4709 FIX Notifications: Missing SERVICECONTACTGROUPNAMES/

by Andreas Boesl

HOSTCONTACTGROUPNAMES parameters no longer causes a notification not to be sent Message-ID: <593827e8.Uht/qd9iLfRHp5Ez%ab(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: e946ee5a9fca6009e47506baa3fef3740390eef0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e946ee5a9fca60… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 7 17:21:52 2017 +0200 4709 FIX Notifications: Missing SERVICECONTACTGROUPNAMES/HOSTCONTACTGROUPNAMES parameters no longer causes a notification not to be sent This werk reverts part of WK3886. The nagios core did not set the environment parameters mentioned in the topic. As a result the notifcation condition Match Contact Groups did never match and a notification was not sent. This has been changed so that this condition check is skipped, whenever this information is missing. An error scenario should always let the message through. The issue, that the nagios core does not set this environment info will be fixed in a future werk. Change-Id: If330de216270299a54f406a913e654526d540381 --- .werks/4709 | 18 ++++++++++++++++++ modules/events.py | 5 +++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.werks/4709 b/.werks/4709 new file mode 100644 index 0000000..02349b0 --- /dev/null +++ b/.werks/4709 @@ -0,0 +1,18 @@ +Title: Notifications: Missing SERVICECONTACTGROUPNAMES/HOSTCONTACTGROUPNAMES parameters no longer causes a notification not to be sent +Level: 1 +Component: notifications +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1496848680 + +This werk reverts part of WK3886. The nagios core did not set the environment parameters mentioned in the topic. +As a result the notifcation condition Match Contact Groups did never match and a notification was not sent. +This has been changed so that this condition check is skipped, whenever this information is missing. + +An error scenario should always let the message through. + + +The issue, that the nagios core does not set this environment info will be fixed in a future werk. diff --git a/modules/events.py b/modules/events.py index cfa9b8d..fdc6170 100644 --- a/modules/events.py +++ b/modules/events.py @@ -517,8 +517,9 @@ def event_match_contactgroups(rule, context): if required_groups != None: if cgn == None: - return "No information about contact groups is in the context, but " \ - "must be in group %s" % (" or ".join(required_groups)) + event_log("Warning: No information about contact groups in the context. " \ + "Seems that you don't use the Check_MK Microcore. ") + return if cgn: contactgroups = cgn.split(",")

7 years

updated werk

by Simon Betz

Module: check_mk Branch: master Commit: 172b5228cc9785580d80db20f555bc65bdac6579 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=172b5228cc9785… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jun 7 15:50:57 2017 +0200 updated werk Change-Id: Idcb7b711fc782e29487726e1e04a4d69f9d35363 --- .werks/4771 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/4771 b/.werks/4771 index 6cbb32b..47f2599 100644 --- a/.werks/4771 +++ b/.werks/4771 @@ -1,4 +1,4 @@ -Title: MKP manager: Fixed indentation error which led to invalid table with TypeError: 'NoneType' object has no attribute '__getitem__' +Title: MKP manager: Fixed broken listing of unpackaged files Level: 1 Component: multisite Class: fix @@ -8,4 +8,4 @@ State: unknown Version: 1.5.0i1 Date: 1496828212 - +Reason was an indentation error which led to invalid table with TypeError: 'NoneType' object has no attribute '__getitem__'

7 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2017