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

Move sentry3 current/voltage/power sensors to YAML (#15715)

Browse Source 
* Move sentry3 current and voltage sensors to YAML, add power to YAML, fix voltage for three-phase

* Sentry3: add systemTotalPower and systemPowerFactor

* sentry3: note that voltage and power factor are configured, not measured

* sentry3: group names to indicate sensors which are configured, rather than measured; prefix current index with infeedID to match previous PHP discovery

* sentry3: add ouprefix to outlet current to match previous PHP discovery index

* sentry3: restrict to recording voltage to only the first feed of each tower, to match previous indices

* sentry3: add snmprec from 3-phase CS-24V4-P32MA

* sentry3: attempt to fall back to Infeed

* sentry3: laravel blade fallback fix

* update tests instead of trying to fall back to old-style descriptions

* sentry3: update expected voltage in test, too

* typo

* fix test

* fix outlet OIDs ; update snmp test data with missing names ; regenerate test output

* add missing num_oids for power

* num_oid requires index, even for system-wide values
This commit is contained in:
Guy Lowe
2024-03-24 16:47:42 +01:00
committed by GitHub
parent 8c4205c614
commit 3f6958706d
9 changed files with 501 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/definitions/discovery/sentry3.yaml
+63
View File
@@ -1,6 +1,69 @@
mib: Sentry3-MIB
modules:
os:
hardware: Sentry3-MIB::towerModelNumber.1
serial: Sentry3-MIB::towerProductSN.1
version: Sentry3-MIB::systemVersion.0
version_regex: '/Version (?<version>\S+)/'
sensors:
# note 2-dimensional index tower.infeed for infeed
# and 3-dimensional index tower.infeed.outlet for outlets
current:
options:
divisor: 100
skip_value_lt: 0
data:
- oid: infeedTable
value: infeedLoadValue
num_oid: '.1.3.6.1.4.1.1718.3.2.2.1.7.{{ $index }}'
descr: infeedName
index: 'infeedID.{{ $index }}'
## limits need to be excluded from the divisor somehow
#warn_limit: infeedLoadHighThresh
#high_limit: infeedCapacity
- oid: outletTable
value: outletLoadValue
num_oid: '.1.3.6.1.4.1.1718.3.2.3.1.7.{{ $index }}'
descr: outletName
index: 'outletID.{{ $index }}'
## limits need to be excluded from the divisor somehow
#low_warn_limit: outletLoadLowThresh
#warn_limit: outletLoadHighThresh
#high_limit: outputCapacity
voltage:
# note: this is configured, not measured
options:
divisor: 10
skip_value_lt: 0
data:
- oid: infeedTable
value: infeedVoltage
num_oid: '.1.3.6.1.4.1.1718.3.2.2.1.11.{{ $index }}'
descr: infeedName
# recording voltage for additional feeds (3-phase)
# would require reindexing and moving RRD files;
# this is a configured value, not measured.
index: '{{ $subindex0 }}'
group: 'Configured Voltage'
power:
options:
skip_value_lt: 0
data:
- oid: infeedTable
value: infeedPower
num_oid: '.1.3.6.1.4.1.1718.3.2.2.1.12.{{ $index }}'
descr: infeedName
skip_value_lt: 0
- oid: systemTotalPower
num_oid: '.1.3.6.1.4.1.1718.3.1.6.{{ $index }}'
descr: 'System Total Power'
power_factor:
data:
- oid: systemPowerFactor
num_oid: '.1.3.6.1.4.1.1718.3.1.10.{{ $index }}'
descr: 'System Power Factor'
group: 'Configured Power Factor'
includes/discovery/sensors/current/sentry3.inc.php
-105
View File
@@ -1,105 +0,0 @@
<?php
$divisor = '100';
$outlet_divisor = $divisor;
$multiplier = '1';
// These PDUs may have > 1 "tower" accessible via a single management interface
$tower_count = snmp_get($device, 'systemTowerCount.0', '-Ovq', 'Sentry3-MIB');
$towers = 1;
while ($towers <= $tower_count) {
// Check for Infeeds
$infeed_oids = snmp_walk($device, "infeedID.$towers", '-Osqn', 'Sentry3-MIB');
d_echo($infeed_oids . "\n");
$infeed_oids = trim($infeed_oids);
if ($infeed_oids) {
echo 'ServerTech Sentry Infeed ';
}
foreach (explode("\n", $infeed_oids) as $infeed_data) {
$infeed_data = trim($infeed_data);
if ($infeed_data) {
[$infeed_oid,$descr] = explode(' ', $infeed_data, 2);
$split_oid = explode('.', $infeed_oid);
$infeed_index = $split_oid[count($split_oid) - 1];
// infeedLoadValue
$infeed_oid = '.1.3.6.1.4.1.1718.3.2.2.1.7.' . $towers . '.' . $infeed_index;
$descr_string = snmp_get($device, "infeedID.$towers.$infeed_index", '-Ovq', 'Sentry3-MIB');
$descr = "Infeed $descr_string";
$low_warn_limit = null;
$low_limit = null;
$high_warn_limit = snmp_get($device, "infeedLoadHighThresh.$towers.$infeed_index", '-Ovq', 'Sentry3-MIB');
$high_limit = snmp_get($device, "infeedCapacity.$towers.$infeed_index", '-Ovq', 'Sentry3-MIB');
$current = (snmp_get($device, "$infeed_oid", '-Ovq', 'Sentry3-MIB') / $divisor);
if ($current >= 0) {
$tmp_index = "infeedID.$towers.$infeed_index";
discover_sensor($valid['sensor'], 'current', $device, $infeed_oid, $tmp_index, 'sentry3', $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current);
}
// Check for per-outlet polling
// $outlet_oids = snmp_walk($device, "outletLoadValue.$towers.$infeed_index", "-Osqn", "Sentry3-MIB");
$outlet_oids = snmp_walk($device, "outletLoadValue.$towers.1", '-Osqn', 'Sentry3-MIB');
$outlet_oids = trim($outlet_oids);
if ($outlet_oids) {
echo 'ServerTech Sentry Outlet ';
}
foreach (explode("\n", $outlet_oids) as $outlet_data) {
$outlet_data = trim($outlet_data);
if ($outlet_data) {
[$outlet_oid,$outlet_descr] = explode(' ', $outlet_data, 2);
$outlet_split_oid = explode('.', $outlet_oid);
$outlet_index = $outlet_split_oid[count($outlet_split_oid) - 1];
$outletsuffix = "$towers.$infeed_index.$outlet_index";
// outletLoadValue: "A non-negative value indicates the measured load in hundredths of Amps"
$outlet_oid = ".1.3.6.1.4.1.1718.3.2.3.1.7.$outletsuffix";
$outlet_descr_string = snmp_get($device, "outletID.$outletsuffix", '-Ovq', 'Sentry3-MIB');
$outlet_descr = "Outlet $outlet_descr_string";
$outlet_low_warn_limit = null;
$outlet_low_limit = null;
$outlet_high_warn_limit = null;
// Should be "outletCapacity" but is always -1. According to MIB: "A negative value indicates that the capacity was not available."
$outlet_high_limit = snmp_get($device, "outletLoadHighThresh.$outletsuffix", '-Ovq', 'Sentry3-MIB');
$outlet_current = (snmp_get($device, "$outlet_oid", '-Ovq', 'Sentry3-MIB') / $outlet_divisor);
if ($outlet_current >= 0) {
$outlet_insert_index = "outletID.$towers.$infeed_index.$outlet_index";
discover_sensor($valid['sensor'], 'current', $device, $outlet_oid, $outlet_insert_index, 'sentry3', $outlet_descr, $outlet_divisor, $multiplier, $outlet_low_limit, $outlet_low_warn_limit, $outlet_high_warn_limit, $outlet_high_limit, $outlet_current);
}
} //end if
unset($outlet_data);
unset($outlet_oids);
unset($outlet_oid);
unset($outlet_descr_string);
unset($outlet_descr);
unset($outlet_low_warn_limit);
unset($outlet_low_limit);
unset($outlet_high_warn_limit);
unset($outlet_high_limit);
unset($outlet_current);
} //end foreach
} //end if
unset($infeed_data);
unset($infeed_oids);
unset($descr_string);
unset($descr);
unset($low_warn_limit);
unset($low_limit);
unset($high_warn_limit);
unset($high_limit);
unset($current);
} //end foreach
$towers++;
} //end while
unset($towers);
includes/discovery/sensors/voltage/sentry3.inc.php
-26
View File
@@ -1,26 +0,0 @@
<?php
$oids = snmpwalk_group($device, 'infeedVoltage', 'Sentry3-MIB', 2);
d_echo($oids);
foreach ($oids as $index => $first) {
foreach ($first as $end => $data) {
$divisor = 10;
discover_sensor(
$valid['sensor'],
'voltage',
$device,
".1.3.6.1.4.1.1718.3.2.2.1.11.$index.$end",
$index,
'sentry3',
'Tower ' . $index,
$divisor,
1,
null,
null,
null,
null,
empty($data['infeedVoltage']) ? 0 : ($data['infeedVoltage'] / $divisor)
);
}
}
tests/data/sentry3.json
+6 -6
View File
@@ -440,7 +440,7 @@
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.7.1.1",
"sensor_index": "infeedID.1.1",
"sensor_type": "sentry3",
"sensor_descr": "Infeed AA",
"sensor_descr": "TowerA_InfeedA",
"group": null,
"sensor_divisor": 100,
"sensor_multiplier": 1,
@@ -465,7 +465,7 @@
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.7.2.1",
"sensor_index": "infeedID.2.1",
"sensor_type": "sentry3",
"sensor_descr": "Infeed BA",
"sensor_descr": "TowerB_InfeedA",
"group": null,
"sensor_divisor": 100,
"sensor_multiplier": 1,
@@ -590,8 +590,8 @@
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.11.1.1",
"sensor_index": "1",
"sensor_type": "sentry3",
"sensor_descr": "Tower 1",
"group": null,
"sensor_descr": "TowerA_InfeedA",
"group": "Configured Voltage",
"sensor_divisor": 10,
"sensor_multiplier": 1,
"sensor_current": 209.3,
@@ -615,8 +615,8 @@
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.11.2.1",
"sensor_index": "2",
"sensor_type": "sentry3",
"sensor_descr": "Tower 2",
"group": null,
"sensor_descr": "TowerB_InfeedA",
"group": "Configured Voltage",
"sensor_divisor": 10,
"sensor_multiplier": 1,
"sensor_current": 205.9,
tests/data/sentry3_3phase.json
+280
View File
@@ -0,0 +1,280 @@
{
"os": {
"discovery": {
"devices": [
{
"sysName": "sentry3_123456",
"sysObjectID": ".1.3.6.1.4.1.1718.3",
"sysDescr": "Sentry Smart CDU",
"sysContact": "No Contact",
"version": "7.1f",
"hardware": "CS-24V4-P32MA",
"features": null,
"location": "No Location",
"os": "sentry3",
"type": "power",
"serial": "KAXV1234567",
"icon": "servertech.png"
}
]
},
"poller": "matches discovery"
},
"sensors": {
"discovery": {
"sensors": [
{
"sensor_deleted": 0,
"sensor_class": "current",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.7.1.1",
"sensor_index": "infeedID.1.1",
"sensor_type": "sentry3",
"sensor_descr": "TowerA_InfeedA",
"group": null,
"sensor_divisor": 100,
"sensor_multiplier": 1,
"sensor_current": 1.11,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "current",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.7.1.2",
"sensor_index": "infeedID.1.2",
"sensor_type": "sentry3",
"sensor_descr": "TowerA_InfeedB",
"group": null,
"sensor_divisor": 100,
"sensor_multiplier": 1,
"sensor_current": 0.4,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "current",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.7.1.3",
"sensor_index": "infeedID.1.3",
"sensor_type": "sentry3",
"sensor_descr": "TowerA_InfeedC",
"group": null,
"sensor_divisor": 100,
"sensor_multiplier": 1,
"sensor_current": 0.59,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "current",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.7.1.4",
"sensor_index": "infeedID.1.4",
"sensor_type": "sentry3",
"sensor_descr": "TowerA_Neutral",
"group": null,
"sensor_divisor": 100,
"sensor_multiplier": 1,
"sensor_current": 2.12,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "power",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.1718.3.1.6.0",
"sensor_index": "0",
"sensor_type": "sentry3",
"sensor_descr": "System Total Power",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 279,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "power",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.12.1.1",
"sensor_index": "1.1",
"sensor_type": "sentry3",
"sensor_descr": "TowerA_InfeedA",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 147,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "power",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.12.1.2",
"sensor_index": "1.2",
"sensor_type": "sentry3",
"sensor_descr": "TowerA_InfeedB",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 53,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "power",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.12.1.3",
"sensor_index": "1.3",
"sensor_type": "sentry3",
"sensor_descr": "TowerA_InfeedC",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 78,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "power_factor",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.1718.3.1.10.0",
"sensor_index": "0",
"sensor_type": "sentry3",
"sensor_descr": "System Power Factor",
"group": "Configured Power Factor",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 100,
"sensor_limit": 1,
"sensor_limit_warn": null,
"sensor_limit_low": -1,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "voltage",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.11.1.3",
"sensor_index": "1",
"sensor_type": "sentry3",
"sensor_descr": "TowerA_InfeedC",
"group": "Configured Voltage",
"sensor_divisor": 10,
"sensor_multiplier": 1,
"sensor_current": 230,
"sensor_limit": 264.5,
"sensor_limit_warn": null,
"sensor_limit_low": 195.5,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"rrd_type": "GAUGE",
"state_name": null
}
]
},
"poller": "matches discovery"
}
}
tests/data/sentry3_switched.json
+10 -10
View File
@@ -440,7 +440,7 @@
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.7.1.1",
"sensor_index": "infeedID.1.1",
"sensor_type": "sentry3",
"sensor_descr": "Infeed AA",
"sensor_descr": "TowerA_InfeedA",
"group": null,
"sensor_divisor": 100,
"sensor_multiplier": 1,
@@ -465,7 +465,7 @@
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.7.1.2",
"sensor_index": "infeedID.1.2",
"sensor_type": "sentry3",
"sensor_descr": "Infeed AB",
"sensor_descr": "TowerA_InfeedB",
"group": null,
"sensor_divisor": 100,
"sensor_multiplier": 1,
@@ -490,7 +490,7 @@
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.7.1.3",
"sensor_index": "infeedID.1.3",
"sensor_type": "sentry3",
"sensor_descr": "Infeed AC",
"sensor_descr": "TowerA_InfeedC",
"group": null,
"sensor_divisor": 100,
"sensor_multiplier": 1,
@@ -1265,8 +1265,8 @@
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.11.1.3",
"sensor_index": "1",
"sensor_type": "sentry3",
"sensor_descr": "Tower 1",
"group": null,
"sensor_descr": "TowerA_InfeedC",
"group": "Configured Voltage",
"sensor_divisor": 10,
"sensor_multiplier": 1,
"sensor_current": 207,
@@ -1294,7 +1294,7 @@
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.7.1.1",
"sensor_index": "infeedID.1.1",
"sensor_type": "sentry3",
"sensor_descr": "Infeed AA",
"sensor_descr": "TowerA_InfeedA",
"group": null,
"sensor_divisor": 100,
"sensor_multiplier": 1,
@@ -1319,7 +1319,7 @@
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.7.1.2",
"sensor_index": "infeedID.1.2",
"sensor_type": "sentry3",
"sensor_descr": "Infeed AB",
"sensor_descr": "TowerA_InfeedB",
"group": null,
"sensor_divisor": 100,
"sensor_multiplier": 1,
@@ -1344,7 +1344,7 @@
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.7.1.3",
"sensor_index": "infeedID.1.3",
"sensor_type": "sentry3",
"sensor_descr": "Infeed AC",
"sensor_descr": "TowerA_InfeedC",
"group": null,
"sensor_divisor": 100,
"sensor_multiplier": 1,
@@ -2119,8 +2119,8 @@
"sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.11.1.3",
"sensor_index": "1",
"sensor_type": "sentry3",
"sensor_descr": "Tower 1",
"group": null,
"sensor_descr": "TowerA_InfeedC",
"group": "Configured Voltage",
"sensor_divisor": 10,
"sensor_multiplier": 1,
"sensor_current": 208.7,
tests/snmpsim/sentry3.snmprec
+2
View File
@@ -296,6 +296,8 @@
1.3.6.1.4.1.1718.3.2.1.1.7.1|4|CW-24V2C458C1
1.3.6.1.4.1.1718.3.2.2.1.2.1.1|4|AA
1.3.6.1.4.1.1718.3.2.2.1.2.2.1|4|BA
1.3.6.1.4.1.1718.3.2.2.1.3.1.1|4|TowerA_InfeedA
1.3.6.1.4.1.1718.3.2.2.1.3.2.1|4|TowerB_InfeedA
1.3.6.1.4.1.1718.3.2.2.1.7.1.1|2|362
1.3.6.1.4.1.1718.3.2.2.1.7.2.1|2|502
1.3.6.1.4.1.1718.3.2.2.1.8.1.1|2|24
tests/snmpsim/sentry3_3phase.snmprec
+107
View File
@@ -0,0 +1,107 @@
1.3.6.1.2.1.1.1.0|4|Sentry Smart CDU
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.1718.3
1.3.6.1.2.1.1.3.0|67|91723761
1.3.6.1.2.1.1.4.0|4|No Contact
1.3.6.1.2.1.1.5.0|4|Sentry3_123456
1.3.6.1.2.1.1.6.0|4|No Location
1.3.6.1.2.1.1.7.0|2|72
1.3.6.1.2.1.1.8.0|67|0
1.3.6.1.4.1.1718.3.1.1.0|4|Sentry Smart CDU Version 7.1f
1.3.6.1.4.1.1718.3.1.2.0|4|8025492
1.3.6.1.4.1.1718.3.1.3.0|4|
1.3.6.1.4.1.1718.3.1.4.0|2|1
1.3.6.1.4.1.1718.3.1.5.0|2|1
1.3.6.1.4.1.1718.3.1.6.0|2|279
1.3.6.1.4.1.1718.3.1.7.0|2|0
1.3.6.1.4.1.1718.3.1.8.0|2|-1
1.3.6.1.4.1.1718.3.1.9.0|2|0
1.3.6.1.4.1.1718.3.1.10.0|2|100
1.3.6.1.4.1.1718.3.1.11.0|4x|00
1.3.6.1.4.1.1718.3.1.12.0|4|
1.3.6.1.4.1.1718.3.1.15.0|2|19
1.3.6.1.4.1.1718.3.2.1.1.2.1|4|A
1.3.6.1.4.1.1718.3.2.1.1.3.1|4|TowerA
1.3.6.1.4.1.1718.3.2.1.1.4.1|2|0
1.3.6.1.4.1.1718.3.2.1.1.5.1|2|4
1.3.6.1.4.1.1718.3.2.1.1.6.1|4|KAXV1234567
1.3.6.1.4.1.1718.3.2.1.1.7.1|4|CS-24V4-P32MA
1.3.6.1.4.1.1718.3.2.1.1.8.1|4|P
1.3.6.1.4.1.1718.3.2.2.1.2.1.1|4|AA
1.3.6.1.4.1.1718.3.2.2.1.2.1.2|4|AB
1.3.6.1.4.1.1718.3.2.2.1.2.1.3|4|AC
1.3.6.1.4.1.1718.3.2.2.1.2.1.4|4|AD
1.3.6.1.4.1.1718.3.2.2.1.3.1.1|4|TowerA_InfeedA
1.3.6.1.4.1.1718.3.2.2.1.3.1.2|4|TowerA_InfeedB
1.3.6.1.4.1.1718.3.2.2.1.3.1.3|4|TowerA_InfeedC
1.3.6.1.4.1.1718.3.2.2.1.3.1.4|4|TowerA_Neutral
1.3.6.1.4.1.1718.3.2.2.1.4.1.1|4x|c000
1.3.6.1.4.1.1718.3.2.2.1.4.1.2|4x|c000
1.3.6.1.4.1.1718.3.2.2.1.4.1.3|4x|c000
1.3.6.1.4.1.1718.3.2.2.1.4.1.4|4x|c000
1.3.6.1.4.1.1718.3.2.2.1.5.1.1|2|1
1.3.6.1.4.1.1718.3.2.2.1.5.1.2|2|1
1.3.6.1.4.1.1718.3.2.2.1.5.1.3|2|1
1.3.6.1.4.1.1718.3.2.2.1.5.1.4|2|1
1.3.6.1.4.1.1718.3.2.2.1.6.1.1|2|0
1.3.6.1.4.1.1718.3.2.2.1.6.1.2|2|0
1.3.6.1.4.1.1718.3.2.2.1.6.1.3|2|0
1.3.6.1.4.1.1718.3.2.2.1.6.1.4|2|0
1.3.6.1.4.1.1718.3.2.2.1.7.1.1|2|111
1.3.6.1.4.1.1718.3.2.2.1.7.1.2|2|40
1.3.6.1.4.1.1718.3.2.2.1.7.1.3|2|59
1.3.6.1.4.1.1718.3.2.2.1.7.1.4|2|212
1.3.6.1.4.1.1718.3.2.2.1.8.1.1|2|8
1.3.6.1.4.1.1718.3.2.2.1.8.1.2|2|8
1.3.6.1.4.1.1718.3.2.2.1.8.1.3|2|8
1.3.6.1.4.1.1718.3.2.2.1.8.1.4|2|8
1.3.6.1.4.1.1718.3.2.2.1.9.1.1|2|0
1.3.6.1.4.1.1718.3.2.2.1.9.1.2|2|0
1.3.6.1.4.1.1718.3.2.2.1.9.1.3|2|0
1.3.6.1.4.1.1718.3.2.2.1.9.1.4|2|0
1.3.6.1.4.1.1718.3.2.2.1.10.1.1|2|10
1.3.6.1.4.1.1718.3.2.2.1.10.1.2|2|10
1.3.6.1.4.1.1718.3.2.2.1.10.1.3|2|10
1.3.6.1.4.1.1718.3.2.2.1.10.1.4|2|10
1.3.6.1.4.1.1718.3.2.2.1.11.1.1|2|2300
1.3.6.1.4.1.1718.3.2.2.1.11.1.2|2|2300
1.3.6.1.4.1.1718.3.2.2.1.11.1.3|2|2300
1.3.6.1.4.1.1718.3.2.2.1.11.1.4|2|-1
1.3.6.1.4.1.1718.3.2.2.1.12.1.1|2|147
1.3.6.1.4.1.1718.3.2.2.1.12.1.2|2|53
1.3.6.1.4.1.1718.3.2.2.1.12.1.3|2|78
1.3.6.1.4.1.1718.3.2.2.1.12.1.4|2|-1
1.3.6.1.4.1.1718.3.2.4.1.2.1|4|A
1.3.6.1.4.1.1718.3.2.4.1.3.1|4|Environmental_Monitor_A
1.3.6.1.4.1.1718.3.2.4.1.4.1|2|0
1.3.6.1.4.1.1718.3.2.4.1.12.1|2|2
1.3.6.1.4.1.1718.3.2.4.1.13.1|2|0
1.3.6.1.4.1.1718.3.2.5.1.2.1.1|4|A1
1.3.6.1.4.1.1718.3.2.5.1.2.1.2|4|A2
1.3.6.1.4.1.1718.3.2.5.1.3.1.1|4|Temp_Humid_Sensor_A1
1.3.6.1.4.1.1718.3.2.5.1.3.1.2|4|Temp_Humid_Sensor_A2
1.3.6.1.4.1.1718.3.2.5.1.4.1.1|2|1
1.3.6.1.4.1.1718.3.2.5.1.4.1.2|2|1
1.3.6.1.4.1.1718.3.2.5.1.5.1.1|2|1
1.3.6.1.4.1.1718.3.2.5.1.5.1.2|2|1
1.3.6.1.4.1.1718.3.2.5.1.6.1.1|2|-1
1.3.6.1.4.1.1718.3.2.5.1.6.1.2|2|-1
1.3.6.1.4.1.1718.3.2.5.1.7.1.1|2|5
1.3.6.1.4.1.1718.3.2.5.1.7.1.2|2|5
1.3.6.1.4.1.1718.3.2.5.1.8.1.1|2|45
1.3.6.1.4.1.1718.3.2.5.1.8.1.2|2|45
1.3.6.1.4.1.1718.3.2.5.1.9.1.1|2|1
1.3.6.1.4.1.1718.3.2.5.1.9.1.2|2|1
1.3.6.1.4.1.1718.3.2.5.1.10.1.1|2|-1
1.3.6.1.4.1.1718.3.2.5.1.10.1.2|2|-1
1.3.6.1.4.1.1718.3.2.5.1.11.1.1|2|10
1.3.6.1.4.1.1718.3.2.5.1.11.1.2|2|10
1.3.6.1.4.1.1718.3.2.5.1.12.1.1|2|90
1.3.6.1.4.1.1718.3.2.5.1.12.1.2|2|90
1.3.6.1.4.1.1718.3.2.5.1.13.1.1|2|0
1.3.6.1.4.1.1718.3.2.5.1.13.1.2|2|0
1.3.6.1.4.1.1718.3.2.5.1.14.1.1|2|1
1.3.6.1.4.1.1718.3.2.5.1.14.1.2|2|1
1.3.6.1.4.1.1718.3.2.5.1.15.1.1|2|2
1.3.6.1.4.1.1718.3.2.5.1.15.1.2|2|2
1.3.6.1.4.1.1718.3.99.1.0|4|
1.3.6.1.4.1.1718.3.99.2.0|2|0
tests/snmpsim/sentry3_switched.snmprec
+33
View File
@@ -295,6 +295,9 @@
1.3.6.1.4.1.1718.3.2.2.1.2.1.1|4|AA
1.3.6.1.4.1.1718.3.2.2.1.2.1.2|4|AB
1.3.6.1.4.1.1718.3.2.2.1.2.1.3|4|AC
1.3.6.1.4.1.1718.3.2.2.1.3.1.1|4|TowerA_InfeedA
1.3.6.1.4.1.1718.3.2.2.1.3.1.2|4|TowerA_InfeedB
1.3.6.1.4.1.1718.3.2.2.1.3.1.3|4|TowerA_InfeedC
1.3.6.1.4.1.1718.3.2.2.1.7.1.1|2|309
1.3.6.1.4.1.1718.3.2.2.1.7.1.2|2|392
1.3.6.1.4.1.1718.3.2.2.1.7.1.3|2|434
@@ -337,6 +340,36 @@
1.3.6.1.4.1.1718.3.2.3.1.2.1.3.8|4|AC8
1.3.6.1.4.1.1718.3.2.3.1.2.1.3.9|4|AC9
1.3.6.1.4.1.1718.3.2.3.1.2.1.3.10|4|AC10
1.3.6.1.4.1.1718.3.2.3.1.3.1.1.1|4|Outlet AA1
1.3.6.1.4.1.1718.3.2.3.1.3.1.1.2|4|Outlet AA2
1.3.6.1.4.1.1718.3.2.3.1.3.1.1.3|4|Outlet AA3
1.3.6.1.4.1.1718.3.2.3.1.3.1.1.4|4|Outlet AA4
1.3.6.1.4.1.1718.3.2.3.1.3.1.1.5|4|Outlet AA5
1.3.6.1.4.1.1718.3.2.3.1.3.1.1.6|4|Outlet AA6
1.3.6.1.4.1.1718.3.2.3.1.3.1.1.7|4|Outlet AA7
1.3.6.1.4.1.1718.3.2.3.1.3.1.1.8|4|Outlet AA8
1.3.6.1.4.1.1718.3.2.3.1.3.1.1.9|4|Outlet AA9
1.3.6.1.4.1.1718.3.2.3.1.3.1.1.10|4|Outlet AA10
1.3.6.1.4.1.1718.3.2.3.1.3.1.2.1|4|Outlet AB1
1.3.6.1.4.1.1718.3.2.3.1.3.1.2.2|4|Outlet AB2
1.3.6.1.4.1.1718.3.2.3.1.3.1.2.3|4|Outlet AB3
1.3.6.1.4.1.1718.3.2.3.1.3.1.2.4|4|Outlet AB4
1.3.6.1.4.1.1718.3.2.3.1.3.1.2.5|4|Outlet AB5
1.3.6.1.4.1.1718.3.2.3.1.3.1.2.6|4|Outlet AB6
1.3.6.1.4.1.1718.3.2.3.1.3.1.2.7|4|Outlet AB7
1.3.6.1.4.1.1718.3.2.3.1.3.1.2.8|4|Outlet AB8
1.3.6.1.4.1.1718.3.2.3.1.3.1.2.9|4|Outlet AB9
1.3.6.1.4.1.1718.3.2.3.1.3.1.2.10|4|Outlet AB10
1.3.6.1.4.1.1718.3.2.3.1.3.1.3.1|4|Outlet AC1
1.3.6.1.4.1.1718.3.2.3.1.3.1.3.2|4|Outlet AC2
1.3.6.1.4.1.1718.3.2.3.1.3.1.3.3|4|Outlet AC3
1.3.6.1.4.1.1718.3.2.3.1.3.1.3.4|4|Outlet AC4
1.3.6.1.4.1.1718.3.2.3.1.3.1.3.5|4|Outlet AC5
1.3.6.1.4.1.1718.3.2.3.1.3.1.3.6|4|Outlet AC6
1.3.6.1.4.1.1718.3.2.3.1.3.1.3.7|4|Outlet AC7
1.3.6.1.4.1.1718.3.2.3.1.3.1.3.8|4|Outlet AC8
1.3.6.1.4.1.1718.3.2.3.1.3.1.3.9|4|Outlet AC9
1.3.6.1.4.1.1718.3.2.3.1.3.1.3.10|4|Outlet AC10
1.3.6.1.4.1.1718.3.2.3.1.7.1.1.1|2|0
1.3.6.1.4.1.1718.3.2.3.1.7.1.1.2|2|0
1.3.6.1.4.1.1718.3.2.3.1.7.1.1.3|2|0