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

Add container fields #31020

Merged
merged 2 commits into from
Mar 28, 2022
Merged

Add container fields #31020

merged 2 commits into from
Mar 28, 2022

Conversation

tetianakravchenko
Copy link
Contributor

@tetianakravchenko tetianakravchenko commented Mar 28, 2022 •
edited
Loading

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

What does this PR do?

make use of new container ECS fields added in ECS 8.2.
Upgrade to version 8.2 cause an error: "Limit of total fields [10000] has been exceeded"

Decision for now: Instead of adding all of 8.2, can we just add a single field and have a follow up discussion on updating to newest version of ECS.

Why is it important?

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

@tetianakravchenko
add container fields
80a3563 
Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
@tetianakravchenko tetianakravchenko requested review from a team as code owners March 28, 2022 13:03
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Mar 28, 2022
@mergify
Copy link
Contributor

mergify bot commented Mar 28, 2022

This pull request does not have a backport label. Could you fix it @tetianakravchenko? 🙏
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 Mar 28, 2022
@tetianakravchenko
add pr number
98a432d 
Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
@tetianakravchenko tetianakravchenko added the backport-v8.2.0 Automated backport with mergify label Mar 28, 2022
@mergify mergify bot removed the backport-skip Skip notification from the automated backport with mergify label Mar 28, 2022
@elasticmachine
Copy link
Collaborator

elasticmachine commented Mar 28, 2022 •
edited by jenkins-beats-ci bot
Loading

❕ Build Aborted

There is a new build on-going so the previous on-going builds have been aborted.

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

Expand to view the summary

Build stats

  • Start Time: 2022-03-28T13:03:40.599+0000

  • Duration: 109 min 24 sec

Test stats 🧪

Test Results
Failed 0
Passed 21972
Skipped 1934
Total 23906

Steps errors 13

Expand to view the steps failures

Show only the first 10 steps failures

Checks if running on a Unix-like node
  • Took 0 min 0 sec . View more details here
  • Description: String index out of range: -1
Checks if running on a Unix-like node
  • Took 0 min 0 sec . View more details here
  • Description: String index out of range: -1
Checks if running on a Unix-like node
  • Took 0 min 0 sec . View more details here
  • Description: String index out of range: -1
Checks if running on a Unix-like node
  • Took 0 min 0 sec . View more details here
  • Description: String index out of range: -1
Checks if running on a Unix-like node
  • Took 0 min 0 sec . View more details here
  • Description: String index out of range: -1
Checks if running on a Unix-like node
  • Took 0 min 0 sec . View more details here
  • Description: String index out of range: -1
Checks if running on a Unix-like node
  • Took 0 min 0 sec . View more details here
  • Description: String index out of range: -1
Checks if running on a Unix-like node
  • Took 0 min 0 sec . View more details here
  • Description: String index out of range: -1
Checks if running on a Unix-like node
  • Took 0 min 0 sec . View more details here
  • Description: String index out of range: -1
Checks if running on a Unix-like node
  • Took 0 min 0 sec . View more details here
  • Description: String index out of range: -1

🤖 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 tetianakravchenko added the Team:Cloudnative-Monitoring Label for the Cloud Native Monitoring team label Mar 28, 2022
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Mar 28, 2022
tetianakravchenko
tetianakravchenko commented Mar 28, 2022
View reviewed changes
metricbeat/tests/system/test_base.py
@@ -85,28 +85,6 @@ def test_dashboards(self):
assert exit_code == 0, 'Error output: ' + self.get_log()
assert self.log_contains("Kibana dashboards successfully loaded.")

@unittest.skipUnless(INTEGRATION_TESTS, "integration test")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

the similar test was already removed in filebeats - #28870, it should be removed here as well as it tests migration from 6.x to 7.x that is not supported in 8.x

@tetianakravchenko tetianakravchenko merged commit 74eee57 into elastic:main Mar 28, 2022
This was referenced Apr 11, 2022
Merged
Closed
kush-elastic pushed a commit to kush-elastic/beats that referenced this pull request May 2, 2022
@tetianakravchenko @kush-elastic
Add container fields (elastic#31020)
b8112e2 
* add container fields

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

* add pr number

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
chrisberkhout pushed a commit that referenced this pull request Jun 1, 2023
@tetianakravchenko @chrisberkhout
Add container fields (#31020)
bbd195c 
* add container fields

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

* add pr number

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MichaelKatsoulis MichaelKatsoulis MichaelKatsoulis approved these changes

@ChrsMark ChrsMark Awaiting requested review from ChrsMark

Assignees

@tetianakravchenko tetianakravchenko

Labels
backport-v8.2.0 Automated backport with mergify Team:Cloudnative-Monitoring Label for the Cloud Native Monitoring team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tetianakravchenko @elasticmachine @MichaelKatsoulis