Checkmk git commits June 2017

checkmk-commits@lists.checkmk.com

13 participants
266 discussions

4897 FIX check_bi_aggr: Fixed URL in error messages in case of exceptions during checking

by Lars Michelsen

Module: check_mk Branch: master Commit: 14e94e8ac134cb65201399ac4bdf533035cf12c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14e94e8ac134cb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 22 13:47:09 2017 +0200 4897 FIX check_bi_aggr: Fixed URL in error messages in case of exceptions during checking Change-Id: I97f2f5fd692d6e877ba80f2c7d47958c5611698a --- .werks/4897 | 11 +++++++++++ active_checks/check_bi_aggr | 7 ++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/4897 b/.werks/4897 new file mode 100644 index 0000000..fe0128e --- /dev/null +++ b/.werks/4897 @@ -0,0 +1,11 @@ +Title: check_bi_aggr: Fixed URL in error messages in case of exceptions during checking +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1498131993 + + diff --git a/active_checks/check_bi_aggr b/active_checks/check_bi_aggr index 07edef6..1657cca 100755 --- a/active_checks/check_bi_aggr +++ b/active_checks/check_bi_aggr @@ -25,6 +25,7 @@ # Boston, MA 02110-1301 USA. import sys, getopt, requests, traceback +import urllib import os import time @@ -161,7 +162,7 @@ def init_auth(): url = "%s/check_mk/view.py" \ "?view_name=aggr_single_api" \ "&aggr_name=%s&output_format=python" % \ - (base_url.rstrip('/'), aggr_name) + (base_url.rstrip('/'), urllib.quote(aggr_name)) auth = None if auth_mode in ['basic', 'digest', 'kerberos']: @@ -184,8 +185,8 @@ except requests.URLRequired, e: sys.stdout.write("UNKNOWN: %s\n" % e) sys.exit(3) except Exception, e: - sys.stdout.write('ERROR: Exception while opening URL (%s): %s\n' % - (url, traceback.format_exc())) + sys.stdout.write('ERROR: Exception while opening URL: %s - %s\n%s' % + (url, e, traceback.format_exc())) sys.exit(3) try:

7 years

livedump: Correctly updating version in binary

by Lars Michelsen

Module: check_mk Branch: master Commit: dc82672293c77c2bdb0e82f5ca10e86c77d2aff9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc82672293c77c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 23 08:43:36 2017 +0200 livedump: Correctly updating version in binary Change-Id: Iffea4f9189be143bd019c8be87c3130a2c2d24ff --- Makefile | 2 +- bin/livedump | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 90957c6..246ca39 100644 --- a/Makefile +++ b/Makefile @@ -389,7 +389,7 @@ setversion: sed -ri 's/^(VERSION[[:space:]]*:?= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/' configure.ac ; \ sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' bin/mkeventd bin/mkbackup ; \ - sed -i 's/^__version__ = ".*"$$/__version__ = "$(NEW_VERSION)"/' lib/__init__.py bin/mkbench ; \ + sed -i 's/^__version__ = ".*"$$/__version__ = "$(NEW_VERSION)"/' lib/__init__.py bin/mkbench bin/livedump; \ sed -i 's/^VERSION=.*/VERSION='"$(NEW_VERSION)"'/' scripts/setup.sh ; \ echo 'check-mk_$(NEW_VERSION)-1_all.deb net optional' > debian/files $(MAKE) -C agents NEW_VERSION=$(NEW_VERSION) setversion diff --git a/bin/livedump b/bin/livedump index 6b0ef15..e115e8c 100755 --- a/bin/livedump +++ b/bin/livedump @@ -27,7 +27,7 @@ import os, sys, getopt, livestatus, tempfile, time # These variable will be substituted at 'make dist' time -check_mk_version = '(inofficial)' +__version__ = "1.4.0p7" def dump_templates(): check_interval = "" @@ -297,7 +297,7 @@ def usage(): """ % os.path.split(sys.argv[0])[1]) def print_version(): - sys.stdout.write("This is livedump version %s\n" % check_mk_version) + sys.stdout.write("This is livedump version %s\n" % __version__) #. # .-main-----------------------------------------------------------------.

7 years

Add a configure flag for old librrd versions.

by Sven Panne

