From c31bc7d844d9dfcb3a5740307baa00a9334c41f4 Mon Sep 17 00:00:00 2001 From: Lorenzo Zafra Date: Sat, 22 Apr 2017 05:46:12 -0600 Subject: [PATCH] newdevice: Etherwan managed switches (#6488) * newdevice: Etherwan managed switches * Fixed requested changes --- html/images/logos/etherwan.png | Bin 0 -> 12636 bytes html/images/os/etherwan.png | Bin 0 -> 1573 bytes includes/definitions/etherwan.yaml | 10 ++++++++ includes/polling/os/etherwan.inc.php | 34 +++++++++++++++++++++++++++ tests/OSDiscoveryTest.php | 5 ++++ tests/snmpsim/etherwan.snmprec | 2 ++ 6 files changed, 51 insertions(+) create mode 100644 html/images/logos/etherwan.png create mode 100644 html/images/os/etherwan.png create mode 100644 includes/definitions/etherwan.yaml create mode 100644 includes/polling/os/etherwan.inc.php create mode 100644 tests/snmpsim/etherwan.snmprec diff --git a/html/images/logos/etherwan.png b/html/images/logos/etherwan.png new file mode 100644 index 0000000000000000000000000000000000000000..f4d061d8085c95dc35d635af42209810fc310b48 GIT binary patch literal 12636 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 RF@Ki;s3>T@sDfLC{trOMp$z~4 literal 0 HcmV?d00001 diff --git a/html/images/os/etherwan.png b/html/images/os/etherwan.png new file mode 100644 index 0000000000000000000000000000000000000000..ddfbe9dd370ee904d7556f929a0c1c612cc29abb GIT binary patch literal 1573 zcmV+=2HN?FP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf00v@9M??Vs0RI60 zpuMM)000H3NkltB~|fQ-d0QN?&1j2Og$(Hz1R*UQ~#Nx+Xz> z_f|D@`ew7w9k?NYFD^mds6j$xHbO!JkeC#MpZ5KMh%O-r3RaTe{b0H%K;BvYw&O^S zU4Vkp9B|_Datn|&B+l$_HgFUeu1CU!8jzq-Ymu3{61BBW2=5e(_Mu8#I)4)t8X$sazb!|RFfQ}r7V5fO}% zqH`{j-@N_+<;N~Vp=eWpgjF9F;@p|*2&9lQxlXHxvDt_(^0UQ?lKrPK`n6>U4tW6_ zz)4dFV(teS!e<}yDJtGmfgPKU(D9YU+6a)a@7r<|75htRM<r`70@Ho6azhxVeC_Q}hRT*T1cxhVc+ zF%tSkQ`A~aKJr?MP{N$)8*#1j9(;VgWD`M89j;sVa8yywA63_*ou9WLHyVworK0?J zQx^P{KH~UUL|FR3h80EFyx|b0W(`4H&(0V(Et#wqu_gf${=Rw#)6>_|?gH5?dre>w z6m58TdI)j`?>==@A0cGHvWaA|CSUySE-E$^DzDr|Ol%}_KblB=;zjaU$QkAo{Ce~< zlwz1zlQX=$JmIPEG?O#<4a)k zooSr~W&y$NmC&18sRb>~En>H=!9jamr^d!zvrQHmi|6gcj4|s(niM2Bbz}lkhR0*X z*nT)mV%cU3lK>;eO-+KYuQ#<_od~Oe!rn*?hCX7#lq9nVBmF&8)l=?gQcDgHwkm49 zV+SoqdD&HjQ%_*gNrU2`Qa#4tw0IO3R$#!O*fs~2)iK<>I~!5aVW_%aCoVp6Og|hv zwG8La-VjHQq0<d_SO|lpQHKhiNkhW8IRyNYCsK z$%Cn^$r(1S*g8Lqn{>l5dBiGl?zslIDZNU&NqD6j)~_t06_Pjwt?NTeYkKvLLNZOt z@itX&3n$Z1!ou0xaN*1itE0&x_+)UdJ;cr|Xraq-`re*D3K^3Jkj25}3D&>10(C*^ z^CwC#ilNaO-acL;+_vOgI}P<}yiCW<6>^3H0l~I2y0>1yI9KP+mP2U_tPem9+^B`wMCVg{_oMA_RJQui;cvAOshGy;+G?ez2EizeL zhuy26Ja$Fw-dXrL^eUPYdk*J5v6$XngIxjFD(|-0xmx21`DZ)cqG=h#7TMtj>@pZFBfCv-YmR!UBj)6!)3>K1XV?`G(=(Fp^V?RT zql%}&jIV!~Z?Zf+>_WIJ_;NG%OGI?$*H1U+(q1 zbG}C`tyoSEqU~tSvyn3#3SgWly?~z&o)?c@F>#T|dM8cTp9eX^$uMHH)d!vrIRN|* XQ$s^eSq(Zi00000NkvXXu0mjf@w(vS literal 0 HcmV?d00001 diff --git a/includes/definitions/etherwan.yaml b/includes/definitions/etherwan.yaml new file mode 100644 index 0000000000..30c8b47822 --- /dev/null +++ b/includes/definitions/etherwan.yaml @@ -0,0 +1,10 @@ +os: etherwan +text: 'Etherwan Managed Switch' +type: network +icon: etherwan +over: + - { graph: device_bits, text: 'Device Traffic' } + - { graph: device_processor, text: 'CPU Usage' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.2736. diff --git a/includes/polling/os/etherwan.inc.php b/includes/polling/os/etherwan.inc.php new file mode 100644 index 0000000000..7d84a6c914 --- /dev/null +++ b/includes/polling/os/etherwan.inc.php @@ -0,0 +1,34 @@ +. + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2017 Lorenzo Zafra + * @author Lorenzo Zafra + */ + +preg_match('~(?\'hardware\'.*?),\sFirmware\srev:\s(?\'version\'.*) \d\d\/\d\d\/\d\d~', $poll_device['sysDescr'], $matches); + +if ($matches['hardware']) { + $hardware = $matches['hardware']; +} + +if ($matches['version']) { + $version = $matches['version']; +} diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php index 0c3c31e574..b811ebcf92 100644 --- a/tests/OSDiscoveryTest.php +++ b/tests/OSDiscoveryTest.php @@ -700,6 +700,11 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase $this->checkOS('ericsson-es'); } + public function testEtherwan() + { + $this->checkOS('etherwan'); + } + public function testExinda() { $this->checkOS('exinda'); diff --git a/tests/snmpsim/etherwan.snmprec b/tests/snmpsim/etherwan.snmprec new file mode 100644 index 0000000000..ed4a9dcce0 --- /dev/null +++ b/tests/snmpsim/etherwan.snmprec @@ -0,0 +1,2 @@ +1.3.6.1.2.1.1.1.0|4|Etherwan 6TX+2G Managed Switch, Firmware rev: 1.94.3 05/11/15 16:31:18 +1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.2736.1.1