Checkmk git commits October 2017

checkmk-commits@lists.checkmk.com

10 participants
288 discussions

by Sven Panne

Module: check_mk Branch: master Commit: d39f3b3eef097bc8871f9be689c53f47edd1b757 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d39f3b3eef097b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Oct 20 13:03:30 2017 +0200 Make IWYU happy again. Change-Id: I039ed5c0759c31c39166ca976e8ba72b672eed8d --- livestatus/src/Store.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/livestatus/src/Store.h b/livestatus/src/Store.h index f42a4a1..9789470 100644 --- a/livestatus/src/Store.h +++ b/livestatus/src/Store.h @@ -29,7 +29,9 @@ #include <list> #include <map> #include <string> +#ifndef CMC #include <vector> +#endif #include "LogCache.h" #include "TableColumns.h" #include "TableCommands.h"

7 years

5400 Added new permission for baking and signing agents using the bakery

by Lars Michelsen

Module: check_mk Branch: master Commit: 5635c468a51b89030654d5d68bfd62f1298fdda4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5635c468a51b89… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 20 12:47:10 2017 +0200 5400 Added new permission for baking and signing agents using the bakery Change-Id: I7473c85f7cc0f84134e1372f0b4eece34d1a05b9 --- .werks/5400 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/5400 b/.werks/5400 new file mode 100644 index 0000000..1433b7a --- /dev/null +++ b/.werks/5400 @@ -0,0 +1,10 @@ +Title: Added new permission for baking and signing agents using the bakery +Level: 1 +Component: agents +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1508496388 +Class: feature + +

7 years

5190 The Livestatus command LOG works for the Nagios core now, too.

by Sven Panne

Module: check_mk Branch: master Commit: 35851fc211bad3da531937d12d96b930027db858 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35851fc211bad3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Oct 20 12:23:15 2017 +0200 5190 The Livestatus command LOG works for the Nagios core now, too. Previously only the CMC understood the Livestatus command LOG. This works for the Nagios core now, too. Note: For technical reasons the command is available under the name _LOG, too, when the Nagios core is used, but this name is discouraged when using Livestatus. On the other hand: If you use the Nagios command pipe, you have to use _LOG. This tiny inconsistency is a bit unfortunate, but it is caused by the way how Nagios handles custom commands. Change-Id: Ic90199aeef897d2881fe60b47f0bc94fc559f02a --- .werks/5190 | 17 ++++++ livestatus/src/Store.cc | 154 +++++++++++++++++++++++++++-------------------- livestatus/src/Store.h | 27 ++++++++- livestatus/src/module.cc | 7 +++ 4 files changed, 139 insertions(+), 66 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=35851fc211…

7 years

Fix chroot msi build and umount at end of do-chroot

by Lars Michelsen

Module: check_mk Branch: master Commit: 482457b3121d543d1a56ddd9613ec02df6eac401 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=482457b3121d54… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 20 12:03:15 2017 +0200 Fix chroot msi build and umount at end of do-chroot Change-Id: Ifc36f6d167cdbc7099a59e9b78458407d3a7256b --- agents/windows/do-chroot | 3 ++- agents/windows/msibuild/Makefile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/agents/windows/do-chroot b/agents/windows/do-chroot index f6527fb..35ac818 100755 --- a/agents/windows/do-chroot +++ b/agents/windows/do-chroot @@ -49,8 +49,9 @@ else fi umount $CHROOT_PATH/$CHROOT_BUILD_DIR + umount $CHROOT_PATH/dev/pts -sleep 2 +sleep 4 umount $CHROOT_PATH/dev umount $CHROOT_PATH/proc diff --git a/agents/windows/msibuild/Makefile b/agents/windows/msibuild/Makefile index ed4b2fe..053dc48 100755 --- a/agents/windows/msibuild/Makefile +++ b/agents/windows/msibuild/Makefile @@ -52,5 +52,6 @@ msibuild: exchange_msi_files: msibuild mkdir -p work sources cp ../check_mk_agent.exe ../check_mk_agent-64.exe ../check_mk.example.ini sources - ./msi-update -v vanilla_container.msi sources $(BUILD_VERSION) $(CHECK_MK_VERSION) + LD_LIBRARY_PATH=$$(pwd)/msitools-0.94/libmsi/.libs \ + ./msi-update -v vanilla_container.msi sources $(BUILD_VERSION) $(CHECK_MK_VERSION) rm -rf work sources

7 years

Fixed bug in recently added KILL_SITE_APACHE function

by Lars Michelsen

