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.

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

Support flattened data_stream.* fields under Elastic-Agent #36516

Merged
merged 1 commit into from
Sep 11, 2023

Conversation

belimawr
Copy link
Contributor

@belimawr belimawr commented Sep 5, 2023

Proposed commit message

When an input configuration comes from Elastic-Agent the data_stream.* fields sometimes are flattened (e.g: data_stream.dataset: mystuff), this was not supported by Beats.

This commit enables support for it.

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.

## Author's Checklist

How to test this PR locally

Configure a standalone Elastic-Agent with a flattened data_stream field, like this:

inputs:
  - type: filestream
    id: unique-id-per-input
    data_stream.dataset: mystuff
    paths:
      - /var/log/my-file/my.log*

Run the Elastic-Agent and assert that the dataset from the events is mystuff.

Related issues

## Use cases
## Screenshots
## Logs

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

mergify bot commented Sep 5, 2023

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @belimawr? 🙏.
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 Sep 5, 2023

💚 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-09-06T09:58:21.226+0000

  • Duration: 65 min 56 sec

Test stats 🧪

Test Results
Failed 0
Passed 8314
Skipped 381
Total 8695

💚 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!)

When an input configuration comes from Elastic-Agent the data_stream.*
fields sometimes are flattened (e.g: data_stream.dataset: mystuff),
this was not supported by Beats.

This commit enables support for it.
@belimawr belimawr marked this pull request as ready for review September 6, 2023 09:59
@belimawr belimawr requested a review from a team as a code owner September 6, 2023 09:59
@pierrehilbert pierrehilbert added the Team:Elastic-Agent Label for the Agent team label Sep 6, 2023
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 6, 2023
Copy link
Contributor

@leehinman leehinman left a comment

Choose a reason for hiding this comment

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

LGTM

@belimawr belimawr merged commit f4535a4 into elastic:main Sep 11, 2023
52 checks passed
Type: "my type",
},
},
"mix of flattened and data_stream": {
Copy link
Member

Choose a reason for hiding this comment

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

Glad to see we test the mixed scenario 👍

belimawr added a commit that referenced this pull request Sep 18, 2023
cmacknz pushed a commit that referenced this pull request Sep 18, 2023
Scholar-Li pushed a commit to Scholar-Li/beats that referenced this pull request Feb 5, 2024
…6516)

When an input configuration comes from Elastic-Agent the data_stream.*
fields sometimes are flattened (e.g: data_stream.dataset: mystuff),
this was not supported by Beats.

This commit enables support for it.
Scholar-Li pushed a commit to Scholar-Li/beats that referenced this pull request Feb 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Team:Elastic-Agent Label for the Agent team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support flattened data_stream fields
5 participants