Checkmk git commits October 2017

checkmk-commits@lists.checkmk.com

10 participants
288 discussions

Added explicit graph definition for "Packet loss" of the PING services

by Lars Michelsen

Module: check_mk Branch: master Commit: 4594c9673483549cf342bdeedd0a4bfe74f0cc07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4594c967348354… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 18 11:59:11 2017 +0200 Added explicit graph definition for "Packet loss" of the PING services Change-Id: Ic80a7fd475cd8dfd2e4f6336ad013343714ad0f7 --- web/plugins/metrics/check_mk.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index c55c527..50c4804 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -7569,6 +7569,17 @@ graph_info["round_trip_average"] = { ] } +graph_info["packet_loss"] = { + "title" : _("Packet loss"), + "metrics" : [ + ("pl", "area"), + ], + "scalars": [ + "rta:warn", + "rta:crit", + ] +} + for idx in range(1, MAX_NUMBER_HOPS): graph_info["hop_%d_round_trip_average" % idx] = { "title" : _("Hop %d Round trip average") % idx,

6 years, 11 months

Profiling can now be enabled per HTTP request

by Lars Michelsen

Module: check_mk Branch: master Commit: 54afce4ff26727be287d22f4b69a883f65e29a3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54afce4ff26727… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 18 16:58:26 2017 +0200 Profiling can now be enabled per HTTP request Change-Id: I31cc9738d938e63b95a8b34d31e9a01c7549bd5e --- web/htdocs/index.py | 36 ++++++++++++++++++------------ web/plugins/wato/check_mk_configuration.py | 19 +++++++++++----- 2 files changed, 35 insertions(+), 20 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index a0f29dd..099073d 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -239,24 +239,32 @@ def init_sys_path(): def init_profiling(is_profiling): - if not is_profiling and config.profile: - import cProfile + if is_profiling: + return # Don't start again when already profiling - # Ubuntu: install python-profiler when using this feature - profile_file = cmk.paths.var_dir + "/multisite.profile" + if config.profile == False: + return # Not enabled - p = cProfile.Profile() - p.runcall(handler, html.req, html.fields, True) - p.dump_stats(profile_file) + if config.profile == "enable_by_var" and not html.has_var("_profile"): + return # Not enabled by HTTP variable - file(profile_file + ".py", "w").write( - "#!/usr/bin/env python\n" - "import pstats\n" - "stats = pstats.Stats(%r)\n" - "stats.sort_stats('time').print_stats()\n" % profile_file) - os.chmod(profile_file + ".py", 0755) + import cProfile - raise FinalizeRequest() + # Ubuntu: install python-profiler when using this feature + profile_file = cmk.paths.var_dir + "/multisite.profile" + + p = cProfile.Profile() + p.runcall(handler, html.req, html.fields, True) + p.dump_stats(profile_file) + + file(profile_file + ".py", "w").write( + "#!/usr/bin/env python\n" + "import pstats\n" + "stats = pstats.Stats(%r)\n" + "stats.sort_stats('time').print_stats()\n" % profile_file) + os.chmod(profile_file + ".py", 0755) + + raise FinalizeRequest() # Early initialization upon first start of the application by the server diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index e579999..c127b7f 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -110,14 +110,21 @@ register_configvar(group, register_configvar(group, "profile", - Checkbox( + DropdownChoice( title = _("Profile requests"), - label = _("enable profile mode"), help = _("It is possible to profile the rendering process of Multisite pages. This " - "Is done using the Python module cProfile. When enabled two files are placed " - "into the Multisite var directory named <tt>multisite.profile</tt> and " - "<tt>multisite.profile.py</tt>. By executing the later file you can get " - "runtime statistics about the last processed page."), + "Is done using the Python module cProfile. When profiling is performed " + "two files are created <tt>%s</tt> and <tt>%s</tt>. By executing the later " + "file you can get runtime statistics about the last processed page. When " + "enabled by request the profiling mode is enabled by providing the HTTP " + "variable <tt>_profile</tt>.") % + (site_neutral_path(cmk.paths.var_dir + "/multisite.profile"), + site_neutral_path(cmk.paths.var_dir + "/multisite.profile.py")), + choices = [ + (False, _("Disable profiling")), + ("enable_by_var", _("Enable profiling by request")), + (True, _("Enable profiling for all requests")), + ], ), domain = "multisite" )

6 years, 11 months

5398 FIX Agent bakery: Hide "Bake Agents" context button when not permitted to bake

by Lars Michelsen

Module: check_mk Branch: master Commit: 93b5633db8d15e1e6c0a4d898a29014a41d5d1af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93b5633db8d15e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 19 08:40:21 2017 +0200 5398 FIX Agent bakery: Hide "Bake Agents" context button when not permitted to bake Change-Id: I50735d9407dc1d0e4fd92d0756e0fb33ef14f768 --- .werks/5398 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/5398 b/.werks/5398 new file mode 100644 index 0000000..60766f2 --- /dev/null +++ b/.werks/5398 @@ -0,0 +1,10 @@ +Title: Agent bakery: Hide "Bake Agents" context button when not permitted to bake +Level: 1 +Component: wato +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1508395191 +Class: fix + +

6 years, 11 months

Fix sequential build of Googletest

by Jukka Aro

Module: check_mk Branch: master Commit: ebb2b16f4af5aa4a2352cf903df4b66fe7863aef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebb2b16f4af5aa… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Oct 18 16:13:34 2017 +0200 Fix sequential build of Googletest After disabling parallel build, changing directory back to parent was broken. Change-Id: I2de6bc473379524f8eb78072f62e719d5fd22841 --- agents/windows/chroot_version | 2 +- agents/windows/test/build-googletest | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/agents/windows/chroot_version b/agents/windows/chroot_version index b8626c4..7ed6ff8 100644 --- a/agents/windows/chroot_version +++ b/agents/windows/chroot_version @@ -1 +1 @@ -4 +5 diff --git a/agents/windows/test/build-googletest b/agents/windows/test/build-googletest index 0255c60..caa90d7 100755 --- a/agents/windows/test/build-googletest +++ b/agents/windows/test/build-googletest @@ -25,16 +25,14 @@ for project in test mock ; do autoreconf --install for arch in 32 64 ; do build $arch - #& done - #wait # make install is not supported by Google -> copy headers and libs cp -r include/g${project} /usr/share/mingw-w64/include/ for arch in 32 64 ; do cp ${builddirs[$arch]}/lib/.libs/libg${project}.a /usr/${archs[$arch]}${common}/lib/ ln -sf ../../share/mingw-w64/include/g${project} /usr/${archs[$arch]}${common}/include/g${project} done - cd - + cd .. done cd ..

6 years, 11 months

Call Windows make-agent script with sudo

by Jukka Aro

Module: check_mk Branch: master Commit: 60ce3998e06bbc3202bb69dbcb34f60a703490c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60ce3998e06bbc… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Oct 18 15:13:15 2017 +0200 Call Windows make-agent script with sudo Change-Id: I61924bb606c36309765a5fd2df39e5e9bd73c5f9 --- agents/Makefile | 2 +- agents/windows/make-agent | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/agents/Makefile b/agents/Makefile index 9c8706a..0c24442 100644 --- a/agents/Makefile +++ b/agents/Makefile @@ -64,7 +64,7 @@ setversion: build: $(MAKE) packages - cd windows && ./make-agent + cd windows && sudo ./make-agent packages: rpm deb diff --git a/agents/windows/make-agent b/agents/windows/make-agent index 8183fd4..7603f03 100755 --- a/agents/windows/make-agent +++ b/agents/windows/make-agent @@ -44,23 +44,20 @@ fi if [ -z $create ] ; then echo "chroot is up to date." else - sudo apt-get -y install "${chroot_dependencies[@]}" - sudo VERSIONFILE=$versionfile \ - CHROOT_PATH=$CHROOT_PATH \ - CHROOT_BUILD_DIR=$CHROOT_BUILD_DIR ./make-chroot + apt-get -y install "${chroot_dependencies[@]}" + VERSIONFILE=$versionfile CHROOT_PATH=$CHROOT_PATH \ + CHROOT_BUILD_DIR=$CHROOT_BUILD_DIR ./make-chroot fi # Build the Windows agent within chroot by calling the 'build-agent' script. -sudo CHROOT_PATH=$CHROOT_PATH \ - CHROOT_BUILD_DIR=$CHROOT_BUILD_DIR \ - NEW_VERSION=$NEW_VERSION \ - ./do-chroot \ - "$CHROOT_BUILD_DIR/agents/windows/build-agent -j${njobs} $targets" +CHROOT_PATH=$CHROOT_PATH CHROOT_BUILD_DIR=$CHROOT_BUILD_DIR \ + NEW_VERSION=$NEW_VERSION ./do-chroot \ + "$CHROOT_BUILD_DIR/agents/windows/build-agent -j${njobs} $targets" EXIT_CODE=$? # Some cleanup: chown build artifacts to the original user. find . -maxdepth 1 -regextype egrep \ -regex '(.*\.(exe|msi|m4|cache|in))|.*\/.*build.*|.*plugins|.*Makefile.*|.*configure|.*comp.*|.*install.*|.*missing' \ --exec sudo chown -R $USER:$USER {} \; +-exec chown -R $USER:$USER {} \; exit $EXIT_CODE

6 years, 11 months

Added compile-neb-cmc target for Jenkins. Improved config.status target.

by Sven Panne

Module: check_mk Branch: master Commit: 125100a0b9668c5eb411c9856acfe2886b27b411 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=125100a0b9668c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Oct 18 14:06:35 2017 +0200 Added compile-neb-cmc target for Jenkins. Improved config.status target. Change-Id: I03db5e52fe835061d58de3ad3bcc22d26aa189a6 --- Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 63d0ab9..ac44566 100644 --- a/Makefile +++ b/Makefile @@ -140,7 +140,7 @@ PNG_FILES := $(wildcard $(addsuffix /*.png,web/htdocs/images web/htdocs .PHONY: all analyze build check check-binaries check-permissions check-spaces \ - check-version clean cppcheck dist documentation format \ + check-version clean compile-neb-cmc cppcheck dist documentation format \ GTAGS headers healspaces help install iwyu mrproper \ optimize-images packages setup setversion tidy version \ am--refresh skel @@ -408,7 +408,8 @@ linesofcode: @wc -l $$(find -type f -name "*.py" -o -name "*.js" -o -name "*.cc" -o -name "*.h" -o -name "*.css" | grep -v openhardwaremonitor | grep -v jquery | grep -v livestatus/src ) | sort -n ar-lib compile config.guess config.sub install-sh missing depcomp: configure.ac - autoreconf --install --include=m4 + autoreconf --install --include=m4 + touch ar-lib compile config.guess config.sub install-sh missing depcomp config.status: $(DIST_DEPS) @echo "Build $@ (newer targets: $?)" @@ -469,6 +470,12 @@ ifeq ($(ENTERPRISE),yes) $(BEAR) --append $(MAKE) -C enterprise/core -j4 endif +compile-neb-cmc: config.status + $(MAKE) -C livestatus -j4 +ifeq ($(ENTERPRISE),yes) + $(MAKE) -C enterprise/core -j4 +endif + tidy: compile_commands.json @scripts/compiled_sources | xargs $(CLANG_TIDY) --extra-arg=-D__clang_analyzer__

6 years, 11 months

5345 FIX mssql_backup: fix GUI error and show warn/crit values

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 74e85d40ca2402ecf48d3a37a6a79b7194f1db34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74e85d40ca2402… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Oct 18 13:23:22 2017 +0200 5345 FIX mssql_backup: fix GUI error and show warn/crit values Fixes an error visible in the GUI when no parameters are present for the check. The check now also shows warn and crit values for a backup type if it is in a warning or critical state. Change-Id: I251d6a9880943df55037d864d4ab199df29c6229 --- .werks/5345 | 12 ++++++++++++ checks/mssql_backup | 26 +++++++++++++++----------- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/.werks/5345 b/.werks/5345 new file mode 100644 index 0000000..8c00bcd --- /dev/null +++ b/.werks/5345 @@ -0,0 +1,12 @@ +Title: mssql_backup: fix GUI error and show warn/crit values +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1508325570 +Class: fix + +Fixes an error visible in the GUI when no parameters are present +for the check. The check now also shows warn and crit values for +a backup type if it is in a warning or critical state. diff --git a/checks/mssql_backup b/checks/mssql_backup index 7331bb5..5a826db 100644 --- a/checks/mssql_backup +++ b/checks/mssql_backup @@ -48,16 +48,15 @@ # Might be None to have no thresholds or a tuple of two ints # (<warn age in seconds>, <crit age in seconds>) -### mssql_backup_default_levels = None factory_settings["mssql_backup_default_levels"] = { - "database": (None, None), - "database_diff": (None, None), - "log": (None, None), - "file_or_filegroup": (None, None), - "file_diff": (None, None), - "partial": (None, None), - "partial_diff": (None, None), - "unspecific": (None, None) + "database": (0, 0), + "database_diff": (0, 0), + "log": (0, 0), + "file_or_filegroup": (0, 0), + "file_diff": (0, 0), + "partial": (0, 0), + "partial_diff": (0, 0), + "unspecific": (0, 0) } @@ -134,11 +133,11 @@ def check_mssql_backup(item, params, parsed): age_warn, age_crit = params["database"] else: backup_type_var = backup_type_name.strip().replace(" ", "_") - age_warn, age_crit = params.get(backup_type_var, (None, None)) + age_warn, age_crit = params[backup_type_var] state = 0 sec_ago = time.time() - timestamp - if age_warn is not None and age_crit is not None: + if age_warn > 0 and age_crit > 0: if sec_ago >= age_crit: state = 2 elif sec_ago >= age_warn: @@ -151,6 +150,11 @@ def check_mssql_backup(item, params, parsed): get_age_human_readable(sec_ago) ) + if state != 0: + infotext += " (warn/crit at %s/%s)" % ( + get_age_human_readable(age_warn), get_age_human_readable(age_crit) + ) + yield state, infotext, perfdata if not found_instance:

6 years, 11 months

Win-agent build: improve error handling and cleanup

by Jukka Aro

Module: check_mk Branch: master Commit: c0ce5d528bc279b04d1bcb796b53716364e32aba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0ce5d528bc279… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Oct 18 12:50:18 2017 +0200 Win-agent build: improve error handling and cleanup * Handle exit codes of functions and subprocesses. * Update chown'd files (cleanup after build). Change-Id: I462cffcfeb9f6e133b08790be7f72c623a3e1bfa --- agents/windows/build-agent | 10 +++++++++- agents/windows/build.sh | 6 +++--- agents/windows/make-agent | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/agents/windows/build-agent b/agents/windows/build-agent index 5b1728a..4f7fd61 100755 --- a/agents/windows/build-agent +++ b/agents/windows/build-agent @@ -10,6 +10,8 @@ # # Requires the environment variable CHROOT_BUILD_DIR to be set. +set -e + # Ensure that CHROOT_BUILD_DIR is set. [[ -z $CHROOT_BUILD_DIR ]] && exit 1 @@ -29,10 +31,16 @@ elif [[ " $targets " =~ " unittest " ]] ; then fi # Build 32 and 64 bit in parallel, wait for child processes to terminate. +children=() for arch in "${build_archs[@]}" ; do build $arch & + children+=($!) +done + +for pid in "${children[@]}" ; do + # If any subprocess fails, wait for the rest to exit in a controlled way. + wait $pid || { wait; exit 1; } done -wait # If no special targets given, produce msi installer as post-install step. if [[ -z "$targets" ]] ; then diff --git a/agents/windows/build.sh b/agents/windows/build.sh index 7ad9fa2..4c18a4c 100644 --- a/agents/windows/build.sh +++ b/agents/windows/build.sh @@ -66,14 +66,14 @@ function build { CC=${archs[$1]}${common}-gcc-posix \ CXX=${archs[$1]}${common}-g++-posix \ WINDRES=${archs[$1]}${common}-windres \ - STRIP=${archs[$1]}${common}-strip + STRIP=${archs[$1]}${common}-strip || return 1 # Default (no targets given): do parallel build and install non-debug exe's. if [ -z "$targets" ] ; then - make -j${njobs} && make install-strip + make -j${njobs} && make install-strip || return 1 else # If special targets given, do just them. - make -j${njobs} "$targets" + make -j${njobs} "$targets" || return 1 fi cd - } diff --git a/agents/windows/make-agent b/agents/windows/make-agent index ab91780..8183fd4 100755 --- a/agents/windows/make-agent +++ b/agents/windows/make-agent @@ -60,7 +60,7 @@ EXIT_CODE=$? # Some cleanup: chown build artifacts to the original user. find . -maxdepth 1 -regextype egrep \ --regex '(.*\.(exe|msi|m4))|.*\/build.*|.*build_version|.*plugins|.*msibuild|.*Makefile.*|.*configure' \ +-regex '(.*\.(exe|msi|m4|cache|in))|.*\/.*build.*|.*plugins|.*Makefile.*|.*configure|.*comp.*|.*install.*|.*missing' \ -exec sudo chown -R $USER:$USER {} \; exit $EXIT_CODE

6 years, 11 months

Fix Windows agent build

by Jukka Aro

Module: check_mk Branch: master Commit: 81e962f18423682dc4d8c2a5d7cdf84bcdd083fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81e962f1842368… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Oct 18 10:15:19 2017 +0200 Fix Windows agent build Change-Id: I94a5c05c8a3ef77616d590398f2a41cc93490765 --- agents/windows/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/configure.ac b/agents/windows/configure.ac index 037c180..1221acb 100644 --- a/agents/windows/configure.ac +++ b/agents/windows/configure.ac @@ -41,7 +41,7 @@ AC_FUNC_ERROR_AT_LINE AC_FUNC_MKTIME AC_CHECK_FUNCS([gethostname gettimeofday localtime_r memmove memset select setlocale socket strcasecmp strchr strcspn strdup strerror strrchr strtol strtoul strtoull]) -AC_CONFIG_FILES([Makefile test/Makefile]) +AC_CONFIG_FILES([Makefile]) AC_SUBST([MT], ['mt${EXEEXT}'])

6 years, 11 months

Googletest build: temporarily disable parallel execution

by Lars Michelsen

Module: check_mk Branch: master Commit: 0727ff1e24bdbc15d4f59277e918e95ec42272d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0727ff1e24bdbc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 18 10:01:29 2017 +0200 Googletest build: temporarily disable parallel execution Change-Id: I8bf3ca3b8f2627d0dd8fb68fe021c4682df5c124 --- agents/windows/test/build-googletest | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/agents/windows/test/build-googletest b/agents/windows/test/build-googletest index 1ccfc24..0255c60 100755 --- a/agents/windows/test/build-googletest +++ b/agents/windows/test/build-googletest @@ -24,9 +24,10 @@ for project in test mock ; do targets=lib/libg${project}.la autoreconf --install for arch in 32 64 ; do - build $arch & + build $arch + #& done - wait + #wait # make install is not supported by Google -> copy headers and libs cp -r include/g${project} /usr/share/mingw-w64/include/ for arch in 32 64 ; do

6 years, 11 months

← Newer
1
...
12
13
14
15
16
17
18
...
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