Module: check_mk Branch: master Commit: bef6719d0291b162ea661eba8f3b51c28fe6be3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bef6719d0291b1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jun 22 14:09:36 2017 +0200 Add a configure flag for old librrd versions. Old (pre-1.6.0) versions of librrd were not thread-safe, so one has to use the thread-safe variant librrd_th explicitly. This in itself is already tragic enough, but to make things worse, you can't write a compile-time check to distinguish these versions. :-/ So we default to the assumption that librrd is thread-safe (which is the case within OMD) and the user of e.g. a standalone version of Livestatus on an old system has to use the configure flag below. Not really nice, but we can't really do much about that. Change-Id: Icc1132814eaf8bd621aa7a0e5f981b1cd48aa625 --- configure.ac | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index b9ef93e..22dbe24 100644 --- a/configure.ac +++ b/configure.ac @@ -36,6 +36,18 @@ AC_REQUIRE_AUX_FILE([compile]) AC_REQUIRE_AUX_FILE([config.guess]) AC_REQUIRE_AUX_FILE([config.sub]) +# Old (pre-1.6.0) versions of librrd were not thread-safe, so one has to use the +# thread-safe variant librrd_th explicitly. This in itself is already tragic +# enough, but to make things worse, you can't write a compile-time check to +# distinguish these versions. :-/ So we default to the assumption that librrd is +# thread-safe (which is the case within OMD) and the user of e.g. a standalone +# version of Livestatus on an old system has to use the configure flag below. +# Not really nice, but we can't really do much about that. +AC_ARG_ENABLE([rrd-is-thread-safe], + AS_HELP_STRING([--disable-rrd-is-thread-safe], [Use librrd_th instead of librrd])) +AS_IF([test "x$enable_rrd_is_thread_safe" != "xno"], [RRDLIB_TO_CHECK=rrd], + [RRDLIB_TO_CHECK=rrd_th]) + # Checks for programs. AC_PROG_CC([gcc-6 gcc-5 clang-3.9 clang-3.8 clang-3.7 clang-3.6 clang-3.5 gcc-4.9 gcc clang]) AC_PROG_CC_C99([], []) @@ -53,14 +65,14 @@ AC_CHECK_LIB(socket, socket) AC_CHECK_LIB(socket, connect) AC_CHECK_LIB(socket, shutdown) -# The detection of the right RRD library is a bit tricky: We can't simply put +# Passing through the right RRD library is a bit tricky: We can't simply put # -lrrd_th or -lrrd globally into LIBS. The problem is that our SUID programs # icmpsender and icmpreceiver would be linked with that option, too, but because # of security reasons the dynamic linker will ignore our LD_LIBRARY_PATH => no # RRD library found or even the wrong one... :-/ RRDLIB= old_LIBS=$LIBS -AC_SEARCH_LIBS([rrd_xport], [rrd_th rrd], +AC_SEARCH_LIBS([rrd_xport], [$RRDLIB_TO_CHECK], [test "$ac_cv_search_rrd_xport" = "none required" || RRDLIB="$ac_cv_search_rrd_xport"], [AC_MSG_ERROR([unable to find the rrd_xport function])]) LIBS=$old_LIBS

7 years

Updated werk 4042

by Mathias Kettner

Module: check_mk Branch: master Commit: d2cbdc5ccea61f108081e5a15ebd70fffc5e64b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2cbdc5ccea61f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jun 22 13:36:41 2017 +0200 Updated werk 4042 Change-Id: I8386209e73ac087bb76446ec414ca596f5dcb76e --- .werks/4042 | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/.werks/4042 b/.werks/4042 index e84864f..8bff113 100644 --- a/.werks/4042 +++ b/.werks/4042 @@ -1,11 +1,27 @@ -Title: Fix missing From address in synchronous SMTP notifications +Title: Use well define From address in email notifications if none is configured Level: 1 Component: notifications -Compatible: compat -Version: 1.4.0i3 -Date: 1478523159 Class: fix +Compatible: incomp +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1478523159 + +Previously when you didn't configure a From address for you email +notifications in {{Monitoring configuration|Notifications|Parameters for ASCII Email}} +or {{Parameters for HTML Email}} the email was created without a +From address and the local mail delivery agent added that address +by using its configuration or some default. + +This cause a problem in the new synchronous STMP devlivery for emails, since +there a From address is required. + +Check_MK does now not longer rely on the default of the system +mailer but always falls back to <tt>mysite@fqdn</tt>, where <tt>mysiste</tt> +is the name of the Check_MK instance and <tt>fqdn</tt> is the fully +qualified domain name of the monitoring host. -If you use the new synchronous STMP devlivery for emails and do -not specify an explicity From address, then the From address -would be empty. This has been fixed. +If the change in the From address causes a problem in your setup please +simply set a From address by creating a global configuration rule in the +upper settings.

