Checkmk git commits June 2016

checkmk-commits@lists.checkmk.com

8 participants
185 discussions

messages from notification scripts are now passed through to the caller ( see werk #8330)

by Sebastian Herbord

Module: check_mk Branch: master Commit: 5421c247679f9b2b3c8e5e3d5748ba90782953cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5421c247679f9b… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Jun 8 14:08:27 2016 +0200 messages from notification scripts are now passed through to the caller (see werk #8330) --- modules/notify.py | 1 + notifications/mail | 2 ++ 2 files changed, 3 insertions(+) diff --git a/modules/notify.py b/modules/notify.py index 5353e1d..fbe7ffc 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -1185,6 +1185,7 @@ def call_notification_script(plugin, plugin_context): line = p.stdout.readline() if line != '': plugin_log("Output: %s" % line.rstrip().decode('utf-8')) + sys.stdout.write(line) else: break # the stdout is closed but the return code may not be available just yet - wait for the diff --git a/notifications/mail b/notifications/mail index e282d7a..6ef6644 100755 --- a/notifications/mail +++ b/notifications/mail @@ -500,6 +500,8 @@ def send_mail_smtp_impl(message, target, host, from_address, context): # evil hack: the smtplib doesn't allow access to the reply code/message # in case of success. But we want it! + conn.last_code = 0 + conn.last_repl = "" conn.getreply = types.MethodType(getreply_wrapper, conn) if encryption == "STARTTLS":

8 years

3140 mail notification script can now optionally connect directly to a smtp server instead of using sendmail

by Sebastian Herbord

Module: check_mk Branch: master Commit: 14fc2ad2f5a0f6c5847a6b97b66cb6627e0ad4d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14fc2ad2f5a0f6… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Jun 8 13:41:50 2016 +0200 3140 mail notification script can now optionally connect directly to a smtp server instead of using sendmail Please note that as of right now, not all features of the smtp protocol are supported (i.e. non-plaintext password transmission). --- .werks/3140 | 10 ++++ ChangeLog | 1 + notifications/mail | 116 ++++++++++++++++++++++++++++++++++--- web/plugins/wato/notifications.py | 53 +++++++++++++++++ 4 files changed, 173 insertions(+), 7 deletions(-) diff --git a/.werks/3140 b/.werks/3140 new file mode 100644 index 0000000..25c2546 --- /dev/null +++ b/.werks/3140 @@ -0,0 +1,10 @@ +Title: mail notification script can now optionally connect directly to a smtp server instead of using sendmail +Level: 1 +Component: notifications +Compatible: compat +Version: 1.4.0i1 +Date: 1465385978 +Class: feature + +Please note that as of right now, not all features of the smtp protocol are supported (i.e. +non-plaintext password transmission). diff --git a/ChangeLog b/ChangeLog index 55ab7f9..33abde6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -430,6 +430,7 @@ Notifications: * 3263 Notifications: allow users to restrict by their contact groups... * 3532 Rule base notifications: Three new conditions for service groups matching... + * 3140 mail notification script can now optionally connect directly to a smtp server instead of using sendmail... * 3253 FIX: sms: notification script sms now handles single quotes in the message in the right way * 3346 FIX: Re-added envelope sender to asciimail/mail notification plugins * 3380 FIX: Fixed graphs in service notifications having spaces in service descriptions diff --git a/notifications/mail b/notifications/mail index b26c2de..e282d7a 100755 --- a/notifications/mail +++ b/notifications/mail @@ -412,11 +412,9 @@ def multipart_mail(target, subject, from_address, reply_to, content_txt, content if reply_to: m['Reply-To'] = reply_to - - return m -def send_mail(m, target, from_address): +def send_mail_sendmail(m, target, from_address): cmd = ["/usr/sbin/sendmail"] if from_address: cmd += ['-F', from_address, "-f", from_address] @@ -426,7 +424,106 @@ def send_mail(m, target, from_address): except OSError: raise Exception("Failed to send the mail: /usr/sbin/sendmail is missing") p.communicate(m.as_string()) - return True + return 0 + +def send_mail_smtp(message, target, from_address, context): + import smtplib # for the error messages + import socket + host_index = 1 + + retry_possible = False + success = False + + while not success: + host_var = 'PARAMETER_SMTP_SMARTHOSTS_%d' % host_index + if host_var not in context: + break + else: + host_index += 1 + + host = context[host_var] + try: + send_mail_smtp_impl(message, target, host, from_address, context) + success = True + except socket.timeout, e: + sys.stderr.write("timeout connecting to \"%s\": %s\n" % (host, str(e))) + except socket.gaierror, e: + sys.stderr.write("socket error connecting to \"%s\": %s\n" % (host, str(e))) + except smtplib.SMTPRecipientsRefused, e: + # 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 + sys.stderr.write("protocol error from \"%s\": %s\n" % (host, str(e))) + except smtplib.SMTPSenderRefused, e: + sys.stderr.write("server didn't accept from-address \"%s\" refused: %s\n" %\ + (from_address, str(e))) + except smtplib.SMTPAuthenticationError, e: + sys.stderr.write("authentication failed on \"%s\": %s\n" % (host, str(e))) + except smtplib.SMTPDataError, e: + retry_possible = True # unexpected error - give retry a chance + sys.stderr.write("unexpected error code from \"%s\": %s\n" % (host, str(e))) + 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: + return 1 + else: + return 2 + +def send_mail_smtp_impl(message, target, host, from_address, context): + import smtplib + import types + def getreply_wrapper(self): + self.last_code, self.last_repl = smtplib.SMTP.getreply(self) + return self.last_code, self.last_repl + + port = int(context['PARAMETER_SMTP_PORT']) + timeout = int(context['PARAMETER_SMTP_TIMEOUT']) + + encryption = context.get('PARAMETER_SMTP_ENCRYPTION', "NONE") + + if encryption == "SSL_TLS": + conn = smtplib.SMTP_SSL(host, port, from_address, timeout=timeout) + else: + conn = smtplib.SMTP(host, port, from_address, timeout=timeout) + + # evil hack: the smtplib doesn't allow access to the reply code/message + # in case of success. But we want it! + conn.getreply = types.MethodType(getreply_wrapper, conn) + + if encryption == "STARTTLS": + conn.starttls() + + if context.get('PARAMETER_SMTP_AUTH_USER') is not None: + conn.login(context['PARAMETER_SMTP_AUTH_USER'], context['PARAMETER_SMTP_AUTH_PASSWORD']) + + # this call returns a dictionary with the recipients that failed + the reason, but only + # if at least one succeeded, otherwise it throws an exception. + # since we send only one mail per call, we either get an exception or an empty dict. + + # the first parameter here is actually used in the return_path header + try: + conn.sendmail(from_address, target, message.as_string()) + sys.stdout.write("success %d - %s\n" % (conn.last_code, conn.last_repl)) + finally: + conn.quit() + +def send_mail(message, target, from_address, context): + if "PARAMETER_SMTP_PORT" in context: + return send_mail_smtp(message, target, from_address, context) + else: + return send_mail_sendmail(message, target, from_address) def fetch_pnp_data(context, params): try: @@ -786,11 +883,16 @@ def main(): sys.stdout.write("Cannot send HTML email: empty destination email address") sys.exit(2) - # Create the mail and send it from_address = context.get("PARAMETER_FROM") reply_to = context.get("PARAMETER_REPLY_TO") m = multipart_mail(mailto, subject, from_address, reply_to, content_txt, content_html, attachments) - send_mail(m, mailto, from_address) + try: + sys.exit(send_mail(m, mailto, from_address, context)) + except Exception, e: + sys.stdout.write("unhandled exception %s" % str(e)) + # unhandled exception, don't retry this... + sys.exit(2) -main() +if __name__ == "__main__": + main() diff --git a/web/plugins/wato/notifications.py b/web/plugins/wato/notifications.py index 8576f16..86832d4 100644 --- a/web/plugins/wato/notifications.py +++ b/web/plugins/wato/notifications.py @@ -115,6 +115,59 @@ register_notification_parameters( title = _("Notification sort order for bulk notifications"), default = "oldest_first" ) + ), + ('smtp', + Dictionary( + title = _("Enable synchronous delivery via SMTP"), + help = _("Configuring this to have the notification plugin connect directly to " + "the smtp server. This has the advantage of providing better error " + "messages in case of an error but it does require more configuration " + "and is strictly synchronous so we advice use only on enterprise " + "installations using the notification spooler."), + elements = [ + ("smarthosts", + ListOfStrings( + title = _("Smarthosts"), + orientation = "horizontal" + )), + ("port", + Integer( + title = _("Port"), + default_value = 25 + )), + ("auth", + Dictionary( + title = _("Authentication"), + elements = [ + ("method", + DropdownChoice( + title = _("Authmethod"), + choices = [ + ("plaintext", _("Plaintext")) + ] + )), + ("user", + TextAscii( + title = _("User") + )), + ("password", + Password( + title = _("Password") + )) + ], + optional_keys = [] + )), + ("encryption", + DropdownChoice( + title = ("Encryption"), + choices = [ + ("ssl_tls", _("SSL/TLS")), + ("starttls", _("STARTTLS")) + ] + )), + ], + optional_keys = ["auth", "encryption"] + ) ) ] )

8 years

support for nested structures when passing parameters from wato to context of notifcation plugins

by Sebastian Herbord

Module: check_mk Branch: master Commit: 3b389e2cd0562bc2f8d133392d54225e9072951c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b389e2cd0562b… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Jun 8 13:37:40 2016 +0200 support for nested structures when passing parameters from wato to context of notifcation plugins --- modules/notify.py | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index 7ef1915..5353e1d 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -1075,6 +1075,26 @@ def notify_via_email(plugin_context): # 1: Could not send now, please retry later # 2: Cannot send, retry does not make sense + +# recursively turns a python object (with lists, dictionaries and pods) containing parameters +# into a flat contextlist for use as environment variables in plugins +# +# this: { "LVL1": [{"VALUE": 42}, {"VALUE": 13}] } +# would be added as: +# PARAMETER_LVL1_1_VALUE = 42 +# PARAMETER_LVL1_2_VALUE = 13 +def add_to_context(plugin_context, prefix, param): + if isinstance(param, list): + plugin_context[prefix + "S"] = " ".join(param) + for nr, value in enumerate(param): + add_to_context(plugin_context, "%s_%d" % (prefix, nr + 1), value) + elif isinstance(param, dict): + for key, value in param.items(): + add_to_context(plugin_context, "%s_%s" % (prefix, key.upper()), value) + else: + plugin_context[prefix] = plugin_param_to_string(param) + + # Add the plugin parameters to the envinroment. We have two types of parameters: # - list, the legacy style. This will lead to PARAMETERS_1, ... # - dict, the new style for scripts with WATO rule. This will lead to @@ -1083,13 +1103,8 @@ def create_plugin_context(raw_context, params): plugin_context = {} plugin_context.update(raw_context) # Make a real copy - if type(params) == list: - plugin_context["PARAMETERS"] = " ".join(params) - for nr, param in enumerate(params): - plugin_context["PARAMETER_%d" % (nr + 1)] = param - else: - for key, value in params.items(): - plugin_context["PARAMETER_" + key.upper()] = plugin_param_to_string(value) + add_to_context(plugin_context, "PARAMETER", params) + return plugin_context

8 years

Fixed version number in werks: 1.2.9i1 => 1.4.0i1.

by Sven Panne

8 years

3643 FIX Fixed check_mkevents active check.

by Sven Panne

Module: check_mk Branch: master Commit: 9f976aab568b4680d5bee7306dc7fd60353cdef5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f976aab568b46… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jun 8 11:31:15 2016 +0200 3643 FIX Fixed check_mkevents active check. check_mkevents didn't make sure that the whole request was sent. Furthermore, it didn't shutdown the socket after sending the request. This (or sending an empty line) is necessary in recent versions of mkeventd. --- .werks/3643 | 11 +++++++++++ ChangeLog | 1 + doc/treasures/active_checks/check_mkevents.cc | 21 +++++++++++++++++++-- doc/treasures/active_checks/check_mkevents.py | 3 ++- 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/.werks/3643 b/.werks/3643 new file mode 100644 index 0000000..a5ae21b --- /dev/null +++ b/.werks/3643 @@ -0,0 +1,11 @@ +Title: Fixed check_mkevents active check. +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1465378101 +Class: fix + +check_mkevents didn't make sure that the whole request was sent. Furthermore, +it didn't shutdown the socket after sending the request. This (or sending an +empty line) is necessary in recent versions of mkeventd. diff --git a/ChangeLog b/ChangeLog index e3233eb..2c78140 100644 --- a/ChangeLog +++ b/ChangeLog @@ -262,6 +262,7 @@ * 3540 FIX: Fixed exception on reading cachefiles... * 3541 FIX: esx_vsphere_hostsystem.state: no longer crashes when data is missing... * 3590 FIX: mssql.vbs: Completely removed plugin timeout... + * 3643 FIX: Fixed check_mkevents active check.... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/doc/treasures/active_checks/check_mkevents.cc b/doc/treasures/active_checks/check_mkevents.cc index 848d81a..6506a84 100644 --- a/doc/treasures/active_checks/check_mkevents.cc +++ b/doc/treasures/active_checks/check_mkevents.cc @@ -214,8 +214,25 @@ int main(int argc, char** argv) } // Send message - ssize_t length = write(sock, query_message.c_str(), query_message.length()); - (void)length; // Make GCC happy + { + const char *buffer = query_message.c_str(); + size_t bytes_to_write = query_message.size(); + while (bytes_to_write > 0) { + ssize_t bytes_written = write(sock, buffer, bytes_to_write); + if (bytes_written == -1) { + printf("UNKNOWN - Cannot send query to event daemon via TCP %s:%d (%s)\n", + remote_hostipaddress, remote_port, strerror(errno)); + exit(3); + } + buffer += bytes_written; + bytes_to_write -= bytes_written; + } + if (shutdown(sock, SHUT_WR) == -1) { + printf("UNKNOWN - Cannot shutdown socket to event daemon via TCP %s:%d (%s)\n", + remote_hostipaddress, remote_port, strerror(errno)); + exit(3); + } + } // Get response char response_chunk[4096]; diff --git a/doc/treasures/active_checks/check_mkevents.py b/doc/treasures/active_checks/check_mkevents.py index c28bf5e..ad1d540 100755 --- a/doc/treasures/active_checks/check_mkevents.py +++ b/doc/treasures/active_checks/check_mkevents.py @@ -52,7 +52,8 @@ def query(query, remote_host): sock.settimeout(3) sock.connect(socket_path) - sock.send(query) + sock.sendall(query) + sock.shutdown(socket.SHUT_WR) response_text = "" while True:

8 years

Reserved 10 Werk IDS

by Sven Panne

Module: check_mk Branch: master Commit: 67b9e2ff9c8d001e8c2ac792ecf283ab7158c3fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67b9e2ff9c8d00… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jun 8 11:28:08 2016 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 6372ab1..799c771 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3643 +3653

8 years

Host inventory API: XML output is now pretty printed

by Lars Michelsen

Module: check_mk Branch: master Commit: f3b593940de3d43181d8cefdea35cdf20de14660 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3b593940de3d4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 8 08:52:59 2016 +0200 Host inventory API: XML output is now pretty printed --- web/htdocs/inventory.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web/htdocs/inventory.py b/web/htdocs/inventory.py index 69e5ff6..7496ce8 100644 --- a/web/htdocs/inventory.py +++ b/web/htdocs/inventory.py @@ -344,7 +344,12 @@ def write_xml(response): raise MKGeneralException(_("You need to have the \"dicttoxml\" python module installed to " "be able to use the XML format.")) - html.write(dicttoxml.dicttoxml(response)) + unformated_xml = dicttoxml.dicttoxml(response) + + from xml.dom.minidom import parseString + dom = parseString(unformated_xml) + + html.write(dom.toprettyxml()) def write_json(response):

8 years

typos fixed

by Sebastian Herbord

Module: check_mk Branch: master Commit: 7ff4313434bb124a84c85e1a3a7f64adbe75c769 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ff4313434bb12… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Jun 7 16:39:55 2016 +0200 typos fixed --- modules/events.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/events.py b/modules/events.py index 8b38934..bfdbadf 100644 --- a/modules/events.py +++ b/modules/events.py @@ -438,7 +438,7 @@ def event_match_contactgroups(rule, context): if required_groups != None: if cgn == None: notify_log("Warning: No information about contact groups in the context. " \ - "Seams that you don't use the Check_MK Microcore. ") + "Seems that you don't use the Check_MK Microcore. ") return if cgn: contactgroups = cgn.split(",") @@ -495,7 +495,7 @@ def event_match_services(rule, context): servicelist = rule["match_services"] service = context["SERVICEDESC"] if not in_extraconf_servicelist(servicelist, service): - return "The service's description '%s' dows not match by the list of " \ + return "The service's description '%s' does not match by the list of " \ "allowed services (%s)" % (service, ", ".join(servicelist))

8 years

Fetched Livestatus from downstream.

by Sven Panne

8 years

diskstat: Corrected manpage

by Konstantin Büttner

Module: check_mk Branch: master Commit: 3e6308b6363a7e5ae3ad0679260537c7e0c75778 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e6308b6363a7e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Jun 7 15:32:39 2016 +0200 diskstat: Corrected manpage --- checkman/diskstat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/diskstat b/checkman/diskstat index 292d5b3..dd5e6a6 100644 --- a/checkman/diskstat +++ b/checkman/diskstat @@ -7,7 +7,7 @@ description: This check measures the throughput of block devices (disks) on Linux hosts. You can either have a single check for every single disk - (which is the default) or a summary check summing up the throughput + or a summary check (which is the default) summing up the throughput of all disks. For legacy reasons it is also possible (but not advisable) to have all disks

8 years

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2016