Checkmk git commits April 2018

checkmk-commits@lists.checkmk.com

10 participants
287 discussions

Linux agent: Fetch information about docker container status

by Konstantin Büttner

Module: check_mk Branch: master Commit: 8c3e368ea336e09766855c68f7c232680b40f333 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c3e368ea336e0… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Apr 6 17:13:56 2018 +0200 Linux agent: Fetch information about docker container status Change-Id: I77c5cf011897136864369456c55af7a27d5cfee7 --- agents/check_mk_agent.linux | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 4fcb74f..ed1f384 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -976,6 +976,14 @@ if type docker > /dev/null 2>&1 ; then echo "[[[containers]]]" docker container ls --all --format "{{json .}}" + # For the container status, we want information about *all* containers + for CONTAINER_ID in $(docker container ls -q --all); do + echo "<<<<$CONTAINER_ID>>>>" + echo "<<<docker_container_status>>>" + docker inspect $CONTAINER_ID --format='{{json .State}}' + echo "<<<<>>>>" + done + for CONTAINER_ID in $(docker container ls -q); do echo "<<<<$CONTAINER_ID>>>>"

6 years, 5 months

5959 docker_node_info: New check which monitors the status of docker daemon

by Simon Betz

Module: check_mk Branch: master Commit: 1cc1d4622ea9b92b931cdd131429b1de6fda488b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cc1d4622ea9b9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Apr 6 17:06:01 2018 +0200 5959 docker_node_info: New check which monitors the status of docker daemon Change-Id: Ida31b1be0724887a803d10d420f8631806386db0 --- .werks/5959 | 10 +++++++++ agents/check_mk_agent.linux | 3 +++ checkman/docker_node_info | 12 ++++++++++ checks/docker_node_info | 54 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+) diff --git a/.werks/5959 b/.werks/5959 new file mode 100644 index 0000000..860951b --- /dev/null +++ b/.werks/5959 @@ -0,0 +1,10 @@ +Title: docker_node_info: New check which monitors the status of docker daemon +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1523020454 +Class: feature + + diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index e102d3a..a7ea57e 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -962,6 +962,9 @@ fi # Iterate all running containers and report piggyback data for them if type docker > /dev/null 2>&1 ; then + echo "<<<docker_node_info>>>" + docker info --format "{{json .}}" 2>&1 + for CONTAINER_ID in $(docker container ls -q); do echo "<<<<$CONTAINER_ID>>>>" diff --git a/checkman/docker_node_info b/checkman/docker_node_info new file mode 100644 index 0000000..b90895f --- /dev/null +++ b/checkman/docker_node_info @@ -0,0 +1,12 @@ +title: Docker Node Info +agents: linux +catalog: app/docker +license: GPL +distribution: check_mk +description: + This check monitors the status of the docker application. + If the daemon is running, the check is OK, otherwise it is + CRIT and displays the error message. + +inventory: + One service is created. diff --git a/checks/docker_node_info b/checks/docker_node_info new file mode 100644 index 0000000..4839273 --- /dev/null +++ b/checks/docker_node_info @@ -0,0 +1,54 @@ +#!/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_info(info): + try: + import json + return json.loads("".join(info[0])) + except ValueError: + return " ".join(info[0]) + + +def inventory_docker_node_info(parsed): + if parsed: + return [(None, {})] + + +def check_docker_node_info(item, params, parsed): + if isinstance(parsed, dict): + # TODO use other infos from this section? + return 0, 'Daemon running on host %s' % parsed["Name"] + + return 2, parsed + + +check_info['docker_node_info'] = { + 'parse_function' : parse_docker_node_info, + 'inventory_function' : inventory_docker_node_info, + 'check_function' : check_docker_node_info, + 'service_description' : 'Docker Node Info', +}

6 years, 5 months

5960 docker_images: Inventorizes information about repository, tag, ID, creation time, size, labels and the amount of containers of docker images

by Simon Betz

