Checkmk git commits October 2016

checkmk-commits@lists.checkmk.com

10 participants
276 discussions

mail notification plugin: Fixed incorrect output in different situations

by Lars Michelsen

Module: check_mk Branch: master Commit: 68bb82c2440a25640464547e769f631b15af9c45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68bb82c2440a25… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 12 10:31:29 2016 +0200 mail notification plugin: Fixed incorrect output in different situations --- notifications/mail | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/notifications/mail b/notifications/mail index abf9026..cee120f 100755 --- a/notifications/mail +++ b/notifications/mail @@ -466,12 +466,14 @@ def send_mail_smtp(message, target, from_address, context): # the exception contains a dict of failed recipients to the respective error. since we # only have one recipient there has to be exactly one element errorcode, message = e.recipients.values()[0] + # default is to retry, these errorcodes are known to if errorcode not in [ 450, # sender address domain not found 550, # sender address unknown - ]: + ]: retry_possible = True + sys.stderr.write("mail to \"%s\" refused: %d, %s\n" % (target, errorcode, message)) except smtplib.SMTPHeloError, e: retry_possible = True # server is acting up, this may be fixed quickly @@ -487,6 +489,7 @@ def send_mail_smtp(message, target, from_address, context): except smtplib.SMTPException, e: retry_possible = True # who knows what went wrong, a retry might just work sys.stderr.write("undocumented error code from \"%s\": %s\n" % (host, str(e))) + if success: return 0 elif retry_possible: @@ -905,7 +908,7 @@ def main(): subject = context['SUBJECT'] if not mailto: # e.g. empty field in user database - sys.stdout.write("Cannot send HTML email: empty destination email address") + sys.stderr.write("Cannot send HTML email: empty destination email address\n") sys.exit(2) # Create the mail and send it @@ -915,7 +918,7 @@ def main(): try: sys.exit(send_mail(m, mailto, from_address, context)) except Exception, e: - sys.stdout.write("unhandled exception %s" % str(e)) + sys.stderr.write("Unhandled exception: %s\n" % e) # unhandled exception, don't retry this... sys.exit(2)

7 years, 11 months

mail: Add notification result message in case of sendmail

by Lars Michelsen

Module: check_mk Branch: master Commit: f93ea8d693060c9f5807155c5bab71f9e647c5cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f93ea8d693060c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 12 10:38:08 2016 +0200 mail: Add notification result message in case of sendmail --- notifications/mail | 2 ++ 1 file changed, 2 insertions(+) diff --git a/notifications/mail b/notifications/mail index cee120f..847fe4d 100755 --- a/notifications/mail +++ b/notifications/mail @@ -437,6 +437,8 @@ def send_mail_sendmail(m, target, from_address): except OSError: raise Exception("Failed to send the mail: /usr/sbin/sendmail is missing") p.communicate(m.as_string()) + + sys.stdout.write("Spooled mail to local mail transmission agent") return 0 def send_mail_smtp(message, target, from_address, context):

7 years, 11 months

3900 FIX Notification analysis: Fixed wrong color for host notification states

by Lars Michelsen

Module: check_mk Branch: master Commit: c98f4f46642d1fa89bc5e4f39a6980a3d6986316 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c98f4f46642d1f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 12 09:41:21 2016 +0200 3900 FIX Notification analysis: Fixed wrong color for host notification states --- .werks/3900 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/3900 b/.werks/3900 new file mode 100644 index 0000000..8544f55 --- /dev/null +++ b/.werks/3900 @@ -0,0 +1,9 @@ +Title: Notification analysis: Fixed wrong color for host notification states +Level: 1 +Component: notifications +Compatible: compat +Version: 1.4.0i2 +Date: 1476258068 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index d5529c5..5e4e692 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ Notifications: * 3957 mail: now allows extra HTML section between body and table + * 3900 FIX: Notification analysis: Fixed wrong color for host notification states BI: * 3955 BI rule ID can now be renamed diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0334d7e..6ccd1fb 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7923,7 +7923,7 @@ def mode_notifications(phase): else: statename = context.get("HOSTSTATE")[:4] state = context["HOSTSTATEID"] - css = "state hstate state%s" % state + css = "state hstate hstate%s" % state table.cell(_("State"), statename, css=css) elif nottype.startswith("DOWNTIME"): table.cell(_("State"))

