make nginx-ingress-controller work with k8s #4855
Merged
Conversation
This file contains 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
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
🤖 GitHub commentsExpand to view the GitHub comments
To re-run your PR in the CI, just comment with:
|
🌐 Coverage report
|
gizas
reviewed
Dec 16, 2022
gizas
approved these changes
Dec 16, 2022
gsantoro
commented
Dec 16, 2022
| multi: false | ||
| required: true | ||
| show_user: true | ||
| default: ${kubernetes.labels.app.kubernetes.io/name} == 'ingress-nginx' | ||
| title: Nginx Ingress Controller access logs | ||
| description: Collect Nginx Ingress Controller access logs |
There was a problem hiding this comment.
I'm not sure this is correct. the name at https://kubernetes.github.io/ingress-nginx/ is Nginx Ingress Controller
ChrsMark
requested changes
Dec 19, 2022
packages/nginx_ingress_controller/data_stream/access/agent/stream/stream.yml.hbs
Outdated
Show resolved
Hide resolved
packages/nginx_ingress_controller/data_stream/access/agent/stream/stream.yml.hbs
Show resolved
Hide resolved
packages/nginx_ingress_controller/data_stream/access/agent/stream/stream.yml.hbs
Outdated
Show resolved
Hide resolved
ChrsMark
reviewed
Dec 19, 2022
|
So only #4855 (comment) seems to be a blocker by now. @gsantoro let me know when the PR is ready for a final look. |
gsantoro
commented
Dec 19, 2022
packages/nginx_ingress_controller/data_stream/access/_dev/test/system/test-default-config.yml
Outdated
Show resolved
Hide resolved
ChrsMark
approved these changes
Dec 20, 2022
|
Package nginx_ingress_controller - 1.6.0 containing this change is available at https://epr.elastic.co/search?package=nginx_ingress_controller |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What does this PR do?
Adapt the nginx-ingress-controller integration to work with logs from /var/log/containers/*.log since /var/log/nginx/access.log and /var/log/nginx/error.log are respectively symlinks to /dev/stdout and /dev/stderr.
List of changes:
logfiletofilestreamto consume from k8s logs (eg. in CRI format and symlinks) instead of static files created by nginxaccessdatastream consumes from container stdout stream whileerrordatastream consumes from container stderr stream/var/log/containers/*${kubernetes.container.id}.logfrom/var/log/nginx/ingress.log*conditionto filter all k8s container logs to only the nginx-ingress-controller podprospector.scanner.symlinksto consume from symbolic linksparsers.containerto consume container logs with either CRI or docker format. By default it usesautoformat so that the input can detect automatically which format to useChecklist
changelog.ymlfile.Author's Checklist
How to test this PR locally
Related issues