ZyXEL Telemetry - XGS4600-32F (#9599)

* 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

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

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/'

View File

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

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
);

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
);