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: Improve support for TiMOS (Alcatel-Lucent) switches #5533

Browse Source 
* Improve TiMOS to include 7210 models

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

* correct case of NOS name, don't bother polling for wifi or toner on an ethernet switch

* Remove sysDescr_regex per comment on #5533

* Present correct interface description, based on following:

$ snmpwalk -v2c -c XXX 172.16.100.173 IF-MIB::ifDescr | head -12
IF-MIB::ifDescr.1 = STRING: system, Loopback IP interface
IF-MIB::ifDescr.2 = STRING: info, IP interface
IF-MIB::ifDescr.3 = STRING: port, IP interface
IF-MIB::ifDescr.4 = STRING: to-Richard-1/1/26, IP interface
IF-MIB::ifDescr.35684352 = STRING: 1/1/1, 10/100/Gig Ethernet SFP, \"to CC 1\"
IF-MIB::ifDescr.35717120 = STRING: 1/1/2, 10/100/Gig Ethernet SFP
IF-MIB::ifDescr.35749888 = STRING: 1/1/3, 10/100/Gig Ethernet SFP
IF-MIB::ifDescr.35782656 = STRING: 1/1/4, 10/100/Gig Ethernet SFP
IF-MIB::ifDescr.35815424 = STRING: 1/1/5, 10/100/Gig Ethernet SFP
IF-MIB::ifDescr.35848192 = STRING: 1/1/6, 10/100/Gig Ethernet SFP, \"to 105.403.P24 | to roof PTP to City\"
IF-MIB::ifDescr.35880960 = STRING: 1/1/7, 10/100/Gig Ethernet SFP, \"CLEINT 135790-XYZ | DIA | to 105.403.P04\"
IF-MIB::ifDescr.35913728 = STRING: 1/1/8, 10/100/Gig Ethernet SFP, \"CLEINT 135790-ABCFOO | DIA | to 105.403.P03\"

$ snmpwalk -v2c -c XXX 172.16.100.173 IF-MIB::ifAlias | head -12
IF-MIB::ifAlias.1 = STRING: Loopback IP interface
IF-MIB::ifAlias.2 = STRING: IP interface
IF-MIB::ifAlias.3 = STRING: IP interface
IF-MIB::ifAlias.4 = STRING: IP interface
IF-MIB::ifAlias.35684352 = STRING: to CC 1
IF-MIB::ifAlias.35717120 = STRING: 10/100/Gig Ethernet SFP
IF-MIB::ifAlias.35749888 = STRING: 10/100/Gig Ethernet SFP
IF-MIB::ifAlias.35782656 = STRING: 10/100/Gig Ethernet SFP
IF-MIB::ifAlias.35815424 = STRING: 10/100/Gig Ethernet SFP
IF-MIB::ifAlias.35848192 = STRING: to 105.403.P24 | to roof PTP to City
IF-MIB::ifAlias.35880960 = STRING: CLEINT 135790-XYZ | DIA | to 105.403.P04
IF-MIB::ifAlias.35913728 = STRING: CLEINT 135790-ABCFOO | DIA | to 105.403.P03

$ snmpwalk -v2c -c XXX 172.16.100.173 IF-MIB::ifName | head -12
IF-MIB::ifName.1 = STRING: system
IF-MIB::ifName.2 = STRING: info
IF-MIB::ifName.3 = STRING: port
IF-MIB::ifName.4 = STRING: to-Richard-1/1/26
IF-MIB::ifName.35684352 = STRING: 1/1/1
IF-MIB::ifName.35717120 = STRING: 1/1/2
IF-MIB::ifName.35749888 = STRING: 1/1/3
IF-MIB::ifName.35782656 = STRING: 1/1/4
IF-MIB::ifName.35815424 = STRING: 1/1/5
IF-MIB::ifName.35848192 = STRING: 1/1/6
IF-MIB::ifName.35880960 = STRING: 1/1/7
IF-MIB::ifName.35913728 = STRING: 1/1/8

* OS unit testing as requested

* fixed test unit
This commit is contained in:
Matt Peterson
2017-02-03 02:01:29 -08:00
committed by Neil Lathwood
parent 591a40d87c
commit 008af4cea0
4 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS.md
View File

@@ -173,6 +173,7 @@ LibreNMS contributors:
- Tim Jackson <jackson.tim@gmail.com> (jackson-tim)
- Viktoria Rei Bauer <vbauer@stargazer.at> (ToeiRei)
- Ryan Eno <ryaneno@gmail.com> (VimCommando)
- Matt Peterson <matt@peterson.org> (dorkmatt)
Observium was written by:
- Adam Armstrong

9
includes/definitions/timos.yaml
View File

@@ -1,8 +1,9 @@
os: timos
group: timos
text: 'Alcatel-Lucent TimOS'
text: 'Alcatel-Lucent TiMOS'
type: network
ifXmcbc: 1
ifname: 1
over:
- { graph: device_bits, text: 'Device Traffic' }
icon: alcatellucent
@@ -11,9 +12,15 @@ discovery:
- .1.3.6.1.4.1.6527.1.3
- .1.3.6.1.4.1.6527.6.2.1.2.2.
- .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.1.6.1
- .1.3.6.1.4.1.6527.1.6.5
- .1.3.6.1.4.1.6527.6.1.1.2.
- .1.3.6.1.4.1.6527.1.9.1
- .1.3.6.1.4.1.6527.1.15.
poller_modules:
wifi: 0
toner: 0
discovery_modules:
toner: 0

1
tests/OSDiscoveryTest.php
View File

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

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

@@ -0,0 +1,2 @@
1.3.6.1.2.1.1.1.0|4|TiMOS-B-6.0.R6 both/mpc ALCATEL SAS-M 24F 2XFP 7210 Copyright (c) 2000-2014 Alcatel-Lucent. All rights reserved. All use subject to applicable license agreements. Built on Wed May 7 11:43:56 IST 2014 by builder in /home/builder/6.0B1/R6/panos/main
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6527.6.2.1.2.2.2