Checkmk git commits July 2017

checkmk-commits@lists.checkmk.com

11 participants
286 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: a38131dd95aed80ab92848064eaa56f96aecd176 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a38131dd95aed8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 28 10:47:01 2017 +0200 make dist needs more build artefacts Change-Id: I2ec31dcf22e6fcf7f6df6242f50f998fb91f6cc5 --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b46594f..737bd36 100644 --- a/Makefile +++ b/Makefile @@ -94,6 +94,8 @@ BEAR := bear M4_DEPS := $(wildcard m4/*) configure.ac CONFIGURE_DEPS := $(M4_DEPS) aclocal.m4 +DIST_DEPS := ar-lib compile config.guess config.sub install-sh missing depcomp configure + LIVESTATUS_SOURCES := Makefile.am api/c++/{Makefile,*.{h,cc}} api/perl/* \ api/python/{README,*.py} {nagios,nagios4}/{README,*.h} \ @@ -190,12 +192,12 @@ check-version: # is currently not used by most distros # Would also use --exclude-vcs, but this is also not available # And --transform is also missing ... -dist: mk-livestatus-$(VERSION).tar.gz $(DISTNAME).tar.gz config.h.in configure +dist: mk-livestatus-$(VERSION).tar.gz $(DISTNAME).tar.gz config.h.in $(DIST_DEPS) @EXCLUDES= ; \ if [ -d .git ]; then \ git rev-parse --short HEAD > COMMIT ; \ for X in $$(git ls-files --directory --others -i --exclude-standard) ; do \ - if [[ $$X != aclocal.m4 && $$X != config.h.in && $$X != configure && $$X != $(DISTNAME).tar.gz ]]; then \ + if [[ $$X != aclocal.m4 && $$X != config.h.in && ! "$(DIST_DEPS)" =~ (^|[[:space:]])$$X($$|[[:space:]]) && $$X != $(DISTNAME).tar.gz ]]; then \ EXCLUDES+=" --exclude $${X%*/}" ; \ fi ; \ done ; \ @@ -407,7 +409,7 @@ setup: ar-lib compile config.guess config.sub install-sh missing depcomp: configure.ac autoreconf --install --include=m4 -config.status: ar-lib compile config.guess config.sub install-sh missing depcomp configure +config.status: $(DIST_DEPS) @if test -f config.status; then \ echo "update config.status by reconfiguring in the same conditions" ; \ ./config.status --recheck; \

6 years, 11 months

Include build artefacts in dist tarball (aclocal.m4, config.h.in, configure)

by Lars Michelsen

Module: check_mk Branch: master Commit: 2d1685bce05c3e4e7da2956607a9944abca181ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d1685bce05c3e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 28 10:10:23 2017 +0200 Include build artefacts in dist tarball (aclocal.m4, config.h.in, configure) Change-Id: Id8168a701d05f9faeae6da1ec501b871b78ba5e1 --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9233c29..daa490c 100644 --- a/Makefile +++ b/Makefile @@ -190,12 +190,14 @@ check-version: # is currently not used by most distros # Would also use --exclude-vcs, but this is also not available # And --transform is also missing ... -dist: mk-livestatus-$(VERSION).tar.gz +dist: mk-livestatus-$(VERSION).tar.gz config.h.in configure @EXCLUDES= ; \ if [ -d .git ]; then \ git rev-parse --short HEAD > COMMIT ; \ for X in $$(git ls-files --directory --others -i --exclude-standard) ; do \ - EXCLUDES+=" --exclude $${X%*/}" ; \ + if [[ $$X != aclocal.m4 && $$X != config.h.in && $$X != configure ]]; then \ + EXCLUDES+=" --exclude $${X%*/}" ; \ + fi ; \ done ; \ fi ; \ if [ -d check-mk-$(EDITION)-$(OMD_VERSION) ]; then \

6 years, 11 months

Pack check_mk package source tarfile during "make dist"

by Lars Michelsen

