Checkmk git commits January 2013

checkmk-commits@lists.checkmk.com

3 participants
210 discussions

Check_MK Git: check_mk: Cleaned up changelog ; added sanity check for waitmax binary

by Lars Michelsen

Module: check_mk Branch: master Commit: a123ed8c53bebbb12edfcfb2fdbd45b7b4c51da3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a123ed8c53bebb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 18 14:37:10 2013 +0100 Cleaned up changelog ; added sanity check for waitmax binary --- ChangeLog | 1 - Makefile | 4 ++++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67d37f1..060d160 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,7 +23,6 @@ * kernel.util: add "Average" information to PNP graph * Windows Agent: Fix startup crash on adding a logfiles pattern, but no logfile specified * Windows Agent: check_mk.example.ini: commented logfiles section - Multisite: * FIX: Fixed rendering of dashboard globes in opera diff --git a/Makefile b/Makefile index 9b171e9..566c7b8 100644 --- a/Makefile +++ b/Makefile @@ -57,6 +57,10 @@ help: dist: mk-livestatus mk-eventd @echo "--------------------------------------------------------------------------" @echo -n "Checking permissions... with find -not -perm -444..." && [ -z "$$(find -not -perm -444)" ] && echo OK + if [ -z "$(SKIP_SANITY_CHECKS)" ]; then \ + echo -n "Checking precompiled binaries..." && file agents/waitmax | grep 32-bit >/dev/null && echo OK ; \ + fi + @echo "Making $(DISTNAME)" rm -rf $(DISTNAME) mkdir -p $(DISTNAME)

11 years, 5 months

Check_MK Git: check_mk: Added mail command to notify env macros

by Lars Michelsen

