[checkmk-commits] 4546 lnx_packages: Now inventorizes also release numbers of rpm based Distributions

Module: check_mk Branch: master Commit: e7874852ed8ce5ae52881c43f084f1990657838c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7874852ed8ce5… Author: Marcel Arentz &lt;ma(a)mathias-kettner.de&gt; Date: Tue Mar 21 14:21:24 2017 +0100 4546 lnx_packages: Now inventorizes also release numbers of rpm based Distributions Change-Id: I7293b87db404d55e4b7a1e977c757d31391f22c6 --- .werks/4546 | 10 ++++++++++ agents/plugins/mk_inventory.linux | 4 ++-- inventory/lnx_packages | 11 ++++++++++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.werks/4546 b/.werks/4546 new file mode 100644 index 0000000..2c938b5 --- /dev/null +++ b/.werks/4546 @@ -0,0 +1,10 @@ +Title: lnx_packages: Now inventorizes also release numbers of rpm based Distributions +Level: 1 +Component: inv +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1490102404 +Class: feature + + diff --git a/agents/plugins/mk_inventory.linux b/agents/plugins/mk_inventory.linux index 8906739..ea8a53f 100755 --- a/agents/plugins/mk_inventory.linux +++ b/agents/plugins/mk_inventory.linux @@ -41,13 +41,13 @@ then # List of DEB packages if type dpkg-query >/dev/null; then echo "<<<lnx_packages:sep(124):persist($UNTIL)>>>" - dpkg-query --show --showformat='${Package}|${Version}|${Architecture}|deb|${Summary}|${Status}\n' + dpkg-query --show --showformat='${Package}|${Version}|${Architecture}|deb|-|${Summary}|${Status}\n' fi # List of RPM packages in same format if type rpm >/dev/null; then echo "<<<lnx_packages:sep(9):persist($UNTIL)>>>" - rpm -qa --qf '%{NAME}\t%{VERSION}\t%{ARCH}\trpm\t%{SUMMARY}\t-\n' + rpm -qa --qf '%{NAME}\t%{VERSION}\t%{ARCH}\trpm\t%{RELEASE}\t%{SUMMARY}\t-\n' fi # List Gentoo packages diff --git a/inventory/lnx_packages b/inventory/lnx_packages index 8699018..3eb86d9 100644 --- a/inventory/lnx_packages +++ b/inventory/lnx_packages @@ -52,7 +52,14 @@ def inv_lnx_packages(info): paclist = inv_tree_list("software.packages:") - for pacname, version, arch, pactype, summary, inststate in info: + + for line in info: + if len(line) == 6: + pacname, version, arch, pactype, summary, inststate = line + release = "-" + elif len(line) == 7: + pacname, version, arch, pactype, release, summary, inststate = line + if pactype == "deb": if "installed" not in inststate: continue @@ -72,6 +79,8 @@ def inv_lnx_packages(info): version, package_version = parts entry["version"] = version entry["package_version"] = package_version + if not release == "-": + entry["package_version"] = release paclist.append(entry)