7 years, 11 months

Fixed exception when trying to fetch graph images for HTML mails

by Lars Michelsen

Module: check_mk Branch: master Commit: 5021437be1703ee1614ba3e4a944dd3a9aef017c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5021437be1703e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 12 10:40:58 2016 +0200 Fixed exception when trying to fetch graph images for HTML mails --- web/htdocs/config.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 879aab1..95bb6cc 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -475,6 +475,10 @@ class LoggedInSuperUser(LoggedInUser): self.siteconf = {} + def load_file(self, name, deflt, lock=False): + return deflt + + class LoggedInNobody(LoggedInUser): def __init__(self): @@ -495,6 +499,10 @@ class LoggedInNobody(LoggedInUser): self.siteconf = {} + def load_file(self, name, deflt, lock=False): + return deflt + + def clear_user_login(): _set_user(LoggedInNobody())

7 years, 11 months

Added icon for notification progress/result log lines

by Lars Michelsen

Module: check_mk Branch: master Commit: bfef52f2be472f1a2d265deca2f0acb44de33f0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfef52f2be472f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 12 10:51:34 2016 +0200 Added icon for notification progress/result log lines --- web/htdocs/images/icon_alert_notify_progress.png | Bin 0 -> 4373 bytes web/htdocs/images/icon_alert_notify_result.png | Bin 0 -> 4217 bytes web/plugins/views/painters.py | 8 ++++++++ 3 files changed, 8 insertions(+) diff --git a/web/htdocs/images/icon_alert_notify_progress.png b/web/htdocs/images/icon_alert_notify_progress.png new file mode 100644 index 0000000..18d6434 Binary files /dev/null and b/web/htdocs/images/icon_alert_notify_progress.png differ diff --git a/web/htdocs/images/icon_alert_notify_result.png b/web/htdocs/images/icon_alert_notify_result.png new file mode 100644 index 0000000..58beadb Binary files /dev/null and b/web/htdocs/images/icon_alert_notify_result.png differ diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 621e086..7c5bf49 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -2312,6 +2312,14 @@ def paint_log_icon(row): img = "notify" title = _("User notification") + elif log_type.endswith("NOTIFICATION RESULT"): + img = "notify_result" + title = _("Final notification result") + + elif log_type.endswith("NOTIFICATION PROGRESS"): + img = "notify_progress" + title = _("The notification is being processed") + elif log_type == "EXTERNAL COMMAND": img = "command" title = _("External command")

7 years, 11 months

Display notification result / progress always as OK/WARN/CRIT

by Lars Michelsen

Module: check_mk Branch: master Commit: 71f9e40317f2733eb249114cb45b1b34e48bd4a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71f9e40317f273… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 12 10:55:14 2016 +0200 Display notification result / progress always as OK/WARN/CRIT --- web/plugins/views/painters.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 7c5bf49..0bd6d82 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -2213,8 +2213,8 @@ def paint_log_plugin_output(row): multisite_painters["log_plugin_output"] = { - "title" : _("Log: output of check plugin"), - "short" : _("Check output"), + "title" : _("Log: Output"), + "short" : _("Output"), "columns" : ["log_plugin_output", "log_type", "log_state_type", "log_comment" ], "paint" : paint_log_plugin_output, } @@ -2410,7 +2410,12 @@ multisite_painters["log_date"] = { def paint_log_state(row): state = row["log_state"] - if row["log_service_description"]: + + # Notification result/progress lines don't hold real states. They hold notification plugin + # exit results (0: ok, 1: temp issue, 2: perm issue). We display them as service states. + if row["log_service_description"] \ + or row["log_type"].endswith("NOTIFICATION RESULT") \ + or row["log_type"].endswith("NOTIFICATION PROGRESS"): return paint_service_state_short({"service_has_been_checked":1, "service_state" : state}) else: return paint_host_state_short({"host_has_been_checked":1, "host_state" : state}) @@ -2418,7 +2423,7 @@ def paint_log_state(row): multisite_painters["log_state"] = { "title" : _("Log: state of host/service at log time"), "short" : _("State"), - "columns" : ["log_state", "log_state_type", "log_service_description"], + "columns" : ["log_state", "log_state_type", "log_service_description", "log_type"], "paint" : paint_log_state, }

7 years, 11 months

made selection menu more user friendly

by Simon Betz

Module: check_mk Branch: master Commit: 77fbad61c5ba7df792694db6726195cf1b8f6a71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77fbad61c5ba7d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Oct 12 09:29:21 2016 +0200 made selection menu more user friendly --- web/htdocs/visuals.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index b7a4ee0..96f38f4 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -661,6 +661,8 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, ("contact_groups", _("Publish to members of contact groups"), userdb.GroupChoice( "contact", title = _("Publish to members of contact groups"), + rows = 5, + size = 40, )), ], title = _('Make this %s available for other users') % visual_type["title"]