Module: check_mk Branch: master Commit: 838fc7ede4371a95df6efb3a1c0ba2517bccc96c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=838fc7ede4371a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Apr 6 15:16:35 2018 +0200 5960 docker_images: Inventorizes information about repository, tag, ID, creation time, size, labels and the amount of containers of docker images Change-Id: Iaa2598b4fd518c737371adb0dcd35e67a7786103 --- .werks/5960 | 10 +++++ agents/check_mk_agent.linux | 13 ++++++- inventory/docker_images | 85 ++++++++++++++++++++++++++++++++++++++++++ web/plugins/views/inventory.py | 6 +++ 4 files changed, 113 insertions(+), 1 deletion(-) diff --git a/.werks/5960 b/.werks/5960 new file mode 100644 index 0000000..0a06e02 --- /dev/null +++ b/.werks/5960 @@ -0,0 +1,10 @@ +Title: docker_images: Inventorizes information about repository, tag, ID, creation time, size, labels and the amount of containers of docker images +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1523020483 +Class: feature + + diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index a7ea57e..4fcb74f 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -60,7 +60,7 @@ SPOOLDIR=$MK_VARDIR/spool # close standard input (for security reasons) and stderr when not # explicitly in debug mode. # When the nodes agent is executed by a e.g. docker node in a container, -# then don't close stdin, because the agent is piped through it in this +# then don't close stdin, because the agent is piped through it in this # case. if [ "$1" = -d ] then @@ -965,6 +965,17 @@ if type docker > /dev/null 2>&1 ; then echo "<<<docker_node_info>>>" docker info --format "{{json .}}" 2>&1 + echo "<<<docker_images>>>" + echo "[[[images]]]" + docker images --all --format "{{json .}}" + for image in $(docker images --all --format "{{.Repository}}"); + do + echo "[[[images_labels:$image]]]" + docker image inspect --format "{{json .Config.Labels}}" $image + done + echo "[[[containers]]]" + docker container ls --all --format "{{json .}}" + for CONTAINER_ID in $(docker container ls -q); do echo "<<<<$CONTAINER_ID>>>>" diff --git a/inventory/docker_images b/inventory/docker_images new file mode 100644 index 0000000..d6ab2a4 --- /dev/null +++ b/inventory/docker_images @@ -0,0 +1,85 @@ +#!/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_images(info): + import json + parsed = {} + section_name = None + for line in info: + if line[0].startswith("[[[") and line[0].endswith("]]]"): + section_name = line[0][3:-3] + continue + + data = json.loads(" ".join(line)) + if section_name == "images": + data = json.loads(" ".join(line)) + parsed.setdefault(data["Repository"], data) + + elif section_name.startswith("images_labels"): + _, image_id = section_name.split(":", 1) + image = parsed.get(image_id) + if image is not None and data: + image.setdefault("__labels__", data) + + elif section_name == "containers": + image = parsed.get(data["Image"]) + if image is not None: + image.setdefault("__containers__", []).append(data) + return parsed + + +def inv_docker_images(info, inventory_tree, status_data_tree): + parsed = _parse_docker_images(info) + path = "software.applications.docker.images:" + inv_node = inventory_tree.get_list(path) + status_node = status_data_tree.get_list(path) + + for repo, image in parsed.iteritems(): + tag = image["Tag"] + id_ = image["ID"] + inv_node.append({ + "repository" : repo, + "tag" : tag, + "id" : id_, + "creation" : image["CreatedAt"], + "size" : image["VirtualSize"], + "labels" : ", ".join([": ".join(e) + for e in image.get("__labels__", {}).items()]), + }) + + status_node.append({ + "repository" : repo, + "tag" : tag, + "id" : id_, + "amount_containers" : len(image.get("__containers__", [])), + }) + + +inv_info['docker_images'] = { + 'inv_function' : inv_docker_images, + 'has_status_data' : True, +} diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 29d7724..0bc887c 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -776,6 +776,12 @@ inventory_displayhints.update({ }, ".software.applications.mssql.instances:*.clustered" : { "title" : _("Clustered"), "paint" : "mssql_is_clustered"}, + ".software.applications.docker." : { "title" : _("Docker") }, + ".software.applications.docker.images:" : { "title" : _("Images"), + "keyorder": ["repository", "tag", "id", "creation", "size", "labels", "amount_containers"], + }, + ".software.applications.docker.images:*.id" : { "title" : _("ID"), }, + ".networking." : { "title" : _("Networking"), "icon" : "networking" }, ".networking.total_interfaces" : { "title" : _("Interfaces"), "paint" : "count", }, ".networking.total_ethernet_ports" : { "title" : _("Ports"), "paint" : "count", },

