mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

newdevice: Add support for Nokia (Alcatel-Lucent) SAS-Sx 7210. Add TiMos version and hardware. (#6344)

Browse Source 
* I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md.

* Add support for Nokia SAS-Sx 7210

* Revert "I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md."

This reverts commit 2b89f9edb5.

* Edited hardware regex to cover more sample data
This commit is contained in:
Lorenzo Zafra
2017-04-04 13:35:39 -06:00
committed by Tony Murray
parent 8a2f103144
commit f85f8c1e13
5 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS.md
View File

@@ -196,7 +196,6 @@ LibreNMS contributors:
- Deeps (deepseth)
- Jari Schäfer <jari.schaefer@gmail.com> (jarischaefer)
- Jan-Philipp Litza <janphilipp@litza.de> (jplitza)
- Lorenzo Zafra <zafra@ualberta.ca> (enzozafra)
Observium was written by:
- Adam Armstrong

1
includes/definitions/timos.yaml
View File

@@ -14,6 +14,7 @@ discovery:
- .1.3.6.1.4.1.6527.6.2.1.2.6.
- .1.3.6.1.4.1.6527.6.2.1.2.5.
- .1.3.6.1.4.1.6527.6.2.1.2.8.
- .1.3.6.1.4.1.6527.6.2.1.2.9.
- .1.3.6.1.4.1.6527.1.6.1
- .1.3.6.1.4.1.6527.1.6.5
- .1.3.6.1.4.1.6527.6.1.1.2.

22
includes/polling/os/timos.inc.php Normal file
View File

@@ -0,0 +1,22 @@
<?php
//SNMPv2-SMI::enterprises.6527.3.1.2.1.1.5.0 = Gauge32: 9 - sgiSwMajorVersion
//SNMPv2-SMI::enterprises.6527.3.1.2.1.1.6.0 = Gauge32: 0 - sgiSwMinorVersion
//SNMPv2-SMI::enterprises.6527.3.1.2.1.1.7.0 = STRING: "R3" - sgiSwVersionModifier
$majorVersion = trim(snmp_get($device, '1.3.6.1.4.1.6527.3.1.2.1.1.5.0', '-OQv', '', ''), '" ');
$minorVersion = trim(snmp_get($device, '1.3.6.1.4.1.6527.3.1.2.1.1.6.0', '-OQv', '', ''), '" ');
$versionModifier = trim(snmp_get($device, '1.3.6.1.4.1.6527.3.1.2.1.1.7.0', '-OQv', '', ''), '" ');
$version = 'v' . $majorVersion . '.' . $minorVersion . '.' . $versionModifier;
//SNMPv2-MIB::sysDescr.0 = STRING: TiMOS-B-9.0.R3 both/hops Nokia SAS-Sx 48Tp4SFP+ (PoE) 7210 Copyright (c) 2000-2017 Nokia.
//All rights reserved. All use subject to applicable license agreements.
//Built on Thu Jan 5 11:01:16 IST 2017 by builder in /home/builder/9.0B1/R3/panos/main
$pattern = "~(cpm|both)\/(hops64|hops|x86_64) (?'hardware'.*)\sCopyright~";
preg_match($pattern, $poll_device['sysDescr'], $matches);
if ($matches['hardware']) {
$hardware = $matches['hardware'];
}

1
tests/OSDiscoveryTest.php
View File

@@ -1653,6 +1653,7 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
$this->checkOS('timos', 'timos7');
$this->checkOS('timos', 'timos8');
$this->checkOS('timos', 'timos9');
$this->checkOS('timos', 'timos10');
}
public function testTomato()

2
tests/snmpsim/timos10.snmprec Normal file
View File

@@ -0,0 +1,2 @@
1.3.6.1.2.1.1.1.0|4|TiMOS-B-9.0.R3 both/hops Nokia SAS-Sx 48Tp4SFP+ (PoE) 7210 Copyright (c) 2000-2017 Nokia. All rights reserved. All use subject to applicable license agreements. Built on Thu Jan 5 11:01:16 IST 2017 by builder in /home/builder/9.0B1/R3/panos/main
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6527.6.2.1.2.9.5