7 years

4809 Display the OMD Site and Host Tags in HTML Emails

by Tom Baerwinkel

Module: check_mk Branch: master Commit: e9b526f51c0e6a967478a52983604182374ec599 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9b526f51c0e6a… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Jun 22 11:39:46 2017 +0200 4809 Display the OMD Site and Host Tags in HTML Emails The OMD Site and Host Tags can be shown optionally in HTML Emails. By default the information is not displayed. To show the information it can be enabled under "Host and Service Parameters" or per rule in the Notifications menu. Change-Id: I4e0272410902fcb428b2538fb60dedbe9288e02b --- .werks/4809 | 14 ++++++++++++++ notifications/mail | 8 ++++++++ web/plugins/wato/notifications.py | 2 ++ 3 files changed, 24 insertions(+) diff --git a/.werks/4809 b/.werks/4809 new file mode 100644 index 0000000..d83459c --- /dev/null +++ b/.werks/4809 @@ -0,0 +1,14 @@ +Title: Display the OMD Site and Host Tags in HTML Emails +Level: 1 +Component: notifications +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1498123688 +Class: feature + +The OMD Site and Host Tags can be shown optionally in HTML Emails. +By default the information is not displayed. To show the information +it can be enabled under "Host and Service Parameters" or per rule +in the Notifications menu. + diff --git a/notifications/mail b/notifications/mail index c5e4fa0..f51922e 100755 --- a/notifications/mail +++ b/notifications/mail @@ -312,6 +312,14 @@ body_elements = [ "$LONGDATETIME$", "$LONGDATETIME$", ), + ( "omdsite", "both", False, "all", "OMD Site", + "$OMD_SITE$", + "$OMD_SITE$" ), + + ( "hosttags", "both", False, "all", "Host Tags", + "$HOST_TAGS$", + "$HOST_TAGS$" ), + ( "notesurl", "both", False, "all", "Custom Host Notes URL", "$HOSTNOTESURL$", "$HOSTNOTESURL$",), diff --git a/web/plugins/wato/notifications.py b/web/plugins/wato/notifications.py index 143afaf..213ac10 100644 --- a/web/plugins/wato/notifications.py +++ b/web/plugins/wato/notifications.py @@ -62,6 +62,8 @@ def html_email_parameter_elements(): ListChoice( title = _("Information to be displayed in the email body"), choices = [ + ( "omdsite", _("OMD Site") ), + ( "hosttags", _("Tags of the Host") ), ( "address", _("IP Address of Host") ), ( "abstime", _("Absolute Time of Alert") ), ( "reltime", _("Relative Time of Alert") ),

7 years

Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: 9dbd19bb1f9c485f2f29d8b9f95ac1066bf35006 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9dbd19bb1f9c48… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jun 22 11:22:52 2017 +0200 Minor cleanup Change-Id: I12f15070140a813f89f8548d144c080f14d6bfb9 --- agents/plugins/mk_sap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/plugins/mk_sap b/agents/plugins/mk_sap index f7d444f..b64a445 100755 --- a/agents/plugins/mk_sap +++ b/agents/plugins/mk_sap @@ -440,7 +440,7 @@ def check(cfg): sap_data.setdefault(sid, []) sap_data[sid].append("%s\t%d\t%3d\t%s\t%s\t%s\t%s" % (context, state['VALUE'], - state['SEVERITY'], path, perfvalue, uom, status_details)) + state['SEVERITY'], path, perfvalue, uom, status_details)) for host, host_sap in sap_data.items():

7 years

4896 FIX Views: Services are now sorted correctly again

by Lars Michelsen

Module: check_mk Branch: master Commit: 8e68230e9bd8b9b85e23f158e1e46af4186591ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e68230e9bd8b9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 22 11:18:01 2017 +0200 4896 FIX Views: Services are now sorted correctly again Change-Id: If3718dc7215a2f586e0e7a520bd5e4d0ded10638 --- .werks/4896 | 11 +++++++++++ web/htdocs/views.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4896 b/.werks/4896 new file mode 100644 index 0000000..5f1b596 --- /dev/null +++ b/.werks/4896 @@ -0,0 +1,11 @@ +Title: Views: Services are now sorted correctly again +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1498123044 + + diff --git a/web/htdocs/views.py b/web/htdocs/views.py index c0eca62..d1c0bd6 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2955,7 +2955,7 @@ def cmp_simple_string(column, r1, r2): def cmp_num_split(column, r1, r2): c1 = r1[column] c2 = r2[column] - return cmp(num_split(c1) + (c1,), num_split(c2) + (c2,)) + return cmp_string_list(column, r1, r2) def cmp_string_list(column, r1, r2): v1 = ''.join(r1.get(column, []))