6 years, 5 months

5945 Hosts can now be configured without IP address

by Lars Michelsen

Module: check_mk Branch: master Commit: 2394633770c08968eeb4346b4b354b674353ecd7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2394633770c089… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 5 14:08:23 2018 +0200 5945 Hosts can now be configured without IP address It is now possible to configure hosts in Check_MK that have no IP address configured. This is useful e.g. in case a host is only monitored using piggyback data from another host. In previous versions of Check_MK a fake IP address had to be configured for each host to prevent warning messages during config generation and during monitoring. To configure a host without IP, simply set the "IP address family" attribute of a host to "No IP". The host check of these hosts will always report "UP" by default. To override this, you can use the rule set "Host check command". Change-Id: I7870d6c2072c8781488f983d4072065340eb755c --- .werks/5945 | 21 +++++++++++++++++++++ cmk_base/config.py | 16 ++++++++++++++-- cmk_base/core_config.py | 2 ++ cmk_base/ip_lookup.py | 4 ++++ tests/unit/cmk_base/test_config.py | 26 ++++++++++++++++++++++++++ web/htdocs/watolib.py | 1 + 6 files changed, 68 insertions(+), 2 deletions(-) diff --git a/.werks/5945 b/.werks/5945 new file mode 100644 index 0000000..43f436a --- /dev/null +++ b/.werks/5945 @@ -0,0 +1,21 @@ +Title: Hosts can now be configured without IP address +Level: 1 +Component: core +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1522929824 +Class: feature + +It is now possible to configure hosts in Check_MK that have no IP address configured. +This is useful e.g. in case a host is only monitored using piggyback data from another +host. + +In previous versions of Check_MK a fake IP address had to be configured for each host +to prevent warning messages during config generation and during monitoring. + +To configure a host without IP, simply set the "IP address family" attribute of a host +to "No IP". + +The host check of these hosts will always report "UP" by default. To override this, you +can use the rule set "Host check command". diff --git a/cmk_base/config.py b/cmk_base/config.py index 96d3767..e964cdb 100644 --- a/cmk_base/config.py +++ b/cmk_base/config.py @@ -679,8 +679,20 @@ def is_ipv6_host(hostname): def is_ipv4_host(hostname): - # Either explicit IPv4 or implicit (when host is not an IPv6 host) - return "ip-v4" in tags_of_host(hostname) or "ip-v6" not in tags_of_host(hostname) + """Whether or not the given host is configured to be monitored via IPv4. + This is the case when it is set to be explicit IPv4 or implicit + (when host is not an IPv6 host and not a "No IP" host)""" + tags = tags_of_host(hostname) + + if "ip-v4" in tags: + return True + + return "ip-v6" not in tags and "no-ip" not in tags + + +def is_no_ip_host(hostname): + """Whether or not the given host is configured not to be monitored via IP""" + return "no-ip" in tags_of_host(hostname) # # Management board diff --git a/cmk_base/core_config.py b/cmk_base/core_config.py index 0f81d26..ce7ec8e 100644 --- a/cmk_base/core_config.py +++ b/cmk_base/core_config.py @@ -88,6 +88,8 @@ def host_check_command(hostname, ip, is_clust, hostcheck_commands_to_define=None values = rulesets.host_extra_conf(hostname, config.host_check_commands) if values: value = values[0] + elif config.is_no_ip_host(hostname): + value = "ok" elif config.monitoring_core == "cmc": value = "smart" else: diff --git a/cmk_base/ip_lookup.py b/cmk_base/ip_lookup.py index d061ed0..e53793d 100644 --- a/cmk_base/ip_lookup.py +++ b/cmk_base/ip_lookup.py @@ -118,6 +118,10 @@ def cached_dns_lookup(hostname, family): cache[cache_id] = cached_ip return cached_ip + if config.is_no_ip_host(hostname): + cache[cache_id] = None + return None + # Now do the actual DNS lookup try: ipa = socket.getaddrinfo(hostname, None, family == 4 and socket.AF_INET or socket.AF_INET6)[0][4][0] diff --git a/tests/unit/cmk_base/test_config.py b/tests/unit/cmk_base/test_config.py new file mode 100644 index 0000000..a0e0e23 --- /dev/null +++ b/tests/unit/cmk_base/test_config.py @@ -0,0 +1,26 @@ +import pytest + +import cmk_base.config as config + +(a)pytest.mark.parametrize("hostname,tags,result", [ + ("testhost", [], True), + ("testhost", ["ip-v4"], True), + ("testhost", ["ip-v4", "ip-v6"], True), + ("testhost", ["ip-v6"], False), + ("testhost", ["no-ip"], False), +]) +def test_is_ipv4_host(monkeypatch, hostname, tags, result): + monkeypatch.setattr(config, "tags_of_host", lambda h: {hostname: tags}[h]) + assert config.is_ipv4_host(hostname) == result + + +(a)pytest.mark.parametrize("hostname,tags,result", [ + ("testhost", [], False), + ("testhost", ["ip-v4"],False), + ("testhost", ["ip-v4", "ip-v6"], False), + ("testhost", ["ip-v6"], False), + ("testhost", ["no-ip"], True), +]) +def test_is_no_ip_host(monkeypatch, hostname, tags, result): + monkeypatch.setattr(config, "tags_of_host", lambda h: {hostname: tags}[h]) + assert config.is_no_ip_host(hostname) == result diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 89109c1..6c895f9 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -6152,6 +6152,7 @@ def register_builtin_host_tags(): ("ip-v4-only", _("IPv4 only"), ["ip-v4"]), ("ip-v6-only", _("IPv6 only"), ["ip-v6"]), ("ip-v4v6", _("IPv4/IPv6 dual-stack"), ["ip-v4", "ip-v6"]), + ("no-ip", _("No IP"), []), ] ), ]

