Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

Get output files when they have a suffix#1829

Merged
jsoriano merged 1 commit intoelastic:masterfrom
jsoriano:output-files-have-suffixes-now
Nov 23, 2021
Merged

Get output files when they have a suffix#1829
jsoriano merged 1 commit intoelastic:masterfrom
jsoriano:output-files-have-suffixes-now

Conversation

@jsoriano
Copy link
Copy Markdown
Member

@jsoriano jsoriano commented Nov 23, 2021 •
edited
Loading

What does this PR do?

Since elastic/beats#28927, Beats file output appends a suffix to all files, that can be also rotated.

This PR makes the following changes to address this issue:

  • Tries to get files with the suffix if they don't exist without it.
  • Configures rotation to try to avoid it.

Why is it important?

To fix autodiscover tests.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have run the Unit tests (make unit-test), and they are passing locally
  • I have run the End-2-End tests for the suite I'm working on, and they are passing locally
  • I have noticed new Go dependencies (run make notice in the proper directory)

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Nov 23, 2021

This pull request does not have a backport label. Could you fix it @jsoriano? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d./d is the label to automatically backport to the 7./d branch. /d is the digit
    NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Nov 23, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Nov 23, 2021 •
edited
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2021-11-23T16:43:07.843+0000

  • Duration: 41 min 5 sec

  • Commit: 59b38cd

Test stats 🧪

Test Results
Failed 0
Passed 248
Skipped 0
Total 248

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

@jsoriano jsoriano force-pushed the output-files-have-suffixes-now branch from ad43274 to 59b38cd Compare November 23, 2021 16:42
@jsoriano jsoriano self-assigned this Nov 23, 2021
@jsoriano jsoriano requested review from ChrsMark and kvch November 23, 2021 16:48
@jsoriano
Copy link
Copy Markdown
Member Author

jsoriano commented Nov 23, 2021

Opening for review. If this continues giving problems, maybe it is better to setup Elasticsearch and use this output, as is already done for elastic-agent scenarios.

@jsoriano jsoriano added Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team Team:Integrations Label for the Integrations team labels Nov 23, 2021
@jsoriano jsoriano marked this pull request as ready for review November 23, 2021 16:49
@jsoriano jsoriano mentioned this pull request Nov 23, 2021
Merged
6 tasks
ChrsMark
ChrsMark approved these changes Nov 23, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@ChrsMark ChrsMark left a comment

Choose a reason for hiding this comment

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

Thanks for tuning the tests! lgtm if CI is happy :)!

@jsoriano jsoriano added the backport-v8.0.0 Automated backport with mergify label Nov 23, 2021
@jsoriano jsoriano merged commit dd51a90 into elastic:master Nov 23, 2021
@jsoriano jsoriano deleted the output-files-have-suffixes-now branch November 23, 2021 17:28
mergify bot pushed a commit that referenced this pull request Nov 23, 2021
@jsoriano
Get output files when they have a suffix (#1829)
d3143a3 
(cherry picked from commit dd51a90)
@mergify mergify bot mentioned this pull request Nov 23, 2021
Merged
@mergify mergify bot removed the backport-skip Skip notification from the automated backport with mergify label Nov 23, 2021
jsoriano added a commit that referenced this pull request Nov 23, 2021
@mergify @jsoriano
Get output files when they have a suffix (#1829) (#1830)
2276545 
(cherry picked from commit dd51a90)

Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>
@jsoriano jsoriano mentioned this pull request Dec 3, 2021
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers

@kvch kvch kvch approved these changes

@ChrsMark ChrsMark ChrsMark approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@jsoriano jsoriano

Labels

backport-v8.0.0 Automated backport with mergify Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team Team:Integrations Label for the Integrations team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jsoriano @elasticmachine @kvch @ChrsMark