Module: check_mk Branch: master Commit: 109099dfa7bed50d00b4bbb04902e3ca89619805 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=109099dfa7bed5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 28 10:16:28 2017 +0200 Pack check_mk package source tarfile during "make dist" Change-Id: Iab829f3b15167d00c0cd108a92b74499647fe7c7 --- Makefile | 4 ++-- omd/packages/check_mk/Makefile | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index daa490c..b46594f 100644 --- a/Makefile +++ b/Makefile @@ -190,12 +190,12 @@ check-version: # is currently not used by most distros # Would also use --exclude-vcs, but this is also not available # And --transform is also missing ... -dist: mk-livestatus-$(VERSION).tar.gz config.h.in configure +dist: mk-livestatus-$(VERSION).tar.gz $(DISTNAME).tar.gz config.h.in configure @EXCLUDES= ; \ if [ -d .git ]; then \ git rev-parse --short HEAD > COMMIT ; \ for X in $$(git ls-files --directory --others -i --exclude-standard) ; do \ - if [[ $$X != aclocal.m4 && $$X != config.h.in && $$X != configure ]]; then \ + if [[ $$X != aclocal.m4 && $$X != config.h.in && $$X != configure && $$X != $(DISTNAME).tar.gz ]]; then \ EXCLUDES+=" --exclude $${X%*/}" ; \ fi ; \ done ; \ diff --git a/omd/packages/check_mk/Makefile b/omd/packages/check_mk/Makefile index 538397b..903fc83 100644 --- a/omd/packages/check_mk/Makefile +++ b/omd/packages/check_mk/Makefile @@ -7,7 +7,9 @@ DISTNAME = $(NAME)-$(CMK_VERSION) .PHONY: skel build: clean - $(MAKE) -C ../../.. $(DISTNAME).tar.gz + if [ ! -f ../../../$(DISTNAME).tar.gz ]; then + $(MAKE) -C ../../.. $(DISTNAME).tar.gz + fi tar xzf $(REPO_PATH)/$(DISTNAME).tar.gz cd $(DISTNAME) ; \ mkdir bin ; \

6 years, 11 months

tar: Fixed another incompatibility with old tar versions (

by Lars Michelsen

missing --transform) Message-ID: <597ae3ab.SV0l5rWN/9yl0vRa%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 020307eb7d72e471e4bc2293df62d1bface08d13 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=020307eb7d72e4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 28 09:05:42 2017 +0200 tar: Fixed another incompatibility with old tar versions (missing --transform) Change-Id: If2da19bf72ef58511184fdba447a6f815ace517e --- Makefile | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 7e9da69..9233c29 100644 --- a/Makefile +++ b/Makefile @@ -188,7 +188,8 @@ check-version: # Would use --exclude-vcs-ignores but that's available from tar 1.29 which # is currently not used by most distros -# Would also use --exclude-vcs, but this is also not available +# Would also use --exclude-vcs, but this is also not available +# And --transform is also missing ... dist: mk-livestatus-$(VERSION).tar.gz @EXCLUDES= ; \ if [ -d .git ]; then \ @@ -197,18 +198,27 @@ dist: mk-livestatus-$(VERSION).tar.gz EXCLUDES+=" --exclude $${X%*/}" ; \ done ; \ fi ; \ - tar -cz --wildcards -f $(DIST_ARCHIVE) \ + if [ -d check-mk-$(EDITION)-$(OMD_VERSION) ]; then \ + rm -rf check-mk-$(EDITION)-$(OMD_VERSION) ; \ + fi ; \ + mkdir check-mk-$(EDITION)-$(OMD_VERSION) ; \ + tar -c --wildcards \ + $(TAROPTS) \ + --exclude check-mk-$(EDITION)-$(OMD_VERSION) \ --exclude .git \ --exclude .gitignore \ --exclude .gitmodules \ --exclude .gitattributes \ --exclude $(DIST_ARCHIVE) \ $$EXCLUDES \ - --transform 's|^|check-mk-$(EDITION)-$(OMD_VERSION)/|gS' \ - * .werks .clang* ; \ + * .werks .clang* | tar x -C check-mk-$(EDITION)-$(OMD_VERSION) ; \ if [ -f COMMIT ]; then \ rm COMMIT ; \ - fi + fi ; \ + tar -cz --wildcards -f $(DIST_ARCHIVE) \ + $(TAROPTS) \ + check-mk-$(EDITION)-$(OMD_VERSION) ; \ + rm -rf check-mk-$(EDITION)-$(OMD_VERSION) # This tar file is only used by "omd/packages/check_mk/Makefile" $(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks $(JAVASCRIPT_MINI) ChangeLog @@ -219,9 +229,9 @@ $(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks $(JAVASCRIPT_MI tar rf $(DISTNAME)/bin.tar $(TAROPTS) -C agents/windows/msibuild msi-update gzip $(DISTNAME)/bin.tar python -m compileall lib ; \ - tar czf $(DISTNAME)/lib.tar.gz $(TAROPTS) -C lib \ - --transform 's|^|cmk/|g' $$(cd lib ; ls) ; \ - rm lib/*.pyc + tar czf $(DISTNAME)/lib.tar.gz $(TAROPTS) \ + cmk/* ; \ + rm cmk/*.pyc python -m compileall cmk_base ; \ tar czf $(DISTNAME)/base.tar.gz \ $(TAROPTS) \

6 years, 11 months

tar: Exclude options should not be used after pathnames

by Lars Michelsen

