Add Traefik json log support #358
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
What was done: 1. Expanded import_logs.py to auto recognize and import Traefik json log files. 2. Modified the NGINX json support, made the autodetect function more specific. It was to generic. All json formatted logs where seen as NGINX logs. 3. Added tests for Traefik log importing.
What was done: * The get_all method was returning the raw json without any key mapping. Fixed that. This meant also changing the names in test_main.yml * changed log file form CLF to LF
|
@sethlinnkuleuven I've fixed the test action to run correctly again. Would you mind pulling in the latest changes, so we can see if they pass here? |
Update test action (matomo-org#359)
|
Ok, I pulled your changes, lets have another run. Thanks! |
sgiehl
approved these changes
Sep 7, 2023
There was a problem hiding this comment.
Looks good to me. Tests are passing, so should be good to go.
Thanks for the contribution @sethlinnkuleuven
sgiehl
pushed a commit
that referenced
this pull request
Oct 2, 2023
* Add Traefik JSON log format * Add Traefik JSON log format * Add Traefik json log support. What was done: 1. Expanded import_logs.py to auto recognize and import Traefik json log files. 2. Modified the NGINX json support, made the autodetect function more specific. It was to generic. All json formatted logs where seen as NGINX logs. 3. Added tests for Traefik log importing. * Fixed failing tests and refactored get_all method What was done: * The get_all method was returning the raw json without any key mapping. Fixed that. This meant also changing the names in test_main.yml * changed log file form CLF to LF --------- Co-authored-by: David Patiashvili <stratagem.david@gmail.com>
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.
Description:
This builds on pull request #322 (which can be deleted if this is accepted) This pull request adds support for the Traefik json log format, not to be confused with the Traefik common log.
What was done: