Checkmk git commits May 2016

checkmk-commits@lists.checkmk.com

6 participants
231 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: 97f87ff6cb60b84b9e7d1302d3bb57f46b2086c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97f87ff6cb60b8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 19 14:53:34 2016 +0200 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index e2e75c0..307bf8e 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2494 +2504

8 years, 4 months

Test commit for CI.

by Sven Panne

Module: check_mk Branch: master Commit: 75c4270b2265d624bdf188224b6af259f5f9afa2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75c4270b2265d6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu May 19 14:47:22 2016 +0200 Test commit for CI. --- livestatus/src/LogCache.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 8c93a12..509c8a4 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -201,11 +201,12 @@ void LogCache::handleNewMessage(Logfile *logfile, time_t /*unused*/, _num_at_last_check + CHECK_MEM_CYCLE) { return; // Do not check this time } + int foobar; // [1] Begin by deleting old logfiles // Begin deleting with the oldest logfile available _logfiles_t::iterator it; - for (it = _logfiles.begin(); it != _logfiles.end(); ++it) { + for (it = _logfiles.begin(); it != _logfiles.end(); it++) { Logfile *log = it->second; if (log == logfile) { // Do not touch the logfile the Query is currently accessing

8 years, 4 months

Added cppcheck-xml target for CI.

by Sven Panne

Module: check_mk Branch: master Commit: 3bde6893865f576c3f37f23372add834404b1338 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bde6893865f57… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu May 19 14:34:26 2016 +0200 Added cppcheck-xml target for CI. --- .gitignore | 1 + Makefile | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1fc2593..4bfe5a4 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ check_mk-*.spec check_mk-*.tar.gz clang-analyzer/ compile_commands.json +cppcheck-result.xml mk-livestatus-*.tar.gz mkeventd-*.tar.gz check-mk-*.exe diff --git a/Makefile b/Makefile index 566efe6..bded7d5 100644 --- a/Makefile +++ b/Makefile @@ -298,11 +298,20 @@ analyze: livestatus/config.h $(MAKE) -C livestatus clean cd livestatus && $(SCAN_BUILD) -o ../clang-analyzer $(MAKE) CXXFLAGS="-std=c++14" -# TODO: Repeating the include paths here is ugly and fragile. +# TODO: Repeating the include paths in the cppcheck targets below is ugly and +# fragile. + +# GCC-like output on stderr intended for human consumption. cppcheck: compile_commands.json @./compiled_sources | \ sed 's/^"$.*$"$$/\1/' | \ - $(CPPCHECK) --quiet -UCMC --enable=all --inline-suppr --template=gcc -I livestatus/src -I livestatus --file-list=- + $(CPPCHECK) -UCMC --enable=all --inline-suppr -I livestatus/src -I livestatus --file-list=- --quiet --template=gcc + +# XML output into file intended for machine processing. +cppcheck-xml: compile_commands.json + @./compiled_sources | \ + sed 's/^"$.*$"$$/\1/' | \ + $(CPPCHECK) -UCMC --enable=all --inline-suppr -I livestatus/src -I livestatus --file-list=- --quiet --template=gcc --xml --xml-version=2 2> cppcheck-result.xml # TODO: We should probably handle this rule via AM_EXTRA_RECURSIVE_TARGETS in # src/configure.ac, but this needs at least automake-1.13, which in turn is only

8 years, 4 months

skype.mobile: fixed a crash if the output didn' t contain all expected instances

by Sebastian Herbord

Module: check_mk Branch: master Commit: a8954e5a7169112da1e99bf0dfd9e07afed178b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8954e5a716911… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu May 19 13:37:25 2016 +0200 skype.mobile: fixed a crash if the output didn't contain all expected instances --- checks/skype | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/checks/skype b/checks/skype index 6d79f6a..1f83e9b 100644 --- a/checks/skype +++ b/checks/skype @@ -427,15 +427,20 @@ def check_skype_mobile(item, params, parsed): for instance, name in [("AndroidLync", "Android"), ("iPadLync", "iPad"), - ("iPhoneLync", "iPhone")]: + ("iPhoneLync", "iPhone"), + ("LyncForMac", "Mac")]: status, infotext, perfdata =\ wmi_yield_raw_counter(parsed["LS:WEB - UCWA"], instance, "UCWA - Active Session Count", label=" active", perfvar="active_sessions") - perfdata = list(perfdata[0]) - perfdata[0] += "_" + name.lower() - yield status, "%s: %s" % (name, infotext), [perfdata] + if status != 3: + if perfdata: + perfdata = list(perfdata[0]) + perfdata[0] += "_" + name.lower() + perfdata = [perfdata] + + yield status, "%s: %s" % (name, infotext), perfdata yield wmi_yield_raw_counter(parsed["LS:WEB - Throttling and Authentication"], item, "WEB - Total Requests In Processing", label=" requested",

8 years, 4 months

Fixed typo

by Sven Panne

Module: check_mk Branch: master Commit: 96de8d3ad324858462d0ac3bfc51c9030ccd344c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96de8d3ad32485… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu May 19 13:16:38 2016 +0200 Fixed typo --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dda6330..566efe6 100644 --- a/Makefile +++ b/Makefile @@ -302,7 +302,7 @@ analyze: livestatus/config.h cppcheck: compile_commands.json @./compiled_sources | \ sed 's/^"$.*$"$$/\1/' | \ - @$(CPPCHECK) --quiet -UCMC --enable=all --inline-suppr --template=gcc -I livestatus/src -I livestatus --file-list=- + $(CPPCHECK) --quiet -UCMC --enable=all --inline-suppr --template=gcc -I livestatus/src -I livestatus --file-list=- # TODO: We should probably handle this rule via AM_EXTRA_RECURSIVE_TARGETS in # src/configure.ac, but this needs at least automake-1.13, which in turn is only

8 years, 4 months

Use real file list for cppcheck.

by Sven Panne

Module: check_mk Branch: master Commit: 74e2108dc004932b713519f2f7b3e13a061be2f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74e2108dc00493… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu May 19 12:13:05 2016 +0200 Use real file list for cppcheck. --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3a4ca43..dda6330 100644 --- a/Makefile +++ b/Makefile @@ -299,8 +299,10 @@ analyze: livestatus/config.h cd livestatus && $(SCAN_BUILD) -o ../clang-analyzer $(MAKE) CXXFLAGS="-std=c++14" # TODO: Repeating the include paths here is ugly and fragile. -cppcheck: livestatus/config.h - @$(CPPCHECK) --quiet -UCMC --enable=all --inline-suppr --template=gcc -I livestatus/src -I livestatus livestatus +cppcheck: compile_commands.json + @./compiled_sources | \ + sed 's/^"$.*$"$$/\1/' | \ + @$(CPPCHECK) --quiet -UCMC --enable=all --inline-suppr --template=gcc -I livestatus/src -I livestatus --file-list=- # TODO: We should probably handle this rule via AM_EXTRA_RECURSIVE_TARGETS in # src/configure.ac, but this needs at least automake-1.13, which in turn is only

8 years, 4 months

Current bear versions don't need a fix.

by Sven Panne

Module: check_mk Branch: master Commit: 2e6283f4beccc9a011c932856fd2858e87d55194 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e6283f4beccc9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu May 19 12:09:00 2016 +0200 Current bear versions don't need a fix. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d3875f9..3a4ca43 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ SCAN_BUILD := scan-build-$(CLANG_VERSION) CPPCHECK := cppcheck DOXYGEN := doxygen IWYU_TOOL := iwyu_tool.py -BEAR := bear-fixed +BEAR := bear # File to pack into livestatus-$(VERSION).tar.gz LIVESTATUS_SOURCES := configure aclocal.m4 config.guess config.h.in config.sub \

8 years, 4 months

Added missing dependencies.

by Sven Panne

Module: check_mk Branch: master Commit: fe42444364bbac13398feee83ca19fa17deca2e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe42444364bbac… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu May 19 11:48:54 2016 +0200 Added missing dependencies. --- Makefile | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index ba27a4c..d3875f9 100644 --- a/Makefile +++ b/Makefile @@ -32,6 +32,7 @@ LIBDIR := $(PREFIX)/lib/$(NAME) DISTNAME := $(NAME)-$(VERSION) TAROPTS := --owner=root --group=root --exclude=.svn --exclude=*~ \ --exclude=.gitignore --exclude=*.swp --exclude=.f12 +C_CXX_FLAGS := -g -O3 -Wall -Wextra CLANG_VERSION := 3.8 CLANG_FORMAT := clang-format-$(CLANG_VERSION) @@ -113,13 +114,13 @@ dist: mk-livestatus tar czf $(DISTNAME)/checkman.tar.gz $(TAROPTS) -C checkman $$(cd checkman ; ls) $(MAKE) minify-js tar czf $(DISTNAME)/web.tar.gz $(TAROPTS) -C web htdocs plugins - + tar cf $(DISTNAME)/livestatus.tar $(TAROPTS) -C livestatus $$(cd livestatus ; echo $(LIVESTATUS_SOURCES) ) if [ -f livestatus/compile ]; then \ tar rf $(DISTNAME)/livestatus.tar $(TAROPTS) -C livestatus compile ; \ fi gzip $(DISTNAME)/livestatus.tar - + tar czf $(DISTNAME)/pnp-templates.tar.gz $(TAROPTS) -C pnp-templates $$(cd pnp-templates ; ls *.php) tar cf $(DISTNAME)/doc.tar $(TAROPTS) -C doc $$(cd doc ; ls) tar rf $(DISTNAME)/doc.tar $(TAROPTS) COPYING AUTHORS ChangeLog @@ -271,11 +272,17 @@ mrproper: setup: sudo apt-get install figlet pngcrush slimit bear dietlibc-dev -GTAGS: +livestatus/config.h.in: livestatus/configure.ac livestatus/m4/* + cd livestatus && autoreconf --install --include=m4 + +livestatus/config.h: livestatus/config.h.in + cd livestatus && ./configure CFLAGS="$(C_CXX_FLAGS)" CXXFLAGS="$(C_CXX_FLAGS)" + +GTAGS: livestatus/config.h $(MAKE) -C livestatus distclean-tags $(MAKE) -C livestatus GTAGS -compile_commands.json: $(FILES_TO_FORMAT) +compile_commands.json: livestatus/config.h $(FILES_TO_FORMAT) $(MAKE) -C livestatus clean $(BEAR) $(MAKE) -C livestatus -j8 @@ -287,12 +294,12 @@ iwyu: compile_commands.json @$(IWYU_TOOL) -p . # Not really perfect rules, but better than nothing -analyze: +analyze: livestatus/config.h $(MAKE) -C livestatus clean cd livestatus && $(SCAN_BUILD) -o ../clang-analyzer $(MAKE) CXXFLAGS="-std=c++14" # TODO: Repeating the include paths here is ugly and fragile. -cppcheck: +cppcheck: livestatus/config.h @$(CPPCHECK) --quiet -UCMC --enable=all --inline-suppr --template=gcc -I livestatus/src -I livestatus livestatus # TODO: We should probably handle this rule via AM_EXTRA_RECURSIVE_TARGETS in @@ -302,5 +309,5 @@ format: $(CLANG_FORMAT) -style=file -i $(FILES_TO_FORMAT) # Note: You need the doxygen and graphviz packages. -documentation: +documentation: livestatus/config.h $(DOXYGEN) doc/Doxyfile

8 years, 4 months

3604 FIX ups_capacity.include: fixed displaying wrong levels and cleanup

by Simon Betz

Module: check_mk Branch: master Commit: 6638b9e955444566595d328003b83cff0fed0943 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6638b9e9554445… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu May 19 10:03:38 2016 +0200 3604 FIX ups_capacity.include: fixed displaying wrong levels and cleanup --- .werks/3604 | 10 ++++++++++ ChangeLog | 1 + checks/ups_capacity.include | 28 ++++++++++++++++------------ 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/.werks/3604 b/.werks/3604 new file mode 100644 index 0000000..89aa36b --- /dev/null +++ b/.werks/3604 @@ -0,0 +1,10 @@ +Title: ups_capacity.include: fixed displaying wrong levels and cleanup +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1463644971 + + diff --git a/ChangeLog b/ChangeLog index 1104eeb..8f3dde3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -223,6 +223,7 @@ * 3603 FIX: wut_webtherm: fixed empty data handling * 3535 FIX: docsis_cm_status: fixed missing performance data * 3536 FIX: alcatel_timetra_chassis: fixed exception when check is not OK + * 3604 FIX: ups_capacity.include: fixed displaying wrong levels and cleanup Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/ups_capacity.include b/checks/ups_capacity.include index 29672bb..fdb6801 100644 --- a/checks/ups_capacity.include +++ b/checks/ups_capacity.include @@ -41,30 +41,34 @@ def check_ups_capacity(item, params, info): # Check time left on battery if minutes_left: minutes_left = int(minutes_left) - levelsinfo = "" + state = 0 + infotext = "%d min left on battery" % minutes_left + if minutes_left <= crit: state = 2 - levelsinfo = " (crit at %d min)" % cap_crit elif minutes_left < warn: state = 1 - levelsinfo = " (warn at %d min)" % cap_warn - else: - state = 0 - yield state, "%d min left on battery" % minutes_left + levelsinfo, [ ('capacity', minutes_left, warn, crit) ] + + if state: + infotext += " (warn/crit below %d min/%d min)" % (warn, crit) + + yield state, infotext, [ ('capacity', minutes_left, warn, crit) ] # Check percentual capacity if percent_fuel: percent_fuel = int(percent_fuel) - levelsinfo = "" + infotext = "capacity: %d%%" % percent_fuel + state = 0 + if percent_fuel <= cap_crit: state = 2 - levelsinfo = " (crit at %d%%)" % cap_crit elif percent_fuel < cap_warn: state = 1 - levelsinfo = " (warn at %d%%)" % cap_warn - else: - state = 0 - yield state, "capacity: %d%%" % percent_fuel + levelsinfo, [ ('percent', percent_fuel, cap_warn, cap_crit) ] + + if state: + infotext += " (warn/crit below %d%%/%d%%)" % (cap_warn, cap_crit) + + yield state, infotext, [ ('percent', percent_fuel, cap_warn, cap_crit) ] # Output time on battery if time_on_bat and int(time_on_bat) > 0:

8 years, 4 months

Check for GCC 6, too.

by Sven Panne

Module: check_mk Branch: master Commit: c10f29cdacdcf5cd5e51582c6426ae142ad47a05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c10f29cdacdcf5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu May 19 10:02:10 2016 +0200 Check for GCC 6, too. As a nice side effect, this tests our CI environment, too. :-) --- livestatus/configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 296efa5..e7b2151 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -35,12 +35,12 @@ AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) # Checks for programs. -AC_PROG_CC([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([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([], []) if test "x$ac_cv_prog_cc_c99" = xno; then AC_MSG_ERROR([Need a C99-compliant C compiler]) fi -AC_PROG_CXX([g++-5 clang++-3.9 clang++-3.8 clang++-3.7 clang++-3.6 clang++-3.5 g++-4.9 g++ clang++]) +AC_PROG_CXX([g++-6 g++-5 clang++-3.9 clang++-3.8 clang++-3.7 clang++-3.6 clang++-3.5 g++-4.9 g++ clang++]) AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory]) AC_PROG_RANLIB AM_CONDITIONAL([HAVE_DIET], [which diet >/dev/null 2>&1])

8 years, 4 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2016