refactor: Moved mibs T-U (or removed) where possible (#5013)

This commit is contained in:
Neil Lathwood
2016-11-26 21:18:42 +00:00
committed by GitHub
parent 9d5fd2b4cf
commit 0908a6048d
11 changed files with 6 additions and 1400 deletions

View File

@@ -114,6 +114,7 @@ $config['os'][$os]['text'] = 'Ubiquiti UniFi';
$config['os'][$os]['type'] = 'wireless';
$config['os'][$os]['icon'] = 'ubiquiti';
$config['os'][$os]['nobulk'] = 1;
$config['os'][$os]['group'] = 'ubnt';
$config['os'][$os]['over'][0]['graph'] = 'device_bits';
$config['os'][$os]['over'][0]['text'] = 'Device Traffic';
$config['os'][$os]['over'][1]['graph'] = 'device_processor';
@@ -126,6 +127,7 @@ $config['os'][$os]['text'] = 'Ubiquiti AirOS';
$config['os'][$os]['type'] = 'network';
$config['os'][$os]['icon'] = 'ubiquiti';
$config['os'][$os]['nobulk'] = 1;
$config['os'][$os]['group'] = 'ubnt';
$config['os'][$os]['over'][0]['graph'] = 'device_bits';
$config['os'][$os]['over'][1]['graph'] = 'device_processor';
@@ -134,6 +136,7 @@ $config['os'][$os]['text'] = 'Ubiquiti AirFiber';
$config['os'][$os]['type'] = 'network';
$config['os'][$os]['icon'] = 'ubiquiti';
$config['os'][$os]['nobulk'] = 1;
$config['os'][$os]['group'] = 'ubnt';
$config['os'][$os]['over'][0]['graph'] = 'device_bits';
$config['os'][$os]['over'][1]['graph'] = 'device_processor';

View File

@@ -28,7 +28,7 @@ if (starts_with($sysDescr, 'Linux') && !starts_with($sysObjectId, $skip_oids)) {
$os = 'airos';
if (str_contains(snmp_walk($device, 'dot11manufacturerProductName', '-Osqnv', 'IEEE802dot11-MIB'), 'UAP')) {
$os = 'unifi';
} elseif (snmp_get($device, 'fwVersion.1', '-Osqnv', 'UBNT-AirFIBER-MIB') !== false) {
} elseif (snmp_get($device, 'fwVersion.1', '-Osqnv', 'UBNT-AirFIBER-MIB', 'ubnt') !== false) {
$os = 'airos-af';
}
} elseif (snmp_get($device, 'GANDI-MIB::rxCounter.0', '-Osqnv', 'GANDI-MIB') !== false) {

View File

@@ -1,103 +0,0 @@
-- Title: TRANZEO Private MIB
-- This Private MIB supports Tranzeo Sixth Generation product line.
-- Tranzeo Wireless Technologies Inc.
-- 19473 Fraser Way
-- Pitt Meadows, BC
-- Canada V3Y 2V4
--
--
--
-- Version: 0.2
-- Date: Wednesday December 27 2006
-- Comments: This is the first private MIB created for Tranzeo. It will contain basic oid's not already included in MIB-II or 802.11 MIB.
-- iso(1).org(3).dod(6).internet(1).private(4).enterprises(24575).
-- Version Date Authors Decription
--
-- v0.1 Nov 28 MR, QA Technician
-- 2006
-- v0.2 Dec 27
-- 2006 MR, QA Technician
TRANZEO-MIB DEFINITIONS ::= BEGIN
IMPORTS
enterprises, OBJECT-TYPE
FROM RFC1155-SMI;
tranzeo OBJECT IDENTIFIER ::= { enterprises 24575 }
signal OBJECT IDENTIFIER ::= { tranzeo 1 }
rssi OBJECT-TYPE
SYNTAX INTEGER (-110..0)
ACCESS read-only
STATUS mandatory
DESCRIPTION
"This object represents the average received signal strength on the current channel. A 0 means no wireless connection."
::= { signal 1 }
signallow OBJECT-TYPE
SYNTAX INTEGER (-110..0)
ACCESS read-only
STATUS mandatory
DESCRIPTION
"This object represents the lowest received signal strength on the current channel. A 0 means no wireless connection."
::= { rssi 1 }
signalaverage OBJECT-TYPE
SYNTAX INTEGER (-110..0)
ACCESS read-only
STATUS mandatory
DESCRIPTION
"This object represents the average received signal strength on the current channel. A 0 means no wireless connection."
::= { rssi 2 }
signalhigh OBJECT-TYPE
SYNTAX INTEGER (-110..0)
ACCESS read-only
STATUS mandatory
DESCRIPTION
"This object represents the highest received signal strength on the current channel. A 0 means no wireless connection."
::= { rssi 3 }
noise OBJECT-TYPE
SYNTAX INTEGER (-110..0)
ACCESS read-only
STATUS mandatory
DESCRIPTION
"This object represents the noise on the current channel. A 0 means no wireless connection."
::= { signal 2 }
noiselow OBJECT-TYPE
SYNTAX INTEGER (-110..0)
ACCESS read-only
STATUS mandatory
DESCRIPTION
"This object represents the lowest noise on the current channel. A 0 means no wireless connection."
::= { noise 1 }
noiseaverage OBJECT-TYPE
SYNTAX INTEGER (-110..0)
ACCESS read-only
STATUS mandatory
DESCRIPTION
"This object represents the average noise on the current channel. A 0 means no wireless connection."
::= { noise 2 }
noisehigh OBJECT-TYPE
SYNTAX INTEGER (-110..0)
ACCESS read-only
STATUS mandatory
DESCRIPTION
"This object represents the highest noise on the current channel. A 0 means no wireless connection."
::= { noise 3 }
END

View File

@@ -1,147 +0,0 @@
TRAP-MIB DEFINITIONS ::= BEGIN
-- ctron-trap-mib.txt
-- Revision: 1.01.03
-- Part Number: 2170572
-- Date: October 29, 1997
-- Cabletron Systems, Inc.
-- 35 Industrial Way, P.O. Box 5005
-- Rochester, NH 03867-0505
-- (603) 332-9400
-- support@ctron.com
-- This module provides authoritative definitions for Cabletron's
-- enterprise-specific Trap Table MIB.
--
-- This module will be extended, as required.
--
-- Cabletron Systems reserves the right to make changes in
-- specification and other information contained in this document
-- without prior notice. The reader should consult Cabletron Systems
-- to determine whether any such changes have been made.
--
-- In no event shall Cabletron Systems be liable for any incidental,
-- indirect, special, or consequential damages whatsoever (including
-- but not limited to lost profits) arising out of or related to this
-- document or the information contained in it, even if Cabletron
-- Systems has been advised of, known, or should have known, the
-- possibility of such damages.
--
-- Cabletron grants vendors, end-users, and other interested parties
-- a non-exclusive license to use this Specification in connection
-- with the management of Cabletron products.
-- Copyright November 95 Cabletron Systems
IMPORTS
IpAddress
FROM RFC1155-SMI
ctTrapTable
FROM CTRON-MIB-NAMES
OBJECT-TYPE
FROM RFC-1212;
trap OBJECT IDENTIFIER ::= { ctTrapTable 1 }
trapTable OBJECT-TYPE
SYNTAX SEQUENCE OF TrapEntry
ACCESS not-accessible
STATUS mandatory
DESCRIPTION
"This table houses information for transmitting traps.
This table is not associated with trivial
authentication."
::= { trap 1 }
trapEntry OBJECT-TYPE
SYNTAX TrapEntry
ACCESS not-accessible
STATUS mandatory
DESCRIPTION
"Each entry contains a community name for the SNMP trap
PDU, network addresses of who receives traps from this
device and a trap status of Enable or Disable."
INDEX { trapIndex }
::= { trapTable 1 }
TrapEntry ::=
SEQUENCE {
trapIndex
INTEGER,
trapCommunityName
OCTET STRING,
trapStatus
INTEGER,
trapIPAddr
IpAddress,
trapSrcParty
OBJECT IDENTIFIER,
trapDstParty
OBJECT IDENTIFIER
}
trapIndex OBJECT-TYPE
SYNTAX INTEGER (0..32)
ACCESS read-only
STATUS mandatory
DESCRIPTION
"A unique value for each trap entry that indexes the
table."
::= { trapEntry 1 }
trapCommunityName OBJECT-TYPE
SYNTAX OCTET STRING (SIZE (0..32))
ACCESS read-write
STATUS mandatory
DESCRIPTION
"The community name that will be used within the SNMP
trap PDU."
::= { trapEntry 2 }
trapStatus OBJECT-TYPE
SYNTAX INTEGER {
trapsDisabled (1),
trapsEnabled (2)
}
ACCESS read-write
STATUS mandatory
DESCRIPTION
"This object is checked to determine if traps should be
sent to the corresponding network address associated
with it."
::= { trapEntry 3 }
trapIPAddr OBJECT-TYPE
SYNTAX IpAddress
ACCESS read-write
STATUS mandatory
DESCRIPTION
"The network address of the device that will receive
traps from this agent."
::= { trapEntry 4 }
trapSrcParty OBJECT-TYPE
SYNTAX OBJECT IDENTIFIER
ACCESS read-write
STATUS mandatory
DESCRIPTION
"This object administratively defines operations of the
source SNMP protocol entity. When processing a
SNMP message, the entity acts as a SNMP party."
::= { trapEntry 5 }
trapDstParty OBJECT-TYPE
SYNTAX OBJECT IDENTIFIER
ACCESS read-write
STATUS mandatory
DESCRIPTION
"This object administratively defines operations of the
destination SNMP protocol entity. When processing a
SNMP message, the entity acts as a SNMP party."
::= { trapEntry 6 }
END

File diff suppressed because it is too large Load Diff

View File

@@ -134,7 +134,7 @@ function snmp_translate_number($oid, $mib = null, $mibdir = null)
}
$cmd = "snmptranslate -IR -On $oid";
$cmd .= ' -M ' . (isset($mibdir) ? $mibdir : $config['mib_dir']);
$cmd .= ' -M ' . (isset($mibdir) ? $config['mib_dir'] . ":".$config['mib_dir']."/$mibdir" : $config['mib_dir']);
if (isset($mib) && $mib) {
$cmd .= " -m $mib";
}
@@ -153,7 +153,7 @@ function snmp_translate_type($oid, $mib = null, $mibdir = null)
global $config;
$cmd = "snmptranslate -IR -Td $oid";
$cmd .= ' -M ' . (isset($mibdir) ? $mibdir : $config['mib_dir']);
$cmd .= ' -M ' . (isset($mibdir) ? $config['mib_dir'] . ":".$config['mib_dir']."/$mibdir" : $config['mib_dir']);
if (isset($mib) && $mib) {
$cmd .= " -m $mib";
}