-
-
Notifications
You must be signed in to change notification settings - Fork 99
Implement the geoip
context
#3731
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
Conversation
8f0725d
to
e9ac320
Compare
The diff here should hopefully fix the static binary build: diff --git a/nix/overlay.nix b/nix/overlay.nix
index e3c04f88be..71f1e92e81 100644
--- a/nix/overlay.nix
+++ b/nix/overlay.nix
@@ -168,6 +168,9 @@ in {
prev.writeShellScriptBin name ''
echo "stub-${name}: $@" >&2
'';
+ libmaxminddb = overrideAttrsIf isStatic prev.libmaxminddb (orig: {
+ nativeBuildInputs = (orig.nativeBuildInputs or []) ++ [prev.buildPackages.cmake];
+ });
fluent-bit = let
fluent-bit' =
overrideAttrsIf isDarwin prev.fluent-bit |
e9ac320
to
d5c8960
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is already looking pretty good. I did not look at the conversion cases in detail, for those we need a functional test that hits all of the code paths.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I missed that we already have tests in the private repo.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This works well in practice; mostly questions now to get the UX right.
bbeaf8f
to
51329fa
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is ready to be shipped. You likely need to rebase the context plugin changes after my blocking operators PR, though.
Doing that right now as we speak. |
ef265b9
to
3af5b3a
Compare
Co-authored-by: tobim <tobim@fastmail.fm>
3af5b3a
to
4cfcee9
Compare
Our integration test framework does not resolve relative data paths correctly for externally-built plugins. This causes the tests to fail in CI that work well locally. We should port these to the new framework, but that can wait for the next PR.
This change implements the
geoip
context - a built-in that reads MaxMind DB files and uses IP values in events to enrich them with the MaxMind DB geolocation data.