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

Stp module rewrite (#13570)

Browse Source 
* STP module rewrite WIP

* Finish rewrite

* Ignore disabled and log root/topology changes

* Remove interfaces for now

* fix style

* Lint fixes

* Document ResolvesPortIds and hide map functions

* whitespace fixes

* Revert to stpInstances in case someone writes mstp support

* missed one

* phpstan fixes

* Handle table and oids separately

* forgot to register observer

* Test data and correct non-table handling in SnmpResponse->table()

* update test

* test data

* revert aos7 silly things

* minimal polling

* Update test data

* order ports_ntp and rename new field to port_index

* forgot the db_schema

* revert ciena-sds port things

* MSTP support, maybe

* Adding test data

* Filter bad lines instead of discarding the entire snmp response
and capture fixes and test data

* fresh data

* add os data

* update data, ignore unfound ports, obviously bad device implementation.

* fixes

* Ignore context files in os detection test

* Remove empty table data

* add ciena-sds vlan

* designatedCost column is too small

* Update stp webui

* Refactor code to interfaces, to allow vendor mibs

* update schema

* fix issues added by abstraction

* STP fixes

* Default to no context for vlan 1

* never store vlan 1

* Update test data

* remove eltex brokenness

* fix style

* fix stan

* Fix Rewrite MAC to Hex padding with floats

* fix sqlite migration
This commit is contained in:
Tony Murray
2022-01-30 16:28:18 -06:00
committed by GitHub
parent 2dbfdda717
commit 29bd6789cb
134 changed files with 25087 additions and 2166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
LibreNMS/Data/Source/NetSnmpQuery.php
View File

@@ -133,13 +133,13 @@ class NetSnmpQuery implements SnmpQueryInterface
* Set a context for the snmp query
* This is most commonly used to fetch alternate sets of data, such as different VRFs
*
* @param string $v2 Version 2/3 context name
* @param string|null $v3 Version 3 context name if different from v2 context name
* @param string|null $v2 Version 2/3 context name
* @param string|null $v3_prefix Optional context prefix to prepend for Version 3 queries
* @return \LibreNMS\Data\Source\SnmpQueryInterface
*/
public function context(string $v2, string $v3 = null): SnmpQueryInterface
public function context(?string $v2, ?string $v3_prefix = null): SnmpQueryInterface
{
$this->context = $this->device->snmpver === 'v3' && $v3 !== null ? $v3 : $v2;
$this->context = ($this->device->snmpver === 'v3' ? $v3_prefix : '') . $v2;
return $this;
}

29
LibreNMS/Data/Source/SnmpResponse.php
View File

@@ -160,9 +160,17 @@ class SnmpResponse
public function table(int $group = 0, array &$array = []): array
{
foreach ($this->values() as $key => $value) {
preg_match_all('/([^[\]]+)/', $key, $parts);
$parts = $parts[1];
array_splice($parts, $group, 0, array_shift($parts)); // move the oid name to the correct depth
if (Str::contains($key, '[')) {
// table
preg_match_all('/([^[\]]+)/', $key, $parts);
$parts = $parts[1]; // get all group 1 matches
} else {
// regular oid
$parts = explode('.', $key);
}
// move the oid name to the correct depth
array_splice($parts, $group, 0, array_shift($parts));
// merge the parts into an array, creating keys if they don't exist
$tmp = &$array;
@@ -182,7 +190,7 @@ class SnmpResponse
*/
public function mapTable(callable $callback): Collection
{
if (! $this->isValid()) {
if (! $this->filterBadLines()->isValid()) {
return new Collection;
}
@@ -211,4 +219,17 @@ class SnmpResponse
{
return $this->exitCode;
}
/**
* Filter bad lines from the raw output, examples:
* "No Such Instance currently exists at this OID"
* "No more variables left in this MIB View (It is past the end of the MIB tree)"
*/
public function filterBadLines(): SnmpResponse
{
$this->raw = preg_replace('/^.*No Such Instance currently exists.*$/', '', $this->raw);
$this->raw = preg_replace('/\n[^\r\n]+No more variables left[^\r\n]+$/s', '', $this->raw);
return $this;
}
}