Checkmk git commits October 2017

checkmk-commits@lists.checkmk.com

10 participants
288 discussions

agents build: Automatically setup and buld chroot (cleaned up soon)

by Lars Michelsen

Module: check_mk Branch: master Commit: 6bcb3df9a4f707362f3e426c24400702c9352ebf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6bcb3df9a4f707… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 4 13:58:49 2017 +0200 agents build: Automatically setup and buld chroot (cleaned up soon) Change-Id: I076f3636556c20c8befbf0160b93433d5e00e246 --- agents/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/agents/Makefile b/agents/Makefile index baad678..fea4c26 100644 --- a/agents/Makefile +++ b/agents/Makefile @@ -64,7 +64,10 @@ setversion: build: $(MAKE) packages - cd windows ; ./make-agent + cd windows \ + && ./make-agent setup \ + && ./make-agent chroot \ + && ./make-agent packages: rpm deb

6 years, 11 months

Hide windows agent build scripts from agent download page

by Lars Michelsen

Module: check_mk Branch: master Commit: 4268c97c6244c0579796d438a4390bf1259e2658 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4268c97c6244c0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 4 13:13:28 2017 +0200 Hide windows agent build scripts from agent download page Change-Id: I743cd1a0cc43b991a9add67db5affa4b218c4fb6 --- agents/windows/CONTENTS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/agents/windows/CONTENTS b/agents/windows/CONTENTS index 5d1c6c1..9f32e66 100644 --- a/agents/windows/CONTENTS +++ b/agents/windows/CONTENTS @@ -53,3 +53,6 @@ ExternalCmd.cc (hide) crashhandling.cc (hide) crashhandling.h (hide) .depend (hide) +do-chroot (hide) +make-chroot (hide) +make-agent (hide)

6 years, 11 months

Fixed wording: The edition is named "Check_MK Managed Services Edition"

by Lars Michelsen

Module: check_mk Branch: master Commit: 67879e622d15f38a6ec85fea3dba5d9827cf6ee9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67879e622d15f3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 4 12:49:45 2017 +0200 Fixed wording: The edition is named "Check_MK Managed Services Edition" Change-Id: Ice41bcf44d9718ccd587d0b8c8aeea708191c8e1 --- web/htdocs/werks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/werks.py b/web/htdocs/werks.py index 27e0b60..0822a6a 100644 --- a/web/htdocs/werks.py +++ b/web/htdocs/werks.py @@ -245,7 +245,7 @@ def werk_table_option_entries(): title = _("Edition"), choices = [ ( None, _("All editions") ), - ( "cme", _("Werks only concerning the Managed Service Edition") ), + ( "cme", _("Werks only concerning the Managed Services Edition") ), ( "cee", _("Werks only concerning the Enterprise Edition") ), ( "cre", _("Werks also concerning the Raw Edition") ), ],

6 years, 11 months

Remove tests for precompiled windows agent files

by Lars Michelsen

Module: check_mk Branch: master Commit: 19457c046824ad9702d1e544c21068a346b319fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19457c046824ad… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 4 12:41:05 2017 +0200 Remove tests for precompiled windows agent files Change-Id: Iff5fef66ceea54711e84bf42fbc4cd1d054da185 --- tests/git/test_precompiled_age.py | 66 --------------------------------------- 1 file changed, 66 deletions(-) diff --git a/tests/git/test_precompiled_age.py b/tests/git/test_precompiled_age.py deleted file mode 100644 index 11c5392..0000000 --- a/tests/git/test_precompiled_age.py +++ /dev/null @@ -1,66 +0,0 @@ -#!/usr/bin/python -# encoding: utf-8 - -import os -import glob -import pytest -from testlib import cmk_path - -# Mark all tests in this file to be executed in the git context -pytestmark = pytest.mark.git - -precompiled_files = [ - 'check_mk_agent.exe', - 'check_mk_agent-64.exe', - 'check_mk_agent.unversioned.exe', - 'check_mk_agent-64.unversioned.exe', - 'install_agent-64.exe', - 'install_agent.exe', - 'check_mk_agent.msi', -] - - -def test_precompiled_files_present(): - for filename in precompiled_files: - path = "%s/agents/windows/%s" % (cmk_path(), filename) - assert os.path.exists(path) - - -def test_precompiled_file_ages(): - newest_source_file, newest_source_time = find_newest_source_file() - - for filename in precompiled_files: - path = "%s/agents/windows/%s" % (cmk_path(), filename) - commit_time = last_commit_time(path) - assert commit_time >= newest_source_time, \ - "%s is older than source code file %s" % (path, newest_source_file) - - -def find_newest_source_file(): - newest_path, newest_commit_time = None, 0 - - for dirpath, dirnames, filenames in os.walk("%s/agents/windows" % cmk_path()): - for filename in filenames: - path = "%s/%s" % (dirpath, filename) - - if not filename.endswith(".cc") and not filename.endswith(".h"): - continue - - if "/msibuild/" in path: - continue - - commit_time = last_commit_time(path) - if commit_time > newest_commit_time: - newest_path, newest_commit_time = path, commit_time - - assert newest_path != None - assert newest_commit_time != 0 - - return newest_path, newest_commit_time - - -def last_commit_time(path): - lines = os.popen('unset GIT_DIR ; cd "%s" ; ' - 'git log -n 1 --date=raw -- "%s"' % (os.path.dirname(path), path)).readlines() - timestamp = int(lines[2].split()[1]) - return timestamp

