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

ZyXEL Telemetry - XGS4600-32F (#9599)

Browse Source 
* ZyXEL XGS4600-32F
- Added mib for diagnostics
    - CPU/Mem
    - Temp/Fan/Voltage
- Updated zyxel group mempools
- Updated test data
    - snmprec
    - json
- Altered ZyWall
    - To exclude XGS switches

* Defined ZYXEL-HW-MONITOR-MIB at the top of file

* Removed .MIB
This commit is contained in:
KodApa85
2019-01-04 16:17:00 +00:00
committed by Tony Murray
parent f10cbddacc
commit 02855fa9c8
8 changed files with 33707 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
includes/definitions/discovery/zynos.yaml
View File

@@ -1,4 +1,4 @@
mib: ZYXEL-ES-COMMON
mib: ZYXEL-ES-COMMON:ZYXEL-HW-MONITOR-MIB
modules:
processors:
data:
@@ -10,3 +10,44 @@ modules:
-
oid: sysMgmtCPU5SecUsage
num_oid: '.1.3.6.1.4.1.890.1.15.3.2.7.{{ $index }}'
sensors:
fanspeed:
options:
skip_values_lt: 0
data:
-
oid: zyxelHwMonitorFanRpmTable
value: zyHwMonitorFanRpmCurrentValue
num_oid: '.1.3.6.1.4.1.890.1.15.3.26.1.1.1.3.{{ $index }}'
descr: zyHwMonitorFanRpmDescription
index: 'zyHwMonitorFanRpmCurrentValue.{{ $index }}'
high_limit: zyHwMonitorFanRpmMaxValue
low_limit: zyHwMonitorFanRpmMinValue
low_warn_limit: zyHwMonitorFanRpmLowThreshold
temperature:
options:
skip_values_lt: 0
data:
-
oid: zyxelHwMonitorTemperatureTable
value: zyHwMonitorTemperatureCurrentValue
num_oid: '.1.3.6.1.4.1.890.1.15.3.26.1.2.1.3.{{ $index }}'
descr: zyHwMonitorTemperatureDescription
index: 'zyHwMonitorTemperatureCurrentValue.{{ $index }}'
high_limit: zyHwMonitorTemperatureMaxValue
low_limit: zyHwMonitorTemperatureMinValue
high_warn_limit: zyHwMonitorTemperatureHighThreshold
voltage:
options:
skip_values_lt: 0
divisor: 1000
data:
-
oid: zyxelHwMonitorVoltageTable
value: zyHwMonitorVoltageCurrentValue
num_oid: '.1.3.6.1.4.1.890.1.15.3.26.1.3.1.3.{{ $index }}'
descr: zyHwMonitorVoltageDescription
index: 'zyHwMonitorVoltageCurrentValue.{{ $index }}'
high_limit: zyHwMonitorVoltageMaxValue
low_limit: zyHwMonitorVoltageMinValue
low_warn_limit: zyHwMonitorVoltageLowThreshold

5
includes/definitions/zynos.yaml
View File

@@ -3,6 +3,10 @@ text: 'ZyXEL Ethernet Switch'
group: zyxel
type: network
icon: zyxel
over:
- { graph: device_bits, text: 'Device Traffic' }
- { graph: device_processor, text: 'CPU Usage' }
- { graph: device_mempool, text: 'Memory Usage' }
discovery:
-
sysObjectID: .1.3.6.1.4.1.890
@@ -11,3 +15,4 @@ discovery:
- '/^GS/'
- '/^MES/'
- '/^XS/'
- '/^XGS/'

1
includes/definitions/zywall.yaml
View File

@@ -14,3 +14,4 @@ discovery:
- .1.3.6.1.4.1.890.1.15
sysDescr_regex_except:
- '/^NWA/'
- '/^XGS/'

16
includes/discovery/mempools/zyxel.inc.php
View File

@@ -23,18 +23,10 @@
* @author Neil Lathwood <neil@lathwood.co.uk>
*/
if ($device['group'] == 'zyxel') {
echo 'Zyxel : ';
$oid = '.1.3.6.1.4.1.890.1.15.3.2.5.0';
$usage = snmp_get($device, $oid, '-Ovq');
$descr = 'Memory';
if ($device['os_group'] == 'zyxel') {
d_echo('Zyxel');
$usage = snmp_get($device, "sysMgmtMemUsage.0", '-OvQ', 'ZYXEL-ES-COMMON');
if (is_numeric($usage)) {
discover_mempool($valid_mempool, $device, '0', 'zyxel', $descr, '1', null, null);
discover_mempool($valid_mempool, $device, '0', 'zyxel', 'Memory', '1', null, null);
}
}
unset(
$oid,
$usage,
$descr
);

6
includes/polling/mempools/zyxel.inc.php
View File

@@ -23,9 +23,8 @@
* @author Neil Lathwood <neil@lathwood.co.uk>
*/
echo 'Zyxel: ';
$oid = '.1.3.6.1.4.1.890.1.15.3.2.5.0';
$perc = snmp_get($device, $oid, '-OvQ');
d_echo('Zyxel: ');
$perc = snmp_get($device, 'sysMgmtMemUsage.0', '-OvQ', 'ZYXEL-ES-COMMON');
if (is_numeric($perc)) {
$mempool['perc'] = $perc;
$mempool['used'] = $perc;
@@ -34,6 +33,5 @@ if (is_numeric($perc)) {
}
unset(
$oid,
$perc
);

519
mibs/zyxel/ZYXEL-HW-MONITOR-MIB Normal file
View File

@@ -0,0 +1,519 @@
-- ZyXEL Communications Corporation
-- Private Enterprise MIB definition
-- This file describes the ZyXEL Communications Corporation Enterprise MIB.
-- It contains ZyXEL products OIDs, and common managed objects.
-- ZYXEL-HW-MONITOR-MIB.mib
-- Revision 1.10 2016/02/24
ZYXEL-HW-MONITOR-MIB DEFINITIONS ::= BEGIN
IMPORTS
OBJECT-TYPE
FROM SNMPv2-SMI -- RFC2578
MODULE-IDENTITY
FROM SNMPv2-SMI
DisplayString
FROM SNMPv2-TC
NOTIFICATION-TYPE
FROM SNMPv2-SMI
esMgmt
FROM ZYXEL-ES-SMI;
zyxelHwMonitor MODULE-IDENTITY
LAST-UPDATED "201207010000Z"
ORGANIZATION "Enterprise Solution ZyXEL"
CONTACT-INFO
""
DESCRIPTION
"The subtree for hardware monitor"
::= { esMgmt 26 }
zyxelHwMonitorStatus OBJECT IDENTIFIER ::= { zyxelHwMonitor 1 }
zyxelHwMonitorNotifications OBJECT IDENTIFIER ::= { zyxelHwMonitor 2 }
zyxelHwMonitorTrapInfoObject OBJECT IDENTIFIER ::= { zyxelHwMonitor 3 }
-- 26.HwMonitor
-- fanRpmTable
zyxelHwMonitorFanRpmTable OBJECT-TYPE
SYNTAX SEQUENCE OF ZyxelHwMonitorFanRpmEntry
MAX-ACCESS not-accessible
STATUS current
DESCRIPTION
"The table contains HW monitor fan information."
::= { zyxelHwMonitorStatus 1 }
zyxelHwMonitorFanRpmEntry OBJECT-TYPE
SYNTAX ZyxelHwMonitorFanRpmEntry
MAX-ACCESS not-accessible
STATUS current
DESCRIPTION
"An entry contains HW monitor fan information."
INDEX { zyHwMonitorFanRpmIndex }
::= { zyxelHwMonitorFanRpmTable 1 }
ZyxelHwMonitorFanRpmEntry ::=
SEQUENCE {
zyHwMonitorFanRpmIndex INTEGER,
zyHwMonitorFanRpmDescription DisplayString,
zyHwMonitorFanRpmCurrentValue INTEGER,
zyHwMonitorFanRpmMaxValue INTEGER,
zyHwMonitorFanRpmMinValue INTEGER,
zyHwMonitorFanRpmLowThreshold INTEGER,
zyHwMonitorFanRpmStatus DisplayString
}
zyHwMonitorFanRpmIndex OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS not-accessible
STATUS current
DESCRIPTION
"Index of fan."
::= { zyxelHwMonitorFanRpmEntry 1 }
zyHwMonitorFanRpmDescription OBJECT-TYPE
SYNTAX DisplayString
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Fan Description"
::= { zyxelHwMonitorFanRpmEntry 2 }
zyHwMonitorFanRpmCurrentValue OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Current speed in Revolutions Per Minute (RPM) on the fan."
::= { zyxelHwMonitorFanRpmEntry 3 }
zyHwMonitorFanRpmMaxValue OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Maximum speed measured in Revolutions Per Minute (RPM) on the fan."
::= { zyxelHwMonitorFanRpmEntry 4 }
zyHwMonitorFanRpmMinValue OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Minimum speed measured in Revolutions Per Minute (RPM) on the fan."
::= { zyxelHwMonitorFanRpmEntry 5 }
zyHwMonitorFanRpmLowThreshold OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The minimum speed at which a normal fan should work."
::= { zyxelHwMonitorFanRpmEntry 6 }
zyHwMonitorFanRpmStatus OBJECT-TYPE
SYNTAX DisplayString
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"'Normal' indicates that this fan is functioning above the minimum speed.
'Error' indicates that this fan is functioning below the minimum speed."
::= { zyxelHwMonitorFanRpmEntry 7 }
-- tempTable
zyxelHwMonitorTemperatureTable OBJECT-TYPE
SYNTAX SEQUENCE OF ZyxelHwMonitorTemperatureEntry
MAX-ACCESS not-accessible
STATUS current
DESCRIPTION
"The table contains HW monitor temperature information."
::= { zyxelHwMonitorStatus 2 }
zyxelHwMonitorTemperatureEntry OBJECT-TYPE
SYNTAX ZyxelHwMonitorTemperatureEntry
MAX-ACCESS not-accessible
STATUS current
DESCRIPTION
"An entry contains HW temperature information."
INDEX { zyHwMonitorTemperatureIndex }
::= { zyxelHwMonitorTemperatureTable 1 }
ZyxelHwMonitorTemperatureEntry ::=
SEQUENCE {
zyHwMonitorTemperatureIndex INTEGER,
zyHwMonitorTemperatureDescription DisplayString,
zyHwMonitorTemperatureCurrentValue INTEGER,
zyHwMonitorTemperatureMaxValue INTEGER,
zyHwMonitorTemperatureMinValue INTEGER,
zyHwMonitorTemperatureHighThreshold INTEGER,
zyHwMonitorTemperatureStatus DisplayString
}
zyHwMonitorTemperatureIndex OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS not-accessible
STATUS current
DESCRIPTION
"Index of temperature unit."
::= { zyxelHwMonitorTemperatureEntry 1 }
zyHwMonitorTemperatureDescription OBJECT-TYPE
SYNTAX DisplayString
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Temperature Description"
::= { zyxelHwMonitorTemperatureEntry 2 }
zyHwMonitorTemperatureCurrentValue OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The current temperature measured at this sensor."
::= { zyxelHwMonitorTemperatureEntry 3 }
zyHwMonitorTemperatureMaxValue OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The maximum temperature measured at this sensor."
::= { zyxelHwMonitorTemperatureEntry 4 }
zyHwMonitorTemperatureMinValue OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The minimum temperature measured at this sensor."
::= { zyxelHwMonitorTemperatureEntry 5 }
zyHwMonitorTemperatureHighThreshold OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The upper temperature limit at this sensor."
::= { zyxelHwMonitorTemperatureEntry 6 }
zyHwMonitorTemperatureStatus OBJECT-TYPE
SYNTAX DisplayString
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"'Normal' indicates temperatures below the threshold and 'Error' for those above."
::= { zyxelHwMonitorTemperatureEntry 7 }
-- voltageTable
zyxelHwMonitorVoltageTable OBJECT-TYPE
SYNTAX SEQUENCE OF ZyxelHwMonitorVoltageEntry
MAX-ACCESS not-accessible
STATUS current
DESCRIPTION
"The table contains HW monitor voltage information."
::= { zyxelHwMonitorStatus 3 }
zyxelHwMonitorVoltageEntry OBJECT-TYPE
SYNTAX ZyxelHwMonitorVoltageEntry
MAX-ACCESS not-accessible
STATUS current
DESCRIPTION
"An entry contains HW voltage information."
INDEX { zyHwMonitorVoltageIndex }
::= { zyxelHwMonitorVoltageTable 1 }
ZyxelHwMonitorVoltageEntry ::=
SEQUENCE {
zyHwMonitorVoltageIndex INTEGER,
zyHwMonitorVoltageDescription DisplayString,
zyHwMonitorVoltageCurrentValue INTEGER,
zyHwMonitorVoltageMaxValue INTEGER,
zyHwMonitorVoltageMinValue INTEGER,
zyHwMonitorVoltageNominalValue INTEGER,
zyHwMonitorVoltageLowThreshold INTEGER,
zyHwMonitorVoltageStatus DisplayString
}
zyHwMonitorVoltageIndex OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS not-accessible
STATUS current
DESCRIPTION
"Index of voltage."
::= { zyxelHwMonitorVoltageEntry 1 }
zyHwMonitorVoltageDescription OBJECT-TYPE
SYNTAX DisplayString
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Voltage Description"
::= { zyxelHwMonitorVoltageEntry 2 }
zyHwMonitorVoltageCurrentValue OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The current voltage reading."
::= { zyxelHwMonitorVoltageEntry 3 }
zyHwMonitorVoltageMaxValue OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The maximum voltage measured at this point."
::= { zyxelHwMonitorVoltageEntry 4 }
zyHwMonitorVoltageMinValue OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The minimum voltage measured at this point."
::= { zyxelHwMonitorVoltageEntry 5 }
zyHwMonitorVoltageNominalValue OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The normal voltage at which the switch work."
::= { zyxelHwMonitorVoltageEntry 6 }
zyHwMonitorVoltageLowThreshold OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The minimum voltage at which the switch should work."
::= { zyxelHwMonitorVoltageEntry 7 }
zyHwMonitorVoltageStatus OBJECT-TYPE
SYNTAX DisplayString
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"'Normal' indicates that the voltage is within an acceptable operating
range at this point; otherwise 'Error' is displayed."
::= { zyxelHwMonitorVoltageEntry 8 }
-- PowerSourceStatus
zyxelHwMonitorPowerSource OBJECT IDENTIFIER ::= { zyxelHwMonitorStatus 4 }
zyHwMonitorPowerSourceMode OBJECT-TYPE
SYNTAX DisplayString
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The current power source reading (AC prefer, load-sharing)."
::= { zyxelHwMonitorPowerSource 1 }
zyxelHwMonitorPowerSourceTable OBJECT-TYPE
SYNTAX SEQUENCE OF ZyxelHwMonitorPowerSourceEntry
MAX-ACCESS not-accessible
STATUS current
DESCRIPTION
"The table contains HW monitor power source information."
::= { zyxelHwMonitorPowerSource 2 }
zyxelHwMonitorPowerSourceEntry OBJECT-TYPE
SYNTAX ZyxelHwMonitorPowerSourceEntry
MAX-ACCESS not-accessible
STATUS current
DESCRIPTION
"An entry contains HW power source information."
INDEX { zyHwMonitorPowerSourceIndex }
::= { zyxelHwMonitorPowerSourceTable 1 }
ZyxelHwMonitorPowerSourceEntry ::=
SEQUENCE {
zyHwMonitorPowerSourceIndex INTEGER,
zyHwMonitorPowerSourceType DisplayString,
zyHwMonitorPowerSourceStatus DisplayString,
zyHwMonitorPowerSourceDescription DisplayString,
zyHwMonitorPowerSourcePreviousStatus DisplayString
}
zyHwMonitorPowerSourceIndex OBJECT-TYPE
SYNTAX INTEGER
MAX-ACCESS not-accessible
STATUS current
DESCRIPTION
"Index of power source."
::= { zyxelHwMonitorPowerSourceEntry 1 }
zyHwMonitorPowerSourceType OBJECT-TYPE
SYNTAX DisplayString
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The current power source type (AC/DC)."
::= { zyxelHwMonitorPowerSourceEntry 2 }
zyHwMonitorPowerSourceStatus OBJECT-TYPE
SYNTAX DisplayString
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"The current power source status (normal/error/absent/present)."
::= { zyxelHwMonitorPowerSourceEntry 3 }
zyHwMonitorPowerSourceDescription OBJECT-TYPE
SYNTAX DisplayString
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Power source Description."
::= { zyxelHwMonitorPowerSourceEntry 4 }
zyHwMonitorPowerSourcePreviousStatus OBJECT-TYPE
SYNTAX DisplayString
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Power source Previous Status (normal/error/absent/present)."
::= { zyxelHwMonitorPowerSourceEntry 5 }
zyHwMonitorFanSpeedOutOfRange NOTIFICATION-TYPE
OBJECTS {
zyHwMonitorFanRpmIndex,
zyHwMonitorFanRpmDescription
}
STATUS current
DESCRIPTION
"Fan speed is out of the normal operation range."
::= { zyxelHwMonitorNotifications 1 }
zyHwMonitorTemperatureOutOfRange NOTIFICATION-TYPE
OBJECTS {
zyHwMonitorTemperatureIndex,
zyHwMonitorTemperatureDescription
}
STATUS current
DESCRIPTION
"Temperature is out of the normal operation range."
::= { zyxelHwMonitorNotifications 2 }
zyHwMonitorPowerSupplyVoltageOutOfRange NOTIFICATION-TYPE
OBJECTS {
zyHwMonitorVoltageIndex,
zyHwMonitorVoltageDescription
}
STATUS current
DESCRIPTION
"Power supply voltage is out of the normal operation range."
::= { zyxelHwMonitorNotifications 3 }
zyHwMonitorBackupPowerSupplyInUse NOTIFICATION-TYPE
STATUS current
DESCRIPTION
"Backup power in use is fault."
::= { zyxelHwMonitorNotifications 4 }
zyHwMonitorDyingGasp NOTIFICATION-TYPE
STATUS current
DESCRIPTION
"Unexpected power down or low power is detected."
::= { zyxelHwMonitorNotifications 5 }
zyHwMonitorFanAirFlowInconsistency NOTIFICATION-TYPE
STATUS current
DESCRIPTION
"FAN airflows are inconsistent."
::= { zyxelHwMonitorNotifications 6 }
zyHwMonitorFanSpeedOutOfRangeRecovered NOTIFICATION-TYPE
OBJECTS {
zyHwMonitorFanRpmIndex,
zyHwMonitorFanRpmDescription
}
STATUS current
DESCRIPTION
"Fan speed is recovered from out of the normal operation range."
::= { zyxelHwMonitorNotifications 7 }
zyHwMonitorTemperatureOutOfRangeRecovered NOTIFICATION-TYPE
OBJECTS {
zyHwMonitorTemperatureIndex,
zyHwMonitorTemperatureDescription
}
STATUS current
DESCRIPTION
"Temperature is recovered from out of the normal operation range."
::= { zyxelHwMonitorNotifications 8 }
zyHwMonitorPowerSupplyVoltageOutOfRangeRecovered NOTIFICATION-TYPE
OBJECTS {
zyHwMonitorVoltageIndex,
zyHwMonitorVoltageDescription
}
STATUS current
DESCRIPTION
"Power supply voltage is recovered from out of the normal operation range."
::= { zyxelHwMonitorNotifications 9 }
zyHwMonitorPowerSourceAbnormal NOTIFICATION-TYPE
OBJECTS {
zyHwMonitorPowerSourceIndex,
zyHwMonitorPowerSourceStatus,
zyHwMonitorPowerSourceDescription,
zyHwMonitorTrapPowerSourceErrorType
}
STATUS current
DESCRIPTION
"Power source status is change."
::= { zyxelHwMonitorNotifications 10 }
zyHwMonitorPowerSourceAbnormalRecovered NOTIFICATION-TYPE
OBJECTS {
zyHwMonitorPowerSourceIndex,
zyHwMonitorPowerSourceStatus,
zyHwMonitorPowerSourceDescription
}
STATUS current
DESCRIPTION
"Power source status change to normal."
::= { zyxelHwMonitorNotifications 11 }
zyHwMonitorPowerSourceStatusChange NOTIFICATION-TYPE
OBJECTS {
zyHwMonitorPowerSourceIndex,
zyHwMonitorPowerSourcePreviousStatus,
zyHwMonitorPowerSourceStatus,
zyHwMonitorPowerSourceDescription,
zyHwMonitorTrapPowerSourceErrorType
}
STATUS current
DESCRIPTION
"Check power source status change situation."
::= { zyxelHwMonitorNotifications 12 }
-- *******************************************************************
-- *
-- * zyxelHwMonitorTrapInfoObject
-- *
-- *******************************************************************
zyHwMonitorTrapPowerSourceErrorType OBJECT-TYPE
SYNTAX DisplayString
MAX-ACCESS not-accessible
STATUS current
DESCRIPTION
"There are the error type of power source."
::= { zyxelHwMonitorTrapInfoObject 1 }
END

27584
tests/data/zynos.json
View File

File diff suppressed because it is too large Load Diff

5555
tests/snmpsim/zynos.snmprec
View File

File diff suppressed because it is too large Load Diff