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

Cherry-pick #28868 to 7.17: Enhance add_kubernetes_metadata matcher #30526

Merged
merged 2 commits into from
Feb 23, 2022

Conversation

tetianakravchenko
Copy link
Contributor

@tetianakravchenko tetianakravchenko commented Feb 22, 2022

Cherry-pick of PR #28868 to 7.17 branch. Original message:

Signed-off-by: Tetiana Kravchenko tetiana.kravchenko@elastic.co

What does this PR do?

  • add documentation for add_kubernetes_metadata matcher;
  • support /var/log/pods/ for resource_type: pod

Why is it important?

to improve understanding on how add_kubernetes_metadata works and which logs_path are supported for available resource_type

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

Related issues

Use cases

Screenshots

Logs

* add documentation for add_kubernetes_metadata matcher; support 'var/log/pods' for resource_type: pod

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

* Apply suggestions from code review

Co-authored-by: Chris Mark <chrismarkou92@gmail.com>

* add record to CHANGELOG.next.asciidoc

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

* address comments: log pod id instead of array; log event

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

* add validation for logs_path matchers config

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

* add comment for the config validation check

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

* set different sourcePath for windows in tests

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>

Co-authored-by: Chris Mark <chrismarkou92@gmail.com>
(cherry picked from commit ac8275f)
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Feb 22, 2022
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations (Team:Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Feb 22, 2022
@elasticmachine
Copy link
Collaborator

elasticmachine commented Feb 22, 2022

💚 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: 2022-02-23T08:25:30.558+0000

  • Duration: 95 min 17 sec

Test stats 🧪

Test Results
Failed 0
Passed 34404
Skipped 3944
Total 38348

💚 Flaky test report

Tests succeeded.

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

@tetianakravchenko
Copy link
Contributor Author

/test

@tetianakravchenko tetianakravchenko merged commit fedc4a2 into elastic:7.17 Feb 23, 2022
@luigibk
Copy link

luigibk commented Feb 23, 2022

Thanks @tetianakravchenko, will this be released with 7.17.1?

@zube zube bot removed the [zube]: Done label May 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Team:Integrations Label for the Integrations team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants