Checkmk git commits April 2018

checkmk-commits@lists.checkmk.com

10 participants
287 discussions

6025 docker_node_network: Inventory information about docker networks

by Lars Michelsen

Module: check_mk Branch: master Commit: d44bbe19e598af22668ff69f6287754abcfd118a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d44bbe19e598af… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 23 07:34:22 2018 +0200 6025 docker_node_network: Inventory information about docker networks Change-Id: Id015cb46fae8d3a8bcbc7356fd09aa7e89e1fb50 --- .werks/6025 | 10 +++++++ agents/check_mk_agent.linux | 4 +++ inventory/docker_node_network | 68 ++++++++++++++++++++++++++++++++++++++++++ web/plugins/views/inventory.py | 13 ++++++++ 4 files changed, 95 insertions(+) diff --git a/.werks/6025 b/.werks/6025 new file mode 100644 index 0000000..5b89ddb --- /dev/null +++ b/.werks/6025 @@ -0,0 +1,10 @@ +Title: docker_node_network: Inventory information about docker networks +Level: 1 +Component: inv +Compatible: compat +Edition: cre +Version: 1.5.0b2 +Date: 1524388763 +Class: feature + + diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 28fb702..4f1738b 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -996,6 +996,10 @@ if type docker > /dev/null 2>&1 ; then echo "[[[containers]]]" docker container ls --all --format "{{json .}}" + echo "<<<docker_node_network:sep(0)>>>" + NETWORK_IDS=$(docker network ls -f 'driver=bridge' --format='{{.ID}}') + docker network inspect "$NETWORK_IDS" + # For the container status, we want information about *all* containers for CONTAINER_ID in $(docker container ls -q --all); do echo "<<<<${CONTAINER_ID}>>>>" diff --git a/inventory/docker_node_network b/inventory/docker_node_network new file mode 100644 index 0000000..0dba8d9 --- /dev/null +++ b/inventory/docker_node_network @@ -0,0 +1,68 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# 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. 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- +# 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. + + +def _parse_docker_node_network(info): + import json + return json.loads("".join([ l[0] for l in info ])) + + +def inv_docker_node_network_networks(info, inventory_tree, status_data_tree): + parsed = _parse_docker_node_network(info) + + inventory_networks = inventory_tree.get_list("software.applications.docker.networks:") + status_networks = status_data_tree.get_list("software.applications.docker.networks:") + + for network in parsed: + labels = sorted(["%s: %s" % (k,v) for k,v in network["Labels"].items()]) + + containers = [] + for container_id, container in network["Containers"].items(): + containers.append({ + "name" : container["Name"], + "id" : container_id[:12], + "ipv4_address" : container["IPv4Address"], + "ipv6_address" : container["IPv6Address"], + "mac_address" : container["MacAddress"], + }) + + status_networks.append({ + "name" : network["Name"], + "containers" : containers, + }) + + inventory_networks.append({ + "name" : network["Name"], + "host_ifname" : network["Options"]["com.docker.network.bridge.name"], + "labels" : ", ".join(labels), + "network_id" : network["Id"][:12], + "scope" : network["Scope"], + }) + + +inv_info["docker_node_network.networks"] = { + "inv_function": inv_docker_node_network_networks, +} diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 12e69de..add9516 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -706,6 +706,19 @@ inventory_displayhints.update({ "keyorder" : [ "port", "protocol", "host_addresses" ], }, + ".software.applications.docker.networks:*.": { + "title": "Network %d", + }, + ".software.applications.docker.networks:*.containers:": { + "keyorder" : [ "name", "id", "ipv4_address", "ipv6_address", "mac_address" ], + }, + ".software.applications.docker.networks:*.containers:*.ipv4_address": { + "title" : _("IPv4 address"), + }, + ".software.applications.docker.networks:*.containers:*.ipv6_address": { + "title" : _("IPv6 address"), + }, + ".software.applications.citrix." : { "title" : _("Citrix") }, ".software.applications.citrix.controller." : { "title" : _("Controller") }, ".software.applications.citrix.controller.controller_version" : { "title" : _("Controller Version"), },

6 years, 2 months

Users sub pages: Made back buttons a little more consistent

by Lars Michelsen

