Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 46aa447a9f1e1f681394b1d9750dd53501c98fcf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46aa447a9f1e1f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 2 09:57:42 2017 +0100 Testcommit Change-Id: Id5083fc6803ad4920074f037de68d4571398a668 --- ChangeLog | 1 - 1 file changed, 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 22fb526..f927788 100644 --- a/ChangeLog +++ b/ChangeLog @@ -147,7 +147,6 @@ * 4188 snmp_extended_info: Now capable to inventorize cisco backplane chassis... * 4258 FIX: snmp_extended_info: fixed undefined variable - 1.4.0i3: Core & Setup: * 3978 FIX: mkbackup: Fixed backup to some CIFS shares ([Errno 13] Permission denied) '...')...

7 years, 7 months

Fixed GTAGS target.

by Sven Panne

Module: check_mk Branch: master Commit: f308cad001e0aed31a475d53dd7f4dd233932de7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f308cad001e0ae… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Feb 2 09:17:24 2017 +0100 Fixed GTAGS target. Change-Id: I22caaa4f5757b417b52a9df1be0d60345157f919 --- .gitignore | 3 +++ Makefile | 6 +++++- gtags.conf | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5ab6e0f..04f1bd9 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,9 @@ .directory .metadata .ropeproject +GPATH +GRTAGS +GTAGS RemoteSystemsTempFiles aclocal.m4 api diff --git a/Makefile b/Makefile index 1932b8f..5fd9423 100644 --- a/Makefile +++ b/Makefile @@ -322,7 +322,11 @@ stamp-h1: config.h.in config.status ./config.status config.h GTAGS: config.h - $(MAKE) -C livestatus distclean-tags +# automake generates "gtags -i ...", but incremental updates seem to be a bit +# fragile, so let's start from scratch, gtags is quite fast. + $(RM) GTAGS GRTAGS GSYMS GPATH +# Note: Even if we descend into livestatus, gtags is run on the top level (next +# to configure.ac). $(MAKE) -C livestatus GTAGS compile_commands.json: config.h $(FILES_TO_FORMAT) diff --git a/gtags.conf b/gtags.conf new file mode 100644 index 0000000..636f776 --- /dev/null +++ b/gtags.conf @@ -0,0 +1,3 @@ +default:\ + :skip=/doc/treasures/,/livestatus/api/,/agents/windows/msibuild/,/enterprise/core/src/livestatus/upstream/,HTML/,HTML.pub/,tags,TAGS,ID,y.tab.c,y.tab.h,gtags.files,cscope.files,cscope.out,cscope.po.out,cscope.in.out,SCCS/,RCS/,CVS/,CVSROOT/,{arch}/,autom4te.cache/,*.orig,*.rej,*.bak,*~,#*#,*.swp,*.tmp,*_flymake.*,*_flymake:\ + :langmap=c\:.c,yacc\:.y,asm\:.s.S,java\:.java,cpp\:.c++.cc.hh.cpp.cxx.hxx.hpp.C.H.h,php\:.php.php3.phtml:

7 years, 7 months

tests: added some enterprise specific files to permission tests

by Lars Michelsen