7 years, 11 months

added some additional information to werk #3946

by Marcel Arentz

Module: check_mk Branch: master Commit: dad3df04b7d86b7f4ee15c638116bb030b9ab59d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dad3df04b7d86b… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Oct 11 17:53:47 2016 +0200 added some additional information to werk #3946 --- inventory/snmp_uptime | 4 +++- inventory/uptime | 4 +++- web/plugins/views/inventory.py | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/inventory/snmp_uptime b/inventory/snmp_uptime index 1289149..59ef36c 100644 --- a/inventory/snmp_uptime +++ b/inventory/snmp_uptime @@ -26,9 +26,11 @@ def inv_snmp_uptime(info): uptime = parse_snmp_uptime(info[0][0]) - since = time.strftime("%c", time.localtime(time.time() - float(uptime))) + current = time.time() + since = time.strftime("%c", time.localtime(current - float(uptime))) node = inv_tree("software.os.") node["since"] = since + node["last"] = time.strftime("%c", time.localtime(current)) inv_info['snmp_uptime'] = { diff --git a/inventory/uptime b/inventory/uptime index 112c4c9..8419180 100644 --- a/inventory/uptime +++ b/inventory/uptime @@ -30,9 +30,11 @@ def inv_uptime(info): uptime = float(info[0][0]) - since = time.strftime("%c", time.localtime(time.time() - float(info[0][0])) ) + current = time.time() + since = time.strftime("%c", time.localtime(current - float(info[0][0])) ) node = inv_tree("software.os.") node["since"] = since + node["last"] = time.strftime("%c", time.localtime(current)) inv_info['uptime'] = { "inv_function" : inv_uptime, diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 1cb65bb..ed31b23 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -680,7 +680,8 @@ inventory_displayhints.update({ ".software.os.service_pack" : { "title" : _("Service Pack"), "short" : _("Service Pack") }, ".software.os.service_packs:" : { "title" : _("Service Packs"), "render" : render_inv_dicttable, "keyorder" : [ "name" ] }, - ".software.os.since" : { "title" : _("Up since") }, + ".software.os.since" : { "title" : _("Up since"), }, + ".software.os.last" : { "title" : _("Last response"), }, ".software.configuration." : { "title" : _("Configuration"), }, ".software.configuration.snmp_info." : { "title" : _("SNMP Information"), }, ".software.configuration.snmp_info.contact" : { "title" : _("Contact"), },

7 years, 11 months

3946 uptime: added the uptime to inventory

by Marcel Arentz

