Checkmk git commits April 2013

checkmk-commits@lists.checkmk.com

3 participants
237 discussions

Check_MK Git: check_mk: Little speedup of check_mk --notify

by Andreas Boesl

Module: check_mk Branch: master Commit: b320956522927bdfb773b4763cce66ec6a5bc1a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b320956522927b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Apr 5 10:59:46 2013 +0200 Little speedup of check_mk --notify --- ChangeLog | 1 + modules/check_mk.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8818697..a5f9027 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,7 @@ Notifications: * FIX: Removing GRAPH_CODE in html mails when not available * Using plugin argument 1 for path to pnp4nagios index php to render graphs + * Little speedup of check_mk --notify Multisite: * FIX: Fixed umlaut handling in reloaded snapins diff --git a/modules/check_mk.py b/modules/check_mk.py index 0b1211e..7e8e257 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4816,7 +4816,7 @@ if __name__ == "__main__": "man", "nowiki", "config-check", "backup=", "restore=", "check-inventory=", "paths", "cleanup-autochecks", "checks=" ] - non_config_options = ['-L', '--list-checks', '-P', '--package', '-M', + non_config_options = ['-L', '--list-checks', '-P', '--package', '-M', '--notify', '--man', '-V', '--version' ,'-h', '--help', '--automation', ] try: @@ -4968,6 +4968,7 @@ if __name__ == "__main__": do_automation(a, args) done = True elif o == '--notify': + read_config_files(False, True) sys.exit(do_notify(args)) except MKGeneralException, e:

11 years, 2 months

Check_MK Git: check_mk: Improved html mail implementation - now working in non omd environments

by Lars Michelsen

Module: check_mk Branch: master Commit: 64a744177da6020904b4f14d415f9d5bf683cc5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64a744177da602… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 5 10:31:19 2013 +0200 Improved html mail implementation - now working in non omd environments Conflicts: modules/notify.py --- ChangeLog | 4 ++++ modules/notify.py | 14 +++++++------- notifications/mail | 15 +++++++++++---- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 056b979..8818697 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,6 +91,10 @@ * Added $HOSTURL$ and $SERVICEURL$ to notification macros which contain an URL to the host/service details views with /check_mk/... as base. + Notifications: + * FIX: Removing GRAPH_CODE in html mails when not available + * Using plugin argument 1 for path to pnp4nagios index php to render graphs + Multisite: * FIX: Fixed umlaut handling in reloaded snapins diff --git a/modules/notify.py b/modules/notify.py index 90ffef5..6b4cdc0 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -341,18 +341,18 @@ def do_notify(args): context["WHAT"] = context.get("SERVICEDESC") and "SERVICE" or "HOST" context["MAIL_COMMAND"] = notification_mail_command - context['HOSTURL'] = '/check_mk/view.py?view_name=hoststatus&host=%s' % urlencode(context['HOSTNAME']) - if context['WHAT'] == 'SERVICE': - context['SERVICEURL'] = '/check_mk/view.py?view_name=service&host=%s&service=%s' % \ - (urlencode(context['HOSTNAME']), urlencode(context['SERVICEDESC'])) - # Handle interactive calls if mode == 'fake-service': set_fake_env('service', context) - sys.exit(call_notification_script(plugin, [], context, True)) - elif mode == 'fake-host': set_fake_env('host', context) + + context['HOSTURL'] = '/check_mk/view.py?view_name=hoststatus&host=%s' % urlencode(context['HOSTNAME']) + if context['WHAT'] == 'SERVICE': + context['SERVICEURL'] = '/check_mk/view.py?view_name=service&host=%s&service=%s' % \ + (urlencode(context['HOSTNAME']), urlencode(context['SERVICEDESC'])) + + if mode in [ 'fake-service', 'fake_host' ]: sys.exit(call_notification_script(plugin, [], context, True)) if 'LASTHOSTSTATECHANGE' in context: diff --git a/notifications/mail b/notifications/mail index 501d490..37d09cb 100755 --- a/notifications/mail +++ b/notifications/mail @@ -315,11 +315,16 @@ def send_mail(m, target): def fetch_pnp_data(context, params): try: - prefix_url = "%s/share" % context['OMD_ROOT'] + # Autodetect the path in OMD environments + path = "%s/share/pnp4nagios/htdocs/index.php" % context['OMD_ROOT'] except: - # Non-omd environment - prefix_url = "" - return os.popen('REMOTE_USER="%s" php %s/pnp4nagios/htdocs/index.php "%s"' % (context['CONTACTNAME'], prefix_url, params)).read() + # Non-omd environment - use plugin argument 1 + path = context['PARAMETER_1'] + + if not os.path.exists(path): + raise GraphException('Unable to locate pnp4nagios index.php (%s)' % path) + + return os.popen('REMOTE_USER="%s" php %s "%s"' % (context['CONTACTNAME'], path, params)).read() def fetch_num_sources(context): svc_desc = context['WHAT'] == 'HOST' and '_HOST_' or context['SERVICEDESC'] @@ -383,6 +388,8 @@ def main(): '<tr><th colspan=2>Graphs</th></tr>' '<tr class="data even0"><td colspan=2 class=graphs>%s</td></tr>' % graph_code ) + else: + context['GRAPH_CODE'] = '' # Compute the subject of the mail if context['WHAT'] == 'HOST':

11 years, 2 months

Check_MK Git: check_mk: Added tcp port parameter to SSL certificate check ( Thanks to Marcel Schulte)

by Lars Michelsen

Module: check_mk Branch: master Commit: 6ca432ee391a350c6c6ccc4a35c100d9af6887aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ca432ee391a35… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 5 08:48:58 2013 +0200 Added tcp port parameter to SSL certificate check (Thanks to Marcel Schulte) --- ChangeLog | 3 ++ web/plugins/wato/active_checks.py | 42 ++++++++++++++++++++++--------------- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8969ac7..056b979 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,9 @@ Multisite: * FIX: Fixed umlaut handling in reloaded snapins + WATO: + * Added tcp port parameter to SSL certificate check (Thanks to Marcel Schulte) + 1.2.2b7: Checks & Agents: * FIX: postfix_mailq: fix labels in WATO rule, set correct default levels diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 56d8d7e..2e8a13b 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -465,23 +465,31 @@ register_rule(group, Dictionary( title = _("Check SSL Certificate Age"), elements = [ - ( "cert_days", - Integer( - title = _("Age"), - help = _("Minimum number of days a certificate has to be valid. " - "Port defaults to 443. When this option is used the URL " - "is not checked."), - unit = _("days"), - ) - ), - ( "cert_host", - TextAscii( - title = _("Check Cerficate on diffrent IP/ DNS Name"), - help = _("For each SSL cerficate on a host, a diffrent IP address is needed. " - "Here you can specify there address if it differs from the " - "address from the host primary address."), - ) - ), + ( "cert_days", + Integer( + title = _("Age"), + help = _("Minimum number of days a certificate has to be valid. " + "Port defaults to 443. When this option is used the URL " + "is not checked."), + unit = _("days"), + ) + ), + ( "cert_host", + TextAscii( + title = _("Check Cerficate on diffrent IP/ DNS Name"), + help = _("For each SSL cerficate on a host, a diffrent IP address is needed. " + "Here you can specify there address if it differs from the " + "address from the host primary address."), + ) + ), + ("port", + Integer( + title = _("TCP Port"), + minvalue = 1, + maxvalue = 65535, + default_value = 443, + ) + ), ], required_keys = [ "cert_days" ], ),

11 years, 2 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 25373773ca0d1611a310f1c398d6bb820f41b769 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25373773ca0d16… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 5 10:32:13 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 2 months

Check_MK Git: check_mk: Updated bug entries #0824, #0886

by Mathias Kettner

Module: check_mk Branch: master Commit: 161bf6e98ad2c85680a7df8d8ce899250c2b399a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=161bf6e98ad2c8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 4 17:30:41 2013 +0200 Updated bug entries #0824, #0886 --- .bugs/824 | 7 +++++-- .bugs/886 | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.bugs/824 b/.bugs/824 index 12091c7..30776db 100644 --- a/.bugs/824 +++ b/.bugs/824 @@ -1,9 +1,9 @@ Title: auth.serials are not created in manual installations Component: core -State: open +Class: todo +State: done Date: 2013-01-24 17:36:24 Targetversion: 1.2.2 -Class: todo Hello, @@ -23,3 +23,6 @@ Wolfgang Resolution: We do not try to create this file but assume a serial number of 0 for all users in case that file is missing. + +2013-04-04 17:30:01: changed state open -> done +Sollte jetzt klappen. diff --git a/.bugs/886 b/.bugs/886 index d1aa9e9..042b33a 100644 --- a/.bugs/886 +++ b/.bugs/886 @@ -1,9 +1,9 @@ Title: Manual installion of EC without OMD Component: docu -State: open +Class: todo +State: done Date: 2013-01-24 16:46:23 Targetversion: 1.2.3 -Class: todo ch versuche mich gerade an der Event Console (mkeventd). Ich habe jedoch massive Probleme in einer nicht OMD Umgebung. @@ -96,3 +96,6 @@ Wäre toll wenn man die Umgehungslösungen in mkevent einpflegen könnte. Versionsinfos: CentOS 6.2 check_MK 1.2.1i4 + +2013-04-04 17:29:40: changed state open -> done +Ist inzwischen in setup.py integriert.

11 years, 2 months

Check_MK Git: check_mk: Fix problem where left-over tables from previous request appeared

by Mathias Kettner

Module: check_mk Branch: master Commit: f06ff4ed89f6197737f7b7c44a2ee85c4b34a713 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f06ff4ed89f619… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 4 16:08:46 2013 +0200 Fix problem where left-over tables from previous request appeared --- web/htdocs/table.py | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 6a4e58f..c8d833b 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -34,9 +34,6 @@ row_css = None def begin(title=None, **kwargs): global table, mode, next_func - if table: - end() - table = { "title": title, "headers" : [],

11 years, 2 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: ceea47bf615808fe10986f6c54fc8c7d86e42654 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ceea47bf615808… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 4 16:08:50 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 2 months

Check_MK Git: check_mk: FIX: Fixed umlaut handling in reloaded snapins

by Lars Michelsen

Module: check_mk Branch: master Commit: 8db0831e0318c7b230aedb774bdd1826b98b311e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8db0831e0318c7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 4 15:39:15 2013 +0200 FIX: Fixed umlaut handling in reloaded snapins --- ChangeLog | 3 +++ web/htdocs/sidebar.py | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 960f1b5..8969ac7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,6 +91,9 @@ * Added $HOSTURL$ and $SERVICEURL$ to notification macros which contain an URL to the host/service details views with /check_mk/... as base. + Multisite: + * FIX: Fixed umlaut handling in reloaded snapins + 1.2.2b7: Checks & Agents: * FIX: postfix_mailq: fix labels in WATO rule, set correct default levels diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 48e16ae..85932ea 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -309,7 +309,7 @@ def ajax_snapin(): snapin["render"]() except Exception, e: snapin_exception(e) - snapin_code.append(html.drain()) + snapin_code.append(html.drain().encode('utf-8')) html.unplug() html.write(repr(snapin_code))

11 years, 2 months

Check_MK Git: check_mk: notifications: Added new macros to help text

by Lars Michelsen

Module: check_mk Branch: master Commit: cf790a1580afdf970b385e2af7dc7aa135e417e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf790a1580afdf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 4 15:29:44 2013 +0200 notifications: Added new macros to help text --- web/plugins/wato/globals_notification.py | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/web/plugins/wato/globals_notification.py b/web/plugins/wato/globals_notification.py index c9f60fa..9b9950f 100644 --- a/web/plugins/wato/globals_notification.py +++ b/web/plugins/wato/globals_notification.py @@ -116,10 +116,11 @@ register_configvar(group, "<tt>$LONGSERVICEOUTPUT$</tt>: the long output of the check command, " "<tt>$SERVICEPERFDATA$</tt>: the performance data of the check, " "<tt>$SERVICECHECKCOMMAND$</tt>: the name of the service check command, " - "<tt>HOSTPROBLEMID</tt>: a unique ID of the host problem this notification is about, " - "<tt>SERVICEPROBLEMID</tt>: the same for service problems, " - "<tt>HOSTNOTIFICATIONNUMBER</tt>: the number of notification of this host problem (begins with 1), " - "<tt>SERVICENOTIFICATIONNUMBER</tt>: same for service problems, " + "<tt>$HOSTPROBLEMID$</tt>: a unique ID of the host problem this notification is about, " + "<tt>$SERVICEPROBLEMID$</tt>: the same for service problems, " + "<tt>$HOSTNOTIFICATIONNUMBER$</tt>: the number of notification of this host problem (begins with 1), " + "<tt>$HOSTURL$</tt>: URL pointing to the host detail view (starting with /check_mk/...), " + "<tt>$SERVICEURL$</tt>: URL pointing to the service detail view (starting with /check_mk/...), " " " "<tt>$MONITORING_HOST$</tt>: the host name of the monitoring server " "<tt>$OMD_ROOT$</tt>: the home directory of the OMD site (only on OMD) "

11 years, 2 months

Check_MK Git: check_mk: Another attribute encoding fix for log contents

by Lars Michelsen

Module: check_mk Branch: master Commit: 403b4f5f13dc167ecd907eef44b8518f9675b040 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=403b4f5f13dc16… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 4 14:48:06 2013 +0200 Another attribute encoding fix for log contents --- web/plugins/views/painters.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 08368f0..6af4787 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1553,7 +1553,7 @@ multisite_painters["log_message"] = { "title" : _("Log: complete message"), "short" : _("Message"), "columns" : ["log_message"], - "paint" : lambda row: ("", row["log_message"]), + "paint" : lambda row: ("", htmllib.attrencode(row["log_message"])), } def paint_log_plugin_output(row): @@ -1648,14 +1648,14 @@ multisite_painters["log_options"] = { "title" : _("Log: informational part of message"), "short" : _("Info"), "columns" : ["log_options"], - "paint" : lambda row: ("", row["log_options"]), + "paint" : lambda row: ("", htmllib.attrencode(row["log_options"])), } def paint_log_comment(msg): if ';' in msg: parts = msg.split(';') if len(parts) > 6: - return ("", parts[-1]) + return ("", htmllib.attrencode(parts[-1])) return ("", "") multisite_painters["log_comment"] = {

11 years, 2 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2013