-
Notifications
You must be signed in to change notification settings - Fork 3.5k
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
Promtail: Add 'country' to geoip pipeline-stage #11378
Conversation
Trivy scan found the following vulnerabilities:
|
Note: Also related to the fix of PR #10256 |
I've now also added database-specific tests. To note: The minimal (1 record) testdata-databases are added for the sake of simplicity. One could also:
|
Hello @superstes , thanks for your PR. We're currently reevaluating promtails position as a project within Grafana Labs. Internally we're actually using the Agent for both metrics and logs collection at this point. Additionally, the agent team is more likely to have time to dedicate to your PR. While we haven't made a formal decision yet, we expect in the near future that all new feature work will be done in the Agent's log collection pipelines rather than in Promtail. |
@cstyan Thanks for information. |
@superstes public discussion in what sense? I'll also point out that the agent has a hard fork of promtail code, so you can likely make a very similar improvement there: https://github.com/grafana/agent/blob/b7f7c57a9420af409508eb3acc5618371b3f8107/component/loki/process/stages/geoip.go |
@cstyan 'Discussion' might've been the wrong word. Per example:
|
There should be feature parity because the Agent team took a fork of Promtail back in March 2023 and incorporated it into Grafana Agent. We’re just starting the process of trying to point requests for new features to grafana/agent. |
@JStickler Thank you for the information. |
closing since it looks like your agent pr was merged, thanks for your time @superstes we appreciate it :) |
What this PR does / why we need it:
Maxmind provides multiple GeoIP2 databases.
The three most used ones are City, Country and ASN as they are also available as free GeoLiteIP2 databases.
Some users might want/need to use the 'Country' database - so I added support for it.
A reason: If the user only has the 'Country' database licensed.
Special notes for your reviewer:
Checklist
CONTRIBUTING.md
guide (required)CHANGELOG.md
updatedSkipped because it's a
simple enhancement