Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Merge 4.x changes into 5.x #361

Merged
merged 2 commits into from
Oct 2, 2023
Merged

Merge 4.x changes into 5.x #361

merged 2 commits into from
Oct 2, 2023

Conversation

tsteur
Copy link
Member

@tsteur tsteur commented Oct 1, 2023

Review

sgiehl and others added 2 commits September 6, 2023 09:20
@sgiehl
Update test action (#359)
132ee12 
* Update test action

* fix older versions

* fix action
@sethlinnkuleuven @davaxi
Add Traefik json log support (#358)
4d87cd0 
* 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 <[email protected]>
@tsteur tsteur requested a review from sgiehl October 1, 2023 19:03
michalkleiner
michalkleiner approved these changes Oct 1, 2023
View reviewed changes
Copy link
Contributor

@michalkleiner michalkleiner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks ok to me but I'd still leave it to Stefan for the final review.

@sgiehl sgiehl merged commit 04bf501 into 5.x-dev Oct 2, 2023
10 of 12 checks passed
@sgiehl sgiehl deleted the 4xmerge5x branch October 2, 2023 07:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michalkleiner michalkleiner michalkleiner approved these changes

@sgiehl sgiehl Awaiting requested review from sgiehl

Assignees
No one assigned
Labels
not-in-changelog
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@tsteur @michalkleiner @sgiehl @sethlinnkuleuven