Module: check_mk Branch: master Commit: 165d95e6fa6938a28b77f683d9a8cf208a2770d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=165d95e6fa6938… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Oct 11 17:23:33 2016 +0200 3946 uptime: added the uptime to inventory Added uptime of snmp and other agent based devices into the "Operating System" subtree. Be aware that the check interval default for the "HW/SW Inventory" is on "once per day". --- .werks/3946 | 13 +++++++++++++ ChangeLog | 1 + inventory/snmp_uptime | 37 +++++++++++++++++++++++++++++++++++++ inventory/uptime | 39 +++++++++++++++++++++++++++++++++++++++ web/plugins/views/inventory.py | 1 + 5 files changed, 91 insertions(+) diff --git a/.werks/3946 b/.werks/3946 new file mode 100644 index 0000000..7722025 --- /dev/null +++ b/.werks/3946 @@ -0,0 +1,13 @@ +Title: uptime: added the uptime to inventory +Level: 1 +Component: inv +Compatible: compat +Version: 1.4.0i2 +Date: 1476199109 +Class: feature + +Added uptime of snmp and other agent based devices into +the "Operating System" subtree. Be aware that the check +interval default for the "HW/SW Inventory" is on +"once per day". + diff --git a/ChangeLog b/ChangeLog index 26bf1e5..d5529c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,7 @@ * 3906 oracle: now version, database creation and startup time, log and open mode, logins, flashback are inventorised * 3944 Added OS related information for Cisco, Fireeye and Infoblox devices... * 3908 winperf_if, lnx_if: new inventory plugins for switch port statistics of linux and windows hosts + * 3946 uptime: added the uptime to inventory... 1.4.0i1: diff --git a/inventory/snmp_uptime b/inventory/snmp_uptime new file mode 100644 index 0000000..1289149 --- /dev/null +++ b/inventory/snmp_uptime @@ -0,0 +1,37 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2016 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. + +def inv_snmp_uptime(info): + uptime = parse_snmp_uptime(info[0][0]) + since = time.strftime("%c", time.localtime(time.time() - float(uptime))) + node = inv_tree("software.os.") + node["since"] = since + + +inv_info['snmp_uptime'] = { + "inv_function" : inv_snmp_uptime, + "includes" : [ 'uptime.include' ], +} diff --git a/inventory/uptime b/inventory/uptime new file mode 100644 index 0000000..112c4c9 --- /dev/null +++ b/inventory/uptime @@ -0,0 +1,39 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + +# Example output from agent: +# <<<uptime>>> +# 15876.96 187476.72 + +def inv_uptime(info): + uptime = float(info[0][0]) + since = time.strftime("%c", time.localtime(time.time() - float(info[0][0])) ) + node = inv_tree("software.os.") + node["since"] = since + +inv_info['uptime'] = { + "inv_function" : inv_uptime, +} diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index b720924..1cb65bb 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -680,6 +680,7 @@ inventory_displayhints.update({ ".software.os.service_pack" : { "title" : _("Service Pack"), "short" : _("Service Pack") }, ".software.os.service_packs:" : { "title" : _("Service Packs"), "render" : render_inv_dicttable, "keyorder" : [ "name" ] }, + ".software.os.since" : { "title" : _("Up since") }, ".software.configuration." : { "title" : _("Configuration"), }, ".software.configuration.snmp_info." : { "title" : _("SNMP Information"), }, ".software.configuration.snmp_info.contact" : { "title" : _("Contact"), },

7 years, 11 months

CEE: 8555 Enable local asynchronous notification delivery using mknotifyd by default

by Lars Michelsen

Module: check_mk Branch: master Commit: e30d921c1649cc7787bc9cf20931ab0e72f5f8f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e30d921c1649cc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 11 16:51:17 2016 +0200 CEE: 8555 Enable local asynchronous notification delivery using mknotifyd by default --- modules/notify.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/notify.py b/modules/notify.py index 39f8b59..e479f53 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -76,7 +76,10 @@ notification_plugin_timeout = 60 # "both" - Asynchronous local delivery plus remote forwarding # False - legacy: sync delivery (and notification_spool_to) # True - legacy: async delivery (and notification_spool_to) -notification_spooling = "off" +if cmk.is_raw_edition(): + notification_spooling = "off" +else: + notification_spooling = "local" # Legacy setting. The spool target is now specified in the # configuration of the spooler. notification_spool_to has

7 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2016