Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Additional TPLink JetStream mem/cpu support #9829

Merged
merged 2 commits into from Feb 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions includes/definitions/jetstream.yaml
Expand Up @@ -6,4 +6,7 @@ mib_dir:
- tplink
discovery:
- sysObjectID:
- .1.3.6.1.4.1.11863.5.28
- .1.3.6.1.4.1.11863.5.31
- .1.3.6.1.4.1.11863.5.34
- .1.3.6.1.4.1.11863.5.86
100 changes: 100 additions & 0 deletions tests/data/jetstream_t1600g-18ts.json
@@ -0,0 +1,100 @@
{
"os": {
"discovery": {
"devices": [
{
"sysName": "<private>",
"sysObjectID": ".1.3.6.1.4.1.11863.5.86",
"sysDescr": "JetStream 16-Port Gigabit Smart Switch with 2 SFP Slots",
"sysContact": null,
"version": null,
"hardware": null,
"features": null,
"os": "jetstream",
"type": "network",
"serial": null,
"icon": "tplink.svg",
"location": null
}
]
},
"poller": {
"devices": [
{
"sysName": "<private>",
"sysObjectID": ".1.3.6.1.4.1.11863.5.86",
"sysDescr": "JetStream 16-Port Gigabit Smart Switch with 2 SFP Slots",
"sysContact": "<private>",
"version": null,
"hardware": null,
"features": null,
"os": "jetstream",
"type": "network",
"serial": null,
"icon": "tplink.svg",
"location": "<private>"
}
]
}
},
"processors": {
"discovery": {
"processors": [
{
"entPhysicalIndex": 0,
"hrDeviceIndex": 0,
"processor_oid": ".1.3.6.1.4.1.11863.6.4.1.1.1.1.2.1",
"processor_index": "1",
"processor_type": "jetstream",
"processor_usage": 90,
"processor_descr": "Proc #1",
"processor_precision": 1,
"processor_perc_warn": 75
}
]
},
"poller": "matches discovery"
},
"mempools": {
"discovery": {
"mempools": [
{
"mempool_index": "1",
"entPhysicalIndex": null,
"hrDeviceIndex": null,
"mempool_type": "jetstream",
"mempool_precision": 1,
"mempool_descr": "Memory #1",
"mempool_perc": 0,
"mempool_used": 0,
"mempool_free": 0,
"mempool_total": 0,
"mempool_largestfree": null,
"mempool_lowestfree": null,
"mempool_deleted": 0,
"mempool_perc_warn": 75
}
]
},
"poller": {
"mempools": [
{
"mempool_index": "1",
"entPhysicalIndex": null,
"hrDeviceIndex": null,
"mempool_type": "jetstream",
"mempool_precision": 1,
"mempool_descr": "Memory #1",
"mempool_perc": 75,
"mempool_used": 75,
"mempool_free": 25,
"mempool_total": 100,
"mempool_largestfree": null,
"mempool_lowestfree": null,
"mempool_deleted": 0,
"mempool_perc_warn": 75
}
]
}
}
}
11 changes: 11 additions & 0 deletions tests/snmpsim/jetstream_t1600g-18ts.snmprec
@@ -0,0 +1,11 @@
1.3.6.1.2.1.1.1.0|4|JetStream 16-Port Gigabit Smart Switch with 2 SFP Slots
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.11863.5.86
1.3.6.1.2.1.1.3.0|67|925826977
1.3.6.1.2.1.1.4.0|4|<private>
1.3.6.1.2.1.1.5.0|4|<private>
1.3.6.1.2.1.1.6.0|4|<private>
1.3.6.1.4.1.11863.6.4.1.1.1.1.1.1|2|1
1.3.6.1.4.1.11863.6.4.1.1.1.1.2.1|2|90
1.3.6.1.4.1.11863.6.4.1.1.1.1.3.1|2|90
1.3.6.1.4.1.11863.6.4.1.1.1.1.4.1|2|90
1.3.6.1.4.1.11863.6.4.1.2.1.1.2.1|2|75
11 changes: 11 additions & 0 deletions tests/snmpsim/jetstream_t1600g-28ts.snmprec
@@ -0,0 +1,11 @@
1.3.6.1.2.1.1.1.0|4|JetStream 24-Port Gigabit Smart Switch with 4 SFP Slots
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.11863.5.28
1.3.6.1.2.1.1.3.0|67|27261695
1.3.6.1.2.1.1.4.0|4|<private>
1.3.6.1.2.1.1.5.0|4|<private>
1.3.6.1.2.1.1.6.0|4|<private>
1.3.6.1.4.1.11863.6.4.1.1.1.1.1.1|2|1
1.3.6.1.4.1.11863.6.4.1.1.1.1.2.1|2|90
1.3.6.1.4.1.11863.6.4.1.1.1.1.3.1|2|90
1.3.6.1.4.1.11863.6.4.1.1.1.1.4.1|2|90
1.3.6.1.4.1.11863.6.4.1.2.1.1.2.1|2|75
11 changes: 11 additions & 0 deletions tests/snmpsim/jetstream_t1700g-28tq.snmprec
@@ -0,0 +1,11 @@
1.3.6.1.2.1.1.1.0|4|JetStream 24-Port Gigabit Stackable Smart Switch with 4 10GE SFP+ Slots
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.11863.5.31
1.3.6.1.2.1.1.3.0|67|27261695
1.3.6.1.2.1.1.4.0|4|<private>
1.3.6.1.2.1.1.5.0|4|<private>
1.3.6.1.2.1.1.6.0|4|<private>
1.3.6.1.4.1.11863.6.4.1.1.1.1.1.1|2|1
1.3.6.1.4.1.11863.6.4.1.1.1.1.2.1|2|90
1.3.6.1.4.1.11863.6.4.1.1.1.1.3.1|2|90
1.3.6.1.4.1.11863.6.4.1.1.1.1.4.1|2|90
1.3.6.1.4.1.11863.6.4.1.2.1.1.2.1|2|75
2 changes: 0 additions & 2 deletions tests/snmpsim/tplink_t1600g-28ts.snmprec

This file was deleted.