Checkmk git commits October 2018

checkmk-commits@lists.checkmk.com

15 participants
308 discussions

6414 FIX aix_memory: Fix graph colouring and labelling

by Tom Baerwinkel

Module: check_mk Branch: master Commit: c6478efd7f95f7f7bc303d5612dde00bf6b81562 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6478efd7f95f7… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Oct 29 14:09:54 2018 +0100 6414 FIX aix_memory: Fix graph colouring and labelling Map the performance value name of averaged memory to the correct metric. Change-Id: I16ba36d18b945a2147397dcce4f403f7f7a00244 --- .werks/6414 | 12 ++++++++++++ cmk/gui/plugins/metrics/check_mk.py | 1 + 2 files changed, 13 insertions(+) diff --git a/.werks/6414 b/.werks/6414 new file mode 100644 index 0000000..0aca4c0 --- /dev/null +++ b/.werks/6414 @@ -0,0 +1,12 @@ +Title: aix_memory: Fix graph colouring and labelling +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1540818490 + +Map the performance value name of averaged memory +to the correct metric. diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index fa569f5..b88367b 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -4695,6 +4695,7 @@ check_metrics["check_mk-aix_memory"] = { "ramused" : { "name" : "mem_used", "scale": MB }, "swapused" : { "name" : "swap_used", "scale": MB }, "memused" : { "name" : "mem_lnx_total_used", "scale" : MB }, + "memusedavg" : { "name" : "memory_avg", "scale" : MB }, } check_metrics["check_mk-mem.win"] = {

5 years, 8 months

CMK-1134: rework re2 Makefile -> enable incremental builds

by Alex Zurhake

Module: check_mk Branch: master Commit: ce9ddfd792a6fb1fe9559409bf57b7ee78895e00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce9ddfd792a6fb… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Fri Oct 26 14:55:42 2018 +0200 CMK-1134: rework re2 Makefile -> enable incremental builds Change-Id: If4dfa7401b88c2f7f8bbe8a92ff70f3d9faf1dd2 --- omd/packages/re2/Makefile | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/omd/packages/re2/Makefile b/omd/packages/re2/Makefile index c8401a8..bdd585a 100644 --- a/omd/packages/re2/Makefile +++ b/omd/packages/re2/Makefile @@ -3,13 +3,24 @@ include ../../Makefile.omd # We use a released version from https://github.com/google/re2/, but in # principle we could use any tag by exporting it manually via: # ( TAG=2018-02-01; git archive --prefix=re2-$TAG/ --output=re2-$TAG.tar.gz $TAG ) -NAME = re2 -VERSION = 2018-10-01 -DIR = $(NAME)-$(VERSION) +NAME := re2 +VERSION := 2018-10-01 +DIR := $(NAME)-$(VERSION) + +BUILD-HELPER-DIR := .$(NAME)-build-helper + +TARXZ := $(shell which tar) xzf +TOUCH := $(shell which touch) +MKDIR := $(shell which mkdir) -p .PHONY: build unpacks install skel clean -build: unpack +build: $(BUILD-HELPER-DIR)/build + +unpack: $(BUILD-HELPER-DIR)/unpack + + +$(BUILD-HELPER-DIR)/build: $(BUILD-HELPER-DIR)/unpack # basically what part of AC_PROC_CXX does @CXX="" ; \ for PROG in g++-8 clang++-7 g++-7 clang++-6.0 clang++-5.0 g++-6 clang++-4.0 g++-5 clang++-3.9 clang++-3.8 clang++-3.7 clang++-3.6 clang++-3.5 g++-4.9 g++ clang++; do \ @@ -28,18 +39,21 @@ build: unpack # TODO(sp): What should we do about RE2_ON_VALGRIND? # Massage paths a bit by moving things around. mv $(PACKAGE_RE2_DESTDIR)/$(OMD_ROOT)/include $(PACKAGE_RE2_DESTDIR)/$(OMD_ROOT)/lib $(PACKAGE_RE2_DESTDIR) - rm -rf $(PACKAGE_RE2_DESTDIR)/$(OMD_BASE) + $(RM) -r $(PACKAGE_RE2_DESTDIR)/$(OMD_BASE) # To link statically against RE2, we must *only* see the static library at link # time. It is a bit wasteful to build the dynamic library, too, but RE2's # Makefile doesn't offer an easy way around that. $(RM) $(PACKAGE_RE2_DESTDIR)/lib/*.so* + $(TOUCH) $@ -unpack: - tar xzf $(DIR).tar.gz +$(BUILD-HELPER-DIR)/unpack: $(DIR).tar.gz + $(MKDIR) $(BUILD-HELPER-DIR) + $(TARXZ) $< + $(TOUCH) $@ install: skel: clean: - rm -rf $(DIR) $(PACKAGE_RE2_DESTDIR) + $(RM) -r $(DIR) $(PACKAGE_RE2_DESTDIR) $(BUILD-HELPER-DIR)

5 years, 8 months

CMK-1134: rework freetds Makefile -> enable incremental builds

by Alex Zurhake

Module: check_mk Branch: master Commit: fc762683b0f1c1c59d0e9414ec1fe5164ef5aa01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc762683b0f1c1… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Fri Oct 26 14:38:53 2018 +0200 CMK-1134: rework freetds Makefile -> enable incremental builds Change-Id: I01869001711ecc4919c37ae3d98647aef9692be3 --- omd/packages/freetds/Makefile | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/omd/packages/freetds/Makefile b/omd/packages/freetds/Makefile index 4b03a50..d68d4d4 100644 --- a/omd/packages/freetds/Makefile +++ b/omd/packages/freetds/Makefile @@ -1,13 +1,26 @@ include ../../Makefile.omd -NAME = freetds -VERSION = 0.95.95 -DIR = $(NAME)-$(VERSION) +NAME := freetds +VERSION := 0.95.95 +DIR := $(NAME)-$(VERSION) + +BUILD-HELPER-DIR := .$(NAME)-build-helper + +TARXZ := $(shell which tar) xzf +TOUCH := $(shell which touch) +MKDIR := $(shell which mkdir) .PHONY: build install skel clean +build: $(BUILD-HELPER-DIR)/build + +unpack: $(BUILD-HELPER-DIR)/unpack + +$(BUILD-HELPER-DIR)/unpack: $(DIR).tar.gz + $(MKDIR) $(BUILD-HELPER-DIR) + $(TARXZ) $< + $(TOUCH) $@ -build: - tar xzf $(DIR).tar.gz +$(BUILD-HELPER-DIR)/build: $(BUILD-HELPER-DIR)/unpack cd $(DIR) && \ ./configure \ --enable-msdblib \ @@ -22,12 +35,13 @@ build: # Package python-modules needs some stuff during the build. $(MAKE) -C $(DIR)/include prefix=$(PACKAGE_FREETDS_DESTDIR) install $(MAKE) -C $(DIR)/src/dblib prefix=$(PACKAGE_FREETDS_DESTDIR) install + $(TOUCH) $@ -install: +install: $(BUILD-HELPER-DIR)/build # At runtime we need only the libraries. $(MAKE) -C $(DIR)/src/dblib DESTDIR=$(DESTDIR) install skel: clean: - rm -rf $(DIR) + $(RM) -r $(DIR) $(BUILD-HELPER-DIR)

5 years, 8 months

CMK-1134: rework perl-modules Makefile -> enable incremental builds

by Alex Zurhake

Module: check_mk Branch: master Commit: dc553b589c0c93ac16a8640221d4cff21f9a538d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc553b589c0c93… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Wed Oct 24 15:33:35 2018 +0200 CMK-1134: rework perl-modules Makefile -> enable incremental builds Change-Id: Ic8c60c52ce92b24b2dba882d893452e3427c5e36 --- omd/packages/perl-modules/Makefile | 76 ++++++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 32 deletions(-) diff --git a/omd/packages/perl-modules/Makefile b/omd/packages/perl-modules/Makefile index c19f432..cc7ed73 100644 --- a/omd/packages/perl-modules/Makefile +++ b/omd/packages/perl-modules/Makefile @@ -1,9 +1,9 @@ include ../../Makefile.omd -NAME = perl-modules -VERSION = $(OMD_VERSION) +NAME := perl-modules +VERSION : $(OMD_VERSION) -MODULES = \ +MODULES := \ Capture-Tiny-0.27.tar.gz \ Carp-Clan-6.04.tar.gz \ Class-Accessor-0.34.tar.gz \ @@ -81,48 +81,60 @@ MODULES = \ Nagios-Plugin-0.36.tar.gz \ DateTime-1.18.tar.gz -build: - mkdir -p $(PACKAGE_PERL_MODULES_DESTDIR)/dest - mkdir -p $(PACKAGE_PERL_MODULES_DESTDIR)/src - rsync -a src/. $(PACKAGE_PERL_MODULES_DESTDIR)/src/. - rsync -a build_module.pl lib $(PACKAGE_PERL_MODULES_DESTDIR)/src/. +# Programms being called by make +# TODO: Define only once +MKDIR := $(shell which mkdir) -p +RSYNC := $(shell which rsync) -a +TOUCH := $(shell which touch) + +BUILD-HELPER-DIR := .$(NAME)-build-helper +BUILD := $(BUILD-HELPER-DIR)/build + +build: $(BUILD) + +$(BUILD): + $(MKDIR) $(PACKAGE_PERL_MODULES_DESTDIR)/dest + $(MKDIR) $(PACKAGE_PERL_MODULES_DESTDIR)/src + $(RSYNC) src/. $(PACKAGE_PERL_MODULES_DESTDIR)/src/. + $(RSYNC) build_module.pl lib $(PACKAGE_PERL_MODULES_DESTDIR)/src/. echo "install --install_base $(PACKAGE_PERL_MODULES_DESTDIR)/dest" > $(PACKAGE_PERL_MODULES_DESTDIR)/dest/.modulebuildrc unset LANG; \ - unset PERL5LIB; \ - unset PERL_MB_OPT; \ - unset PERL_LOCAL_LIB_ROOT; \ - unset PERL_MM_OPT; \ - export PATH=$(PACKAGE_PERL_MODULES_DESTDIR)/dest/bin:$$PATH; \ + unset PERL5LIB; \ + unset PERL_MB_OPT; \ + unset PERL_LOCAL_LIB_ROOT; \ + unset PERL_MM_OPT; \ + export PATH=$(PACKAGE_PERL_MODULES_DESTDIR)/dest/bin:$$PATH; \ export PERL_MM_OPT=INSTALL_BASE=$(PACKAGE_PERL_MODULES_DESTDIR)/dest; \ export PERL_MB_OPT=--install_base=$(PACKAGE_PERL_MODULES_DESTDIR)/dest; \ export MODULEBUILDRC=$(PACKAGE_PERL_MODULES_DESTDIR)/dest/.modulebuildrc; \ export PERL5LIB=$(PACKAGE_PERL_MODULES_PERL5LIB):$(PACKAGE_PERL_MODULES_DESTDIR)/src/lib:$(PACKAGE_PERL_MODULES_DESTDIR)/src/Crypt-SSLeay-0.72; \ - cd $(PACKAGE_PERL_MODULES_DESTDIR)/src && \ - FORCE=1 ./build_module.pl -d "$(DISTRO_INFO)" -p $(PACKAGE_PERL_MODULES_DESTDIR)/dest \ - ExtUtils-MakeMaker-*.tar.gz \ - parent-*.tar.gz \ - version-*.tar.gz \ - Module-CoreList-*.tar.gz \ - common-sense-*.tar.gz \ - Types-Serialiser-*.tar.gz \ - JSON-*.tar.gz; \ + cd $(PACKAGE_PERL_MODULES_DESTDIR)/src ; \ + FORCE=1 ./build_module.pl -d "$(DISTRO_INFO)" -p $(PACKAGE_PERL_MODULES_DESTDIR)/dest \ + ExtUtils-MakeMaker-*.tar.gz \ + parent-*.tar.gz \ + version-*.tar.gz \ + Module-CoreList-*.tar.gz \ + common-sense-*.tar.gz \ + Types-Serialiser-*.tar.gz \ + JSON-*.tar.gz; \ export PERL_JSON_BACKEND='JSON::XS'; \ - cd $(PACKAGE_PERL_MODULES_DESTDIR)/src && \ - ./build_module.pl -d "$(DISTRO_INFO)" -p $(PACKAGE_PERL_MODULES_DESTDIR)/dest $(MODULES) - cd $(PACKAGE_PERL_MODULES_PERL5LIB)/ && rm -f utils.pm && ln -s ../../../nagios/plugins/utils.pm . - mkdir -p $(PACKAGE_PERL_MODULES_PERL5LIB)/CPAN + cd $(PACKAGE_PERL_MODULES_DESTDIR)/src ; \ + ./build_module.pl -d "$(DISTRO_INFO)" -p $(PACKAGE_PERL_MODULES_DESTDIR)/dest $(MODULES) + cd $(PACKAGE_PERL_MODULES_PERL5LIB)/ ; $(RM) utils.pm ; ln -s ../../../nagios/plugins/utils.pm . + $(MKDIR) $(PACKAGE_PERL_MODULES_PERL5LIB)/CPAN cp MyConfig.pm $(PACKAGE_PERL_MODULES_PERL5LIB)/CPAN/MyConfig.skel + $(MKDIR) $(BUILD-HELPER-DIR) + $(TOUCH) $@ install: if [ -z $(DESTDIR) ]; then echo "cannot install without DESTDIR set!"; exit 1; fi - mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/perl5 $(DESTDIR)$(OMD_ROOT)/bin - rsync -a $(PACKAGE_PERL_MODULES_DESTDIR)/dest/lib $(DESTDIR)$(OMD_ROOT)/lib/perl5/ - rsync -a $(PACKAGE_PERL_MODULES_DESTDIR)/dest/bin $(DESTDIR)$(OMD_ROOT)/lib/perl5/ - mkdir -p $(DESTDIR)$(OMD_ROOT)/local/lib/perl5 + $(MKDIR) $(DESTDIR)$(OMD_ROOT)/lib/perl5 $(DESTDIR)$(OMD_ROOT)/bin + $(RSYNC) $(PACKAGE_PERL_MODULES_DESTDIR)/dest/lib $(DESTDIR)$(OMD_ROOT)/lib/perl5/ + $(RSYNC) $(PACKAGE_PERL_MODULES_DESTDIR)/dest/bin $(DESTDIR)$(OMD_ROOT)/lib/perl5/ + $(MKDIR) $(DESTDIR)$(OMD_ROOT)/local/lib/perl5 install -m 755 bin/cpan.wrapper $(DESTDIR)$(OMD_ROOT)/bin/cpan.wrapper - skel: echo "install --install_base ###ROOT###/local/lib/perl5" > $(SKEL)/.modulebuildrc clean: - rm -rf src/inc $(PACKAGE_PERL_MODULES_DESTDIR) + $(RM) -r src/inc $(PACKAGE_PERL_MODULES_DESTDIR) $(BUILD-HELPER-DIR)

5 years, 8 months

add custom sources.list, since original one does not always work in docker

by Alex Zurhake

Module: check_mk Branch: master Commit: bd893f00a59eb8c8e0bf908e08167f54fff2d79b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd893f00a59eb8… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Oct 29 12:36:29 2018 +0100 add custom sources.list, since original one does not always work in docker Change-Id: I56c8f7b48a24389cb8ee1c5203b3e2b6d25806d6 --- docker/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 74d228e..9018231 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -31,10 +31,12 @@ COPY needed-packages /needed-packages # Then fetch the package and install it. This will make sure all Check_MK # containers will share all dependencies, including this step. # hadolint ignore=SC2046,DL3008 +# Add sources.list since 'deb http://deb.debian.org/debian stretch main' is not always resolved correctly RUN set -e \ && echo "exit 101" > /usr/sbin/policy-rc.d \ && chmod +x /usr/sbin/policy-rc.d \ && export DEBIAN_FRONTEND=noninteractive \ + && echo 'ftp.de.debian.org/debian stretch main' > /etc/apt/sources.list && apt-get update \ && apt-get install -y --no-install-recommends \ ca-certificates \

5 years, 8 months

YAPFed cmk/gui files availability.py to cron.py

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 260843dd98748958f7fe09b31f71195199b14669 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=260843dd987489… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Oct 26 11:47:57 2018 +0200 YAPFed cmk/gui files availability.py to cron.py CMK-1180 Change-Id: I2b93c6b29d4ef22e76fca9120416e9ffb92c4fec --- cmk/gui/availability.py | 517 +++++++++++---------- cmk/gui/background_job.py | 160 +++---- cmk/gui/bi.py | 1098 ++++++++++++++++++++++++-------------------- cmk/gui/config.py | 209 +++++---- cmk/gui/crash_reporting.py | 72 +-- cmk/gui/cron.py | 8 +- 6 files changed, 1096 insertions(+), 968 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=260843dd98…

5 years, 8 months

YAPFed web directory

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 302c84ded64fef5d78d2ad99eceba082a27196d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=302c84ded64fef… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Oct 26 09:55:24 2018 +0200 YAPFed web directory CMK-1180 Change-Id: Ic0f3688c7406c0445e6abf8958dca32ce3d5c10f --- web/app/index.wsgi | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/web/app/index.wsgi b/web/app/index.wsgi index c1230e0..33ae521 100644 --- a/web/app/index.wsgi +++ b/web/app/index.wsgi @@ -55,11 +55,13 @@ from cmk.gui.exceptions import ( MKAuthException, MKUnauthenticatedException, FinalizeRequest, - HTTPRedirect + HTTPRedirect, ) + class Application(object): """The Check_MK GUI WSGI entry point""" + def __init__(self, wsgi_environ, start_response): self._start_response = start_response self._request = cmk.gui.http.Request(wsgi_environ) @@ -80,12 +82,12 @@ class Application(object): self._process_request() - def _process_request(self): try: config.initialize() - with cmk.profile.Profile(enabled=self._profiling_enabled(), + with cmk.profile.Profile( + enabled=self._profiling_enabled(), profile_file=os.path.join(cmk.paths.var_dir, "multisite.profile")): self._handle_request() @@ -96,8 +98,15 @@ class Application(object): except FinalizeRequest, e: html.response.set_status_code(e.status) - except (MKUserError, MKAuthException, MKUnauthenticatedException, MKConfigError, MKGeneralException, - livestatus.MKLivestatusNotFoundError, livestatus.MKLivestatusException), e: + except ( + MKUserError, + MKAuthException, + MKUnauthenticatedException, + MKConfigError, + MKGeneralException, + livestatus.MKLivestatusNotFoundError, + livestatus.MKLivestatusException, + ), e: # TODO: Refactor all the special cases handled here to simplify the exception handling html.unplug_all() @@ -110,7 +119,7 @@ class Application(object): title = _("Livestatus problem") plain_title = _("Livestatus problem") else: - title = e.title() + title = e.title() plain_title = e.plain_title() if self._plain_error(): @@ -121,7 +130,6 @@ class Application(object): html.show_error(e) html.footer() - # Some exception need to set a specific HTTP status code if ty == MKUnauthenticatedException: html.response.set_status_code(cmk.gui.http_status.HTTP_UNAUTHORIZED) @@ -150,7 +158,6 @@ class Application(object): logger.exception() raise - def _teardown(self): """Final steps that are performed after each handled HTTP request""" store.release_all_locks() @@ -159,7 +166,6 @@ class Application(object): html.finalize() cmk.gui.globals.html.unset_current() - def _handle_request(self): html.init_modes() @@ -206,13 +212,11 @@ class Application(object): self._ensure_general_access() handler() - def _show_exception_info(self, e): html.write_text("%s" % e) if config.debug: html.write_text(traceback.format_exc()) - def _handle_not_authenticated(self): if self._fail_silently(): # While api call don't show the login dialog @@ -223,7 +227,7 @@ class Application(object): # or "dashboard.py". This results in strange problems. if html.myfile != 'login': html.response.http_redirect('%scheck_mk/login.py?_origtarget=%s' % - (config.url_prefix(), html.urlencode(html.makeuri([])))) + (config.url_prefix(), html.urlencode(html.makeuri([])))) else: # This either displays the login page or validates the information submitted # to the login form. After successful login a http redirect to the originally @@ -232,7 +236,6 @@ class Application(object): raise FinalizeRequest() - def _localize_request(self): previous_language = cmk.gui.i18n.get_current_language() user_language = html.get_ascii_input("lang", config.user.language()) @@ -246,29 +249,25 @@ class Application(object): if cmk.gui.i18n.get_current_language() != previous_language: modules.load_all_plugins() - def _fail_silently(self): """Ajax-Functions want no HTML output in case of an error but just a plain server result code of 500""" return html.has_var("_ajaxid") - def _plain_error(self): """Webservice functions may decide to get a normal result code but a text with an error message in case of an error""" return html.has_var("_plain_error") or html.myfile == "webapi" - def _profiling_enabled(self): if config.profile == False: - return False # Not enabled + return False # Not enabled if config.profile == "enable_by_var" and not html.has_var("_profile"): - return False # Not enabled by HTTP variable + return False # Not enabled by HTTP variable return True - # TODO: This is a page handler. It should not be located in generic application # object. Move it to another place def _page_not_found(self): @@ -279,7 +278,6 @@ class Application(object): html.show_error(_("This page was not found. Sorry.")) html.footer() - def _ensure_general_access(self): if config.user.may("general.use"): return @@ -302,7 +300,6 @@ class Application(object): raise MKAuthException(" ".join(reason)) - def __iter__(self): """Is called by the WSGI server to serve the current page""" self._start_response(self._response.http_status, self._response.headers)

5 years, 8 months

Unbreak openhardwaremonitor 'dist' target.

by Sven Panne

Module: check_mk Branch: master Commit: f6669effb3a3e0c3afe81af86db3b273f302ac85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6669effb3a3e0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Oct 26 16:36:33 2018 +0200 Unbreak openhardwaremonitor 'dist' target. Change-Id: I9a3e6a2f84d659ec8146effd28eb6a99e83c5a82 --- omd/packages/openhardwaremonitor/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/omd/packages/openhardwaremonitor/Makefile b/omd/packages/openhardwaremonitor/Makefile index 4a17d49..2bf30dc 100644 --- a/omd/packages/openhardwaremonitor/Makefile +++ b/omd/packages/openhardwaremonitor/Makefile @@ -22,7 +22,11 @@ OpenHardwareMonitorCLI.exe OpenHardwareMonitorLib.dll: $(DIR)/Bin/Release/OpenHa cp -p $(DIR)/Bin/Release/OpenHardwareMonitorCLI.exe $(DIR)/Bin/Release/OpenHardwareMonitorLib.dll . $(DIR)/Bin/Release/OpenHardwareMonitorCLI.exe $(DIR)/Bin/Release/OpenHardwareMonitorLib.dll: $(DIR) $(DIR)/OpenHardwareMonitorCLI $(DIR)/OpenHardwareMonitor.sln - xbuild /p:Configuration=Release /p:TargetFrameworkVersion="v4.5" $(DIR)/OpenHardwareMonitor.sln /target:OpenHardwareMonitorCLI +# The strange "cat" below is necessary because the extremely ancient Mono +# versions coming with even the latest Ubuntus still contain the rather severe +# bug https://github.com/mono/mono/issues/6752. ("...System.Exception: Magic +# number is wrong: 542") :-P + xbuild /p:Configuration=Release /p:TargetFrameworkVersion="v4.5" $(DIR)/OpenHardwareMonitor.sln /target:OpenHardwareMonitorCLI | cat $(DIR): $(DIR).zip unzip -o $<

5 years, 8 months

Fixed race condition.

by Sven Panne

Module: check_mk Branch: master Commit: f59f7df4a3f5f17fe83b4585ece57f9c83de749d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f59f7df4a3f5f1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Oct 26 15:59:07 2018 +0200 Fixed race condition. Change-Id: If630777722a2f83add9568ef7ca97f1a682cde45 --- omd/packages/python/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omd/packages/python/Makefile b/omd/packages/python/Makefile index bf21075..f371e5c 100644 --- a/omd/packages/python/Makefile +++ b/omd/packages/python/Makefile @@ -62,7 +62,7 @@ bin/gcc: echo "no"; IFS=$$SAVED_IFS ; \ done ; \ test -z "$$CC" && { echo "error: no C compiler found" >&2 ; exit 1; } ; \ - test -d bin || mkdir bin ; \ + mkdir -p bin ; \ rm -f bin/gcc ; \ ln -s "$$CC" bin/gcc @@ -79,7 +79,7 @@ bin/g++: echo "no"; IFS=$$SAVED_IFS ; \ done ; \ test -z "$$CXX" && { echo "error: no C++ compiler found" >&2 ; exit 1; } ; \ - test -d bin || mkdir bin ; \ + mkdir -p bin ; \ rm -f bin/g++ ; \ ln -s "$$CXX" bin/g++

5 years, 8 months

[CMC-1183] - correct processing of binary data from the WMI

by Sergey Kipnis

Module: check_mk Branch: master Commit: 80a9f10400051a1bc29947a208248e6e9fd7af57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80a9f10400051a… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Tue Oct 23 18:15:40 2018 +0200 [CMC-1183] - correct processing of binary data from the WMI 6861 FIX Correct "ps" section output for Process Id, Pagefile usage, etc Now Windows Agent produces correct output for Process Id, Handle Counts, Thread Counts, Pagefile Usage when 32-bit OS used. Change-Id: I7dacdb135dc91993632acccd51599a216df036c3 --- .werks/6861 | 12 ++++++++ agents/windows/sections/SectionPS.cc | 54 ++++++++++++++++++++++++++--------- agents/windows/sections/SectionWMI.cc | 2 ++ agents/windows/wmiHelper.cc | 50 ++++++++++++++++++++++++-------- agents/windows/wmiHelper.h | 10 +++++-- 5 files changed, 99 insertions(+), 29 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=80a9f10400…

5 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2018