Module: check_mk Branch: master Commit: 3b7f4bc8f432d64f8aa7b398acb965b601ddbc56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b7f4bc8f432d6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 18 08:12:30 2018 +0200 Users sub pages: Made back buttons a little more consistent Change-Id: I6c9b2a76446d41aaf5eb61c8e874810e44cca05c --- web/htdocs/notify.py | 2 +- web/htdocs/wato.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/notify.py b/web/htdocs/notify.py index aa5e4d1..b115075 100644 --- a/web/htdocs/notify.py +++ b/web/htdocs/notify.py @@ -108,7 +108,7 @@ def page_notify(): html.header(_('Notify Users'), stylesheets = ['pages', 'status', 'views']) html.begin_context_buttons() - html.context_button(_('User Config'), 'wato.py?mode=users', 'users') + html.context_button(_("Users"), "wato.py?mode=users", "back") html.end_context_buttons() vs_notify = _vs_notify() diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ea0fc47..f15da8b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6346,7 +6346,7 @@ class ModeLDAPConfig(LDAPMode): def buttons(self): global_buttons() - html.context_button(_("Users"), watolib.folder_preserving_link([("mode", "users")]), "users") + html.context_button(_("Back"), watolib.folder_preserving_link([("mode", "users")]), "back") html.context_button(_("New Connection"), watolib.folder_preserving_link([("mode", "edit_ldap_connection")]), "new") @@ -11060,7 +11060,7 @@ def mode_edit_user(phase): return _("Edit user %s") % user_id elif phase == "buttons": - html.context_button(_("All Users"), watolib.folder_preserving_link([("mode", "users")]), "back") + html.context_button(_("Users"), watolib.folder_preserving_link([("mode", "users")]), "back") if rulebased_notifications and not is_new_user: html.context_button(_("Notifications"), watolib.folder_preserving_link([("mode", "user_notifications"), ("user", user_id)]), "notifications")

6 years, 2 months

Minor cleanup

by Lars Michelsen