Module: check_mk Branch: master Commit: f07f19bf4d7273f7af38aee1fb1c71f6a7d35e1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f07f19bf4d7273… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 1 17:53:34 2017 +0100 tests: added some enterprise specific files to permission tests Change-Id: Idb5ea23c850de0b4dd105cc64a984cd6d7ea6986 --- tests/git/test_permissions.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/git/test_permissions.py b/tests/git/test_permissions.py index 1e5affb..9923275 100644 --- a/tests/git/test_permissions.py +++ b/tests/git/test_permissions.py @@ -29,6 +29,7 @@ permissions = [ ('bin/*', is_executable, ['Makefile', 'mkevent.cc', 'mkeventd_open514.cc']), # Enterprise specific ('enterprise/bin/*', is_executable, []), + ('enterprise/active_checks/*', is_executable, []), ('enterprise/agents/bakery/*', is_not_executable, []), ('enterprise/agents/plugins/*', is_executable, []), ('enterprise/alert_handlers/*', is_executable, []),

7 years, 7 months

tests: added some enterprise specific files to permission tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 521ff7b4bc45a65ab61af92f69280155897fce80 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=521ff7b4bc45a6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 1 17:51:09 2017 +0100 tests: added some enterprise specific files to permission tests Change-Id: I45a0a3ac2c44f388e03b4f41788ea2cc600f35a3 --- tests/git/test_permissions.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/git/test_permissions.py b/tests/git/test_permissions.py index 58747ef..1e5affb 100644 --- a/tests/git/test_permissions.py +++ b/tests/git/test_permissions.py @@ -27,6 +27,12 @@ permissions = [ ('pnp-templates/*', is_not_executable, []), ('notifications/*', is_executable, ['README', 'debug']), ('bin/*', is_executable, ['Makefile', 'mkevent.cc', 'mkeventd_open514.cc']), + # Enterprise specific + ('enterprise/bin/*', is_executable, []), + ('enterprise/agents/bakery/*', is_not_executable, []), + ('enterprise/agents/plugins/*', is_executable, []), + ('enterprise/alert_handlers/*', is_executable, []), + ('enterprise/alert_handlers/*', is_executable, []), ] def test_permissions():

7 years, 7 months

Moved compiled_sources helper script to subdirectory scripts

by Lars Michelsen

Module: check_mk Branch: master Commit: 01d61d4d094b222a6194600975286377616c6e74 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01d61d4d094b22… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 1 18:00:49 2017 +0100 Moved compiled_sources helper script to subdirectory scripts Change-Id: Ifef0e823002b208cd2a091dad439f2ee1dde8c97 --- Makefile | 6 +++--- compiled_sources => scripts/compiled_sources | 0 make_package_info => scripts/make_package_info | 0 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 24d55d5..1932b8f 100644 --- a/Makefile +++ b/Makefile @@ -157,7 +157,7 @@ dist: mk-livestatus precompile-werks --exclude "crash.exe" \ --exclude "openhardwaremonitor" \ --exclude .f12 $$(cd agents ; ls) - cd $(DISTNAME) ; ../make_package_info $(VERSION) > package_info + cd $(DISTNAME) ; ../scripts/make_package_info $(VERSION) > package_info install -m 755 scripts/*.{sh,py} $(DISTNAME) install -m 644 COPYING AUTHORS ChangeLog $(DISTNAME) echo "$(VERSION)" > $(DISTNAME)/VERSION @@ -331,7 +331,7 @@ compile_commands.json: config.h $(FILES_TO_FORMAT) $(BEAR) $(MAKE) -C livestatus -j8 tidy: compile_commands.json - @./compiled_sources | xargs $(CLANG_TIDY) --extra-arg=-D__clang_analyzer__ + @scripts/compiled_sources | xargs $(CLANG_TIDY) --extra-arg=-D__clang_analyzer__ # Not really perfect rules, but better than nothing iwyu: compile_commands.json @@ -347,7 +347,7 @@ analyze: config.h # GCC-like output on stderr intended for human consumption. cppcheck: compile_commands.json - @./compiled_sources | \ + @scripts/compiled_sources | \ sed 's/^"$.*$"$$/\1/' | \ $(CPPCHECK) --max-configs=16 -UCMC --enable=all --suppress=missingIncludeSystem --inline-suppr -I livestatus/src -I livestatus --file-list=- --quiet --template=gcc diff --git a/compiled_sources b/scripts/compiled_sources similarity index 100% rename from compiled_sources rename to scripts/compiled_sources diff --git a/make_package_info b/scripts/make_package_info similarity index 100% rename from make_package_info rename to scripts/make_package_info

7 years, 7 months

mkbench: Started creating a standard system benchmark tool

by Lars Michelsen

Module: check_mk Branch: master Commit: 8afbe7c3f26992d773ec68089d43016705baa402 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8afbe7c3f26992… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 16 08:47:33 2017 +0100 mkbench: Started creating a standard system benchmark tool The tool is meant to execute different tasks in a Check_MK site on a system and measure the performance of the task on that system. The test is saving different static information of the system (Installed CPUs, memory, disks, ...) and captures the most important peformance relevant values during testing for later analysis and comparision. The tool also monitors the performance of different values of the system and aborts tests in case thresholds are reached. Change-Id: I128418d7897ab318ea888029402131defb6f5c15 --- .bugs/2474 | 8 +- bin/.f12 | 2 +- bin/mkbench | 3431 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 3438 insertions(+), 3 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8afbe7c3f2…

7 years, 7 months

fixed interface grouping rule

by Simon Betz

Module: check_mk Branch: master Commit: d33b4c7002ac2083cdbe17e5993f0cc82ededaea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d33b4c7002ac20… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Feb 2 08:37:16 2017 +0100 fixed interface grouping rule Change-Id: I454ba7ca0f6d94c9799ebb10c8c0b6e0ef3ceaec --- web/plugins/wato/check_parameters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index c45ef29..8b620d8 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -9984,7 +9984,7 @@ def transform_if_groups_forth(params): param["group_name"] = param["name"] del param["name"] if param.get("include_items"): - param["node_items"] = param["include_items"] + param["items"] = param["include_items"] del param["include_items"] if param.get("single") is not None: if param["single"]: @@ -10005,7 +10005,7 @@ vs_elements_if_groups_matches = [ ), forth = lambda x: str(x), back = lambda x: int(x), )), - ("node_items", ListOfStrings( + ("items", ListOfStrings( title = _("Restrict interface items"), help = _("Only interface with these item names are put into this group."), )),

7 years, 7 months

Added missing enterprise edition werks to sites werk list

by Lars Michelsen

Module: check_mk Branch: master Commit: 1b6655a2778ef1017c49f84512b5dd0228ef3cb2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b6655a2778ef1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 1 17:26:33 2017 +0100 Added missing enterprise edition werks to sites werk list Change-Id: I3268acacc57ba2ca263074c6b5593b4b9970622b --- .werks/.f12 | 1 + Makefile | 2 +- scripts/precompile-werks | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/.f12 b/.werks/.f12 index 88fa005..e317cfd 100644 --- a/.werks/.f12 +++ b/.werks/.f12 @@ -4,3 +4,4 @@ SITE=${SITE:-$(omd sites --bare | head -n 1)} sudo mkdir -p /omd/sites/$SITE/share/check_mk/werks/ make -C .. precompile-werks sudo install -m 644 -g $SITE -o $SITE werks /omd/sites/$SITE/share/check_mk/werks/werks +sudo omd restart $SITE apache diff --git a/Makefile b/Makefile index d5e2632..24d55d5 100644 --- a/Makefile +++ b/Makefile @@ -107,7 +107,7 @@ check-binaries: check: check-spaces check-permissions check-binaries check-version precompile-werks: - python -c "import cmk.werks ; cmk.werks.write_precompiled_werks('.werks/werks', cmk.werks.load_raw_files('.werks'))" + PYTHONPATH=. python scripts/precompile-werks dist: mk-livestatus precompile-werks @echo "Making $(DISTNAME)" diff --git a/scripts/precompile-werks b/scripts/precompile-werks new file mode 100644 index 0000000..f118567 --- /dev/null +++ b/scripts/precompile-werks @@ -0,0 +1,10 @@ +#!/usr/bin/env python + +import os +import cmk.werks + +werks = cmk.werks.load_raw_files('.werks') +if os.path.exists('enterprise/.werks'): + werks.update(cmk.werks.load_raw_files('enterprise/.werks')) + +cmk.werks.write_precompiled_werks('.werks/werks', werks)

7 years, 7 months

Improved and fixed autotools-related targets.

by Sven Panne

Module: check_mk Branch: master Commit: ca91ff741f413abc1a903b23eb9cecf32b7b1b4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca91ff741f413a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 1 15:32:47 2017 +0100 Improved and fixed autotools-related targets. Change-Id: I2aa3610ceb1f9ceed3743268550fa33951a8c3a7 --- Makefile | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 7fc1070..d5e2632 100644 --- a/Makefile +++ b/Makefile @@ -43,10 +43,14 @@ DOXYGEN := doxygen IWYU_TOOL := tests/iwyu_tool_jenkins.py BEAR := bear +M4_DEPS := $(wildcard m4/*) configure.ac +CONFIGURE_DEPS := $(M4_DEPS) aclocal.m4 + # File to pack into livestatus-$(VERSION).tar.gz -LIVESTATUS_AUTO := aclocal.m4 ar-lib compile config.h.in configure depcomp \ - install-sh Makefile.in missing src/Makefile.in -LIVESTATUS_SOURCES := $(LIVESTATUS_AUTO) config.guess config.sub configure.ac \ +LIVESTATUS_AUTO := aclocal.m4 ar-lib compile config.guess config.h.in \ + config.sub configure depcomp install-sh missing \ + Makefile.in src/Makefile.in +LIVESTATUS_SOURCES := $(LIVESTATUS_AUTO) configure.ac \ Makefile.am nagios/README nagios/*.h \ nagios4/README m4/* nagios4/*.h src/*.{h,cc} \ src/Makefile.am api/python/{*.py,README} api/perl/* @@ -290,13 +294,32 @@ setup: pngcrush \ slimit -$(addprefix %/,$(LIVESTATUS_AUTO)): $(addprefix %/,configure.ac m4/* Makefile.am src/Makefile.am) - @echo "making $@: $? is newer" - cd livestatus && autoreconf --install --include=m4 +config.status: configure + if test -f config.status; then \ + ./config.status --recheck; \ + else \ + autoreconf --install --include=m4; \ + ./configure CXXFLAGS="$(CXX_FLAGS)"; \ + fi -config.h: configure config.h.in - @echo "making $@: $? is newer" - ./configure CXXFLAGS="$(CXX_FLAGS)" +configure: $(CONFIGURE_DEPS) + autoconf + +aclocal.m4: $(M4_DEPS) + aclocal + +config.h.in: $(CONFIGURE_DEPS) + autoheader + rm -f stamp-h1 + touch $@ + +config.h: stamp-h1 + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) stamp-h1 + +stamp-h1: config.h.in config.status + @rm -f stamp-h1 + ./config.status config.h GTAGS: config.h $(MAKE) -C livestatus distclean-tags

7 years, 7 months

Adapted a few paths.

by Sven Panne

Module: check_mk Branch: master Commit: ef1c4b887e79a8408b83548ccc14a72a29801e54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef1c4b887e79a8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 1 15:18:21 2017 +0100 Adapted a few paths. Change-Id: I768145877e031555172aac1d06d627d501fa17b0 --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 04ccaf2..7fc1070 100644 --- a/Makefile +++ b/Makefile @@ -201,7 +201,7 @@ version: 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])/' livestatus/configure.ac ; \ + 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 ; \ sed -i 's/^VERSION=.*/VERSION='"$(NEW_VERSION)"'/' scripts/setup.sh ; \ @@ -294,15 +294,15 @@ $(addprefix %/,$(LIVESTATUS_AUTO)): $(addprefix %/,configure.ac m4/* Makefile.am @echo "making $@: $? is newer" cd livestatus && autoreconf --install --include=m4 -livestatus/config.h: livestatus/configure livestatus/config.h.in +config.h: configure config.h.in @echo "making $@: $? is newer" - cd livestatus && ./configure CXXFLAGS="$(CXX_FLAGS)" + ./configure CXXFLAGS="$(CXX_FLAGS)" -GTAGS: livestatus/config.h +GTAGS: config.h $(MAKE) -C livestatus distclean-tags $(MAKE) -C livestatus GTAGS -compile_commands.json: livestatus/config.h $(FILES_TO_FORMAT) +compile_commands.json: config.h $(FILES_TO_FORMAT) @echo "making $@: $? is newer" $(MAKE) -C livestatus clean $(BEAR) $(MAKE) -C livestatus -j8 @@ -315,7 +315,7 @@ iwyu: compile_commands.json @$(IWYU_TOOL) --output-format=clang -p . # Not really perfect rules, but better than nothing -analyze: livestatus/config.h +analyze: config.h $(MAKE) -C livestatus clean cd livestatus && $(SCAN_BUILD) -o ../clang-analyzer $(MAKE) CXXFLAGS="-std=c++14" @@ -341,5 +341,5 @@ format: $(CLANG_FORMAT) -style=file -i $(FILES_TO_FORMAT) # Note: You need the doxygen and graphviz packages. -documentation: livestatus/config.h +documentation: config.h $(DOXYGEN) doc/Doxyfile

7 years, 7 months

← Newer
1
...
39
40
41
42
43
44
45
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017