6 years, 5 months

Hand over REMOTE variable to docker container context

by Lars Michelsen

Module: check_mk Branch: master Commit: c03732e216b5535a084f2034b88f36c8a4c45be7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c03732e216b553… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 6 16:20:02 2018 +0200 Hand over REMOTE variable to docker container context Change-Id: I7fc52bb7732a14bc8613e33a62637f1a122373b5 --- agents/check_mk_agent.linux | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index cabbc97..e102d3a 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -972,16 +972,15 @@ if type docker > /dev/null 2>&1 ; then # the container. # Once it comes to plugins and custom configuration the user needs to use # a little more complex setup. Have a look at the documentation. - # TODO: Hand over REMOTE (and other?) environment variables AGENT_PATH=$(docker container exec "$CONTAINER_ID" which check_mk_agent 2>/dev/null) if [ -n "$AGENT_PATH" ]; then - docker container exec "$CONTAINER_ID" check_mk_agent + docker container exec --env "REMOTE=$REMOTE" "$CONTAINER_ID" check_mk_agent else # TODO: In case the docker part is added to the official agent script # erase the hard coded path and replace it with 'basename "$0"'. # In case the docker stuff remains as plugin, at least replace it with # to get the agent path $(type check_mk_agent). - docker container exec --env MK_FROM_NODE=1 -i "$CONTAINER_ID" bash </usr/bin/check_mk_agent + docker container exec --env "MK_FROM_NODE=1,REMOTE=$REMOTE" -i "$CONTAINER_ID" bash </usr/bin/check_mk_agent fi echo "<<<<>>>>"

6 years, 5 months

docker_container_diskstat: Check Disk IO of a docker container

by Lars Michelsen