Module: check_mk Branch: master Commit: 78055c4f6317dcced737cd11dd08a13ff161e363 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78055c4f6317dc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 20 09:17:12 2017 +0200 Fixed bug in recently added KILL_SITE_APACHE function Change-Id: I0dfee10809630e1bf6428491a9e13dfd2fb22abe --- web/.f12 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/.f12 b/web/.f12 index 3f10657..2d1ca93 100755 --- a/web/.f12 +++ b/web/.f12 @@ -21,7 +21,7 @@ if [ ${ALL_EDITIONS:-1} != 0 ]; then done fi -if [ "$KILL_SITE_APACHE" -eq "1" ]; then +if [ "$KILL_SITE_APACHE" = "1" ]; then echo "KILLING site apache of $SITE" sudo killall -9 -u $SITE apache2 fi

7 years

Cleaned up some hand crafted HTML code

by Lars Michelsen

Module: check_mk Branch: master Commit: cd29509e09008365240259b6d7b50c5de2fae942 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd29509e090083… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 20 10:07:36 2017 +0200 Cleaned up some hand crafted HTML code Change-Id: I35fbd360c1929f5e4c19867c1dc6babc5f29d280 --- web/htdocs/bi.py | 7 ++++--- web/htdocs/wato.py | 23 +++++++++++++---------- web/htdocs/werks.py | 2 +- web/plugins/views/availability.py | 14 +++++++------- web/plugins/views/bi.py | 4 ++-- web/plugins/views/mkeventd.py | 2 +- web/plugins/views/painters.py | 34 +++++++++++++++++----------------- web/plugins/wato/bi.py | 6 +++--- 8 files changed, 48 insertions(+), 44 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cd29509e09…

7 years

Minor UI improvements on host/folder edit page

by Lars Michelsen

Module: check_mk Branch: master Commit: 5a7ef3c650d72440c206f7cd34be5b9117efd737 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a7ef3c650d724… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 20 10:14:20 2017 +0200 Minor UI improvements on host/folder edit page Change-Id: I89868507ada38dcf377b9b4ddcf28c1223dbb9a5 --- web/htdocs/wato.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 141efb1..baf2155 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1134,7 +1134,7 @@ def mode_editfolder(phase, new): page_title = _("Create new folder") name, title = None, None else: - page_title = _("Folder Properties") + page_title = _("Folder properties") name = Folder.current().name() title = Folder.current().title() @@ -1191,7 +1191,7 @@ def mode_editfolder(phase, new): # title forms.header(_("Title")) - forms.section() + forms.section(_("Title")) TextUnicode().render_input("title", title) html.set_focus("title") @@ -17160,7 +17160,9 @@ def configure_attributes(new, hosts, for_what, parent, myself=None, without_attr content = _("empty") if isinstance(attr, ValueSpecAttribute): + html.open_b() html.write(content) + html.close_b() else: html.b(_u(content))

7 years

Fixed windows agent build

by Lars Michelsen

