From 116a64deb95d6a71c322f4fa1d5da6395165a728 Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Sat, 27 Jun 2015 22:52:01 +0100
Subject: [PATCH] Added basic detection for Mellanox devices

---
 html/images/os/mellanox.png            | Bin 0 -> 1323 bytes
 includes/definitions.inc.php           |  10 ++++++++++
 includes/discovery/os/mellanox.inc.php |   7 +++++++
 includes/polling/os/mellanox.inc.php   |   8 ++++++++
 4 files changed, 25 insertions(+)
 create mode 100644 html/images/os/mellanox.png
 create mode 100644 includes/discovery/os/mellanox.inc.php
 create mode 100644 includes/polling/os/mellanox.inc.php

diff --git a/html/images/os/mellanox.png b/html/images/os/mellanox.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1b9b4b0eb2c6da64d5f4a738eee97ac947863c3
GIT binary patch
literal 1323
zcmc(e|2xwO0LMS14xLbXqA2B(WY1N0aea|x3U!XnMCHtvk(2K`C2BKLhI=;G^+g>C
z8z)+&xoxT0WH$LWh7t2^n^|m{jhS)ouekT~yx*_q{qy^I=Lh(oGc(<33IKqauMZTq
zPW%6CykR||mH5_m*r2^b(D0-f^!12T6aa}%ibUD_CPc)dV5o@bj1(^FBmfv-11<!4
z&&+&vI+np}9~l{yO-#-T`o*u_boB5i=I50xcFRpn?b4ENN<3Fd{s?Rfo|{w4WU|Ps
ze}y6+4hp4o`n!dNCBOzL7K<CGUFDVR{GtX|4-BhiaPz*n7S2#yQu%wP02W&Oq>S0u
zCs<ioNlvd?US1Ijhh}HzMn^@ftE*qXE^0K(8jXg=;OFMQo}bqwq*XqA^8U*g)%{2B
zPW$BPbj#$wIjJ|uRitWc?n^&-VMnK^jmvvp)zZ<?$^Iyun3y2^K`SIQYPH&D6|B~_
z;XfZY(ckqp(t4mj;p-{w$GvmIqDyY$>VGe$y{P9=UVW;q<B@APdH6Th&MA8R>cF6c
z(bOxEDsXv}uI@3FYDuHflB!!*SM>^oy7W0qEK#(!a&$U9Hn)CqYF0ERzn)nmomTet
zO-{?^Kd}0hN(EpWz0EP<!v`iJ?0!i21G!wjw6w@<ZuSo*sMT6jd}(~jqxSYsss)wT
zg`AGguHpxbwY9Y%6Y`n$!LVqUKYYFZp90)Bo{t3p!?(UrNYITTG+%#tZ=lsT$`f8z
zQI%Yav-^pSpB_;WTxYL)m-ah+$A#fX(|Z$#OEI_3Rk<;wcWI)`vM$%fr&5}6X@Mx7
zc|Jn^y`?(msZ}^cnrKnoCVa?t<hpwpg1CgNwZnqF2Rv}<0<Z+rd9=0gv7G{<?Wb;K
zM3x=vxr27RnqfYXZAdca>`BXsuR<KfEP}?^(3+e9u&&80v87}D&6R18(-&|9Sajj+
zO}h}W5u6wbVjb!(b36D$T@u%eZ;yA}vOvFRMgArGx#O>Da5&<%Y4x2!BZ9NfO|aG@
z*|zzjXT!J7&#KEd^R^NW5KdhkzjauU`m<-zZd_RT3pkEsx?pl&nKfqf&j$NW_Io3j
z6zg6;jNHIuQ|OGzm@0snP0qnmJS{9?X$>Yw*Kq2o>}0#bYwUjCy6IHOscXfIrixxr
zCTxpPzuWz-<d98av;Tt)We02de%p`XNwR_hbVEO7f!PTzve}%wYZM_U2_g<WwIeio
z#n6>qe*8+yfH>48v$dKEk+-LS)8^+krOok41IlAAnJYm~21#_1?nh(n=R3!@WoE_2
z_6Q*Xi?Ph8(Od#fd{2m{THg)10W*KH%V`(9Bzii?w!&y_rF&B>-m=+&=qGg@rk*Z=
zdT~fD#(Q}cNc%u-6f2N02A+YMIwpIl@^M>SeBAcEnu)L{xA}$@A_}P0lAVU|qPk%V
zq`hmcLBb9J=w-&^$e@<riVIRNUkvt-n%dWXf_TlTB+vm;a#XP$d*E4n`UrEFxT6o%
z?c6M<TsP1f>Gb2{6gy<#PM({~t<UU4LNLR@Tr@Jxmt6_7O|gl&eKL!-f=VuOk4Tt`
zL35KaS#f*9=#bfuw5Vno{fK+4WOvNjfh)CXd3Vz@KaZu=FAq(+VK!O=vqK04@AeV?
P`k4S<Z+~e086@ss3Yr1N

literal 0
HcmV?d00001

diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 52d24bbc1e..06bde76797 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -656,6 +656,16 @@ $config['os'][$os]['over'][1]['text']   = "CPU Usage";
 #$config['os'][$os]['over'][2]['graph']  = "device_mempool";
 #$config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
+$os = "mellanox";
+$config['os'][$os]['text']               = "Mellanox";
+$config['os'][$os]['type']              = "network";
+$config['os'][$os]['over'][0]['graph']  = "device_bits";
+$config['os'][$os]['over'][0]['text']   = "Device 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";
+
 $os = "powervault";
 $config['os'][$os]['text']              = "Dell PowerVault";
 $config['os'][$os]['icon']              = "dell";
diff --git a/includes/discovery/os/mellanox.inc.php b/includes/discovery/os/mellanox.inc.php
new file mode 100644
index 0000000000..7400f910be
--- /dev/null
+++ b/includes/discovery/os/mellanox.inc.php
@@ -0,0 +1,7 @@
+<?php
+
+if (!$os) {
+    if (stristr($sysDescr, "mellanox")) {
+        $os = "mellanox";
+    }
+}
diff --git a/includes/polling/os/mellanox.inc.php b/includes/polling/os/mellanox.inc.php
new file mode 100644
index 0000000000..69744f9743
--- /dev/null
+++ b/includes/polling/os/mellanox.inc.php
@@ -0,0 +1,8 @@
+<?php
+
+if (stristr($poll_device['sysDescr'], "Linux")) {
+    list(,,$version,$hardware) = explode(' ', $poll_device['sysDescr']);
+} else {
+    list($hardware,,$version) = explode(',',$poll_device['sysDescr']);
+    $hardware = preg_replace("/Mellanox /","", $hardware);
+}