Module: check_mk
Branch: master
Commit: 6c41dd0f6935b81443a90648f4df0742241d6b0d
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c41dd0f6935b8…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Tue Mar 28 09:12:09 2017 +0200
4530 FIX lnx_distro: Fixed missing distribution if eg. Oracle and Redhat release files are
available
Change-Id: Ibfd639a1004e1f72df68a09d31446db103b30e83
---
.werks/4530 | 11 +++++++++++
agents/plugins/mk_inventory.linux | 3 ++-
inventory/lnx_distro | 5 +++++
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/.werks/4530 b/.werks/4530
new file mode 100644
index 0000000..feb73e3
--- /dev/null
+++ b/.werks/4530
@@ -0,0 +1,11 @@
+Title: lnx_distro: Fixed missing distribution if eg. Oracle and Redhat release files are
available
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+Edition: cre
+State: unknown
+Version: 1.5.0i1
+Date: 1490684986
+
+
diff --git a/agents/plugins/mk_inventory.linux b/agents/plugins/mk_inventory.linux
index 6c22dde..1dca0c8 100755
--- a/agents/plugins/mk_inventory.linux
+++ b/agents/plugins/mk_inventory.linux
@@ -52,9 +52,10 @@ then
# Information about distribution
echo "<<<lnx_distro:sep(124):persist($UNTIL)>>>"
- for f in
{/etc/{debian_version,lsb-release,redhat-release,SuSE-release},/usr/share/cma/version} ;
do
+ for f in
{/etc/{oracle-release,debian_version,lsb-release,redhat-release,SuSE-release},/usr/share/cma/version}
; do
if [ -e $f ] ; then
echo -n "$f|" ; tr \\n \| < $f | sed 's/|$//' ; echo
+ break
fi
done
diff --git a/inventory/lnx_distro b/inventory/lnx_distro
index 0a683d5..df5e7d6 100644
--- a/inventory/lnx_distro
+++ b/inventory/lnx_distro
@@ -40,6 +40,9 @@
# <<<lnx_distro:sep(124):persist(1399310551)>>>
# /etc/SuSE-release|SUSE Linux Enterprise Server 11 (x86_64)|VERSION = 11|PATCHLEVEL = 2
+# <<<lnx_distro:sep(124):persist(1490598851)>>>
+# /etc/oracle-release|Oracle LinuxServer release 7.1
+
def inv_lnx_distro(info):
node = inv_tree("software.os.")
@@ -57,6 +60,8 @@ def inv_lnx_distro(info):
inv_lnx_parse_suse_release(node, line[1:])
elif line[0] == '/usr/share/cma/version':
inv_lnx_parse_cma(node, line[1])
+ elif line[0] == '/etc/oracle-release':
+ inv_lnx_parse_oracle_vm_server_release(node, line[1])
def inv_lnx_parse_suse_release(node, line):