[checkmk-commits] 6223 fileinfo: Read config from fileinfo.d dropin directory on Linux

Module: check_mk Branch: master Commit: f44a32597231c0388eae49901277e8629155a1e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f44a32597231c0… Author: Konstantin Büttner &lt;kb(a)mathias-kettner.de&gt; Date: Tue Jun 26 14:47:31 2018 +0200 6223 fileinfo: Read config from fileinfo.d dropin directory on Linux If a fileinfo.cfg file is present, the Linux agent will now also read patterns from files in $MK_CONFDIR/fileinfo.d Change-Id: Ie600a9916378441c80a76d257602bcd6e332257a --- .werks/6223 | 11 +++++++++++ agents/check_mk_agent.linux | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/6223 b/.werks/6223 new file mode 100644 index 0000000..07b05d7 --- /dev/null +++ b/.werks/6223 @@ -0,0 +1,11 @@ +Title: fileinfo: Read config from fileinfo.d dropin directory on Linux +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1530019246 +Class: feature + +If a fileinfo.cfg file is present, the Linux agent will now also +read patterns from files in $MK_CONFDIR/fileinfo.d diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index ebb61cd..13f7389 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -874,14 +874,14 @@ if [ -r "$MK_CONFDIR/fileinfo.cfg" ] ; then OLD_IFS=$IFS IFS=' ' - while read -r pattern; do + (cat $MK_CONFDIR/fileinfo.cfg $MK_CONFDIR/fileinfo.d/* 2>/dev/null) | while read -r pattern; do case $pattern in /*) pattern=$(replace_datevariable "$pattern") for file in $pattern; do stat -c "%n|%s|%Y" "$file" 2> /dev/null || echo "$file|missing|$(date +%s)" done ;; esac - done < "$MK_CONFDIR/fileinfo.cfg" + done IFS=$OLD_IFS fi