Checkmk git commits April 2018

checkmk-commits@lists.checkmk.com

10 participants
287 discussions

by Jukka Aro

Module: check_mk Branch: master Commit: d52af6fcd98c3be984a4bbcb866e1883d8608159 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d52af6fcd98c3b… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Apr 20 08:38:37 2018 +0200 Win-agent: fix winperf integration test --- agents/windows/it/test_section_winperf.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/agents/windows/it/test_section_winperf.py b/agents/windows/it/test_section_winperf.py index c35d151..dfa0ccc 100644 --- a/agents/windows/it/test_section_winperf.py +++ b/agents/windows/it/test_section_winperf.py @@ -29,5 +29,7 @@ def expected_output(): r'|\-?\d+( \d+)+ [\w]+') -def test_section_winperf(testconfig, expected_output, actual_output, testfile): - remotetest(expected_output, actual_output, testfile) +def test_section_winperf(request, testconfig, expected_output, actual_output, + testfile): + # request.node.name gives test name + remotetest(expected_output, actual_output, testfile, request.node.name)

6 years, 2 months

5922 FIX Windows agent: Many WMI queries could lead to integer overflow

by Jukka Aro

Module: check_mk Branch: master Commit: 372a17b09ee44cd98a633b0cd1284eb39d15fc7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=372a17b09ee44c… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Apr 19 09:04:18 2018 +0200 5922 FIX Windows agent: Many WMI queries could lead to integer overflow Integer values returned by a number of WMI queries were handled incorrectly, squeezing 64 bit integers into 32 bit representation. This led to sporadical erroneous results for a number of agent sections / checks. Potentially affected were at least the checks wmi_cpuload and ps, but basically any checks using information provided by WMI. The symptoms of this may have been varying across different checks. --- .werks/5922 | 17 +++++++++++++++++ agents/windows/build_version | 2 +- agents/windows/it/test_section_dotnet_clrmemory.py | 2 +- agents/windows/it/test_section_wmi_cpuload.py | 4 ++-- agents/windows/sections/SectionPS.cc | 14 +++++++------- agents/windows/sections/SectionPS.h | 8 ++++---- agents/windows/wmiHelper.cc | 16 +++++----------- agents/windows/wmiHelper.h | 2 +- 8 files changed, 38 insertions(+), 27 deletions(-) diff --git a/.werks/5922 b/.werks/5922 new file mode 100644 index 0000000..73cbce9 --- /dev/null +++ b/.werks/5922 @@ -0,0 +1,17 @@ +Title: Windows agent: Many WMI queries could lead to integer overflow +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1524205799 +Class: fix + +Integer values returned by a number of WMI queries were handled incorrectly, +squeezing 64 bit integers into 32 bit representation. This lead to sporadical +erroneous results for a number of agent sections / checks. Potentially +affected were at least the checks wmi_cpuload and ps, but basically any checks +using information provided by WMI. The symptoms of this may have been varying +across different checks. + + diff --git a/agents/windows/build_version b/agents/windows/build_version index 362875e..c5f1662 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3248 +3250 diff --git a/agents/windows/it/test_section_dotnet_clrmemory.py b/agents/windows/it/test_section_dotnet_clrmemory.py index 84e45b1..2a34c56 100644 --- a/agents/windows/it/test_section_dotnet_clrmemory.py +++ b/agents/windows/it/test_section_dotnet_clrmemory.py @@ -38,7 +38,7 @@ def expected_output(): ], repeat(r'\d+,,,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,' r'[\w\#\.]+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,' - r'\d+,\-?\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+')) + r'\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+')) def test_section_dotnet_clrmemory(testconfig, expected_output, actual_output, diff --git a/agents/windows/it/test_section_wmi_cpuload.py b/agents/windows/it/test_section_wmi_cpuload.py index ca55544..5889ba6 100644 --- a/agents/windows/it/test_section_wmi_cpuload.py +++ b/agents/windows/it/test_section_wmi_cpuload.py @@ -34,7 +34,7 @@ def expected_output(): r'ProcessorQueueLength,SystemCallsPersec,SystemUpTime,Threads,' r'Timestamp_Object,Timestamp_PerfTime,Timestamp_Sys100NS'), (r'\d+,,\d+,,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,,\d+,' - r'\-?\d+,\d+,\d+,\-?\d+,\d+,\d+,\d+,\d+,\d+'), + r'\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+,\d+'), re.escape(r'[computer_system]'), (r'AdminPasswordStatus,AutomaticManagedPagefile,' r'AutomaticResetBootOption,AutomaticResetCapability,BootOptionOnLimit,' @@ -57,7 +57,7 @@ def expected_output(): (r'\d+,\d+,\d+,\d+,\d*,\d*,\d+,[^,]*,[^,]+,[\w-]+,\d+,,\w+,\d+,\d+,' r'[^,]+,[\w-]+,[^,]+,\d+,\d+,\d+,\d+,\d+,,,\d+,,[^,]+(, [^,]+)?,[^,]+,' r'[\w-]+,,\d+,\d+,\d+,,[^,]+,\d+,\-?\d+,\d+,\d+,,,\d+,\d+,\d+,,[\w-]+,' - r'\d+,\-?\d+,\-?\d+,[^,]+,\w+,,[^,]*,,,,,[^,]+,\d+,\d+,[^,]*,\d+,\w*') + r'\d+,\d+,\d+,[^,]+,\w+,,[^,]*,,,,,[^,]+,\d+,\d+,[^,]*,\d+,\w*') ] diff --git a/agents/windows/sections/SectionPS.cc b/agents/windows/sections/SectionPS.cc index 13a1e97..352aacb 100644 --- a/agents/windows/sections/SectionPS.cc +++ b/agents/windows/sections/SectionPS.cc @@ -160,9 +160,9 @@ bool SectionPS::produceOutputInner(std::ostream &out, void SectionPS::outputProcess( std::ostream &out, ULONGLONG virtual_size, ULONGLONG working_set_size, - ULONGLONG pagefile_usage, ULONGLONG uptime, ULONGLONG usermode_time, - ULONGLONG kernelmode_time, DWORD process_id, DWORD process_handle_count, - DWORD thread_count, const std::string &user, const std::string &exe_file) { + long long pagefile_usage, ULONGLONG uptime, long long usermode_time, + long long kernelmode_time, long long process_id, long long process_handle_count, + long long thread_count, const std::string &user, const std::string &exe_file) { // Note: CPU utilization is determined out of usermodetime and // kernelmodetime out << "(" << user << "," << virtual_size / 1024 << "," @@ -185,7 +185,7 @@ bool SectionPS::outputWMI(std::ostream &out) { bool more = result.valid(); while (more) { - int processId = result.get<int>(L"ProcessId"); + long long processId = result.get<long long>(L"ProcessId"); NullHandle process( _winapi.OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, @@ -224,11 +224,11 @@ bool SectionPS::outputWMI(std::ostream &out) { outputProcess( out, std::stoull(result.get<std::string>(L"VirtualSize")), std::stoull(result.get<std::string>(L"WorkingSetSize")), - result.get<int>(L"PagefileUsage"), uptime, + result.get<long long>(L"PagefileUsage"), uptime, std::stoull(result.get<std::wstring>(L"UserModeTime")), std::stoull(result.get<std::wstring>(L"KernelModeTime")), - processId, result.get<int>(L"HandleCount"), - result.get<int>(L"ThreadCount"), user, to_utf8(process_name)); + processId, result.get<long long>(L"HandleCount"), + result.get<long long>(L"ThreadCount"), user, to_utf8(process_name)); more = result.next(); } diff --git a/agents/windows/sections/SectionPS.h b/agents/windows/sections/SectionPS.h index 63a7766..174a215 100644 --- a/agents/windows/sections/SectionPS.h +++ b/agents/windows/sections/SectionPS.h @@ -59,10 +59,10 @@ private: std::string &csOwner_o); process_entry_t getProcessPerfdata(); void outputProcess(std::ostream &out, ULONGLONG virtual_size, - ULONGLONG working_set_size, ULONGLONG pagefile_usage, - ULONGLONG uptime, ULONGLONG usermode_time, - ULONGLONG kernelmode_time, DWORD process_id, - DWORD process_handle_count, DWORD thread_count, + ULONGLONG working_set_size, long long pagefile_usage, + ULONGLONG uptime, long long usermode_time, + long long kernelmode_time, long long process_id, + long long process_handle_count, long long thread_count, const std::string &user, const std::string &exe_file); bool outputWMI(std::ostream &out); bool outputNative(std::ostream &out); diff --git a/agents/windows/wmiHelper.cc b/agents/windows/wmiHelper.cc index 67b4cfd..4e42f1f 100644 --- a/agents/windows/wmiHelper.cc +++ b/agents/windows/wmiHelper.cc @@ -254,20 +254,14 @@ bool Result::next() { } template <> -int Variant::get() const { +long long Variant::get() const { switch (_value.vt) { case VT_I1: - return _value.bVal; - case VT_I2: return _value.iVal; - case VT_I4: - return _value.intVal; - case VT_UI1: - return _value.cVal; - case VT_UI2: - return _value.uiVal; - case VT_UI4: + case VT_I2: return _value.intVal; + case VT_I4: + return _value.llVal; default: throw ComTypeException(string("wrong value type requested: ") + to_string(_value.vt)); @@ -367,7 +361,7 @@ wstring Variant::get() const { case VT_I1: case VT_I2: case VT_I4: - return std::to_wstring(get<int>()); + return std::to_wstring(get<long long>()); case VT_UI1: case VT_UI2: case VT_UI4: diff --git a/agents/windows/wmiHelper.h b/agents/windows/wmiHelper.h index 19b3cec..cf80f83 100644 --- a/agents/windows/wmiHelper.h +++ b/agents/windows/wmiHelper.h @@ -79,7 +79,7 @@ private: }; template <> -int Variant::get() const; +long long Variant::get() const; template <> bool Variant::get() const; template <>

6 years, 2 months

6021 FIX Combined graphs: Fixed handling of optional metrics

by Lars Michelsen

Module: check_mk Branch: master Commit: b3433b371a1de2d40d9c2a54a7414ba6c46d4f55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3433b371a1de2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 19 19:56:46 2018 +0200 6021 FIX Combined graphs: Fixed handling of optional metrics When trying to render combined graphs with graph templates that have optional metrics, these graphs could not be rendered. For example the "CPU utilization" graphs of some devices could not be displayed in combined graphs. Change-Id: I3f4e507fcba40da8955834c8808d2ecdbb67d4ae --- .werks/6021 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.werks/6021 b/.werks/6021 new file mode 100644 index 0000000..daaf1f0 --- /dev/null +++ b/.werks/6021 @@ -0,0 +1,13 @@ +Title: Combined graphs: Fixed handling of optional metrics +Level: 1 +Component: metrics +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1524160513 + +When trying to render combined graphs with graph templates that have optional +metrics, these graphs could not be rendered. For example the "CPU utilization" +graphs of some devices could not be displayed in combined graphs.

6 years, 2 months

6020 FIX View permitted group selection: Increased size of select fields

by Lars Michelsen

Module: check_mk Branch: master Commit: 679c379ad4dbd0a2240979ab5714a49759dea2c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=679c379ad4dbd0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 19 19:30:53 2018 +0200 6020 FIX View permitted group selection: Increased size of select fields The contact group selection fields have now a better initial size and are also resizable which may be useful in case you have very long group names. Change-Id: Ibc404e0ecf5a4037d8be200edb62aacbeac836ed --- .werks/6020 | 13 +++++++++++++ web/htdocs/check_mk.css | 1 + web/htdocs/visuals.py | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/6020 b/.werks/6020 new file mode 100644 index 0000000..8fc5344 --- /dev/null +++ b/.werks/6020 @@ -0,0 +1,13 @@ +Title: View permitted group selection: Increased size of select fields +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1524158989 + +The contact group selection fields have now a better initial size +and are also resizable which may be useful in case you have very +long group names. diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 16b2818..2acc3b3 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -623,6 +623,7 @@ table.vs_duallist td { table.vs_duallist td select { width: 100%; height: 200px; + resize: both; } table.vs_duallist td.head { text-align:center; diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 31a6485..50b7fa0 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -911,7 +911,7 @@ class PublishTo(CascadingDropdown): with_foreign_groups=with_foreign_groups, title = _("Publish to members of contact groups"), rows = 5, - size = 40, + size = 80, )), ], title = _('Make this %s available for other users') % type_title,

6 years, 2 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 255e472cec5c0e49e5b7008f8ee8b45a25736c64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=255e472cec5c0e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 19 19:01:21 2018 +0200 Reserved 20 Werk IDS Change-Id: I09da967b428dc23f9d8004e59975405575d6f31d --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index a92ae41..13d67a3 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6019 +6039

6 years, 2 months

6019 FIX docker_container_cpu: Fixed calculation of CPU utilization

by Lars Michelsen

Module: check_mk Branch: master Commit: cceced85a4fe99cdc07d8b6d71cfddb27b453b84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cceced85a4fe99… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 19 19:02:17 2018 +0200 6019 FIX docker_container_cpu: Fixed calculation of CPU utilization The CPU utilization was not correctly calculated for docker containers. Change-Id: Idcb81a6ee6d86c1c88197e8bd040cc788ab154f8 --- .werks/6019 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/6019 b/.werks/6019 new file mode 100644 index 0000000..aeafe58 --- /dev/null +++ b/.werks/6019 @@ -0,0 +1,11 @@ +Title: docker_container_cpu: Fixed calculation of CPU utilization +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1524157293 + +The CPU utilization was not correctly calculated for docker containers.

6 years, 2 months

5841 FIX MSSQL plugin: fixed instance connection setup if at least one, but not all instances, use TCP ports

by Marcel Schulte

Module: check_mk Branch: master Commit: 0bc03e701a50f1267a571d4a4a04a0db91261a97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bc03e701a50f1… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Thu Apr 19 14:11:33 2018 +0200 5841 FIX MSSQL plugin: fixed instance connection setup if at least one, but not all instances, use TCP ports Change-Id: I75b1f86b00ca8c1c6e383978378cfd9a04b31bab --- .werks/5841 | 11 +++++++++++ agents/windows/plugins/mssql.vbs | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/5841 b/.werks/5841 new file mode 100644 index 0000000..0f876c2 --- /dev/null +++ b/.werks/5841 @@ -0,0 +1,11 @@ +Title: MSSQL plugin: fixed instance connection setup if at least one, but not all instances, use TCP ports +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1524139736 + + diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index e5a8d7d..69b0bdf 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -152,14 +152,14 @@ For Each rk In regkeys instance_name & "\MSSQLServer\SuperSocketNetLib\TCP\IPAll", _ "tcpPort", tcpport - If IsNull(cluster_name) Then + If IsNull(cluster_name) Or cluster_name = "" Then cluster_name = "" ' In case of instance name "MSSQLSERVER" always use (local) as connect string If instance_id = "MSSQLSERVER" Then sources.add instance_id, "(local)" Else - If isNull(tcpport) Then + If isNull(tcpport) Or tcpport = "" Then sources.add instance_id, hostname & "\" & instance_id Else sources.add instance_id, hostname & "," & tcpport @@ -170,7 +170,7 @@ For Each rk In regkeys If instance_id = "MSSQLSERVER" Then sources.add instance_id, cluster_name Else - If isNull(tcpport) Then + If isNull(tcpport) Or tcpport = "" Then sources.add instance_id, cluster_name & "\" & instance_id Else sources.add instance_id, cluster_name & "," & tcpport

6 years, 2 months

Win-agent: fix regeneration of gcov/lcov coverage

by Jukka Aro

Module: check_mk Branch: master Commit: e5bef7b202480f5d64451f1985257231075decd3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5bef7b202480f… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Apr 19 12:34:26 2018 +0200 Win-agent: fix regeneration of gcov/lcov coverage Need to pass "--directory . --zerocounters" to lcov in order to properly reset coverage counters. --- agents/windows/Makefile.am | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index 7547084..6da5328 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -9,14 +9,16 @@ AM_CPPFLAGS = -I$(top_srcdir)/sections -O2 -Wformat=2 -Werror -Wall -fno-rtti \ -D__USE_MINGW_ANSI_STDIO -DSI_SUPPORT_IOSTREAMS AM_LDFLAGS = -static -static-libgcc -static-libstdc++ LD_COMMON = -lwsock32 -lws2_32 -lole32 -loleaut32 -lwbemuuid -lpsapi -lshlwapi -limagehlp -lstdc++fs +COVERAGE_CPPFLAGS=-fprofile-arcs -ftest-coverage +COVERAGE_LDFLAGS=-lgcov --coverage check_mk_agent_LDADD = check_mk_agent.res libcheck_mk_agent.a $(LD_COMMON) WindowsAgentTest_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/test WindowsAgentTest_LDADD = libcheck_mk_agent.a -lgtest -lgmock $(LD_COMMON) -WindowsAgentCoverage_CPPFLAGS = $(WindowsAgentTest_CPPFLAGS) -fprofile-arcs -ftest-coverage -WindowsAgentCoverage_LDFLAGS = $(AM_LDFLAGS) -lgcov --coverage +WindowsAgentCoverage_CPPFLAGS = $(WindowsAgentTest_CPPFLAGS) $(COVERAGE_CPPFLAGS) +WindowsAgentCoverage_LDFLAGS = $(AM_LDFLAGS) $(COVERAGE_LDFLAGS) WindowsAgentCoverage_LDADD = libcheck_mk_agent_coverage.a -lgtest -lgmock $(LD_COMMON) libcheck_mk_agent_coverage_a_CPPFLAGS = -D main=check_mk_agent_main $(WindowsAgentCoverage_CPPFLAGS) @@ -66,10 +68,12 @@ integrationtest: install-strip cd - # Force regeneration of coverage data during test run. -clean-coverage: - rm -f $$(find . -name "*.gcda") +coverage-reset: + rm -fr "*coverage.info" + find . -name "*.gcda" -exec rm {} \; + lcov --directory . --zerocounters -coverage.info: WindowsAgentCoverage$(EXEEXT) clean-coverage +coverage.info: WindowsAgentCoverage$(EXEEXT) coverage-reset DISPLAY="$$DISPLAY xterm" wine $< 2>/dev/null ; \ lcov -c --rc lcov_branch_coverage=1 --directory . -o $@

6 years, 2 months

docker_container_mem: Skeleton for a check, include information about total memory in agent section

by Konstantin Büttner

Module: check_mk Branch: master Commit: 5130a060a82f7147994fe2dd4748b4a4cba13cdd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5130a060a82f71… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Apr 6 16:54:42 2018 +0200 docker_container_mem: Skeleton for a check, include information about total memory in agent section Change-Id: I8278f981a834e40293c74abf7c28f0c20313babd --- agents/check_mk_agent.linux | 6 +- checks/docker_container_mem | 134 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 139 insertions(+), 1 deletion(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index a3f5b04..44a215a 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -114,7 +114,11 @@ function section_mem() grep -E -v '^Swap:|^Mem:|total:' < /proc/meminfo else echo '<<<docker_container_mem>>>' - cat /sys/fs/cgroup/memory/memory.stat + echo -n "usage_in_bytes " + cat /sys/fs/cgroup/memory/memory.usage_in_bytes + echo -n "limit_in_bytes " + cat /sys/fs/cgroup/memory/memory.limit_in_bytes + grep -F 'MemTotal:' /proc/meminfo fi } diff --git a/checks/docker_container_mem b/checks/docker_container_mem new file mode 100644 index 0000000..eb630ff --- /dev/null +++ b/checks/docker_container_mem @@ -0,0 +1,134 @@ +#!/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. + +# cur[cgroup.name]['memory.usage_in_bytes'] = cgroup['memory.usage_in_bytes'] +# cache = cgroup['memory.stat']['cache'] +# cur[cgroup.name]['memory.usage_in_bytes'] = cgroup['memory.usage_in_bytes'] - cache +# cur[cgroup.name]['memory.limit_in_bytes'] = min(int(cgroup['memory.limit_in_bytes']), measures['global']['total_memory']) + + +# Example: +# +# <<<docker_container_mem>>> +# cache 57294848 -> Cached +# rss 43728896 +# rss_huge 27262976 +# shmem 13275136 +# mapped_file 32395264 +# dirty 0 +# writeback 0 +# pgpgin 2270817 +# pgpgout 2252796 +# pgfault 4699689 +# pgmajfault 466 +# inactive_anon 13275136 +# active_anon 43556864 +# inactive_file 22306816 +# active_file 21712896 +# unevictable 0 +# hierarchical_memory_limit 9223372036854771712 +# MemTotal: 16299300 kB + +# cache -> page cache, including tmpfs (shmem), in bytes +# rss -> anonymous and swap cache, not including tmpfs (shmem), in bytes +# mapped_file -> size of memory-mapped mapped files, including tmpfs (shmem), in bytes +# -> 'rss + mapped_file" will give you resident set size of cgroup. +# -> mapped_file - # of bytes of mapped file (includes tmpfs/shmem) +# swap -> swap usage, in bytes + +# When you interpret the values reported by memory.stat, note how the various statistics inter-relate: +# +# active_anon + inactive_anon = anonymous memory + file cache for tmpfs + swap cache +# Therefore, active_anon + inactive_anon ≠ rss, because rss does not include tmpfs. +# active_file + inactive_file = cache - size of tmpfs + +# 5.2 stat file +# +# memory.stat file includes following statistics +# +# # per-memory cgroup local status +# cache - # of bytes of page cache memory. +# rss - # of bytes of anonymous and swap cache memory (includes +# transparent hugepages). +# rss_huge - # of bytes of anonymous transparent hugepages. +# mapped_file - # of bytes of mapped file (includes tmpfs/shmem) +# swap - # of bytes of swap usage + +# dirty - # of bytes that are waiting to get written back to the disk. +# writeback - # of bytes of file/anon cache that are queued for syncing to +# disk. + +# inactive_anon - # of bytes of anonymous and swap cache memory on inactive +# LRU list. +# active_anon - # of bytes of anonymous and swap cache memory on active +# LRU list. + +# inactive_file - # of bytes of file-backed memory on inactive LRU list. +# active_file - # of bytes of file-backed memory on active LRU list. + +# hierarchical_memory_limit - # of bytes of memory limit with regard to hierarchy +# under which the memory cgroup is +# hierarchical_memsw_limit - # of bytes of memory+swap limit with regard to +# hierarchy under which memory cgroup is. + +# Note: +# Only anonymous and swap cache memory is listed as part of 'rss' stat. +# This should not be confused with the true 'resident set size' or the +# amount of physical memory used by the cgroup. +# 'rss + mapped_file" will give you resident set size of cgroup. +# (Note: file and shmem may be shared among other cgroups. In that case, +# mapped_file is accounted only when the memory cgroup is owner of page +# cache.) + + + +def parse_docker_container_mem(info): + parsed = {} + for line in info: + if line[0] == "MemTotal:": + if line[2] == "kB": + parsed["system_mem_total"] = int(line[1]) * 1024 + #TODO: Other cases? + else: + parsed[line[0]] = int(line[1]) + return parsed + + +def inventory_docker_container_mem(parsed): + pprint.pprint(parsed) + return [(None, None)] + + +def check_docker_container_mem(_no_item, params, parsed): + return 3, 'not yet implemented' + + +check_info['docker_container_mem'] = { + 'parse_function' : parse_docker_container_mem, + 'inventory_function' : inventory_docker_container_mem, + 'check_function' : check_docker_container_mem, + 'service_description' : 'Memory', +}

6 years, 2 months

5987 docker_container_mem: Check memory usage of docker containers

by Lars Michelsen

Module: check_mk Branch: master Commit: 3ea6029f9354a5bca33ffec962e60a6064381c19 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ea6029f9354a5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 19 07:22:19 2018 +0200 5987 docker_container_mem: Check memory usage of docker containers Change-Id: I6a0bd4cbcfc6d02eee3273cc2657324a63c860ad --- .werks/5987 | 11 +++ agents/check_mk_agent.linux | 1 + checkman/docker_container_cpu | 2 +- checkman/docker_container_mem | 16 ++++ checkman/docker_container_status | 2 +- checkman/docker_container_status.health | 2 +- checks/docker_container_mem | 132 +++++++++----------------------- checks/mem.include | 49 ++++++++---- web/plugins/metrics/check_mk.py | 1 + 9 files changed, 102 insertions(+), 114 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3ea6029f93…

6 years, 2 months

← Newer
1
...
6
7
8
9
10
11
12
...
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