Module: check_mk Branch: master Commit: db228ae216186d636f67a6812aa7fff583d0cd7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db228ae216186d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 23 08:15:51 2018 +0200 Minor cleanup Change-Id: I262fef8ed62ca69e55484b134b37a8cfa380e7c8 --- web/htdocs/htmllib.py | 3 +-- web/htdocs/js/checkmk.js | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index c7ed416..37e8cb1 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -2294,8 +2294,7 @@ class html(HTMLGenerator, RequestHandler): if (submit or label) and not id_: id_ = "ti_%s" % varname - onkeydown = None if not submit else\ - HTML('function(e) { if (!e) e = window.event; textinput_enter_submit(e, \'%s\'); };' % submit) + onkeydown = None if not submit else HTML('textinput_enter_submit(\'%s\');' % submit) attributes = {"class" : cssclass, "id" : id_, diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 68c930f..2c75a3c 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -142,6 +142,9 @@ function reload_sidebar() // Handle Enter key in textfields function textinput_enter_submit(e, submit) { + if(!e) + e = window.event; + var keyCode = e.which || e.keyCode; if (keyCode == 13) { if (submit) {

6 years, 2 months

Minor wording changes

by Lars Michelsen

Module: check_mk Branch: master Commit: be0f0378399ad8c17c2fac52ed6a9eb70251bd49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be0f0378399ad8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 23 07:54:38 2018 +0200 Minor wording changes Change-Id: I7b4031cf3f709dd6fe4c48e82201a5cda5b2947a --- web/htdocs/gui_background_job.py | 2 +- web/plugins/wato/background_job.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/gui_background_job.py b/web/htdocs/gui_background_job.py index d8e93cf..1fb5b58 100644 --- a/web/htdocs/gui_background_job.py +++ b/web/htdocs/gui_background_job.py @@ -45,7 +45,7 @@ def load_plugins(force): if loaded_with_language == current_language and not force: return - config.declare_permission_section("background_jobs", _("Background Jobs"), do_sort = False) + config.declare_permission_section("background_jobs", _("Background jobs"), do_sort = False) config.declare_permission("background_jobs.manage_jobs", _("Manage background jobs"), _("Allows you to see the job overview page."), ["admin"]) diff --git a/web/plugins/wato/background_job.py b/web/plugins/wato/background_job.py index 396588b..69e7ce7 100644 --- a/web/plugins/wato/background_job.py +++ b/web/plugins/wato/background_job.py @@ -26,7 +26,7 @@ register_modules(WatoModule( mode_or_url="background_jobs_overview", - title=_("Background Jobs"), + title=_("Background jobs"), icon="background_jobs", permission="background_jobs.manage_jobs", description=_("Manage longer running tasks in the Check_MK GUI"), @@ -39,7 +39,7 @@ class ModeBackgroundJobsOverview(WatoMode): def title(self): - return _("Background Jobs Overview") + return _("Background jobs overview") def page(self): @@ -74,7 +74,7 @@ class ModeBackgroundJobDetails(WatoMode): def title(self): - return _("Background Job Details") + return _("Background job details")

6 years, 2 months

6023 Add build support for Ubuntu 18.04 (bionic)

by Lars Michelsen

Module: check_mk Branch: master Commit: 33c82ca5a9830dbfc8bc9d23d0bdc4b84dbb4b7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33c82ca5a9830d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 20 17:32:25 2018 +0200 6023 Add build support for Ubuntu 18.04 (bionic) Change-Id: I7855650a838a23f03491714a4625c3400fa5282a --- .werks/6023 | 11 +++++ omd/distros/UBUNTU_18.04.mk | 114 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+) diff --git a/.werks/6023 b/.werks/6023 new file mode 100644 index 0000000..0af4b42 --- /dev/null +++ b/.werks/6023 @@ -0,0 +1,11 @@ +Title: Add build support for Ubuntu 18.04 (bionic) +Level: 1 +Component: distros +Class: feature +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1524238326 + + diff --git a/omd/distros/UBUNTU_18.04.mk b/omd/distros/UBUNTU_18.04.mk new file mode 100644 index 0000000..cc5049c --- /dev/null +++ b/omd/distros/UBUNTU_18.04.mk @@ -0,0 +1,114 @@ +DISTRO_CODE = bionic +BUILD_PACKAGES = +BUILD_PACKAGES += build-essential +BUILD_PACKAGES += devscripts +BUILD_PACKAGES += dpatch +BUILD_PACKAGES += dnsutils +BUILD_PACKAGES += fping +BUILD_PACKAGES += smbclient # otherwise missing path in util.pm +BUILD_PACKAGES += rpcbind # otherwise missing path in util.pm +BUILD_PACKAGES += git-buildpackage +BUILD_PACKAGES += libboost-all-dev +BUILD_PACKAGES += libcloog-ppl1 +BUILD_PACKAGES += libcurl4-openssl-dev # needed by perl modules / thruk +BUILD_PACKAGES += libevent-dev +BUILD_PACKAGES += libgd-dev +BUILD_PACKAGES += libglib2.0-dev +BUILD_PACKAGES += libgnutls28-dev +BUILD_PACKAGES += libldap2-dev +BUILD_PACKAGES += libltdl-dev +BUILD_PACKAGES += libmcrypt-dev +BUILD_PACKAGES += libmysqlclient-dev +BUILD_PACKAGES += libpq-dev +BUILD_PACKAGES += libpango1.0-dev +BUILD_PACKAGES += libperl-dev +BUILD_PACKAGES += libreadline-dev +BUILD_PACKAGES += libssl-dev +BUILD_PACKAGES += libxml2-dev +BUILD_PACKAGES += libsqlite3-dev # needed by Python (for sqlite3 module) +BUILD_PACKAGES += tk-dev # needed by Python (for Tkinter module) +BUILD_PACKAGES += patch +BUILD_PACKAGES += rsync +BUILD_PACKAGES += uuid-dev +BUILD_PACKAGES += snmp +BUILD_PACKAGES += apache2-dev # compiling mod_python +BUILD_PACKAGES += apache2 # compiling mod_python +BUILD_PACKAGES += libncurses5-dev # compiling mod-gearman +BUILD_PACKAGES += libpcap-dev # needed for CMC +BUILD_PACKAGES += gettext # needed for german l10n +BUILD_PACKAGES += libfreeradius-dev +# +# Check_MK build specific packages below +# +BUILD_PACKAGES += libgsf-1-dev # needed for msitools +BUILD_PACKAGES += librrd-dev # needed for CMC +BUILD_PACKAGES += libffi-dev # needed for pyOpenSSL (and dependant) compilations +BUILD_PACKAGES += libkrb5-dev # needed for python kerberos support +BUILD_PACKAGES += flex # needed for heirloom-pkgtools +BUILD_PACKAGES += openssh-client # needed for check_by_ssh +OS_PACKAGES = +OS_PACKAGES += time # needed for mk-job +OS_PACKAGES += traceroute # needed for Check_MK parent scan +OS_PACKAGES += curl +OS_PACKAGES += dialog +OS_PACKAGES += dnsutils +OS_PACKAGES += fping +OS_PACKAGES += graphviz +OS_PACKAGES += apache2 +OS_PACKAGES += apache2-utils # contains htpasswd2 +OS_PACKAGES += libdbi1 +OS_PACKAGES += libevent-1.4-2 +OS_PACKAGES += libltdl7 +OS_PACKAGES += libnet-snmp-perl +OS_PACKAGES += libpango1.0-0 +OS_PACKAGES += libperl5.26 +OS_PACKAGES += libreadline5 +OS_PACKAGES += libsnmp-perl +OS_PACKAGES += libuuid1 +OS_PACKAGES += libxml2 +OS_PACKAGES += patch +OS_PACKAGES += php-cli +OS_PACKAGES += php-cgi +OS_PACKAGES += php-gd +OS_PACKAGES += php-mcrypt +OS_PACKAGES += php-sqlite3 +OS_PACKAGES += php-json +OS_PACKAGES += php-pear +OS_PACKAGES += pyro +OS_PACKAGES += rsync +OS_PACKAGES += smbclient +OS_PACKAGES += rpcbind # otherwise missing path in util.pm +OS_PACKAGES += snmp +OS_PACKAGES += unzip +OS_PACKAGES += xinetd +OS_PACKAGES += freeradius-utils +# +# Check_MK build specific packages below +# +OS_PACKAGES += libpcap0.8 # needed for cmc +OS_PACKAGES += rpm # needed by msitools/Agent Bakery +OS_PACKAGES += binutils # needed by msitools/Agent Bakery +OS_PACKAGES += lcab # needed for creating MSI packages +OS_PACKAGES += libgsf-1-114 # needed by msitools/Agent Bakery +OS_PACKAGES += libglib2.0-0 # needed by msitools/Agent Bakery +OS_PACKAGES += poppler-utils # needed for preview of PDF in reporting +OS_PACKAGES += libffi6 # needed for pyOpenSSL and dependant +USERADD_OPTIONS = +ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s +PACKAGE_INSTALL = aptitude -y update ; aptitude -y install +ACTIVATE_INITSCRIPT = update-rc.d %s defaults +APACHE_CONF_DIR = /etc/apache2/conf.d +APACHE_INIT_NAME = apache2 +APACHE_USER = www-data +APACHE_GROUP = www-data +APACHE_BIN = /usr/sbin/apache2 +APACHE_CTL = /usr/sbin/apache2ctl +APACHE_MODULE_DIR = /usr/lib/apache2/modules +APACHE_MODULE_DIR_64 = /usr/lib/apache2/modules +HTPASSWD_BIN = /usr/bin/htpasswd +APACHE_ENMOD = a2enmod %s +PHP_FCGI_BIN = /usr/bin/php-cgi +BECOME_ROOT = sudo su -c +ARCH = $(shell dpkg --print-architecture) +MOUNT_OPTIONS = +INIT_CMD = /etc/init.d/%(name)s %(action)s

6 years, 2 months

Win-agent: Simplify coverage-reset make target

by Jukka Aro

Module: check_mk Branch: master Commit: 3c41fe85c35547733af594e0f2b4de3aff4f467a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c41fe85c35547… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Apr 20 16:37:00 2018 +0200 Win-agent: Simplify coverage-reset make target --- agents/windows/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index e27e1d0..c7ede10 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -183,7 +183,7 @@ integrationtest: install-strip # Force regeneration of coverage data during test run. coverage-reset: rm -fr "*coverage.info" - find . -name "*.gcda" -exec rm {} \; + find . -name "*.gcda" -delete lcov --directory . --zerocounters coverage.info: WindowsAgentCoverage$(EXEEXT) coverage-reset

6 years, 2 months

6022 FIX Analyze configuration: Enabled livestatus proxy is now deceted correctly

by Lars Michelsen

Module: check_mk Branch: master Commit: d18059b275078acb8256b66cd8603b875cc7266e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d18059b275078a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 20 13:14:01 2018 +0200 6022 FIX Analyze configuration: Enabled livestatus proxy is now deceted correctly Change-Id: Ib410cf374f43f9547bc436edc96e3873855bbe0b --- .werks/6022 | 11 +++++++++++ web/htdocs/watolib.py | 9 +++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.werks/6022 b/.werks/6022 new file mode 100644 index 0000000..1cb7260 --- /dev/null +++ b/.werks/6022 @@ -0,0 +1,11 @@ +Title: Analyze configuration: Enabled livestatus proxy is now deceted correctly +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1524222712 + + diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index f345c05..d5f145c 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -9710,8 +9710,13 @@ automation_commands["check-analyze-config"] = check_analyze_config def site_is_using_livestatus_proxy(site_id): - site = config.site(site_id) - socket = site["socket"] + sites = SiteManagement.load_sites() + site = sites[site_id] + + socket = site.get("socket") + if not socket: + return False # local site + return type(socket) == tuple and socket[0] == "proxy" #.

6 years, 2 months

Analyse configuration: Show warning message when no site usable with AC

by Lars Michelsen

Module: check_mk Branch: master Commit: 1573fba0e07da35cfa8136debfcdbd9c6fbf6cf7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1573fba0e07da3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 20 15:06:16 2018 +0200 Analyse configuration: Show warning message when no site usable with AC Change-Id: I9d56bbe8bc9a2852d89a1c33f897b33f34ce9c4c --- web/htdocs/wato.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 918dcc8..ea0fc47 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -17062,6 +17062,7 @@ class ModeAnalyzeConfig(WatoMode): def __init__(self): super(ModeAnalyzeConfig, self).__init__() + self._logger = logger.getChild("analyze-config") self._acks = self._load_acknowledgements() @@ -17111,6 +17112,11 @@ class ModeAnalyzeConfig(WatoMode): def page(self): + if not self._analyze_site_ids(): + html.show_info(_("Analyze configuration can only be used with the local site and " + "distributed WATO slave sites. You currently have no such site configured.")) + return + results_by_category = self._perform_tests() site_ids = sorted(self._analyze_site_ids()) @@ -17237,13 +17243,16 @@ class ModeAnalyzeConfig(WatoMode): def _perform_tests(self): + test_site_ids = self._analyze_site_ids() + + self._logger.debug("Executing tests for %d sites" % len(test_site_ids)) results_by_site = {} # Results are fetched simultaneously from the remote sites result_queue = multiprocessing.JoinableQueue() processes = [] - for site_id in self._analyze_site_ids(): + for site_id in test_site_ids: process = multiprocessing.Process(target=self._perform_tests_for_site, args=(site_id, result_queue)) process.start() @@ -17277,6 +17286,8 @@ class ModeAnalyzeConfig(WatoMode): log_exception() html.show_error("%s: %s" % (site_id, e)) + self._logger.debug("Got test results") + # Group results by category in first instance and then then by test results_by_category = {} for site_id, results in results_by_site.items(): @@ -17302,6 +17313,7 @@ class ModeAnalyzeConfig(WatoMode): # Executes the tests on the site. This method is executed in a dedicated # subprocess (One per site) def _perform_tests_for_site(self, site_id, result_queue): + self._logger.debug("[%s] Starting" % site_id) try: # Would be better to clean all open fds that are not needed, but we don't # know the FDs of the result_queue pipe. Can we find it out somehow? @@ -17326,12 +17338,15 @@ class ModeAnalyzeConfig(WatoMode): results_data = watolib.do_remote_automation( config.site(site_id), "check-analyze-config", []) + self._logger.debug("[%s] Finished" % site_id) + result = { "state" : 0, "response" : results_data, } except Exception, e: + self._logger.exception("[%s] Failed" % site_id) log_exception() result = { "state" : 1,

6 years, 2 months

Add information to apache process test

by Lars Michelsen

Module: check_mk Branch: master Commit: 541e370bc933c5ae772a284bf3a1c1ff669fbf8d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=541e370bc933c5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 20 15:10:05 2018 +0200 Add information to apache process test Change-Id: I1c607c1722d9789588e6ccde785cd4f141720bc3 --- web/plugins/wato/ac_tests.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web/plugins/wato/ac_tests.py b/web/plugins/wato/ac_tests.py index 02ca080..17b549a 100644 --- a/web/plugins/wato/ac_tests.py +++ b/web/plugins/wato/ac_tests.py @@ -372,7 +372,12 @@ class ACTestApacheNumberOfProcesses(ACTest, BPApacheTest): "Possible actions:<ul>" "<li>Change the <a href=\"wato.py?mode=edit_configvar&varname=apache_process_tuning\">number of apache processes</a></li>" "</ul>" - "") + "" + "Once you have verified your settings, you can acknowledge this test. The " + "test will not automatically turn to OK, because it can not exactly estimate " + "the required memory nedded by the apache processes." + "" + ) def is_relevant(self):

6 years, 2 months

Win-agent: Run unit tests only in its own target

by Jukka Aro

Module: check_mk Branch: master Commit: 4acbc57c5be45d5efce04e6d8ae29a9dfeb41a47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4acbc57c5be45d… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Apr 20 11:40:07 2018 +0200 Win-agent: Run unit tests only in its own target Do not run unit tests as a post-build step. Produce XUnit XML output for the unit tests. --- agents/windows/Makefile.am | 156 ++++++++++++++++++++++++++------------------- agents/windows/build-agent | 34 ++++------ 2 files changed, 104 insertions(+), 86 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4acbc57c5b…

6 years, 2 months

← Newer
1
...
5
6
7
8
9
10
11
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2018