Optionally import RIPE routes #23
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The ripe importer can now optionally import RIPE route data. In the context of IntelMQ, this information is useful to e.g. map IP addresses to ASNs which in turn can be mapped to contact information for notifications. This commit contains the changes for main part of this: * The download script also downloads the ripe.db.route.gz and ripe.db.route6.gz files * The database schema has a new table and index for the route information * The import code optionally loads these files and saves it into the database Notably missing is the database upgrade. Related to Intevation#15
This adds an update script for the new route_automatic table. The name script file does not include a version number like the other update scripts because it's not clear yet which version this file will be included in. Related to Intevation#15
The RIPE importer has a new command line option, --before-commit-command, whose argument is an SQL statement that is executed by the importer before the transaction that updates the RIPE data is committed. This command can be used to e.g. cleanup data that depends on the RIPE data, but which cannot be automatically updated with 'ON DELETE CASCADE' for foreign keys or similar mechanisms.
Author
|
@wagner-intevation if you had a second to have a look, it would be great |
wagner-intevation
requested changes
Jul 9, 2024
Member
wagner-intevation
left a comment
wagner-intevation
left a comment
There was a problem hiding this comment.
Thank you for this enhancement!
|
|
||
|
|
||
| def remove_old_entries(cur, verbose): | ||
| def remove_old_entries(cur, verbose, delete_route_data=False): |
Member
There was a problem hiding this comment.
Where is this new parameter used?
Member
There was a problem hiding this comment.
to answer my own question: in main.
It is set to args.import_route_data, which has a different meaning?
Comment on lines
-129
to
+134
| def insert_new_asn_org_entries(cur, asn_list, mapping): | ||
| # many-to-many table organisation <-> as number | ||
| def _generate_asn_entries(asn_list, mapping): | ||
| insert_time = datetime.now(tz=timezone.utc) |
Member
There was a problem hiding this comment.
Is this just refactoring or required for something else?
Author
There was a problem hiding this comment.
This is to give all bulk inserted entries the same import time
| @@ -0,0 +1,18 @@ | |||
| -- Update script for the route_automatic table. | |||
Member
There was a problem hiding this comment.
Please mention this in UPDATE.md
Member
There was a problem hiding this comment.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR propose merging an old change to optionally import RIPE routes, used in case of Tuency support. In addition, the query was updated to use bulk execution[1] to improve the overall performance.
It requires
psycopg2>= 2.7, which is already available even in distro packages [2].[1] https://www.psycopg.org/docs/extras.html#psycopg2.extras.execute_values
[2] https://pkgs.org/search/?q=psycopg2