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.

Sign up for GitHub

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

Jump to bottom

Fixed ifType being removed when a port is down #9493

Merged
merged 9 commits into from Dec 12, 2018
Merged

Fixed ifType being removed when a port is down #9493

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
69aceab
Adding ifType to base_oids
PipoCanaja Nov 29, 2018
f02c9f6
Improve discovery (update ifType) and polling (save ifType)
PipoCanaja Dec 1, 2018
f059942
Merge branch 'master' of github.com:librenms/librenms into ifTypeToBase
laf Dec 5, 2018
9a6a7d3
Updated test data
laf Dec 5, 2018
91f7c94
Updated json test data
laf Dec 7, 2018
96b9882
vlan isn't filtered by default :P
murrant Dec 11, 2018
7d81e10
With default ignored ports
murrant Dec 11, 2018
7017a90
Merge remote-tracking branch 'upstream/master' into ifTypeToBase
murrant Dec 12, 2018
a4f71f8
Update newer test data
murrant Dec 12, 2018
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
8 changes: 5 additions & 3 deletions includes/discovery/ports.inc.php
View file
Open in desktop
Expand Up @@ -47,21 +47,23 @@
$ifName = $port['ifName'];
$ifAlias = $port['ifAlias'];
$ifDescr = $port['ifDescr'];
$ifType = $port['ifType'];

// Get port_id according to port_association_mode used for this device
$port_id = get_port_id($ports_mapped, $port, $port_association_mode);
if (is_port_valid($port, $device)) {
// Port newly discovered?
if (! is_array($ports_db[$port_id])) {
$port_id = dbInsert(array('device_id' => $device['device_id'], 'ifIndex' => $ifIndex, 'ifName' => $ifName, 'ifAlias' => $ifAlias, 'ifDescr' => $ifDescr), 'ports');
$port_id = dbInsert(array('device_id' => $device['device_id'], 'ifType' => $ifType, 'ifIndex' => $ifIndex, 'ifName' => $ifName, 'ifAlias' => $ifAlias, 'ifDescr' => $ifDescr), 'ports');
$ports[$port_id] = dbFetchRow('SELECT * FROM `ports` WHERE `device_id` = ? AND `port_id` = ?', array($device['device_id'], $port_id));
echo 'Adding: '.$ifName.'('.$ifIndex.')('.$port_id.')';
} // Port re-discovered after previous deletion?
elseif ($ports_db[$port_id]['deleted'] == '1') {
dbUpdate(array('deleted' => '0'), 'ports', '`port_id` = ?', array($port_id));
dbUpdate(array('deleted' => '0', 'ifType' => $ifType, 'ifName' => $ifName, 'ifAlias' => $ifAlias, 'ifDescr' => $ifDescr, 'ifIndex' => $ifIndex), 'ports', '`port_id` = ?', array($port_id));
$ports_db[$port_id]['deleted'] = '0';
echo 'U';
} else {
} else { // port is existing, let's update it with some data we have collected here
dbUpdate(array('ifType' => $ifType, 'ifName' => $ifName, 'ifAlias' => $ifAlias, 'ifDescr' => $ifDescr), 'ports', '`port_id` = ?', array($port_id));
echo '.';
}
} else {
Expand Down
1 change: 1 addition & 0 deletions includes/polling/ports.inc.php
View file
Open in desktop
Expand Up @@ -220,6 +220,7 @@

foreach ($polled_ports as $port_id => $port) {
$ifIndex = $port['ifIndex'];
$port_stats[$ifIndex]['ifType'] = $port['ifType']; // we keep it as it is not included in $base_oids

if (is_port_valid($port, $device)) {
if (!$walk_base) {
Expand Down