[checkmk-commits] Check_MK Git: check_mk: FIX fileinfo: Avoid duplicate entries in Solaris agent

Module: check_mk Branch: master Commit: 0479245f5e8314afd471fb6450529aee3e879b7b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0479245f5e8314… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Thu Feb 6 12:56:19 2014 +0100 FIX fileinfo: Avoid duplicate entries in Solaris agent If due to redundant patterns files would be listed twice, the duplicates are now correctly suppressed. --- .werks/692 | 10 ++++++++++ ChangeLog | 1 + agents/check_mk_agent.solaris | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/692 b/.werks/692 new file mode 100644 index 0000000..538021d --- /dev/null +++ b/.werks/692 @@ -0,0 +1,10 @@ +Title: fileinfo: Avoid duplicate entries in Solaris agent +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1391687738 + +If due to redundant patterns files would be listed twice, the duplicates +are now correctly suppressed. diff --git a/ChangeLog b/ChangeLog index 3eaa2b0..6f61f04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -161,6 +161,7 @@ * 0578 FIX: zypper: check is always registered as soon as mk_zypper plugin detects zypper tool... * 0689 FIX: postgres_sessions: fix empty agent section in case of 0 sessions... * 0579 FIX: veeam_client: fix for case when no StopTime section in agent output + * 0692 FIX: fileinfo: Avoid duplicate entries in Solaris agent... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 0469809..ef03a60 100644 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -231,7 +231,7 @@ if [ -f "$MK_CONFDIR/fileinfo.cfg" ] then echo '<<<fileinfo:sep(124)>>>' /usr/bin/perl -e 'print time."\n"' - ls $(cat "$MK_CONFDIR/fileinfo.cfg") | \ + ls $(cat "$MK_CONFDIR/fileinfo.cfg") | sort -u | \ /usr/bin/perl -e ' while(my $file = <>) { $file =~ s/\n$//;