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

x-pack/filebeat: Add Instance Id to trace filename #35024

Merged
merged 11 commits into from
Apr 6, 2023
Merged

x-pack/filebeat: Add Instance Id to trace filename #35024

merged 11 commits into from
Apr 6, 2023

Conversation

bhapas
Copy link
Contributor

@bhapas bhapas commented Apr 5, 2023 •
edited
Loading

What does this PR do?

This PR adds input instance ID to the request trace filename for httpjson input type

There is a placeholder * in the filename from integrations and the input instance id is replaced.

Why is it important?

This provides different filenames to request trace files in httpjson/cel inputs

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 added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Apr 5, 2023
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Apr 5, 2023
@mergify mergify bot assigned bhapas Apr 5, 2023
@mergify
Copy link
Contributor

mergify bot commented Apr 5, 2023

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @bhapas? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

@elasticmachine
Copy link
Collaborator

elasticmachine commented Apr 5, 2023 •
edited by jenkins-beats-ci bot
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: 2023-04-06T10:02:39.658+0000

  • Duration: 73 min 44 sec

Test stats 🧪

Test Results
Failed 0
Passed 2881
Skipped 175
Total 3056

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

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

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@bhapas
Copy link
Contributor Author

bhapas commented Apr 5, 2023

/test

@bhapas bhapas marked this pull request as ready for review April 6, 2023 09:17
@bhapas bhapas requested a review from a team as a code owner April 6, 2023 09:17
@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

@bhapas bhapas added backport-skip Skip notification from the automated backport with mergify Filebeat Filebeat labels Apr 6, 2023
efd6
efd6 approved these changes Apr 6, 2023
View reviewed changes
Copy link
Contributor

@efd6 efd6 left a comment

Choose a reason for hiding this comment

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

LGTM, but please wait for another since this was my design and I would like to have that confirmed by another member of the team.

@bhapas bhapas added backport-v8.7.0 Automated backport with mergify 8.8-candidate and removed backport-skip Skip notification from the automated backport with mergify labels Apr 6, 2023
@marc-gr
Copy link
Contributor

marc-gr commented Apr 6, 2023

LGTM but adding some mention of this in the docs would be nice

@bhapas bhapas changed the title Add Instance Id to trace filename x-pack/filebeat: Add Instance Id to trace filename Apr 6, 2023
@bhapas bhapas merged commit 545f0f8 into elastic:main Apr 6, 2023
@bhapas bhapas deleted the register-hook branch April 6, 2023 11:51
mergify bot pushed a commit that referenced this pull request Apr 6, 2023
@bhapas @mergify
x-pack/filebeat: Add Instance Id to trace filename (#35024)
e19cb4f 
* Add Instance Id to trace filename

* Add for CEL input

* Add changelog

* fix lint issues

* restore lint changes

* Make * placeholder

* add docs

* update note

(cherry picked from commit 545f0f8)
@mergify mergify bot mentioned this pull request Apr 6, 2023
Merged
bhapas added a commit that referenced this pull request Apr 6, 2023
@mergify @bhapas
[8.7](backport #35024) x-pack/filebeat: Add Instance Id to trace file…
fd08baf 
…name (#35037)

* x-pack/filebeat: Add Instance Id to trace filename (#35024)

* Add Instance Id to trace filename

* Add for CEL input

* Add changelog

* fix lint issues

* restore lint changes

* Make * placeholder

* add docs

* update note

(cherry picked from commit 545f0f8)

* Update CHANGELOG.next.asciidoc

* Update CHANGELOG.next.asciidoc

---------

Co-authored-by: Bharat Pasupula <123897612+bhapas@users.noreply.github.com>
chrisberkhout pushed a commit that referenced this pull request Jun 1, 2023
@bhapas @chrisberkhout
x-pack/filebeat: Add Instance Id to trace filename (#35024)
2c8a759 
* Add Instance Id to trace filename

* Add for CEL input

* Add changelog

* fix lint issues

* restore lint changes

* Make * placeholder

* add docs

* update note
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@efd6 efd6 efd6 approved these changes

@andrewkroh andrewkroh andrewkroh left review comments

@marc-gr marc-gr marc-gr approved these changes

Assignees

@bhapas bhapas

Labels
backport-v8.7.0 Automated backport with mergify enhancement Filebeat Filebeat
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@bhapas @elasticmachine @marc-gr @andrewkroh @efd6