Module: check_mk Branch: master Commit: a81cef6729bc53e70aadc5e88a1d0d3ebab1a200 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a81cef6729bc53… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 20 11:43:08 2017 +0200 Fixed windows agent build * Fixed environment processing of su command * do-chroot: Use chrooted command exit code as final exit code * Moved CHROOT_NAME to make-agent script Change-Id: I62a791c431541f08f9ec9f1362bf25a1d9a6dbb9 --- agents/windows/build-agent | 6 ++++-- agents/windows/configure.ac | 2 +- agents/windows/do-chroot | 7 +++++-- agents/windows/make-agent | 14 ++++++++------ 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/agents/windows/build-agent b/agents/windows/build-agent index 4f7fd61..3f9847e 100755 --- a/agents/windows/build-agent +++ b/agents/windows/build-agent @@ -15,10 +15,12 @@ set -e # Ensure that CHROOT_BUILD_DIR is set. [[ -z $CHROOT_BUILD_DIR ]] && exit 1 -. $CHROOT_BUILD_DIR/agents/windows/build.sh +. /$CHROOT_BUILD_DIR/agents/windows/build.sh parse-args "$@" -cd $CHROOT_BUILD_DIR/agents/windows + +cd /$CHROOT_BUILD_DIR/agents/windows + autoreconf --install build_archs=(32 64) diff --git a/agents/windows/configure.ac b/agents/windows/configure.ac index 1221acb..8871127 100644 --- a/agents/windows/configure.ac +++ b/agents/windows/configure.ac @@ -5,7 +5,7 @@ AC_PREREQ([2.69]) AC_INIT([Check_MK Windows Agent], [1.5.0i1], [feedback(a)check-mk.org]) AM_INIT_AUTOMAKE([foreign subdir-objects]) AC_CONFIG_COMMANDS([check_chroot], \ - [[[ -z $CHROOTNAME ]] && \ + [[[ -z $CHROOT_NAME ]] && \ echo "Not allowed outside chroot. Please call './make-agent' instead." && \ exit 1]) AC_CONFIG_SRCDIR([config.h.in]) diff --git a/agents/windows/do-chroot b/agents/windows/do-chroot index fec56fa..f6527fb 100755 --- a/agents/windows/do-chroot +++ b/agents/windows/do-chroot @@ -6,7 +6,6 @@ CMD="$1" export HOSTNAME=cmk-windows-agent-chroot unset LANG -CHROOTNAME=WinAgent BASE="$(realpath ../..)" @@ -41,10 +40,12 @@ if [ ! -e $CHROOT_PATH/$CHROOT_BUILD_DIR/Makefile ] ; then fi if [ -n "$CMD" ] ; then - chroot $CHROOT_PATH /usr/bin/env CHROOTNAME=$CHROOTNAME \ + chroot $CHROOT_PATH /usr/bin/env \ NEW_VERSION=$NEW_VERSION bash -c "$CMD" + EXIT_CODE=$? else chroot $CHROOT_PATH /usr/bin/env CHROOTNAME=$CHROOTNAME bash -l + EXIT_CODE=$? fi umount $CHROOT_PATH/$CHROOT_BUILD_DIR @@ -52,3 +53,5 @@ umount $CHROOT_PATH/dev/pts sleep 2 umount $CHROOT_PATH/dev umount $CHROOT_PATH/proc + +exit $EXIT_CODE diff --git a/agents/windows/make-agent b/agents/windows/make-agent index 3199353..619f0c3 100755 --- a/agents/windows/make-agent +++ b/agents/windows/make-agent @@ -10,6 +10,11 @@ set -e +if [ -z $SUDO_USER ]; then + echo "ERROR: $0 must be executed with sudo" + exit 1 +fi + . build.sh parse-args "$@" @@ -22,6 +27,7 @@ base="$(realpath ../..)" # directory in agents/windows export CHROOT_PATH=${CHROOT_PATH:-$base/agents/windows/chroot} export CHROOT_BUILD_DIR=${CHROOT_BUILD_DIR:-build} +export CHROOT_NAME=${CHROOT_NAME:-WinAgent} if [ ! -f "$base/agents/windows/$versionfile" ] ; then echo "Error: File $base/agents/windows/$versionfile not found." @@ -51,9 +57,5 @@ fi # Build the Windows agent within chroot by calling the 'build-agent' script as # $SUDO_USER. -CHROOT_PATH=$CHROOT_PATH CHROOT_BUILD_DIR=$CHROOT_BUILD_DIR \ - NEW_VERSION=$NEW_VERSION ./do-chroot \ - "/bin/su - $SUDO_USER -m -c '$CHROOT_BUILD_DIR/agents/windows/build-agent -j${njobs} $targets'" -EXIT_CODE=$? - -exit $EXIT_CODE +./do-chroot \ + "/bin/su - $SUDO_USER -c bash -c 'CHROOT_NAME=$CHROOT_NAME CHROOT_PATH=$CHROOT_PATH CHROOT_BUILD_DIR=$CHROOT_BUILD_DIR NEW_VERSION=$NEW_VERSION /$CHROOT_BUILD_DIR/agents/windows/build-agent -j${njobs} $targets'"

7 years

Little more consistent formating of seconds in host/service detail view

by Lars Michelsen

