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

Don't allow underscores in variant names (#9182)

Browse Source 
* Don't allow underscores in variant names

* forgot test files

* Update test data
This commit is contained in:
Tony Murray
2018-09-11 19:21:07 -05:00
committed by GitHub
parent 32a7c50189
commit a5f2dc46b5
3 changed files with 37197 additions and 37613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/collect-snmp-data.php
View File

@@ -98,6 +98,10 @@ if (isset($options['v'])) {
$variant = $options['variant'];
}
if (str_contains($variant, '_')) {
exit("Variant name cannot contain an underscore (_).\n");
}
echo "OS: $target_os\n";
echo "Module(s): $modules_input\n";
if ($variant) {

486
tests/data/vrp_5720_vrf.json → tests/data/vrp_5720-vrf.json
View File

@@ -34386,7 +34386,7 @@
"sensor_divisor": 1000000,
"sensor_multiplier": 1,
"sensor_current": 0.0051,
"sensor_limit": 0.00765,
"sensor_limit": 0.0076500000000000005,
"sensor_limit_warn": null,
"sensor_limit_low": null,
"sensor_limit_low_warn": null,
@@ -34454,10 +34454,10 @@
"sensor_descr": "XGigabitEthernet0/0/1 Rx",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": -2.21849,
"sensor_limit": -2.10756,
"sensor_current": -2.2184874961635637,
"sensor_limit": -2.1075631213553856,
"sensor_limit_warn": null,
"sensor_limit_low": -2.32941,
"sensor_limit_low": -2.3294118709717417,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
@@ -34477,10 +34477,10 @@
"sensor_descr": "XGigabitEthernet1/0/1 Rx",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": -2.58061,
"sensor_limit": -2.45158,
"sensor_current": -2.58060922270801,
"sensor_limit": -2.4515787615726095,
"sensor_limit_warn": null,
"sensor_limit_low": -2.70964,
"sensor_limit_low": -2.709639683843411,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
@@ -34500,10 +34500,10 @@
"sensor_descr": "XGigabitEthernet2/0/1 Rx",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": -3.03644,
"sensor_limit": -2.88461,
"sensor_current": -3.036436112666679,
"sensor_limit": -2.8846143070333445,
"sensor_limit_warn": null,
"sensor_limit_low": -3.18826,
"sensor_limit_low": -3.188257918300013,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
@@ -34523,10 +34523,10 @@
"sensor_descr": "XGigabitEthernet0/0/1 Tx",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": -2.38072,
"sensor_limit": -2.26169,
"sensor_current": -2.3807216157947098,
"sensor_limit": -2.261685535004974,
"sensor_limit_warn": null,
"sensor_limit_low": -2.49976,
"sensor_limit_low": -2.4997576965844455,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
@@ -34546,10 +34546,10 @@
"sensor_descr": "XGigabitEthernet1/0/1 Tx",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": -2.21126,
"sensor_limit": -2.10069,
"sensor_current": -2.2112552799726046,
"sensor_limit": -2.100692515973974,
"sensor_limit_warn": null,
"sensor_limit_low": -2.32182,
"sensor_limit_low": -2.321818043971235,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
@@ -34569,10 +34569,10 @@
"sensor_descr": "XGigabitEthernet2/0/1 Tx",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": -2.34331,
"sensor_limit": -2.22615,
"sensor_current": -2.3433144524098592,
"sensor_limit": -2.226148729789366,
"sensor_limit_warn": null,
"sensor_limit_low": -2.46048,
"sensor_limit_low": -2.4604801750303524,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
@@ -34777,7 +34777,7 @@
"sensor_divisor": 1000,
"sensor_multiplier": 1,
"sensor_current": 3.288,
"sensor_limit": 3.7812,
"sensor_limit": 3.7811999999999997,
"sensor_limit_warn": null,
"sensor_limit_low": 2.7948,
"sensor_limit_low_warn": null,
@@ -34792,433 +34792,10 @@
],
"state_indexes": []
},
"poller": {
"sensors": [
{
"sensor_deleted": 0,
"sensor_class": "current",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2011.5.25.31.1.1.3.1.7.67469390",
"sensor_index": "67469390",
"sensor_type": "vrp",
"sensor_descr": "XGigabitEthernet0/0/1",
"sensor_divisor": 1000000,
"sensor_multiplier": 1,
"sensor_current": 0.0051,
"sensor_limit": 0.00765,
"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,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "current",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2011.5.25.31.1.1.3.1.7.68517966",
"sensor_index": "68517966",
"sensor_type": "vrp",
"sensor_descr": "XGigabitEthernet1/0/1",
"sensor_divisor": 1000000,
"sensor_multiplier": 1,
"sensor_current": 0.005498,
"sensor_limit": 0.008247,
"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,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "current",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2011.5.25.31.1.1.3.1.7.69566542",
"sensor_index": "69566542",
"sensor_type": "vrp",
"sensor_descr": "XGigabitEthernet2/0/1",
"sensor_divisor": 1000000,
"sensor_multiplier": 1,
"sensor_current": 0.006082,
"sensor_limit": 0.009123,
"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,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "dbm",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2011.5.25.31.1.1.3.1.8.67469390",
"sensor_index": "rx-67469390",
"sensor_type": "vrp",
"sensor_descr": "XGigabitEthernet0/0/1 Rx",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": -2.21849,
"sensor_limit": -2.10756,
"sensor_limit_warn": null,
"sensor_limit_low": -2.32941,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": -2.21849,
"user_func": "uw_to_dbm",
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "dbm",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2011.5.25.31.1.1.3.1.8.68517966",
"sensor_index": "rx-68517966",
"sensor_type": "vrp",
"sensor_descr": "XGigabitEthernet1/0/1 Rx",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": -2.58061,
"sensor_limit": -2.45158,
"sensor_limit_warn": null,
"sensor_limit_low": -2.70964,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": -2.58061,
"user_func": "uw_to_dbm",
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "dbm",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2011.5.25.31.1.1.3.1.8.69566542",
"sensor_index": "rx-69566542",
"sensor_type": "vrp",
"sensor_descr": "XGigabitEthernet2/0/1 Rx",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": -3.03644,
"sensor_limit": -2.88461,
"sensor_limit_warn": null,
"sensor_limit_low": -3.18826,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": -3.03644,
"user_func": "uw_to_dbm",
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "dbm",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2011.5.25.31.1.1.3.1.9.67469390",
"sensor_index": "tx-67469390",
"sensor_type": "vrp",
"sensor_descr": "XGigabitEthernet0/0/1 Tx",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": -2.38072,
"sensor_limit": -2.26169,
"sensor_limit_warn": null,
"sensor_limit_low": -2.49976,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": -2.38072,
"user_func": "uw_to_dbm",
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "dbm",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2011.5.25.31.1.1.3.1.9.68517966",
"sensor_index": "tx-68517966",
"sensor_type": "vrp",
"sensor_descr": "XGigabitEthernet1/0/1 Tx",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": -2.21126,
"sensor_limit": -2.10069,
"sensor_limit_warn": null,
"sensor_limit_low": -2.32182,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": -2.21126,
"user_func": "uw_to_dbm",
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "dbm",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2011.5.25.31.1.1.3.1.9.69566542",
"sensor_index": "tx-69566542",
"sensor_type": "vrp",
"sensor_descr": "XGigabitEthernet2/0/1 Tx",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": -2.34331,
"sensor_limit": -2.22615,
"sensor_limit_warn": null,
"sensor_limit_low": -2.46048,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": -2.34331,
"user_func": "uw_to_dbm",
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2011.5.25.31.1.1.1.1.11.67108873",
"sensor_index": "67108873",
"sensor_type": "vrp",
"sensor_descr": "MPU Board 0",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 44,
"sensor_limit": 64,
"sensor_limit_warn": null,
"sensor_limit_low": 34,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2011.5.25.31.1.1.3.1.5.67469390",
"sensor_index": "67469390",
"sensor_type": "vrp",
"sensor_descr": "XGigabitEthernet0/0/1",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 37,
"sensor_limit": 57,
"sensor_limit_warn": null,
"sensor_limit_low": 27,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2011.5.25.31.1.1.1.1.11.68157449",
"sensor_index": "68157449",
"sensor_type": "vrp",
"sensor_descr": "MPU Board 1",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 44,
"sensor_limit": 64,
"sensor_limit_warn": null,
"sensor_limit_low": 34,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2011.5.25.31.1.1.3.1.5.68517966",
"sensor_index": "68517966",
"sensor_type": "vrp",
"sensor_descr": "XGigabitEthernet1/0/1",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 40,
"sensor_limit": 60,
"sensor_limit_warn": null,
"sensor_limit_low": 30,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2011.5.25.31.1.1.1.1.11.69206025",
"sensor_index": "69206025",
"sensor_type": "vrp",
"sensor_descr": "MPU Board 2",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 43,
"sensor_limit": 63,
"sensor_limit_warn": null,
"sensor_limit_low": 33,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "temperature",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2011.5.25.31.1.1.3.1.5.69566542",
"sensor_index": "69566542",
"sensor_type": "vrp",
"sensor_descr": "XGigabitEthernet2/0/1",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 41,
"sensor_limit": 61,
"sensor_limit_warn": null,
"sensor_limit_low": 31,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "voltage",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2011.5.25.31.1.1.3.1.6.67469390",
"sensor_index": "67469390",
"sensor_type": "vrp",
"sensor_descr": "XGigabitEthernet0/0/1",
"sensor_divisor": 1000,
"sensor_multiplier": 1,
"sensor_current": 3.309,
"sensor_limit": 3.80535,
"sensor_limit_warn": null,
"sensor_limit_low": 2.81265,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "voltage",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2011.5.25.31.1.1.3.1.6.68517966",
"sensor_index": "68517966",
"sensor_type": "vrp",
"sensor_descr": "XGigabitEthernet1/0/1",
"sensor_divisor": 1000,
"sensor_multiplier": 1,
"sensor_current": 3.265,
"sensor_limit": 3.75475,
"sensor_limit_warn": null,
"sensor_limit_low": 2.77525,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "voltage",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.2011.5.25.31.1.1.3.1.6.69566542",
"sensor_index": "69566542",
"sensor_type": "vrp",
"sensor_descr": "XGigabitEthernet2/0/1",
"sensor_divisor": 1000,
"sensor_multiplier": 1,
"sensor_current": 3.288,
"sensor_limit": 3.7812,
"sensor_limit_warn": null,
"sensor_limit_low": 2.7948,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
"entPhysicalIndex": null,
"entPhysicalIndex_measured": null,
"sensor_prev": null,
"user_func": null,
"state_name": null
}
],
"state_indexes": []
}
"poller": "matches discovery"
},
"bgp-peers": {
"discovery": {
"devices": [
{
"bgpLocalAs": "65000"
}
],
"bgpPeers": [
{
"astext": "",
@@ -35228,13 +34805,15 @@
"bgpPeerAdminStatus": "stop",
"bgpLocalAddr": "0.0.0.0",
"bgpPeerRemoteAddr": "0.0.0.0",
"bgpPeerDescr": "",
"bgpPeerInUpdates": 0,
"bgpPeerOutUpdates": 0,
"bgpPeerInTotalMessages": 0,
"bgpPeerOutTotalMessages": 0,
"bgpPeerFsmEstablishedTime": 0,
"bgpPeerInUpdateElapsedTime": 0,
"context_name": ""
"context_name": "",
"bgpLocalAs": 65000
},
{
"astext": "",
@@ -35244,23 +34823,20 @@
"bgpPeerAdminStatus": "stop",
"bgpLocalAddr": "0.0.0.0",
"bgpPeerRemoteAddr": "0.0.0.0",
"bgpPeerDescr": "",
"bgpPeerInUpdates": 0,
"bgpPeerOutUpdates": 0,
"bgpPeerInTotalMessages": 0,
"bgpPeerOutTotalMessages": 0,
"bgpPeerFsmEstablishedTime": 0,
"bgpPeerInUpdateElapsedTime": 0,
"context_name": ""
"context_name": "",
"bgpLocalAs": 65000
}
],
"bgpPeers_cbgp": []
},
"poller": {
"devices": [
{
"bgpLocalAs": "65000"
}
],
"bgpPeers": [
{
"astext": "",
@@ -35270,13 +34846,15 @@
"bgpPeerAdminStatus": "start",
"bgpLocalAddr": "1.1.1.1",
"bgpPeerRemoteAddr": "0.0.0.0",
"bgpPeerDescr": "",
"bgpPeerInUpdates": 14,
"bgpPeerOutUpdates": 5,
"bgpPeerInTotalMessages": 14913,
"bgpPeerOutTotalMessages": 12975,
"bgpPeerFsmEstablishedTime": 778027,
"bgpPeerInUpdateElapsedTime": 185502,
"context_name": ""
"context_name": "",
"bgpLocalAs": 65000
},
{
"astext": "",
@@ -35286,13 +34864,15 @@
"bgpPeerAdminStatus": "start",
"bgpLocalAddr": "1.1.1.1",
"bgpPeerRemoteAddr": "0.0.0.0",
"bgpPeerDescr": "",
"bgpPeerInUpdates": 15,
"bgpPeerOutUpdates": 5,
"bgpPeerInTotalMessages": 14892,
"bgpPeerOutTotalMessages": 12975,
"bgpPeerFsmEstablishedTime": 778026,
"bgpPeerInUpdateElapsedTime": 185502,
"context_name": ""
"context_name": "",
"bgpLocalAs": 65000
}
],
"bgpPeers_cbgp": []

0
tests/snmpsim/vrp_5720_vrf.snmprec → tests/snmpsim/vrp_5720-vrf.snmprec
View File