6 years, 11 months

Exclude chroot from dist package

by Lars Michelsen

Module: check_mk Branch: master Commit: 470ff6967b642ae507b307710135d348424bc051 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=470ff6967b642a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 4 12:18:19 2017 +0200 Exclude chroot from dist package Change-Id: Ib4d448c3f1f0d884a59485c89782083b601f00c7 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e58da91..4dd6638 100644 --- a/Makefile +++ b/Makefile @@ -291,6 +291,7 @@ $(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks $(JAVASCRIPT_MI --exclude "windows/openhardwaremonitor" \ --exclude "windows/sections" \ --exclude "windows/frozen_binaries" \ + --exclude "windows/chroot" \ --exclude "special/lib" \ --exclude .f12 $$(cd agents ; ls) cd $(DISTNAME) ; ../scripts/make_package_info $(VERSION) > package_info @@ -383,7 +384,6 @@ clean: precompiled cache web/htdocs/js/*_min.js \ .werks/werks \ ChangeLog - find -name "*~" | xargs rm -f mrproper: git clean -d --force -x \

6 years, 11 months

Agents: Removed build steps from "make setversion"

by Lars Michelsen

Module: check_mk Branch: master Commit: ce28e8eeaf36e38168cf5cc2850f2987430cb68b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce28e8eeaf36e3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 4 11:50:14 2017 +0200 Agents: Removed build steps from "make setversion" The setversion target should only modify checked in source files to update their version numbers. The creation/update of build results should be independent of that. We now execute the building of agent files now during "make dist" of the main makefile. Change-Id: Icd2cea0f0b0ceb1a388afe6ed96a14db34403893 --- Makefile | 1 + agents/Makefile | 5 ++++- agents/windows/Makefile | 5 ++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 2cdd4c1..e58da91 100644 --- a/Makefile +++ b/Makefile @@ -230,6 +230,7 @@ $(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks $(JAVASCRIPT_MI @echo "Making $(DISTNAME)" rm -rf $(DISTNAME) mkdir -p $(DISTNAME) + $(MAKE) -C agents build tar cf $(DISTNAME)/bin.tar $(TAROPTS) -C bin $$(cd bin ; ls) tar rf $(DISTNAME)/bin.tar $(TAROPTS) -C agents/windows/msibuild msi-update gzip $(DISTNAME)/bin.tar diff --git a/agents/Makefile b/agents/Makefile index dec3b0d..baad678 100644 --- a/agents/Makefile +++ b/agents/Makefile @@ -34,6 +34,7 @@ DEB_PACKAGE = check-mk-agent_$(VERSION)-1_all.deb usage: @echo "make waitmax -- compile waitmax.c" + @echo "make build -- create all files needed for \"make dist\" of Check_MK" @echo "make rpm -- create RPM package of Linux agent" @echo "make deb -- create DEB package of Linux agent" @echo "make packages -- create RPM and DEB package of Linux agent" @@ -59,7 +60,9 @@ setversion: if [ "$$agent" != windows -a "$$agent" != plugins -a "$$agent" != hpux ] ; then \ sed -i 's/echo Version: [0-9.a-z-]*/'"echo Version: $(NEW_VERSION)/g" $$agent; \ fi ; \ - done ; \ + done + +build: $(MAKE) packages cd windows ; ./make-agent diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 529d33c..9f9a18e 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -62,9 +62,8 @@ all: directories fix_linebreaks check_mk_agent.exe check_mk_agent-64.exe install .PHONY: directories inc_build_version fix_linebreaks setversion: - sed -i 's/!define CHECK_MK_VERSION .*/!define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' installer*.nsi ; \ - sed -ri 's/^(VERSION[[:space:]]*:?= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ - $(MAKE) clean install_agent.exe install_agent-64.exe msi_installer + sed -i 's/!define CHECK_MK_VERSION .*/!define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' installer*.nsi + sed -ri 's/^(VERSION[[:space:]]*:?= *).*/\1'"$(NEW_VERSION)/" Makefile # Converts all files which are targeted to a windows system to CRLF fix_linebreaks:

6 years, 11 months

IWYU fixes.

by Sven Panne

Module: check_mk Branch: master Commit: 2549f4bd7a67b6b08629d386817db069a037e07c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2549f4bd7a67b6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Oct 4 12:05:30 2017 +0200 IWYU fixes. Change-Id: Ia964639049e221e35d007895070a9ec2185c6f55 --- livestatus/src/HostServiceState.h | 3 ++- livestatus/src/RendererBrokenCSV.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/livestatus/src/HostServiceState.h b/livestatus/src/HostServiceState.h index adf89f7..0782647 100644 --- a/livestatus/src/HostServiceState.h +++ b/livestatus/src/HostServiceState.h @@ -26,8 +26,9 @@ #define HostServiceState_h #include "config.h" // IWYU pragma: keep +#include <cstdint> #include <ctime> -#include <string> // for string +#include <string> #include <vector> class HostServiceState; diff --git a/livestatus/src/RendererBrokenCSV.h b/livestatus/src/RendererBrokenCSV.h index 6aef523..11e7180 100644 --- a/livestatus/src/RendererBrokenCSV.h +++ b/livestatus/src/RendererBrokenCSV.h @@ -26,6 +26,7 @@ #define RendererBrokenCSV_h #include "config.h" // IWYU pragma: keep +#include <chrono> #include <iosfwd> #include <string> #include <vector>

6 years, 11 months

Fixed bug in changed test

by Lars Michelsen

Module: check_mk Branch: master Commit: bed19f0954c96749cbdf38a28e37a422c53c87b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bed19f0954c967… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 4 11:33:10 2017 +0200 Fixed bug in changed test Change-Id: I17f7eb4a687bd1eae1f94cc4424bd95457e709d7 --- tests/mkeventd/test_mkeventd_status.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/mkeventd/test_mkeventd_status.py b/tests/mkeventd/test_mkeventd_status.py index b3d5a17..8582fe9 100644 --- a/tests/mkeventd/test_mkeventd_status.py +++ b/tests/mkeventd/test_mkeventd_status.py @@ -76,7 +76,7 @@ def test_handle_client(status_server, event_status): def test_mkevent_check_query_perf(config, status_server, event_status, perfcounters): - for n in range(10000): + for num in range(10000): event_status.new_event(CMKEventConsole.new_event({ "host": "heute-%d" % num, "text": "%s %s BLA BLUB DINGELING ABASD AD R#@A AR@AR A@ RA@R A@RARAR ARKNLA@RKA@LRKNA@KRLNA@RLKNA@äRLKA@RNKAL@R" \

6 years, 11 months

Windows agent: Cleanup precompiled binary stuff - move build to chroot

by Lars Michelsen

Module: check_mk Branch: master Commit: 85032462da642e60478016e6ba27ba7ae0496800 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85032462da642e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 4 11:41:25 2017 +0200 Windows agent: Cleanup precompiled binary stuff - move build to chroot Change-Id: Ia393231f918d3086e60fde7c9c386595676b1a04 --- Makefile | 1 - agents/windows/.gitignore | 4 +-- agents/windows/CONTENTS | 2 -- agents/windows/Makefile | 35 +++++------------------ agents/windows/README | 6 ++-- agents/windows/bin_replace | 29 ------------------- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1568768 -> 0 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 22974157 -> 0 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1568768 -> 0 bytes agents/windows/check_mk_agent.exe | Bin 1552384 -> 0 bytes agents/windows/check_mk_agent.msi | Bin 3395072 -> 0 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 19784372 -> 0 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1552384 -> 0 bytes agents/windows/crash.exe | Bin 358864 -> 0 bytes agents/windows/install_agent-64.exe | Bin 683171 -> 0 bytes agents/windows/install_agent.exe | Bin 678268 -> 0 bytes agents/windows/nowin.exe | Bin 361000 -> 0 bytes 18 files changed, 12 insertions(+), 67 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=85032462da…

6 years, 11 months

Fixed wrong versions in git files

by Lars Michelsen

Module: check_mk Branch: master Commit: 7124b94d37f0baf7e06d3c359176cb28e03a42c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7124b94d37f0ba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 4 10:50:42 2017 +0200 Fixed wrong versions in git files Change-Id: I9fbac182323b76b30efbfa4bd3fe600e489cfc5f --- bin/livedump | 2 +- bin/mkbench | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/livedump b/bin/livedump index e115e8c..48b0ca2 100755 --- a/bin/livedump +++ b/bin/livedump @@ -27,7 +27,7 @@ import os, sys, getopt, livestatus, tempfile, time # These variable will be substituted at 'make dist' time -__version__ = "1.4.0p7" +__version__ = "1.5.0i1" def dump_templates(): check_interval = "" diff --git a/bin/mkbench b/bin/mkbench index 4af2c3b..f3b0f7d 100755 --- a/bin/mkbench +++ b/bin/mkbench @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -__version__ = "1.4.0b4" +__version__ = "1.5.0i1" # TODO: # - Create a more detailed report out of the test results. For example

6 years, 11 months

← Newer
1
...
22
23
24
25
26
27
28
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