From f5b3fb1136e5ed1074ac5483aa113a858904816d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Rosiak?= <sfr@sfrs-MacBook-Pro.local>
Date: Sun, 12 Jun 2016 15:59:17 +0200
Subject: [PATCH] Basic Oracle ILOM Support

#3632
---
 html/images/os/oracle.png                 | Bin 0 -> 764 bytes
 includes/definitions.inc.php              |  12 ++++++++++++
 includes/discovery/os/oracle-ilom.inc.php |  17 +++++++++++++++++
 includes/polling/os/oracle-ilom.inc.php   |  16 ++++++++++++++++
 4 files changed, 45 insertions(+)
 create mode 100644 html/images/os/oracle.png
 create mode 100644 includes/discovery/os/oracle-ilom.inc.php
 create mode 100644 includes/polling/os/oracle-ilom.inc.php

diff --git a/html/images/os/oracle.png b/html/images/os/oracle.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a4235fc654c331b0389540532aaf42cd9b92f4f
GIT binary patch
literal 764
zcmV<Y0t5YtP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4#WTe4#WYKD-Ig~000McNliru;06p0Fd>BTPQ(BJ0*OgP
zK~z}7?bb_3RACgr@&9+fJL9~^nI1$omWV;7Eh0tQMf9KtSO^gWLC_*16gMrRh@dxt
z5p60Ig^Cu@iz0fcAu&{oh#uouL{^igQCV|m?#$eKzZOB!rtNI**&Pm?^MeD2Ba~8#
zGKNN(!v(ki7vKV1fR0kwsbQ@2YY-rULA=YC;e7o{@xc&6N{|v+Q-j`64}i)VSTA1U
zX=(nQ=ki$3o@0N?ApCx`NEi{TL|?e@?<CvCN{?Wrh5><`JqwvgAa~EI+Mn;~LyN~z
zQ$Mg@zri?o6i;I#xvo>lsw$kZam=gN(V|ggb%K0%FUH>ecvmb3Ab0o}rDPH<90sAG
zCMGG~ANW&O#UlB$-Q>G_kuzt2kwZknD5cQN%U6lrz4?!nu2U5H2k<U!!M|fW$}o_F
zLs&0U==BRI^$!s4I!^xNX#$<?*q<ke_MG|CqBQgnYdHP4<*O9x`xJrpo#?f-U|Wb-
z3=s;U<MsTz6s6GOajY+IKtOiSJ_>j4qXhy)`p!}8A4E1bpwF+P;Pp^?^cWEg{D09(
z;k+BAkjYRCh7greD%Pz*U(|rE&zpzYcLBX=F(^=mfqDKSfzA%B$4>}!wqreiMfk)K
zgwKz8@e;najeJ|(ikLnP`|Ueqb%Mg3d&s%f2#*J6auW6PC-&%jRNh1tifD-hA{@fk
zwgJb;p+zI06vD~nm2v0@c6tPaKm<bsI(9*Ym(s%|{%u=vK4!=sIEZ)EN>nzBf9n>o
zZJhCO%q!Q?=htCgyMgm*44IgNr)deLr%!Q4KcE~NPjeF$>(^4ab(>Q15$F=%=1urE
uwj#><5h+#XJ0OI630;5-Z~-pB1@H@Ep9gabW)W`y0000<MNUMnLSTaFYFMBE

literal 0
HcmV?d00001

diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 3d11f2690a..2c1d00df4e 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1692,6 +1692,18 @@ $config['os'][$os]['text']             = 'Infoblox';
 $config['os'][$os]['type']             = 'appliance';
 $config['os'][$os]['icon']             = 'infoblox';
 
+// Oracle ILOM
+$os = 'oracle-ilom';
+$config['os'][$os]['text']             = 'Oracle ILOM';
+$config['os'][$os]['type']             = 'appliance';
+$config['os'][$os]['icon']             = 'oracle';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text']  = 'Traffic';
+$config['os'][$os]['over'][1]['graph'] = 'device_processor';
+$config['os'][$os]['over'][1]['text']  = 'CPU Usage';
+$config['os'][$os]['over'][2]['graph'] = 'device_mempool';
+$config['os'][$os]['over'][2]['text']  = 'Memory Usage';
+
 // Lenovo EMC (NAS)
 $os = 'lenovoemc';
 $config['os'][$os]['type']             = 'storage';
diff --git a/includes/discovery/os/oracle-ilom.inc.php b/includes/discovery/os/oracle-ilom.inc.php
new file mode 100644
index 0000000000..03e6e3772b
--- /dev/null
+++ b/includes/discovery/os/oracle-ilom.inc.php
@@ -0,0 +1,17 @@
+<?php
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2016 Søren Friis Rosiak <sorenrosiak@gmail.com> 
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */
+
+if (!$os) {
+    if (strstr($sysObjectId, '.1.3.6.1.4.1.42.2.200.2.1.1')) {
+        $os = 'oracle-ilom';
+    }
+}
diff --git a/includes/polling/os/oracle-ilom.inc.php b/includes/polling/os/oracle-ilom.inc.php
new file mode 100644
index 0000000000..60166f3b34
--- /dev/null
+++ b/includes/polling/os/oracle-ilom.inc.php
@@ -0,0 +1,16 @@
+<?php
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2016 Søren Friis Rosiak <sorenrosiak@gmail.com> 
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */
+
+if (preg_match('/^(.*), ILOM v(.*), (.*)/', $poll_device['sysDescr'], $regexp_result)) {
+    $hardware = 'Oracle ' . $regexp_result[1];
+    $version = $regexp_result[2];
+}