7 years

4694 FIX Reloading the Nagios core works again

by Sven Panne

Module: check_mk Branch: master Commit: 21a899e9ebddc980aae5956b337f39019e26a6fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21a899e9ebddc9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jun 22 10:46:15 2017 +0200 4694 FIX Reloading the Nagios core works again Reloading the Nagios core (e.g. via "cmk -O") resulted in a segmentation fault of Nagios, this has been fixed. This was a regression from the 1.2.8 series. Change-Id: Ib7faf0368841a6580f40d9ca170a1348b7fcbe41 --- .werks/4694 | 12 ++++++++++++ livestatus/src/module.cc | 3 +++ 2 files changed, 15 insertions(+) diff --git a/.werks/4694 b/.werks/4694 new file mode 100644 index 0000000..1e8630b --- /dev/null +++ b/.werks/4694 @@ -0,0 +1,12 @@ +Title: Reloading the Nagios core works again +Level: 1 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1498121005 +Class: fix + +Reloading the Nagios core (e.g. via "cmk -O") resulted in a segmentation +fault of Nagios, this has been fixed. This was a regression from the 1.2.8 +series. \ No newline at end of file diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index c01095f..9070545 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -337,6 +337,9 @@ void start_threads() { // start thread that listens on socket info.name = "main"; pthread_create(&info.id, nullptr, main_thread, &info); + // Our current thread (i.e. the main one, confusing terminology) + // needs thread-local infos for logging, too. + tl_info = &info; } else { info.name = "client " + to_string(idx); pthread_create(&info.id, &attr, client_thread, &info);

7 years

4895 FIX cmk --convert-rrds: Don' t fail when RRDs refered by PNP XMLs are missing

by Lars Michelsen

Module: check_mk Branch: master Commit: 652c9e68b8cfeef451ab58e4578408f658b84fb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=652c9e68b8cfee… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 22 09:16:47 2017 +0200 4895 FIX cmk --convert-rrds: Don't fail when RRDs refered by PNP XMLs are missing When using the "cmk --convert-rrds" command it is possible that XML files of PNP4Nagios are refering to RRDs that do not exist. Previously the conversion totally failed with an error message. It was now converted to a warning message instead. The conversion of other RRDs is now continued in case of such errors. Change-Id: I813b62ef9527646e3c67fd304e1a961105503080 --- .werks/4895 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.werks/4895 b/.werks/4895 new file mode 100644 index 0000000..6e75289 --- /dev/null +++ b/.werks/4895 @@ -0,0 +1,14 @@ +Title: cmk --convert-rrds: Don't fail when RRDs refered by PNP XMLs are missing +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1498115660 + +When using the "cmk --convert-rrds" command it is possible that XML files of PNP4Nagios +are refering to RRDs that do not exist. Previously the conversion totally failed with an +error message. It was now converted to a warning message instead. The conversion of other +RRDs is now continued in case of such errors.

7 years

4894 FIX Fixed still visible sites on "activate changes" page after deletion

by Lars Michelsen

Module: check_mk Branch: master Commit: a5b9ac4d738bb1073aa78c5795967df8ef61d261 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5b9ac4d738bb1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 22 08:27:11 2017 +0200 4894 FIX Fixed still visible sites on "activate changes" page after deletion When deleting a site from a distributed WATO setup, the site was still visible on the activate changes page until the site apache was restarted in some cases. This has now been fixed and the sites are removed immediately from the activate changes page. Change-Id: Ic23d87c44bde24e39007bfb3c408d4df34fbcf32 --- .werks/4894 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.werks/4894 b/.werks/4894 new file mode 100644 index 0000000..8caa35c --- /dev/null +++ b/.werks/4894 @@ -0,0 +1,16 @@ +Title: Fixed still visible sites on "activate changes" page after deletion +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1498112743 + +When deleting a site from a distributed WATO setup, the site was still +visible on the activate changes page until the site apache was restarted +in some cases. + +This has now been fixed and the sites are removed immediately from the +activate changes page.

7 years

← Newer
1
...
7
8
9
10
11
12
13
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2017