Module: check_mk Branch: master Commit: 518101b613835009e404d720a19e715f62b483cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=518101b6138350… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 6 15:56:11 2018 +0200 docker_container_diskstat: Check Disk IO of a docker container Change-Id: Ibbe038a44c66111fa700f9f31896f7c8119fa903 --- agents/check_mk_agent.linux | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 258a7cd..cabbc97 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -467,16 +467,24 @@ if type multipath >/dev/null ; then fi # Performancecounter Platten -echo '<<<diskstat>>>' -date +%s -egrep ' (x?[shv]d[a-z]*[0-9]*|cciss/c[0-9]+d[0-9]+|emcpower[a-z]+|dm-[0-9]+|VxVM.*|mmcblk.*|dasd[a-z]*|bcache[0-9]+|nvme[0-9]+n[0-9]+) ' < /proc/diskstats -if type dmsetup >/dev/null ; then - echo '[dmsetup_info]' - dmsetup info -c --noheadings --separator ' ' -o name,devno,vg_name,lv_name -fi -if [ -d /dev/vx/dsk ] ; then - echo '[vx_dsk]' - stat -c "%t %T %n" /dev/vx/dsk/*/* +if [ -z "$MK_IN_CONTAINER" ]; then + echo '<<<diskstat>>>' + date +%s + grep -E ' (x?[shv]d[a-z]*[0-9]*|cciss/c[0-9]+d[0-9]+|emcpower[a-z]+|dm-[0-9]+|VxVM.*|mmcblk.*|dasd[a-z]*|bcache[0-9]+|nvme[0-9]+n[0-9]+) ' < /proc/diskstats + if type dmsetup >/dev/null ; then + echo '[dmsetup_info]' + dmsetup info -c --noheadings --separator ' ' -o name,devno,vg_name,lv_name + fi + if [ -d /dev/vx/dsk ] ; then + echo '[vx_dsk]' + stat -c "%t %T %n" /dev/vx/dsk/*/* + fi +else + echo '<<<docker_container_diskstat>>>' + for F in io_service_bytes io_serviced; do + echo "[$F]" + echo "$(</sys/fs/cgroup/blkio/blkio.throttle.$F)" + done fi

6 years, 5 months

Win-agent: improve string handling

by Jukka Aro