Module: check_mk Branch: master Commit: 4111cedc9742440857e87927d299eb62dc8cccfc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4111cedc974244… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 28 08:46:10 2017 +0200 tar: Exclude options should not be used after pathnames Change-Id: I80bd7ac0bdda44851e37ced42520f02d9e609516 --- Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4f90c08..7e9da69 100644 --- a/Makefile +++ b/Makefile @@ -223,10 +223,13 @@ $(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks $(JAVASCRIPT_MI --transform 's|^|cmk/|g' $$(cd lib ; ls) ; \ rm lib/*.pyc python -m compileall cmk_base ; \ - tar czf $(DISTNAME)/base.tar.gz $(TAROPTS) cmk_base/* \ - --exclude ".f12" \ + tar czf $(DISTNAME)/base.tar.gz \ + $(TAROPTS) \ --exclude "cee" \ - --exclude "cee.py*" ; \ + --exclude "cee.py*" \ + --exclude "cme" \ + --exclude "cme.py*" \ + cmk_base/* ; \ rm cmk_base/*.pyc python -m compileall agents/special/lib ; \ tar czf $(DISTNAME)/special_agent_api.tar.gz $(TAROPTS) -C agents/special/lib cmk_special_agent_api.py \

6 years, 11 months

make dist target compatible with older distros

by Lars Michelsen

Module: check_mk Branch: master Commit: 9f83a65869d995d1b895b99fbf18814dc41d3c8d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f83a65869d995… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 28 08:31:56 2017 +0200 make dist target compatible with older distros Change-Id: I77955cc2a209f528affcd569a62dbe373e25a56a --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 002ec10..4f90c08 100644 --- a/Makefile +++ b/Makefile @@ -188,6 +188,7 @@ check-version: # Would use --exclude-vcs-ignores but that's available from tar 1.29 which # is currently not used by most distros +# Would also use --exclude-vcs, but this is also not available dist: mk-livestatus-$(VERSION).tar.gz @EXCLUDES= ; \ if [ -d .git ]; then \ @@ -197,7 +198,10 @@ dist: mk-livestatus-$(VERSION).tar.gz done ; \ fi ; \ tar -cz --wildcards -f $(DIST_ARCHIVE) \ - --exclude-vcs \ + --exclude .git \ + --exclude .gitignore \ + --exclude .gitmodules \ + --exclude .gitattributes \ --exclude $(DIST_ARCHIVE) \ $$EXCLUDES \ --transform 's|^|check-mk-$(EDITION)-$(OMD_VERSION)/|gS' \

6 years, 11 months

5046 Site specific globals: Highlight setting icon of sites having modified settings

by Lars Michelsen

Module: check_mk Branch: master Commit: ba3aa91ac6415317efee90cba82b41c511c87323 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba3aa91ac64153… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 27 17:19:23 2017 +0200 5046 Site specific globals: Highlight setting icon of sites having modified settings Change-Id: I328cd15e127958cbf7ca6a2364fc627b79976e67 --- .werks/5046 | 10 ++++++++++ web/htdocs/images/button_site_globals.png | Bin 0 -> 3722 bytes web/htdocs/images/button_site_globals_modified.png | Bin 0 -> 4386 bytes web/htdocs/wato.py | 11 ++++++++++- 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.werks/5046 b/.werks/5046 new file mode 100644 index 0000000..2a1b171 --- /dev/null +++ b/.werks/5046 @@ -0,0 +1,10 @@ +Title: Site specific globals: Highlight setting icon of sites having modified settings +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1501168736 +Class: feature + + diff --git a/web/htdocs/images/button_site_globals.png b/web/htdocs/images/button_site_globals.png new file mode 100644 index 0000000..d3ba9e4 Binary files /dev/null and b/web/htdocs/images/button_site_globals.png differ diff --git a/web/htdocs/images/button_site_globals_modified.png b/web/htdocs/images/button_site_globals_modified.png new file mode 100644 index 0000000..89b9d6f Binary files /dev/null and b/web/htdocs/images/button_site_globals_modified.png differ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e6e4823..d48914b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9688,7 +9688,16 @@ class ModeDistributedMonitoring(ModeSites): and (site.get("replication") or config.site_is_local(site_id))) \ or is_wato_slave_site(): globals_url = folder_preserving_link([("mode", "edit_site_globals"), ("site", site_id)]) - html.icon_button(globals_url, _("Site specific global configuration"), "configuration") + + has_site_globals = bool(site.get("globals")) + title = _("Site specific global configuration") + if has_site_globals: + icon = "site_globals_modified" + title += " (%s)" % (_("%d specific settings") % len(site.get("globals"))) + else: + icon = "site_globals" + + html.icon_button(globals_url, title, icon) def _page_basic_settings(self, site_id, site):

6 years, 11 months

Moved OMD site configuration WATO plugin to regular WATO plugin directory

by Lars Michelsen

Module: check_mk Branch: master Commit: 715f76a40d3746f00150b55f9708cb795d7feece URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=715f76a40d3746… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 27 17:04:24 2017 +0200 Moved OMD site configuration WATO plugin to regular WATO plugin directory Change-Id: I863a4ae6e6c2aa53640eb390c57e882a3244c41e --- omd/packages/maintenance/Makefile | 2 -- .../plugins/wato/omd_configuration.py | 28 +++++++++++----------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/omd/packages/maintenance/Makefile b/omd/packages/maintenance/Makefile index 7255e6a..14c3c90 100644 --- a/omd/packages/maintenance/Makefile +++ b/omd/packages/maintenance/Makefile @@ -14,8 +14,6 @@ install: # Create directory for the diskspace plugin mkdir -p $(DESTDIR)$(OMD_ROOT)/share/diskspace - - install -m 644 wato_omd_configuration.py $(DESTDIR)$(OMD_ROOT)/share/check_mk/web/plugins/wato/omd_configuration.py skel: diff --git a/omd/packages/maintenance/wato_omd_configuration.py b/web/plugins/wato/omd_configuration.py similarity index 87% rename from omd/packages/maintenance/wato_omd_configuration.py rename to web/plugins/wato/omd_configuration.py index 4dff906..1069342 100644 --- a/omd/packages/maintenance/wato_omd_configuration.py +++ b/web/plugins/wato/omd_configuration.py @@ -1,25 +1,25 @@ #!/usr/bin/python # -*- encoding: utf-8; py-indent-offset: 4 -*- -# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4 +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ # -# U ___ u __ __ ____ -# \/"_ \/U|' \/ '|u| _"\ -# | | | |\| |\/| |/| | | | -# .-,_| |_| | | | | |U| |_| |\ -# \_)-\___/ |_| |_| |____/ u -# \\ <<,-,,-. |||_ -# (__) (./ \.) (__)_) +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. # -# This file is part of OMD - The Open Monitoring Distribution. -# The official homepage is at <http://omdistro.org>. -# -# OMD is free software; you can redistribute it and/or modify it +# check_mk is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation in version 2. OMD is distributed +# the Free Software Foundation in version 2. check_mk is distributed # in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- # out even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. See the GNU General Public License for more de- -# ails. You should have received a copy of the GNU General Public +# tails. You should have received a copy of the GNU General Public # License along with GNU Make; see the file COPYING. If not, write # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA.

6 years, 11 months

Do not update cmc in integration tests for the moment

by Lars Michelsen

Module: check_mk Branch: master Commit: 7a7c504672b97a6eb6b5c6a366cd54b5962f10d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a7c504672b97a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 27 16:43:17 2017 +0200 Do not update cmc in integration tests for the moment Change-Id: If886da9252a35c3437a8834955ca526a0dbcf170 --- tests/testlib/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index f44f189..4191da8 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -441,7 +441,9 @@ class Site(object): cmc_path() + "/web", cmc_path() + "/alert_handlers", cmc_path() + "/misc", - cmc_path() + "/core", + # TODO: To be able to build the core correctly we need to build + # python/boost/python-modules/rrdtool first. Skip cmc for the moment here + #cmc_path() + "/core", cmc_path() + "/agents/bakery", cmc_path() + "/agents/plugins", cmc_path() + "/agents",

6 years, 11 months

Add some debug output to tests

by Lars Michelsen

Module: check_mk Branch: master Commit: caffe4acce5209e69a3ff24a377df35506563806 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=caffe4acce5209… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 27 16:23:36 2017 +0200 Add some debug output to tests Change-Id: Id5aa6bcc9fb03593011f8deded7d8cdc1aecad2d --- tests/testlib/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 9e84cf5..f44f189 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -246,13 +246,14 @@ class Site(object): def execute(self, cmd, *args, **kwargs): assert type(cmd) == list, "The command must be given as list" - sys.stdout.write("Executing: %s\n" % subprocess.list2cmdline(cmd)) if not self._is_running_as_site_user(): + sys.stdout.write("Executing (sudo): %s\n" % subprocess.list2cmdline(cmd)) cmd = [ "sudo", "su", "-l", self.id, "-c", pipes.quote(" ".join([ pipes.quote(p) for p in cmd ])) ] cmd_txt = " ".join(cmd) return subprocess.Popen(cmd_txt, shell=True, *args, **kwargs) else: + sys.stdout.write("Executing (site): %s\n" % subprocess.list2cmdline(cmd)) return subprocess.Popen(subprocess.list2cmdline(cmd), shell=True, *args, **kwargs)

6 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2017