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

Discoverying and polling vrf #Issue280 #2820

Merged
merged 47 commits into from Feb 15, 2016
Merged

Discoverying and polling vrf #Issue280 #2820

merged 47 commits into from Feb 15, 2016

Conversation

h3n0c
Copy link

@h3n0c h3n0c commented Jan 20, 2016

Trying again to add vrf-life adaptation, made by @nicearma.

On this pull request, there is no visual, only code for discoverying and polling vrf-lite :

sql-schema
adding vrf_lite_cisco table, and context name columns for some tables
mibs for work with VRF-Lite
CISCO-BRIDGE-DOMAIN-MIB and CISCO-CONTEXT-MAPPING-MIB 
discovery :
arp-table to work with vrf-lite context (sql changes and foreach for search with the device context array)
bgp-peers for work with vrf-lite context (sql changes and foreach for search with the device context array)
function for work with vrf-lite (sql changes and foreach for search with the device context array)
ipv4-addresses for work with vrf-lite (sql changes and foreach for search with the device context array)
ipv6-addresses for work with vrf-lite (sql changes and foreach for search with the device context array)
polling :
bgp-peers change for work with vrf-lite context and change to librenms logic (no more `` for execute the code, the code now the librenms function for this) and serveral logic fix
ospf change for work with vrf-lite context and change to librenms logic and serveral logic fix
other modifications :
snmp add context if SNMP v3 and if the device have the key context_name (very important!! for work with vrf-lite context)
poller add the vrf-lite array to the device
default add discovery module to the $config array

I will check for rebase regularly. Thanks for reading

@LibreNMS-CI
Copy link

Auto-Deploy finished, Test PR at http://2820.ci.librenms.org or https://2820.ci.librenms.org

@LibreNMS-CI
Copy link

Auto-Deploy finished, Test PR at http://2820.ci.librenms.org or https://2820.ci.librenms.org

@@ -734,6 +736,7 @@ function set_debug($debug) {
$config['discovery_modules']['cisco-mac-accounting'] = 1;
$config['discovery_modules']['cisco-pw'] = 1;
$config['discovery_modules']['cisco-vrf'] = 1;
$config['discovery_modules']['cisco-vrf-lite'] = 1;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you align this config item with the others please.

@laf
Copy link
Member

laf commented Jan 24, 2016

I've made some inline comments here. Once those have been updated then you have my 👍

Whilst I can't test vrf lite, I can confirm this doesn't break anything Cisco wise.

@LibreNMS-CI
Copy link

Auto-Deploy finished, Test PR at http://2820.ci.librenms.org or https://2820.ci.librenms.org

@LibreNMS-CI
Copy link

Auto-Deploy finished, Test PR at http://2820.ci.librenms.org or https://2820.ci.librenms.org

@LibreNMS-CI
Copy link

Auto-Deploy finished, Test PR at http://2820.ci.librenms.org or https://2820.ci.librenms.org

@laf
Copy link
Member

laf commented Feb 9, 2016

If you can update your sql-schema file to 101.sql then we should be good for a merge.

@LibreNMS-CI
Copy link

Auto-Deploy finished, Test PR at http://2820.ci.librenms.org or https://2820.ci.librenms.org

@laf
Copy link
Member

laf commented Feb 10, 2016

Re-started scrut check.

@h3n0c
Copy link
Author

h3n0c commented Feb 10, 2016

@laf I don't understand your last message

@laf
Copy link
Member

laf commented Feb 10, 2016

@henocka Scrutinizer which does code check didn't run, I've restarted it that's all.

@h3n0c
Copy link
Author

h3n0c commented Feb 10, 2016

Thanks, i fix this

@LibreNMS-CI
Copy link

Auto-Deploy finished, Test PR at http://2820.ci.librenms.org or https://2820.ci.librenms.org

@laf
Copy link
Member

laf commented Feb 11, 2016

👍 from me.

@librenms/reviewers tagging. Merge in 24 hours.

@laf
Copy link
Member

laf commented Feb 12, 2016

Really sorry but this has a merge conflict because of the bgp-peers update we did yesterday. Can you rebase and push an update. We can merge asap at that stage.

@h3n0c
Copy link
Author

h3n0c commented Feb 14, 2016

I update the bgp-peers :)

Le ven. 12 févr. 2016 16:20, Neil Lathwood notifications@github.com a
écrit :

Really sorry but this has a merge conflict because of the bgp-peers update
we did yesterday. Can you rebase and push an update. We can merge asap at
that stage.


Reply to this email directly or view it on GitHub
#2820 (comment).

@LibreNMS-CI
Copy link

Auto-Deploy finished, Test PR at http://2820.ci.librenms.org or https://2820.ci.librenms.org

laf added a commit that referenced this pull request Feb 15, 2016
Discoverying and polling vrf #Issue280
@laf laf merged commit a572bc4 into librenms:master Feb 15, 2016
@nicearma
Copy link
Contributor

@henocka Congrats

@h3n0c
Copy link
Author

h3n0c commented Feb 15, 2016

Thanks @nicearma !
Tu as fait du bon boulot. Merci

@laf
Copy link
Member

laf commented Feb 16, 2016

FYI we've had to revert some of the code in includes/polling/bgp-peers.inc.php as it was affecting junos ipv6 peers.

#3011 and #3010

@laf
Copy link
Member

laf commented Feb 17, 2016

We've had to do another revert #3028 from this PR.

@lock lock bot locked as resolved and limited conversation to collaborators Jan 22, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants