Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

by Alex Zurhake

Module: check_mk Branch: master Commit: 73dd25a8a6a07fb2ad2484bbcdcfb5327fb0b007 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73dd25a8a6a07f… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Mar 26 09:53:56 2019 +0100 fix signing and upload procedure Change-Id: I633ad95b5a47bbc8fc10ea391d6ab7af3445fc91 --- buildscripts/scripts/nightly-build.jenkins | 24 +++++++++++++----------- buildscripts/scripts/sign-packages.sh | 16 ++++++++++------ 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/buildscripts/scripts/nightly-build.jenkins b/buildscripts/scripts/nightly-build.jenkins index 08e30ca..892d1b4 100644 --- a/buildscripts/scripts/nightly-build.jenkins +++ b/buildscripts/scripts/nightly-build.jenkins @@ -211,20 +211,22 @@ node { docker.image(IMAGE).inside("-u 0:0 -v ${DAILY_DATA}:${DAILY_DATA} -v ${PACKAGE_DIR}:${PACKAGE_DIR} -v ${GPG_KEY_DIR}:${GPG_KEY_DIR}:ro -v ${RELEASE_KEY_DIR}:${RELEASE_KEY_DIR}:ro --network ci_local-infra") { stage('Archive artifacts') { // Only master builds should end up on the Website - if (${BRANCH} == 'master') { - dir("/bauwelt/downloads/${CMK_VERS}") { - sh "cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*_amd64.deb . || true" - sh "cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*.x86_64.rpm . || true" - withCredentials([usernamePassword(credentialsId: '9d7aca31-0043-4cd0-abeb-26a249d68261', passwordVariable: 'GPG_PASSPHRASE', usernameVariable: 'GPG_USERNAME')]) { - sh "${DAILY_DATA}/git/buildscripts/scripts/sign-packages.sh ${CMK_VERS}" - sh """ - rsync -av -e "ssh -i ${RELEASE_KEY_DIR}" \ + if (BRANCH_NAME == 'master') { + sh """ + mkdir -p /bauwelt/downloads/${CMK_VERS} + cd /bauwelt/downloads/${CMK_VERS} + cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*_amd64.deb . || true + cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*.x86_64.rpm . || true + """ + withCredentials([usernamePassword(credentialsId: '9d7aca31-0043-4cd0-abeb-26a249d68261', passwordVariable: 'GPG_PASSPHRASE', usernameVariable: 'GPG_USERNAME')]) { + sh """ + cd /bauwelt/downloads/${CMK_VERS} + ${DAILY_DATA}/git/buildscripts/scripts/sign-packages.sh ${CMK_VERS} + rsync -av -e "ssh -o StrictHostKeyChecking=no -i ${RELEASE_KEY_DIR}" \ ${PACKAGE_DIR}/${CMK_VERS} \ bauwelt@mathias-kettner.de:${PACKAGE_DIR} - """ - } + """ } - archiveArtifacts "*" } else { dir("${DAILY_DATA}/downloads") { sh "cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*_amd64.deb . || true" diff --git a/buildscripts/scripts/sign-packages.sh b/buildscripts/scripts/sign-packages.sh index f804896..fef6b1c 100755 --- a/buildscripts/scripts/sign-packages.sh +++ b/buildscripts/scripts/sign-packages.sh @@ -2,13 +2,13 @@ set -e TARGET=. -VERSION=$CMK_VERS +VERSION=$1 KEY_ID=434DAC48C4503261 KEY_DESC="Check_MK Software Release Signing Key (2018) <feedback(a)check-mk.org>" if [ -z "$VERSION" ]; then - echo "set CMK_VERS VERSION" - echo "Beispiel: CMK_VERS=2018.01.19 $0" + echo "Call with: $0 VERSION" + echo "Example: $0 2018.01.19" exit 1 fi @@ -30,7 +30,7 @@ echo "$GPG_PASSPHRASE" | \ $TARGET/*.rpm echo "Verify signed RPM packages..." -for RPM in $TARGET/$VERSION/*.rpm; do +for RPM in $TARGET/*.rpm; do rpm -qp $RPM --qf='%-{NAME} %{SIGPGP:pgpsig}\n' if ! rpm -qp $RPM --qf='%-{NAME} %{SIGPGP:pgpsig}\n' | grep -i "Key ID $KEY_ID"; then echo "ERROR: RPM not signed: $RPM" @@ -40,7 +40,7 @@ done echo "Sign DEB packages..." ( echo set timeout -1;\ - echo spawn dpkg-sig -p --sign builder -k $KEY_ID $TARGET/$VERSION/*.deb; \ + echo spawn dpkg-sig -p --sign builder -k $KEY_ID $TARGET/*.deb; \ echo expect -exact \"The passphrase for ${KEY_ID}:\";\ echo send -- \"$GPG_PASSPHRASE\\r\";\ echo expect eof;\ @@ -54,4 +54,8 @@ done # Hashes der kopierten Dateien ablegen # (werden später auf der Webseite angezeigt) echo "Create HASHES file..." -sha256sum *.{cma,tar.gz,rpm,deb,cmk} > HASHES +sha256sum *.cma >> HASHES || true +sha256sum *.tar.gz >> HASHES || true +sha256sum *.rpm >> HASHES || true +sha256sum *.deb >> HASHES || true +sha256sum *.cmk >> HASHES || true

5 years, 3 months

Stash former missing plugins for new Windows agent

by Alex Zurhake

Module: check_mk Branch: master Commit: 2b7d8d9bcc8b177a8e5567a50076c834ff85da10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b7d8d9bcc8b17… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Mar 25 12:19:49 2019 +0100 Stash former missing plugins for new Windows agent Change-Id: I24ed361013bc1f5f16ae6f137908a66a58530e30 --- buildscripts/scripts/nightly-build.jenkins | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/buildscripts/scripts/nightly-build.jenkins b/buildscripts/scripts/nightly-build.jenkins index 23ff51f..5b02a95 100644 --- a/buildscripts/scripts/nightly-build.jenkins +++ b/buildscripts/scripts/nightly-build.jenkins @@ -51,6 +51,9 @@ node { dir('agents/windows/dependencies/') { stash name: 'WinDep', include: '**/*' } + dir('agents/windows/plugins/') { + stash name: 'WinPlugins', include: '**/*' + } dir('omd/packages/') { stash name: 'WinDepOMD', include: 'googletest/*, simpleini/*' } @@ -71,6 +74,9 @@ AGENT_LIST.each { AGENT -> dir('agents/windows/dependencies/') { unstash name: 'WinDep' } + dir('agents/windows/plugins/') { + unstash name: 'WinPlugins' + } dir('omd/packages/') { unstash name: 'WinDepOMD' }

5 years, 3 months

Clean workspace before building WNX agent

by Alex Zurhake

Module: check_mk Branch: master Commit: 0cc6b96d502521fe324ead63627ef2a2cd9b1ce1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cc6b96d502521… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Mar 25 12:22:04 2019 +0100 Clean workspace before building WNX agent Change-Id: I5e3596543d1c31fdbcf456a6dadbd4d87edde3a9 --- buildscripts/scripts/nightly-build.jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildscripts/scripts/nightly-build.jenkins b/buildscripts/scripts/nightly-build.jenkins index 5b02a95..08e30ca 100644 --- a/buildscripts/scripts/nightly-build.jenkins +++ b/buildscripts/scripts/nightly-build.jenkins @@ -67,7 +67,7 @@ AGENT_LIST.each { AGENT -> AGENT_BUILDS['build agent ' + AGENT] = { if (AGENT == 'windows') { node('windows') { -// bat 'deltree *' + bat 'powershell Remove-Item .\\* -Recurse -Force' dir('agents/wnx') { unstash name: 'WinSRC' }

5 years, 3 months

Fixed YAPF breakage. >:-(

by Sven Panne

Module: check_mk Branch: master Commit: 216b6e722659cc04e1c825baaf9396fba5d1d559 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=216b6e722659cc… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Mar 26 09:08:56 2019 +0100 Fixed YAPF breakage. >:-( Change-Id: I3594a5821dfe9a105275375c2b3696cff0454fe4 --- cmk_base/discovery.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index 687d0ea..f3a4abd 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -495,7 +495,6 @@ def discover_marked_hosts(core): if not hosts: console.verbose(" Nothing to do. No hosts marked by discovery check.\n") - # Fetch host state information from livestatus host_states = _fetch_host_states() activation_required = False @@ -551,7 +550,8 @@ def _discover_marked_host_exists(hostname, all_hosts): os.remove(host_flag_path) except OSError: pass - console.verbose(" Skipped. Host %s does not exist in configuration. Removing mark.\n" % hostname) + console.verbose( + " Skipped. Host %s does not exist in configuration. Removing mark.\n" % hostname) return False

5 years, 3 months

7146 mk_docker.py: Optionally use container names as identifier

by Moritz Kiemer

Module: check_mk Branch: master Commit: 07555860a9a787f46fdbf54984b14fec6d9c0d58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07555860a9a787… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Feb 18 09:30:51 2019 +0100 7146 mk_docker.py: Optionally use container names as identifier You can now configure the plugin mk_docker.py to use the containers name or long ID as host name. You can do this either using the agent bakery rule "Docker node and containers", or via configuration file. CMK-1707 Change-Id: If1285df52db33d4003dbf9c48052dc43bf915d63 --- .werks/7146 | 13 +++++++++++++ agents/cfg_examples/docker.cfg | 10 ++++++++++ agents/plugins/mk_docker.py | 36 ++++++++++++++++-------------------- tests/unit/plugins/test_mk_docker.py | 2 +- 4 files changed, 40 insertions(+), 21 deletions(-) diff --git a/.werks/7146 b/.werks/7146 new file mode 100644 index 0000000..843569d --- /dev/null +++ b/.werks/7146 @@ -0,0 +1,13 @@ +Title: mk_docker.py: Optionally use container names as identifier +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1550501351 +Class: feature + +You can now configure the plugin mk_docker.py to use the containers +name or long ID as host name. You can do this either using the +agent bakery rule "Docker node and containers", or via configuration +file. diff --git a/agents/cfg_examples/docker.cfg b/agents/cfg_examples/docker.cfg index a874c94..bf12ab0 100644 --- a/agents/cfg_examples/docker.cfg +++ b/agents/cfg_examples/docker.cfg @@ -27,6 +27,16 @@ skip_sections: docker_node_disk_usage,docker_node_images # * docker_container_agent: retrieve information by running the # check_mk_agent inside the container +# CONTAINER ID +# You can choose what to use as the container identifier. This will +# affect the name used for the piggyback host corresponding to the +# container, as well as items for services created on the node for each +# container. +# By default, the identifier is assumed to be the first 12 characters +# of the container UUID. You can choose to use the full ID or the containers +# name instead. Allowed values are "short" (the default), "long" and "name". +container_id: name + # BASE URL # By default we are trying to connect to the docker API engine # via the unix socket: diff --git a/agents/plugins/mk_docker.py b/agents/plugins/mk_docker.py index 04a3fc2..c8661ec 100755 --- a/agents/plugins/mk_docker.py +++ b/agents/plugins/mk_docker.py @@ -73,6 +73,7 @@ DEFAULT_CFG_SECTION = { "base_url": "unix://var/run/docker.sock", "api_version": "auto", "skip_sections": "", + "container_id": "short", } LOGGER = logging.getLogger(__name__) @@ -159,9 +160,15 @@ def report_exception_to_server(exc): class MKDockerClient(docker.DockerClient): '''a docker.DockerClient that caches containers and node info''' - def __init__(self, *args, **kwargs): - super(MKDockerClient, self).__init__(*args, **kwargs) - self.all_containers = self.containers.list(all=True) + def __init__(self, config): + super(MKDockerClient, self).__init__(config['base_url'], version=config['api_version']) + all_containers = self.containers.list(all=True) + if config['container_id'] == "name": + self.all_containers = [(c.attrs["Name"].lstrip('/'), c) for c in all_containers] + elif config['container_id'] == "long": + self.all_containers = [(c.attrs["Id"], c) for c in all_containers] + else: + self.all_containers = [(c.attrs["Id"][:12], c) for c in all_containers] self.node_info = self.info() @@ -242,7 +249,7 @@ class AgentDispatcher(object): return None result = container.exec_run(['sh', '-c', 'bash -c echo'], socket=True) if not self.get_stdout(result): - LOGGER.info("failed to run bash in container: %s", container.short_id) + LOGGER.info("failed to run bash in container") return None result = container.exec_run( @@ -279,15 +286,6 @@ def set_version_info(client): Section.version_info['ApiVersion'] = data.get('ApiVersion') -def short_id(container): - '''return a shortened id - - We do not use container.short_id for compatibility reasons. - Also we are dealing with trust issues. - ''' - return container.attrs["Id"][:12] - - #. # .--Sections------------------------------------------------------------. # | ____ _ _ | @@ -381,7 +379,7 @@ def section_node_images(client, _config): LOGGER.debug(client.all_containers) section.append('[[[containers]]]') - for container in client.all_containers: + for __, container in client.all_containers: section.append(json.dumps(container.attrs)) section.write() @@ -403,8 +401,7 @@ def section_container_client(client, _config): node_name = client.node_info.get("Name") # For the container status, we want information about *all* containers - for container in client.all_containers: - container_id = short_id(container) + for container_id, container in client.all_containers: LOGGER.info("container (via client): %s", container_id) section = Section('container_node_name', piggytarget=container_id) @@ -422,13 +419,12 @@ def section_container_client(client, _config): @skippable def section_container_agent(client, _config): - running_containers = [c for c in client.all_containers if c.status == "running"] + running_containers = [c for c in client.all_containers if c[1].status == "running"] if not running_containers: return dispatcher = AgentDispatcher() - for container in running_containers: - container_id = short_id(container) + for container_id, container in running_containers: LOGGER.info("container(via agent): %s", container_id) result = dispatcher.check_container(container) @@ -466,7 +462,7 @@ def main(): config = get_config(args.config_file) try: # first calls by docker-daemon: report failure - client = MKDockerClient(config['base_url'], version=config['api_version']) + client = MKDockerClient(config) except () if DEBUG else Exception as exc: report_exception_to_server(exc) sys.exit(1) diff --git a/tests/unit/plugins/test_mk_docker.py b/tests/unit/plugins/test_mk_docker.py index af740ad..fdb9cd6 100644 --- a/tests/unit/plugins/test_mk_docker.py +++ b/tests/unit/plugins/test_mk_docker.py @@ -11,7 +11,7 @@ sys.path.insert(0, os.path.join(cmk_path(), 'agents', 'plugins')) import mk_docker # pylint: disable=import-error,wrong-import-position PLUGIN_CHECKSUMS = { - '0.1': '609daeed48fda1198701458e9bd4f205', + '0.1': 'aec6ebec8565d1326d1b0df52191d594', }

5 years, 3 months

Move history entry formatting for notifications to separate module.

by Sven Panne

Module: check_mk Branch: master Commit: 37c248c65f5f8dbc4ec908fa20156fd98ac51e4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37c248c65f5f8d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 25 14:37:20 2019 +0100 Move history entry formatting for notifications to separate module. Various cleanups on the way. Change-Id: I64d3b769b59bd928696f9ae8bf1d52c9bd52dd8a --- cmk/utils/notify.py | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++ cmk_base/notify.py | 25 ++++------------ 2 files changed, 88 insertions(+), 19 deletions(-) diff --git a/cmk/utils/notify.py b/cmk/utils/notify.py new file mode 100644 index 0000000..20d841d --- /dev/null +++ b/cmk/utils/notify.py @@ -0,0 +1,82 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 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. + +import cmk.utils.defines + + +def _state_for(exit_code): + # The exit codes are not really service states, but we treat them like this. + # 0 -> OK + # 1 -> temporary issue + # 2 -> permanent issue + return cmk.utils.defines.service_state_name(exit_code, "UNKNOWN") + + +def notification_message(plugin, context): + contact = context["CONTACTNAME"] + hostname = context["HOSTNAME"] + service = context.get("SERVICEDESC") + if service: + what = "SERVICE NOTIFICATION" + spec = "%s;%s" % (hostname, service) + state = context["SERVICESTATE"] + output = context["SERVICEOUTPUT"] + else: + what = "HOST NOTIFICATION" + spec = hostname + state = context["HOSTSTATE"] + output = context["HOSTOUTPUT"] + return "%s: %s;%s;%s;%s;%s" % (what, contact, spec, state, plugin, output) + + +def notification_progress_message(plugin, context, exit_code, output): + contact = context["CONTACTNAME"] + hostname = context["HOSTNAME"] + service = context.get("SERVICEDESC") + if service: + what = "SERVICE NOTIFICATION PROGRESS" + spec = "%s;%s" % (hostname, service) + else: + what = "HOST NOTIFICATION PROGRESS" + spec = hostname + state = _state_for(exit_code) + return "%s: %s;%s;%s;%s;%s" % (what, contact, spec, state, plugin, output) + + +def notification_result_message(plugin, context, exit_code, output): + contact = context["CONTACTNAME"] + hostname = context["HOSTNAME"] + service = context.get("SERVICEDESC") + if service: + what = "SERVICE NOTIFICATION RESULT" + spec = "%s;%s" % (hostname, service) + else: + what = "HOST NOTIFICATION RESULT" + spec = hostname + state = _state_for(exit_code) + comment = " -- ".join(output) + output = output[-1] + return "%s: %s;%s;%s;%s;%s;%s" % (what, contact, spec, state, plugin, output, comment) diff --git a/cmk_base/notify.py b/cmk_base/notify.py index 94f90ea..91309f0 100755 --- a/cmk_base/notify.py +++ b/cmk_base/notify.py @@ -47,6 +47,7 @@ import time # suppress "Cannot find module" error from mypy import livestatus # type: ignore import cmk.utils.debug +from cmk.utils.notify import notification_message from cmk.utils.regex import regex import cmk.utils.paths from cmk.utils.exceptions import MKGeneralException @@ -1310,7 +1311,7 @@ def path_to_notification_script(plugin): # # Note: this function is *not* being called for bulk notification. def call_notification_script(plugin, plugin_context): - core_notification_log(plugin, plugin_context) + _log_to_history(notification_message(plugin or "plain email", plugin_context)) def plugin_log(s): notify_log(" %s" % s) @@ -1744,7 +1745,7 @@ def notify_bulk(dirname, uuids): # a single entry for each notification contained in the bulk. # It is important later to have this precise information. plugin_name = "bulk " + (plugin or "plain email") - core_notification_log(plugin_name, context) + _log_to_history(notification_message(plugin_name, context)) if bulk_context: # otherwise: only corrupted files # Per default the uuids are sorted chronologically from oldest to newest @@ -1945,25 +1946,11 @@ def fresh_uuid(): return str(uuid.uuid4()) -def core_notification_log(plugin, plugin_context): - what = plugin_context["WHAT"] - contact = plugin_context["CONTACTNAME"] - spec = plugin_context["HOSTNAME"] - if what == "HOST": - state = plugin_context["HOSTSTATE"] - output = plugin_context["HOSTOUTPUT"] - if what == "SERVICE": - spec += ";" + plugin_context["SERVICEDESC"] - state = plugin_context["SERVICESTATE"] - output = plugin_context["SERVICEOUTPUT"] - - log_message = "%s NOTIFICATION: %s;%s;%s;%s;%s" % (what, contact, spec, state, plugin or - "plain email", output) - - _send_livestatus_command("LOG;%s" % log_message) +def _log_to_history(message): + _livestatus_cmd("LOG;%s" % message) -def _send_livestatus_command(command): +def _livestatus_cmd(command): try: livestatus.LocalConnection().command("[%d] %s" % (time.time(), command.encode("utf-8"))) except Exception as e:

5 years, 3 months

ps.include: remove break statement

by Moritz Kiemer

Module: check_mk Branch: master Commit: 5bb384acb4e57fda841adac680aaa4a2a9f9958f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5bb384acb4e57f… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Mon Mar 25 13:41:28 2019 +0100 ps.include: remove break statement Unfortunately, we have to check all lines against all specs: Even if a line already matched an earlier spec, it may match another spec as well (and create a new item). Even if a spec found a matching line earlier, it may match a different line and create a different item when the matching group changes. Change-Id: Iab8be87adc2f728283ac40b353f233ab94f52b43 --- checks/ps.include | 4 -- tests/unit/checks/test_ps.py | 90 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 86 insertions(+), 8 deletions(-) diff --git a/checks/ps.include b/checks/ps.include index 74e2a4c..b023c77 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -160,10 +160,6 @@ def inventory_ps_common(invdata, invrules, parsed): if inv not in inventory: inventory.append(inv) - # Once a process is matched, don't need to iterate the other - # inventory_specs - break - return inventory diff --git a/tests/unit/checks/test_ps.py b/tests/unit/checks/test_ps.py index 7f9c0a5..7e5fcc7 100644 --- a/tests/unit/checks/test_ps.py +++ b/tests/unit/checks/test_ps.py @@ -16,12 +16,16 @@ def generate_inputs(): return [ # CMK 1.5 # linux, openwrt agent(5 entry, cmk>=1.2.7) + # NOTE: It is important that the last line ("(twelve,...") + # remains the last line of the following output! splitter("""(root,225948,9684,00:00:03/05:05:29,1) /sbin/init splash (root,0,0,00:00:00/05:05:29,2) [kthreadd] (on,288260,7240,00:00:00/05:03:00,4480) /usr/bin/gnome-keyring-daemon --start --foreground --components=secrets (on,1039012,11656,00:00:00/05:02:41,5043) /usr/bin/pulseaudio --start --log-target=syslog (on,1050360,303252,00:14:59/1-03:59:39,9902) emacs -(on,2924232,472252,00:12:05/07:24:15,7912) /usr/lib/firefox/firefox"""), +(on,2924232,472252,00:12:05/07:24:15,7912) /usr/lib/firefox/firefox +(heute,11180,1144,00:00:00/03:54:10,10884) /omd/sites/heute/lib/cmc/checkhelper +(twelve,11180,1244,00:00:00/02:37:39,30136) /omd/sites/twelve/lib/cmc/checkhelper"""), # solaris (5 entry cmk>=1.5) splitter( """(root,4056,1512,0.0/52-04:56:05,5689) /usr/lib/ssh/sshd @@ -86,7 +90,9 @@ result_parse = [ [None, ("on", "1050360", "303252", "00:14:59/1-03:59:39", "9902"), "emacs"], [None, ("on", "2924232", "472252", "00:12:05/07:24:15", "7912"), - "/usr/lib/firefox/firefox"]]), + "/usr/lib/firefox/firefox"], + [None, ("heute", "11180", "1144", "00:00:00/03:54:10", "10884"), "/omd/sites/heute/lib/cmc/checkhelper"], + [None, ("twelve", "11180", "1244", "00:00:00/02:37:39", "30136"), "/omd/sites/twelve/lib/cmc/checkhelper"]]), (1, [["solaris", ("root", "4056", "1512", "0.0/52-04:56:05", "5689"), "/usr/lib/ssh/sshd"], ["solaris", ("zombie", "0", "0", "-/-", "1952"), "<defunct>"]]), (1, @@ -265,6 +271,26 @@ PS_DISCOVERY_WATO_RULES = [ 'descr': 'PS counter', 'user': 'zombie', }, [], ["@all"], {}), + ({ + "default_params": { + "process_info": "text" + }, + "match": "~/omd/sites/(\w+)/lib/cmc/checkhelper", + "descr": "Checkhelpers %s", + "user": None, + }, [], ["@all"], { + "description": u"Checkhelpers per site" + }), + ({ + "default_params": { + "process_info": "text" + }, + "match": "~/omd/sites/\w+/lib/cmc/checkhelper", + "descr": "Checkhelpers Overall", + "user": None, + }, [], ["@all"], { + "description": u"Overall checkhelpers" + }), ] PS_DISCOVERY_SPECS = [ @@ -308,6 +334,14 @@ PS_DISCOVERY_SPECS = [ ('PS counter', None, 'zombie', { 'cpu_rescale_max': None }), + ("Checkhelpers %s", "~/omd/sites/(\w+)/lib/cmc/checkhelper", None, { + "process_info": "text", + 'cpu_rescale_max': None, + }), + ("Checkhelpers Overall", "~/omd/sites/\w+/lib/cmc/checkhelper", None, { + "process_info": "text", + 'cpu_rescale_max': None, + }), ] @@ -421,6 +455,27 @@ PS_DISCOVERED_ITEMS = [ 'cpu_rescale_max': None, 'match_groups': ['fire'], }), + ("Checkhelpers heute", { + "process": "~/omd/sites/(\\w+)/lib/cmc/checkhelper", + "process_info": "text", + "user": None, + 'cpu_rescale_max': None, + 'match_groups': ['heute'], + }), + ("Checkhelpers Overall", { + "process": "~/omd/sites/\\w+/lib/cmc/checkhelper", + "process_info": "text", + "user": None, + 'match_groups': [], + 'cpu_rescale_max': None, + }), + ("Checkhelpers twelve", { + "process": "~/omd/sites/(\\w+)/lib/cmc/checkhelper", + "process_info": "text", + "user": None, + 'cpu_rescale_max': None, + 'match_groups': ['twelve'], + }), ("sshd", { "process": "~.*sshd", "user": None, @@ -460,8 +515,8 @@ def test_inventory_common(check_manager): check = check_manager.get_check("ps") info = sum(generate_inputs(), []) parsed = check.run_parse(info)[1] - assert check.context["inventory_ps_common"]([], PS_DISCOVERY_WATO_RULES, - parsed) == PS_DISCOVERED_ITEMS + assert sorted(check.context["inventory_ps_common"]([], PS_DISCOVERY_WATO_RULES, + parsed)) == sorted(PS_DISCOVERED_ITEMS) @pytest.mark.parametrize("service_description, matches, result", [ @@ -507,6 +562,33 @@ check_results = [ []) ]), CheckResult([ + (0, "1 process", [("count", 1, 100000, 100000, 0, None)]), + (0, "10.92 MB virtual", [("vsz", 11180, None, None, None, None)]), + (0, "1.12 MB physical", [("rss", 1144, None, None, None, None)]), + (0, "0.0% CPU", [("pcpu", 0.0, None, None, None, None)]), + (0, "running for 234 m", []), + (0, "\nname /omd/sites/heute/lib/cmc/checkhelper, user heute, virtual size 11180kB, resident size 1144kB, creation time 2018-10-24 08:08:12, pid 10884, cpu usage 0.0%\r\n", + []) + ]), + CheckResult([ + (0, "2 processes", [("count", 2, 100000, 100000, 0, None)]), + (0, "21.84 MB virtual", [("vsz", 22360, None, None, None, None)]), + (0, "2.33 MB physical", [("rss", 2388, None, None, None, None)]), + (0, "0.0% CPU", [("pcpu", 0.0, None, None, None, None)]), + (0, "youngest running for 157 m, oldest running for 234 m", []), + (0, "\nname /omd/sites/heute/lib/cmc/checkhelper, user heute, virtual size 11180kB, resident size 1144kB, creation time 2018-10-24 08:08:12, pid 10884, cpu usage 0.0%\r\nname /omd/sites/twelve/lib/cmc/checkhelper, user twelve, virtual size 11180kB, resident size 1244kB, creation time 2018-10-24 09:24:43, pid 30136, cpu usage 0.0%\r\n", + []) + ]), + CheckResult([ + (0, "1 process", [("count", 1, 100000, 100000, 0, None)]), + (0, "10.92 MB virtual", [("vsz", 11180, None, None, None, None)]), + (0, "1.21 MB physical", [("rss", 1244, None, None, None, None)]), + (0, "0.0% CPU", [("pcpu", 0.0, None, None, None, None)]), + (0, "running for 157 m", []), + (0, "\nname /omd/sites/twelve/lib/cmc/checkhelper, user twelve, virtual size 11180kB, resident size 1244kB, creation time 2018-10-24 09:24:43, pid 30136, cpu usage 0.0%\r\n", + []) + ]), + CheckResult([ (0, "2 processes [running on bsd, solaris]", [("count", 2, 100000, 100000, 0, None)]), (0, "20.73 MB virtual", [("vsz", 21232, None, None, None, None)]), (0, "18.61 MB physical", [("rss", 19052, None, None, None, None)]),

5 years, 3 months

Fixed werk description

by Marcel Arentz

Module: check_mk Branch: master Commit: dd5f0aee596214e7d5f74bf77b23f1b7c21c035d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd5f0aee596214… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Mar 25 17:26:32 2019 +0100 Fixed werk description Change-Id: I0ffa4761c526f68e5e666dfd8d2c0851e2d5c3cc --- .werks/7107 | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.werks/7107 b/.werks/7107 index 99a488c..649190a 100644 --- a/.werks/7107 +++ b/.werks/7107 @@ -10,17 +10,13 @@ Class: feature Dedicated credentials for each section in custom_sqls could be configured. The following parameters are valid: +F+: my_custom_sql () { SQLS_DBUSER=customuser SQLS_DBPASSWORD=secretpwd -SQLS_DBSYSCONNECT="None" +SQLS_DBSYSCONNECT=SYSDBA SQLS_TNSALIAS=testdb123 +F-: -These are the new parameters. -An important note against SQLS_DBSYSCONNECT: -If sysdba or sysoper has been set in DBUSER inside mk_oracle.cfg, the -SQLS_DBSYSCONNECT="None" is needed to overwrite the default from DBUSER. -This is often needed in environments with connections to mounted -databases. -SQLS_DBSYSCONNECT could be ignored, when sysdba or sysoper is not set in -DBUSER. +These are the new parameters. SQLS_DBSYSCONNECT needs be set only if the +user is sysdba or sysoper. Otherwise just skip this line.

5 years, 3 months

Reserved 10 Werk IDS

by Marcel Arentz

Module: check_mk Branch: master Commit: b98eea5ad24e2b394707822eb99c7216cbcc9bc0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b98eea5ad24e2b… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Mar 25 15:19:55 2019 +0100 Reserved 10 Werk IDS Change-Id: Id274d1905b89282d737c597b7ff5540d045cddf7 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index cbf8a2e..c003899 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -7374 +7384

5 years, 3 months

7222 FIX check_http: port config for certificate check via proxy

by Moritz Kiemer

Module: check_mk Branch: master Commit: 72180fc378ac1ab430493a452f62382f89b10547 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72180fc378ac1a… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Mar 22 12:53:22 2019 +0100 7222 FIX check_http: port config for certificate check via proxy If users had the active check "Check HTTP" configured to check a certificate via a proxy, the option "TCP Port" had wrongly been used as the proxys port instead of the certificate servers port. The port defined in the option "TCP Port" is now applied to the certificate server, regardless of whether a proxy is used. If you relied on the wrong behaviour, remove the option "TCP Port" and include the port for the proxy in the proxy settings. NOTE: To make this work, we have to pass proxy address and server name not using the "-I proxy.com" and "-H server.com" option, but as the first and second argument, respectively. This weird hack bypasses a bug in the check_http commandline parsing: When we pass the arguments this way, we can include the *servers* port in the second argument (e.g. "server.com:8443"). When we try the same with "-H server.vom:8443" the port will be stripped, and ignored if the "-p" option is set, and used as the proxys port otherwise. Change-Id: I2f7babed02b652186f996a91e53048a3689c9ebb --- .werks/7222 | 18 ++++++++++ checks/check_http | 68 ++++++++++++++++++++++++------------ tests/unit/checks/test_check_http.py | 35 +++++++++++++++++-- 3 files changed, 97 insertions(+), 24 deletions(-) diff --git a/.werks/7222 b/.werks/7222 new file mode 100644 index 0000000..f55922c --- /dev/null +++ b/.werks/7222 @@ -0,0 +1,18 @@ +Title: check_http: Mixup of ports when configuring certificate check via proxy +Level: 1 +Component: wato +Compatible: incomp +Edition: cre +Version: 1.6.0i1 +Date: 1553255189 +Class: fix + +If users had the active check "Check HTTP" configured to check a certificate +via a proxy, the option "TCP Port" had wrongly been used as the proxys port +instead of the certificate servers port. + +The port defined in the option "TCP Port" is now applied to the certificate +server, regardless of whether a proxy is used. + +If you relied on the wrong behaviour, remove the option "TCP Port" and include +the port for the proxy in the proxy settings. diff --git a/checks/check_http b/checks/check_http index e1c265d..365d927 100644 --- a/checks/check_http +++ b/checks/check_http @@ -43,31 +43,34 @@ def _get_family_and_address(settings): return family, address +def _get_proxy_setting(settings): + """return proxys (address, port, auth) or None""" + proxy = settings.get("proxy") + if not proxy: + return None + + # ':' outside a IPv6 address indicates port + if ':' in proxy.split(']')[-1]: + address, port = proxy.rsplit(':', 1) + else: + address, port = proxy, None + + auth = settings.get("proxy_auth") + if auth: + auth = passwordstore_get_cmdline("%s:%%s" % auth[0], auth[1]) + + proset = collections.namedtuple("ProxySettings", ("address", "port", "auth")) + return proset(address, port, auth) + + def _certificate_args(address_family, address, settings): args = [] server = settings.get('cert_host', address) - proxy = settings.get('proxy') - - args += ['-I', proxy or server] - - if proxy: - args += ['-H', server] - args.append('--ssl') - args += ['-j', 'CONNECT'] - elif settings.get("sni"): - args += ['-H', server] if address_family == 'ipv6': args += ['-6'] - if "port" in settings: - args += ['-p', settings["port"]] - - if "proxy_auth" in settings: - username, password = settings["proxy_auth"] - args += ["-b", passwordstore_get_cmdline("%s:%%s" % username, password)] - if "cert_days" in settings: # legacy behavior if isinstance(settings["cert_days"], int): @@ -79,6 +82,25 @@ def _certificate_args(address_family, address, settings): if "sni" in settings: args += ['--sni'] + proxy = _get_proxy_setting(settings) + server_port = settings.get("port") + + specify_port = proxy.port if proxy else server_port + if specify_port: + args += ['-p', specify_port] + + if proxy: + args += ['--ssl', '-j', 'CONNECT'] + if proxy.auth: + args += ["-b", proxy.auth] + args.append(proxy.address) + if server_port: + server += ':%s' % server_port + + elif settings.get("sni"): + args += ['-H', server] + + args += [server] return args @@ -87,11 +109,12 @@ def _url_args(address_family, address, settings): # get virthost settings: # TODO: when did 'vhost' dissapear from WATO? vhost, omit_ip = settings.get("virthost", (settings.get("vhost"), False)) + proxy = _get_proxy_setting(settings) args = [] - if "proxy" in settings: - args += ["-I", settings["proxy"]] + if proxy: + args += ["-I", proxy.address] elif not omit_ip: args += ["-I", address] @@ -101,6 +124,8 @@ def _url_args(address_family, address, settings): if address_family == 'ipv6': args += ['-6'] + # TODO: I think this should be overridden by the proxy port + # in the same way as in the cert check. (mo) if "port" in settings: args += ['-p', settings["port"]] @@ -136,9 +161,8 @@ def _url_args(address_family, address, settings): username, password = settings["auth"] args += ["-a", passwordstore_get_cmdline("%s:%%s" % username, password)] - if "proxy_auth" in settings: - username, password = settings["proxy_auth"] - args += ["-b", passwordstore_get_cmdline("%s:%%s" % username, password)] + if proxy and proxy.auth: + args += ["-b", proxy.auth] if "onredirect" in settings: args += ['--onredirect=%s' % settings["onredirect"]] diff --git a/tests/unit/checks/test_check_http.py b/tests/unit/checks/test_check_http.py index eae8884..3bcffc7 100644 --- a/tests/unit/checks/test_check_http.py +++ b/tests/unit/checks/test_check_http.py @@ -32,9 +32,40 @@ pytestmark = pytest.mark.checks ( (None, { 'cert_days': (10, 20), - 'cert_host': 'www.test123.com' + 'cert_host': 'www.test123.com', + 'port': '42', }), - ['-I', 'www.test123.com', '-C', '10,20'], + ['-C', '10,20', '-p', '42', 'www.test123.com'], + ), + ( + (None, { + 'cert_days': (10, 20), + 'cert_host': 'www.test123.com', + 'port': '42', + 'proxy': 'p.roxy', + }), + ['-C', '10,20', '--ssl', '-j', 'CONNECT', 'p.roxy', 'www.test123.com:42'], + ), + ( + (None, { + 'cert_days': (10, 20), + 'cert_host': 'www.test123.com', + 'port': '42', + 'proxy': 'p.roxy:23', + }), + ['-C', '10,20', '-p', '23', '--ssl', '-j', 'CONNECT', 'p.roxy', 'www.test123.com:42'], + ), + ( + (None, { + 'cert_days': (10, 20), + 'cert_host': 'www.test123.com', + 'port': '42', + 'proxy': '[dead:beef::face]:23', + }), + [ + '-C', '10,20', '-p', '23', '--ssl', '-j', 'CONNECT', '[dead:beef::face]', + 'www.test123.com:42' + ], ), ( (None, {

5 years, 3 months

← Newer
1
...
10
11
12
13
14
15
16
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2019