Module: check_mk Branch: master Commit: 3f14b643a69949665f66bb4760c1f467ea30b2be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f14b643a69949… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 18 14:16:13 2013 +0100 Added mail command to notify env macros --- ChangeLog | 2 +- modules/notify.py | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a5af39..67d37f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,7 +52,7 @@ * Added valuespec for cisco_mem check to configure thresholds via WATO * FIX: Fixed displaying of tag selections when creating a rule in the ruleeditor * FIX: Rulesets are always cloned in the same folder - * Flexibile notifications: removed "debug notification" script from GUI (you make it + * Flexibile notifications: removed "debug notification" script from GUI (you can make it executable to be choosable again) * Flexibile notifications: added plain mail notification which uses the mail templates from global settings dialog diff --git a/modules/notify.py b/modules/notify.py index db92845..4cedf1e 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -85,24 +85,16 @@ test_vars = { 'NOTIFY_HOSTSTATE': 'DOWN', 'NOTIFY_HOSTTAGS': 'cmk-agent prod lan tcp wato /wato/', 'NOTIFY_LASTHOSTSTATE': 'UP', - 'NOTIFY_LASTSERVICESTATE': '$LASTSERVICESTATE$', 'NOTIFY_LOGDIR': '/omd/sites/event/var/check_mk/notify', 'NOTIFY_LONGDATETIME': 'Thu Jan 17 15:28:13 CET 2013', 'NOTIFY_LONGHOSTOUTPUT': '', - 'NOTIFY_LONGSERVICEOUTPUT': '$LONGSERVICEOUTPUT$', 'NOTIFY_NOTIFICATIONTYPE': 'PROBLEM', 'NOTIFY_PARAMETERS': '', - 'NOTIFY_SERVICECHECKCOMMAND': '$SERVICECHECKCOMMAND$', - 'NOTIFY_SERVICEDESC': '$SERVICEDESC$', - 'NOTIFY_SERVICENOTIFICATIONNUMBER': '$SERVICENOTIFICATIONNUMBER$', - 'NOTIFY_SERVICEOUTPUT': '$SERVICEOUTPUT$', - 'NOTIFY_SERVICEPERFDATA': '$SERVICEPERFDATA$', - 'NOTIFY_SERVICEPROBLEMID': '$SERVICEPROBLEMID$', - 'NOTIFY_SERVICESTATE': '$SERVICESTATE$', 'NOTIFY_SHORTDATETIME': '2013-01-17 15:28:13', 'NOTIFY_WHAT': 'HOST', 'NOTIFY_OMD_ROOT': '/omd/sites/event', 'NOTIFY_OMD_SITE': 'event', + 'NOTIFY_MAIL_COMMAND': 'mail -s \'$SUBJECT$\' \'$CONTACTEMAIL$\'', }, 'service': { 'NOTIFY_CONTACTEMAIL': 'lm(a)mathias-kettner.de', @@ -139,6 +131,7 @@ test_vars = { 'NOTIFY_WHAT': 'SERVICE', 'NOTIFY_OMD_ROOT': '/omd/sites/event', 'NOTIFY_OMD_SITE': 'event', + 'NOTIFY_MAIL_COMMAND': 'mail -s \'$SUBJECT$\' \'$CONTACTEMAIL$\'', }, } @@ -229,6 +222,7 @@ def do_notify(args): context["OMD_SITE"] = os.getenv("OMD_SITE", "") context["WHAT"] = "SERVICEDESC" in context and "SERVICE" or "HOST" + context["MAIL_COMMAND"] = notification_mail_command # Handle interactive calls if mode == 'fake-service': @@ -377,7 +371,7 @@ def call_notification_script(plugin, parameters, context): os.putenv("NOTIFY_PARAMETER_%d" % (nr + 1), value) os.putenv("NOTIFY_LOGDIR", notification_logdir) - for key in [ 'WHAT', 'OMD_ROOT', 'OMD_SITE' ]: + for key in [ 'WHAT', 'OMD_ROOT', 'OMD_SITE', 'MAIL_COMMAND' ]: if key in context: os.putenv('NOTIFY_' + key, context[key])

11 years, 5 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: b3d19e17f1570593847341d5ce23eb6f096b17af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3d19e17f15705… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 18 11:53:56 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0876

by Lars Michelsen

Module: check_mk Branch: master Commit: 415c62ced637683e1b7635ed45eb25c801258371 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=415c62ced63768… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 18 11:53:53 2013 +0100 Updated bug entries #0876 --- .bugs/876 | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/.bugs/876 b/.bugs/876 new file mode 100644 index 0000000..0ddf177 --- /dev/null +++ b/.bugs/876 @@ -0,0 +1,13 @@ +Title: Notification form broken after personal settings editing +Component: wato +State: open +Date: 2013-01-18 11:50:32 +Targetversion: 1.2.2 +Class: bug + +When editing the personal settings while being permitted to edit the custom notifications, +the shown data seems to be broken after submission. For example the title of a custom +notification is set to "Notify by: (no title)" instead of the correct title. + +It seems that the CascadingDropdown (and maybe also ListOf) do not use the "value" provided +to the render_input() method. Instead of it they try to fetch the infos from html.var.

11 years, 5 months

Check_MK Git: check_mk: Improved flexible notification handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 3f4963b9a941b7f6319a8d09db65b02518781981 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f4963b9a941b7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 18 11:28:27 2013 +0100 Improved flexible notification handling * Flexibile notifications: removed "debug notification" script from GUI (you can make it executable to be choosable again) * Flexibile notifications: added plain mail notification which uses the mail templates from global settings dialog --- ChangeLog | 4 ++++ modules/notify.py | 5 ++++- web/htdocs/wato.py | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 938a009..8a5af39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,6 +52,10 @@ * Added valuespec for cisco_mem check to configure thresholds via WATO * FIX: Fixed displaying of tag selections when creating a rule in the ruleeditor * FIX: Rulesets are always cloned in the same folder + * Flexibile notifications: removed "debug notification" script from GUI (you make it + executable to be choosable again) + * Flexibile notifications: added plain mail notification which uses the + mail templates from global settings dialog BI: * Added FOREACH_SERVICE capability to leaf nodes diff --git a/modules/notify.py b/modules/notify.py index 5ca0b87..db92845 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -364,7 +364,10 @@ def notify_flexible(contact, context, notification_table): notify_log(" - Skipping: time period %s is currently not active" % timeperiod) continue - call_notification_script(plugin, entry.get("parameters", []), context) + if plugin is None: + notify_via_email(context) + else: + call_notification_script(plugin, entry.get("parameters", []), context) def call_notification_script(plugin, parameters, context): diff --git a/notifications/debug b/notifications/debug old mode 100755 new mode 100644 diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5254540..fae9b2c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7596,6 +7596,7 @@ def load_notification_scripts(): except: pass choices = scripts.items() + choices.append((None, _("Plain Text Email (using configured templates)"))) choices.sort(cmp = lambda a,b: cmp(a[1], b[1])) return choices @@ -7608,7 +7609,7 @@ vs_notification_method = \ CascadingDropdown( title = _("Notification Method"), choices = [ - ( "email", _("Send Email") ), + ( "email", _("Plain Text Email (using configured templates)") ), ( "flexible", _("Flexible Custom Notifications"), ListOf(

11 years, 5 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: 619effc6fdec6c123dad5bc0c481aef34b0ba3d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=619effc6fdec6c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 18 10:43:09 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 5 months

Check_MK Git: check_mk: Hopefully fix compile problem with diet on some distros

by Mathias Kettner

Module: check_mk Branch: master Commit: b8e7a196deea3038a90e6f4b2c43daf6330da86d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8e7a196deea30… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 18 10:43:04 2013 +0100 Hopefully fix compile problem with diet on some distros --- livestatus/src/Makefile.am | 4 ++-- livestatus/src/strutil.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index b498b67..ef95b9f 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -26,7 +26,7 @@ bin_PROGRAMS = unixcat livecheck unixcat_SOURCES = unixcat.c unixcat_LDADD = -lpthread -livecheck_SOURCES = livecheck.c strutil.cc check_icmp.c +livecheck_SOURCES = livecheck.c strutil.c check_icmp.c pkglib_LIBRARIES = livestatus.so @@ -52,7 +52,7 @@ livestatus_so_SOURCES = \ global_counters.c module.c logger.c waittriggers.c TimeperiodsCache.cc pnp4nagios.cc \ ContactgroupsColumn.cc opids.cc auth.cc livechecking.c -livecheck$(EXEEXT): livecheck.c strutil.cc check_icmp.c +livecheck$(EXEEXT): livecheck.c strutil.c check_icmp.c if HAVE_DIET diet -v $(CC) -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -s -o $@ $^ else diff --git a/livestatus/src/strutil.c b/livestatus/src/strutil.c new file mode 120000 index 0000000..82ed8f1 --- /dev/null +++ b/livestatus/src/strutil.c @@ -0,0 +1 @@ +strutil.cc \ No newline at end of file

11 years, 5 months

Check_MK Git: check_mk: FIX: Re-added an empty file as auth.py (wato plugin ) to prevent problems during update

by Lars Michelsen

Module: check_mk Branch: master Commit: 985613e33c60c598ef7d6e818d1c0f8a27daf32a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=985613e33c60c5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 18 10:12:54 2013 +0100 FIX: Re-added an empty file as auth.py (wato plugin) to prevent problems during update --- ChangeLog | 1 + modules/notify.py | 11 ++++++++++- web/plugins/wato/auth.py | 4 ++++ 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4f92314..938a009 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,7 @@ * LDAP: Improved error handling in case of misconfigurations * LDAP: Reduced number of ldap querys during a single page request / sync process * LDAP: Implemnted some kind of debug logging for LDAP communication + * FIX: Re-added an empty file as auth.py (wato plugin) to prevent problems during update WATO: * CPU load ruleset does now accept float values diff --git a/modules/notify.py b/modules/notify.py index 989d3bb..5ca0b87 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -100,6 +100,9 @@ test_vars = { 'NOTIFY_SERVICEPROBLEMID': '$SERVICEPROBLEMID$', 'NOTIFY_SERVICESTATE': '$SERVICESTATE$', 'NOTIFY_SHORTDATETIME': '2013-01-17 15:28:13', + 'NOTIFY_WHAT': 'HOST', + 'NOTIFY_OMD_ROOT': '/omd/sites/event', + 'NOTIFY_OMD_SITE': 'event', }, 'service': { 'NOTIFY_CONTACTEMAIL': 'lm(a)mathias-kettner.de', @@ -133,6 +136,9 @@ test_vars = { 'NOTIFY_SERVICEPROBLEMID': '137', 'NOTIFY_SERVICESTATE': 'CRITICAL', 'NOTIFY_SHORTDATETIME': '2013-01-17 15:31:46', + 'NOTIFY_WHAT': 'SERVICE', + 'NOTIFY_OMD_ROOT': '/omd/sites/event', + 'NOTIFY_OMD_SITE': 'event', }, } @@ -367,7 +373,10 @@ def call_notification_script(plugin, parameters, context): for nr, value in enumerate(parameters): os.putenv("NOTIFY_PARAMETER_%d" % (nr + 1), value) os.putenv("NOTIFY_LOGDIR", notification_logdir) - os.putenv("NOTIFY_WHAT", context['WHAT']) + + for key in [ 'WHAT', 'OMD_ROOT', 'OMD_SITE' ]: + if key in context: + os.putenv('NOTIFY_' + key, context[key]) # Remove service macros for host notifications if context['WHAT'] == 'HOST': diff --git a/web/plugins/wato/auth.py b/web/plugins/wato/auth.py new file mode 100644 index 0000000..3e12ec2 --- /dev/null +++ b/web/plugins/wato/auth.py @@ -0,0 +1,4 @@ +# The auth.php was shipped by default in previos versions. It has +# been removed with 1.2.1i4. To prevent problems during update, +# this dummy file is shipped which overwrites the existing file +# and invalidates it. This can be removed in later versions.

11 years, 5 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: a1da68c773d3dd122e8047b683a0bb734385f97f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1da68c773d3dd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 17 17:10:04 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 5 months

Check_MK Git: check_mk: Improved cmk --notify

by Lars Michelsen

Module: check_mk Branch: master Commit: ac99b0c571004b549853cf575d77fd6c56dc3494 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac99b0c571004b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 17 17:09:32 2013 +0100 Improved cmk --notify * cmk --notify: new environment variable NOTIFY_WHAT which has HOST or SERVICE as value * cmk --notify: removing service related envvars in case of host notifications * cmk --notify: added test code to help developing nitofication plugins. Can be called with "cmk --notify fake-service debug" for example --- ChangeLog | 4 + modules/notify.py | 149 ++++++++++++++++++++++++++++++++++++++++----- notifications/test_plugin | 84 ------------------------- 3 files changed, 138 insertions(+), 99 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ac99b0c571…

11 years, 5 months

← Newer
1
...
6
7
8
9
10
11
12
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2013