nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-08-01 00:24:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3255 from HenocKA/issue280b

Browse Source 
VRF Lite Support - update
This commit is contained in:
Neil Lathwood
2016-04-28 12:22:01 +01:00
parent 7066c27b0a ca9caca264
commit 6d37d36354
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/General/Changelog.md
+1
View File
@@ -86,6 +86,7 @@
- Updated visjs to 4.14.0 (PR3031) - Updated visjs to 4.14.0 (PR3031)
- Updated apps layout to use panels (PR3117) - Updated apps layout to use panels (PR3117)
- Discovery / Polling: - Discovery / Polling:
- Added VRF Lite support (PR2820)
- Added ability to ignore device sensors from entity mib (PR2862) - Added ability to ignore device sensors from entity mib (PR2862)
- Added `ifOperStatus_prev` and `ifAdminStatus_prev` values to db (PR2912) - Added `ifOperStatus_prev` and `ifAdminStatus_prev` values to db (PR2912)
- Improved bgpPolling efficiency (PR2967) - Improved bgpPolling efficiency (PR2967)
doc/Support/Discovery Support.md
+4 -1
View File
@@ -42,6 +42,7 @@ $config['discovery_modules']['ports-stack'] = 1;
$config['discovery_modules']['entity-physical'] = 1; $config['discovery_modules']['entity-physical'] = 1;
$config['discovery_modules']['processors'] = 1; $config['discovery_modules']['processors'] = 1;
$config['discovery_modules']['mempools'] = 1; $config['discovery_modules']['mempools'] = 1;
$config['discovery_modules']['cisco-vrf-lite'] = 1;
$config['discovery_modules']['ipv4-addresses'] = 1; $config['discovery_modules']['ipv4-addresses'] = 1;
$config['discovery_modules']['ipv6-addresses'] = 1; $config['discovery_modules']['ipv6-addresses'] = 1;
$config['discovery_modules']['route'] = 0; $config['discovery_modules']['route'] = 0;
@@ -57,7 +58,7 @@ $config['discovery_modules']['vlans'] = 1;
$config['discovery_modules']['cisco-mac-accounting'] = 1; $config['discovery_modules']['cisco-mac-accounting'] = 1;
$config['discovery_modules']['cisco-pw'] = 1; $config['discovery_modules']['cisco-pw'] = 1;
$config['discovery_modules']['cisco-vrf'] = 1; $config['discovery_modules']['cisco-vrf'] = 1;
#$config['discovery_modules']['cisco-cef'] = 1; #$config['discovery_modules']['cisco-cef'] = 1;
$config['discovery_modules']['cisco-sla'] = 1; $config['discovery_modules']['cisco-sla'] = 1;
$config['discovery_modules']['vmware-vminfo'] = 1; $config['discovery_modules']['vmware-vminfo'] = 1;
$config['discovery_modules']['libvirt-vminfo'] = 1; $config['discovery_modules']['libvirt-vminfo'] = 1;
@@ -81,6 +82,8 @@ $config['discovery_modules']['charge'] = 1;
`mempools`: Memory detection support for devices. `mempools`: Memory detection support for devices.
`cisco-vrf-lite`: VRF-Lite detection and support.
`ipv4-addresses`: IPv4 Address detection `ipv4-addresses`: IPv4 Address detection
`ipv6-addresses`: IPv6 Address detection `ipv6-addresses`: IPv6 Address detection
poller.php
+1
View File
@@ -134,6 +134,7 @@ if (!isset($query)) {
foreach (dbFetch($query) as $device) { foreach (dbFetch($query) as $device) {
$device = dbFetchRow("SELECT * FROM `devices` WHERE `device_id` = '".$device['device_id']."'"); $device = dbFetchRow("SELECT * FROM `devices` WHERE `device_id` = '".$device['device_id']."'");
$device['vrf_lite_cisco'] = dbFetchRows("SELECT * FROM `vrf_lite_cisco` WHERE `device_id` = '".$device['device_id']."'");
poll_device($device, $options); poll_device($device, $options);
RunRules($device['device_id']); RunRules($device['device_id']);
echo "\r\n"; echo "\r\n";