Module: check_mk Branch: master Commit: e15cc717e4f2776a4ee944864bd8c4c2cef69a79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e15cc717e4f277… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Apr 6 15:41:29 2018 +0200 Win-agent: improve string handling Replace (some) occurrences of snprintf and strncpy with std::string operations. Favour std::string over C char pointers. Mark input string parameters as const. Throw own character replace implementation where it belongs to. --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent.cc | 14 ++++++------ agents/windows/sections/SectionDF.cc | 43 ++++++++++++++++-------------------- agents/windows/sections/SectionDF.h | 4 ++-- 4 files changed, 29 insertions(+), 34 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 31bd29a..b2ad126 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3230 +3245 diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index d84453d..71f0506 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -365,16 +365,16 @@ void InstallService() { s_winapi.OpenSCManager(0, 0, SC_MANAGER_CREATE_SERVICE); if (serviceControlManager) { - char path[_MAX_PATH + 1]; + char path[_MAX_PATH + 1] = {0}; if (s_winapi.GetModuleFileName(0, path, sizeof(path) / sizeof(path[0])) > 0) { - char quoted_path[1024]; - snprintf(quoted_path, sizeof(quoted_path), "\"%s\"", path); + const auto quoted_path = std::string{"\""} + path + "\""; ServiceHandle service{ - s_winapi.CreateService( - serviceControlManager, gszServiceName, gszServiceName, - SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, - SERVICE_AUTO_START, SERVICE_ERROR_IGNORE, quoted_path), + s_winapi.CreateService(serviceControlManager, gszServiceName, + gszServiceName, SERVICE_ALL_ACCESS, + SERVICE_WIN32_OWN_PROCESS, + SERVICE_AUTO_START, SERVICE_ERROR_IGNORE, + quoted_path.c_str()), s_winapi}; if (service) { std::cout << SERVICE_NAME << " Installed Successfully" diff --git a/agents/windows/sections/SectionDF.cc b/agents/windows/sections/SectionDF.cc index 7b738b1..d4c0be7 100644 --- a/agents/windows/sections/SectionDF.cc +++ b/agents/windows/sections/SectionDF.cc @@ -42,13 +42,6 @@ struct MountPointHandleTraits { } }; -void char_replace(char what, char into, char *in) { - while (*in) { - if (*in == what) *in = into; - in++; - } -} - } // namespace SectionDF::SectionDF(const Environment &env, Logger *logger, @@ -57,51 +50,53 @@ SectionDF::SectionDF(const Environment &env, Logger *logger, std::make_unique<SectionHeader<'\t', SectionBrackets>>("df", logger)) {} -void SectionDF::output_filesystem(std::ostream &out, char *volid) { +void SectionDF::output_filesystem(std::ostream &out, const std::string &volid) { static const int KiloByte = 1024; - char fsname[128]; - char volume[512]; + char fsname[128] = {0}; + char volume[512] = {0}; DWORD dwSysFlags = 0; - if (!_winapi.GetVolumeInformation(volid, volume, sizeof(volume), 0, 0, - &dwSysFlags, fsname, sizeof(fsname))) - fsname[0] = 0; + if (!_winapi.GetVolumeInformation(volid.c_str(), volume, sizeof(volume), 0, + 0, &dwSysFlags, fsname, sizeof(fsname))) { + fsname[0] = '\0'; // May be necessary if partial information returned + } ULARGE_INTEGER free_avail, total, free; free_avail.QuadPart = 0; total.QuadPart = 0; free.QuadPart = 0; int returnvalue = - _winapi.GetDiskFreeSpaceEx(volid, &free_avail, &total, &free); + _winapi.GetDiskFreeSpaceEx(volid.c_str(), &free_avail, &total, &free); if (returnvalue > 0) { double perc_used = 0; if (total.QuadPart > 0) perc_used = 100 - (100 * free_avail.QuadPart / total.QuadPart); - if (volume[0]) // have a volume name - char_replace(' ', '_', volume); + std::string volumeStr{volume}; + if (!volumeStr.empty()) // have a volume name + std::replace(volumeStr.begin(), volumeStr.end(), ' ', '_'); else - strncpy(volume, volid, sizeof(volume)); + volumeStr = volid; - out << volume << "\t" << fsname << "\t" << (total.QuadPart / KiloByte) - << "\t" << (total.QuadPart - free_avail.QuadPart) / KiloByte << "\t" + out << volumeStr << "\t" << fsname << "\t" + << (total.QuadPart / KiloByte) << "\t" + << (total.QuadPart - free_avail.QuadPart) / KiloByte << "\t" << (free_avail.QuadPart / KiloByte) << "\t" << std::fixed << std::setprecision(0) << perc_used << "%\t" << volid << "\n"; } } -void SectionDF::output_mountpoints(std::ostream &out, char *volid) { +void SectionDF::output_mountpoints(std::ostream &out, + const std::string &volid) { char mountpoint[512]; WrappedHandle<MountPointHandleTraits> hPt{ - _winapi.FindFirstVolumeMountPoint(volid, mountpoint, + _winapi.FindFirstVolumeMountPoint(volid.c_str(), mountpoint, sizeof(mountpoint)), _winapi}; if (hPt) { while (true) { - char combined_path[1024]; - snprintf(combined_path, sizeof(combined_path), "%s%s", volid, - mountpoint); + const std::string combined_path = volid + mountpoint; output_filesystem(out, combined_path); if (!_winapi.FindNextVolumeMountPoint(hPt.get(), mountpoint, sizeof(mountpoint))) diff --git a/agents/windows/sections/SectionDF.h b/agents/windows/sections/SectionDF.h index 4302b0d..d42623b 100644 --- a/agents/windows/sections/SectionDF.h +++ b/agents/windows/sections/SectionDF.h @@ -39,8 +39,8 @@ protected: std::ostream &out, const std::optional<std::string> &) override; private: - void output_filesystem(std::ostream &out, char *volid); - void output_mountpoints(std::ostream &out, char *volid); + void output_filesystem(std::ostream &out, const std::string &volid); + void output_mountpoints(std::ostream &out, const std::string &volid); }; #endif // SectionDF_h

6 years, 5 months

Fix section header

by Konstantin Büttner

Module: check_mk Branch: master Commit: ad1559d1d9aabd7d56fbbf1a346e54c1cb18331e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad1559d1d9aabd… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Apr 6 15:43:14 2018 +0200 Fix section header Change-Id: I04a52ca81bd8fec68c194263b895d6f200941473 --- agents/check_mk_agent.linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 4422ecd..258a7cd 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -113,7 +113,7 @@ function section_mem() echo '<<<mem>>>' grep -E -v '^Swap:|^Mem:|total:' < /proc/meminfo else - echo '<<docker_container_mem>>>' + echo '<<<docker_container_mem>>>' echo "$(</sys/fs/cgroup/memory/memory.stat)" fi }

6 years, 5 months

Linux agent: Find docker containers and execute agent in context

by Lars Michelsen

Module: check_mk Branch: master Commit: 3e21f30e3ff3b47ae2ba9285da1c9c763278503f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e21f30e3ff3b4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 6 15:28:10 2018 +0200 Linux agent: Find docker containers and execute agent in context * In case the agent is running on a docker node, it iterates all running containers and executes the Check_MK agent in to context of the container to gather container specific information. * In case a check_mk_agent is already installed in the container, then this agent is executed. * In case there is no check_mk_agent installed, the agent of the docker node is executed in the container. Change-Id: I202c43919cef87a2deecc540424efa9a815af1e0 --- agents/check_mk_agent.linux | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index bca690d..4422ecd 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -952,6 +952,34 @@ if type pvecm > /dev/null 2>&1 ; then pvecm nodes fi +# Iterate all running containers and report piggyback data for them +if type docker > /dev/null 2>&1 ; then + for CONTAINER_ID in $(docker container ls -q); do + echo "<<<<$CONTAINER_ID>>>>" + + # Is there a regular agent available in the container? Use it! + # + # Otherwise execute the agent of the node in the context of the container. + # Using this approach we should always get at least basic information from + # the container. + # Once it comes to plugins and custom configuration the user needs to use + # a little more complex setup. Have a look at the documentation. + # TODO: Hand over REMOTE (and other?) environment variables + AGENT_PATH=$(docker container exec "$CONTAINER_ID" which check_mk_agent 2>/dev/null) + if [ -n "$AGENT_PATH" ]; then + docker container exec "$CONTAINER_ID" check_mk_agent + else + # TODO: In case the docker part is added to the official agent script + # erase the hard coded path and replace it with 'basename "$0"'. + # In case the docker stuff remains as plugin, at least replace it with + # to get the agent path $(type check_mk_agent). + docker container exec --env MK_FROM_NODE=1 -i "$CONTAINER_ID" bash </usr/bin/check_mk_agent + fi + + echo "<<<<>>>>" + done +fi + # Start new liveupdate process in background on each agent execution. Starting # a new live update process will terminate the old one automatically after # max. 1 sec.

6 years, 5 months

Reduced g_snmp_engine usage a bit.

by Sven Panne

Module: check_mk Branch: master Commit: bb8394254732bde48490dac7207cb77ffa195d0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb8394254732bd… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Apr 6 15:00:33 2018 +0200 Reduced g_snmp_engine usage a bit. Change-Id: I11c7c50a6ec1b99079fde97d779123a8413cac41 --- cmk/ec/main.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 157bcf9..7b01653 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -477,18 +477,19 @@ def initialize_snmptrap_handling(settings, config, event_server, table_events): def initialize_snmptrap_engine(config, event_server, table_events): - global g_snmp_engine, g_snmp_receiver - g_snmp_engine = snmp_engine.SnmpEngine() + the_snmp_engine = snmp_engine.SnmpEngine() # Disable receiving of SNMPv3 INFORM messages. We do not support them (yet) class ECNotificationReceiver(snmp_ntfrcv.NotificationReceiver): pduTypes = (snmp_v1.TrapPDU.tagSet, snmp_v2c.SNMPv2TrapPDU.tagSet) - initialize_snmp_credentials(config) - g_snmp_receiver = ECNotificationReceiver(g_snmp_engine, event_server.handle_snmptrap) + initialize_snmp_credentials(config, the_snmp_engine) + global g_snmp_receiver, g_snmp_engine + g_snmp_receiver = ECNotificationReceiver(the_snmp_engine, event_server.handle_snmptrap) + g_snmp_engine = the_snmp_engine -def initialize_snmp_credentials(config): +def initialize_snmp_credentials(config, the_snmp_engine): user_num = 0 for spec in config["snmp_credentials"]: credentials = spec["credentials"] @@ -496,7 +497,7 @@ def initialize_snmp_credentials(config): # SNMPv1/v2 if type(credentials) != tuple: - snmp_config.addV1System(g_snmp_engine, 'snmpv2-%d' % user_num, credentials) + snmp_config.addV1System(the_snmp_engine, 'snmpv2-%d' % user_num, credentials) continue # SNMPv3 @@ -529,7 +530,7 @@ def initialize_snmp_credentials(config): for engine_id in spec["engine_ids"]: snmp_config.addV3User( - g_snmp_engine, user_id, + the_snmp_engine, user_id, auth_proto, auth_key, priv_proto, priv_key, securityEngineId=snmp_v2c.OctetString(hexValue=engine_id)

6 years, 5 months

← Newer
1
...
19
20
21
22
23
24
25
...
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