Module: check_mk Branch: master Commit: 5ca9a03d782636e8513aa4ba7e38b0c56acf1221 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ca9a03d782636… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 20 10:26:31 2017 +0200 Little more consistent formating of seconds in host/service detail view Change-Id: Ia69f1de0e213b44e98ef93fbb90f2031bc5a75d5 --- web/plugins/views/painters.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index a23ddf8..611988f 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -876,14 +876,14 @@ multisite_painters["svc_check_latency"] = { "title" : _("Service check latency"), "short" : _("Latency"), "columns" : [ "service_latency" ], - "paint" : lambda row: ("", "%.3f sec" % row["service_latency"]), + "paint" : lambda row: ("", age_human_readable(row["service_latency"])), } multisite_painters["svc_check_duration"] = { "title" : _("Service check duration"), "short" : _("Duration"), "columns" : [ "service_execution_time" ], - "paint" : lambda row: ("", "%.3f sec" % row["service_execution_time"]), + "paint" : lambda row: ("", age_human_readable(row["service_execution_time"])), } multisite_painters["svc_attempt"] = { @@ -897,27 +897,28 @@ multisite_painters["svc_normal_interval"] = { "title" : _("Service normal check interval"), "short" : _("Check int."), "columns" : [ "service_check_interval" ], - "paint" : lambda row: ("number", "%.0fs" % (row["service_check_interval"] * 60.0)), + "paint" : lambda row: ("number", age_human_readable(row["service_check_interval"] * 60.0)), } multisite_painters["svc_retry_interval"] = { "title" : _("Service retry check interval"), "short" : _("Retry"), "columns" : [ "service_retry_interval" ], - "paint" : lambda row: ("number", "%.0fs" % (row["service_retry_interval"] * 60.0)), + "paint" : lambda row: ("number", age_human_readable(row["service_retry_interval"] * 60.0)), } multisite_painters["svc_check_interval"] = { "title" : _("Service normal/retry check interval"), "short" : _("Interval"), "columns" : [ "service_check_interval", "service_retry_interval" ], - "paint" : lambda row: (None, "%.0fs/%.0fs" % ( - row["service_check_interval"] * 60.0, row["service_retry_interval"] * 60.0)), + "paint" : lambda row: (None, "%s / %s" % ( + age_human_readable(row["service_check_interval"] * 60.0), + age_human_readable(row["service_retry_interval"] * 60.0))), } multisite_painters["svc_check_type"] = { "title" : _("Service check type"), "short" : _("Type"), "columns" : [ "service_check_type" ], - "paint" : lambda row: (None, row["service_check_type"] == 0 and "ACTIVE" or "PASSIVE"), + "paint" : lambda row: (None, _("ACTIVE") if row["service_check_type"] == 0 else _("PASSIVE")), } def paint_nagiosflag(row, field, bold_if_nonzero): @@ -1344,14 +1345,14 @@ multisite_painters["host_check_latency"] = { "title" : _("Host check latency"), "short" : _("Latency"), "columns" : [ "host_latency" ], - "paint" : lambda row: ("", "%.3f sec" % row["host_latency"]), + "paint" : lambda row: ("", age_human_readable(row["host_latency"])), } multisite_painters["host_check_duration"] = { "title" : _("Host check duration"), "short" : _("Duration"), "columns" : [ "host_execution_time" ], - "paint" : lambda row: ("", "%.3f sec" % row["host_execution_time"]), + "paint" : lambda row: ("", age_human_readable(row["host_execution_time"])), } multisite_painters["host_attempt"] = { @@ -1365,20 +1366,21 @@ multisite_painters["host_normal_interval"] = { "title" : _("Normal check interval"), "short" : _("Check int."), "columns" : [ "host_check_interval" ], - "paint" : lambda row: (None, "%.0fs" % (row["host_check_interval"] * 60.0)), + "paint" : lambda row: (None, age_human_readable(row["host_check_interval"] * 60.0)), } multisite_painters["host_retry_interval"] = { "title" : _("Retry check interval"), "short" : _("Retry"), "columns" : [ "host_retry_interval" ], - "paint" : lambda row: (None, "%.0fs" % (row["host_retry_interval"] * 60.0)), + "paint" : lambda row: (None, age_human_readable(row["host_retry_interval"] * 60.0)), } multisite_painters["host_check_interval"] = { "title" : _("Normal/retry check interval"), "short" : _("Interval"), "columns" : [ "host_check_interval", "host_retry_interval" ], - "paint" : lambda row: (None, "%.0fs/%.0fs" % ( - row["host_check_interval"] * 60.0, row["host_retry_interval"] * 60.0)), + "paint" : lambda row: (None, "%s / %s" % ( + age_human_readable(row["host_check_interval"] * 60.0), + age_human_readable(row["host_retry_interval"] * 60.0))), } multisite_painters["host_check_type"] = {

7 years

Updated bug entries #3001

by Manfred Brunner

Module: check_mk Branch: master Commit: cac4a15716994f776c379412a749fec0addc7f49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cac4a15716994f… Author: Manfred Brunner <mb(a)mathias-kettner.de> Date: Fri Oct 20 09:39:31 2017 +0200 Updated bug entries #3001 --- .bugs/3001 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.bugs/3001 b/.bugs/3001 new file mode 100644 index 0000000..f8ee93e --- /dev/null +++ b/.bugs/3001 @@ -0,0 +1,7 @@ +Title: Agent encryption rule edit dosn't mark bakery dirty +Component: wato +State: open +Date: 2017-10-20 09:37:10 +Targetversion: 1.4.0 +Class: bug +

7 years

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2017