[checkmk-commits] Check_MK Git: check_mk: FIX mk_inventory.linux: Changed field separator from pipe to tab

Module: check_mk Branch: master Commit: bd349fad34b2eb9ef5cda3c350d005cfbd0d9574 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd349fad34b2eb… Author: Bastian Kuhn &lt;bk(a)mathias-kettner.de&gt; Date: Thu Jun 26 11:17:58 2014 +0200 FIX mk_inventory.linux: Changed field separator from pipe to tab Some rpm packages using the pipe symbol as part of her description. Cause of this reason we need another internal separator. --- .werks/167 | 9 +++++++++ ChangeLog | 3 +++ agents/plugins/mk_inventory.linux | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/167 b/.werks/167 new file mode 100644 index 0000000..a1f5226 --- /dev/null +++ b/.werks/167 @@ -0,0 +1,9 @@ +Title: mk_inventory.linux: Changed field separator from pipe to tab +Level: 1 +Component: inv +Version: 1.2.5i5 +Date: 1403774134 +Class: fix + +Some rpm packages using the pipe symbol as part of her description. Cause of this reason we need another internal separator. + diff --git a/ChangeLog b/ChangeLog index d610c5c..993f67e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ Checks & Agents: * 0994 FIX: agent plugin smart: fixed syntax error + HW/SW-Inventory: + * 0167 FIX: mk_inventory.linux: Changed field separator from pipe to tab... + 1.2.5i4: Core & Setup: diff --git a/agents/plugins/mk_inventory.linux b/agents/plugins/mk_inventory.linux index 0ae6af6..2f2ece1 100755 --- a/agents/plugins/mk_inventory.linux +++ b/agents/plugins/mk_inventory.linux @@ -20,8 +20,8 @@ then # List of RPM packages in same format if type rpm >/dev/null; then - echo "<<<lnx_packages:sep(124):persist($UNTIL)>>>" - rpm -qa --qf '%{NAME}|%{VERSION}|%{ARCH}|rpm|%{SUMMARY}|\n' + echo "<<<lnx_packages:sep(9):persist($UNTIL)>>>" + rpm -qa --qf '%{NAME}\t%{VERSION}\t%{ARCH}\trpm\t%{SUMMARY}\t-\n' fi # Information about distribution