[checkmk-commits] 5951 kernel: Disabled in docker container contexts

Module: check_mk Branch: master Commit: 5cfdefed7c76cb49dffa8bdad9d37466ca8c8d8f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cfdefed7c76cb… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Fri Apr 6 13:49:19 2018 +0200 5951 kernel: Disabled in docker container contexts These checks do not make sense in the context of a docker container. The agent is now skipping this section when executed in a container. Change-Id: I9811054b1c9ab559fa934c9fd8798db793d55f43 --- .werks/5951 | 11 +++++++++++ agents/check_mk_agent.linux | 8 +++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.werks/5951 b/.werks/5951 new file mode 100644 index 0000000..b29c480 --- /dev/null +++ b/.werks/5951 @@ -0,0 +1,11 @@ +Title: kernel: Disabled in docker container contexts +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1523015219 +Class: feature + +These checks do not make sense in the context of a docker container. +The agent is now skipping this section when executed in a container. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 28e3005..cc437c2 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -478,9 +478,11 @@ fi # Performancecounter Kernel -echo '<<<kernel>>>' -date +%s -cat /proc/vmstat /proc/stat +if [ -z "$MK_IN_CONTAINER" ]; then + echo '<<<kernel>>>' + date +%s + cat /proc/vmstat /proc/stat +fi # Hardware sensors via IPMI (need ipmitool) if type ipmitool > /dev/null