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

[8.11](backport #37458) Upgrade elastic-agent-autodiscover dependency; use InitDefaults() to init default configuration #37511

Merged
merged 5 commits into from
Jan 2, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 27, 2023

This is an automatic backport of pull request #37458 done by Mergify.
Cherry-pick of 8c4a40f has failed:

On branch mergify/bp/8.11/pr-37458
Your branch is up to date with 'origin/8.11'.

You are currently cherry-picking commit 8c4a40fdbf.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   libbeat/processors/add_kubernetes_metadata/config.go
	modified:   libbeat/processors/add_kubernetes_metadata/config_test.go
	modified:   libbeat/processors/add_kubernetes_metadata/kubernetes.go
	modified:   metricbeat/docs/modules/kubernetes.asciidoc
	modified:   metricbeat/metricbeat.reference.yml
	modified:   metricbeat/module/kubernetes/_meta/config.reference.yml
	modified:   metricbeat/module/kubernetes/_meta/config.yml
	modified:   metricbeat/module/kubernetes/util/kubernetes.go
	modified:   metricbeat/modules.d/kubernetes.yml.disabled
	modified:   x-pack/metricbeat/metricbeat.reference.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…init default configuration (#37458)

* use InitDefaults(); elastic-agent-autodiscover: fix default resource metadata config - elastic/elastic-agent-autodiscover#72

Signed-off-by: Tetiana Kravchenko <[email protected]>

* revert unintended changes

Signed-off-by: Tetiana Kravchenko <[email protected]>

* upgrade elastic-agent-autodiscover lib to v0.6.6

Signed-off-by: Tetiana Kravchenko <[email protected]>

* run make update; fix linter issues

Signed-off-by: Tetiana Kravchenko <[email protected]>

* revert changes related to the 'commonMetaConfig'; add missing metadata configuration on the metricset level

Signed-off-by: Tetiana Kravchenko <[email protected]>

* x-pack/metricbeat: run make update

Signed-off-by: Tetiana Kravchenko <[email protected]>

---------

Signed-off-by: Tetiana Kravchenko <[email protected]>
(cherry picked from commit 8c4a40f)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
@mergify mergify bot requested review from a team as code owners December 27, 2023 08:55
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 27, 2023
@mergify mergify bot requested review from rdner and fearful-symmetry and removed request for a team December 27, 2023 08:55
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 27, 2023
@botelastic
Copy link

botelastic bot commented Dec 27, 2023

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

💔 Build Failed

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-12-27T08:55:37.700+0000

  • Duration: 7 min 50 sec

Steps errors 1

Expand to view the steps failures

Shell Script
  • Took 0 min 8 sec . View more details here
  • Description: HOME=/var/lib/jenkins/workspace/Beats_beats_PR-37511 GO_VERSION=1.20.11 ./dev-tools/run_with_go_ver make test-mage

❕ Flaky test report

No test was executed to be analysed.

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

Signed-off-by: Tetiana Kravchenko <[email protected]>
@elasticmachine
Copy link
Collaborator

💔 Build Failed

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-12-27T11:52:11.105+0000

  • Duration: 40 min 24 sec

Test stats 🧪

Test Results
Failed 0
Passed 299
Skipped 5
Total 304

Steps errors 205

Expand to view the steps failures

Show only the first 10 steps failures

x-pack/winlogbeat-build-windows-2019 - mage build unitTest
  • Took 0 min 20 sec . View more details here
  • Description: mage build unitTest
x-pack/winlogbeat-build-windows-2019 - mage build unitTest
  • Took 0 min 18 sec . View more details here
  • Description: mage build unitTest
x-pack/winlogbeat-build-windows-2019 - mage build unitTest
  • Took 0 min 18 sec . View more details here
  • Description: mage build unitTest
x-pack/winlogbeat-windows-2022-windows-2022 - mage build unitTest
  • Took 0 min 20 sec . View more details here
  • Description: mage build unitTest
x-pack/winlogbeat-windows-2022-windows-2022 - mage build unitTest
  • Took 0 min 17 sec . View more details here
  • Description: mage build unitTest
x-pack/winlogbeat-windows-2022-windows-2022 - mage build unitTest
  • Took 0 min 17 sec . View more details here
  • Description: mage build unitTest
x-pack/winlogbeat-windows-2016-windows-2016 - mage build unitTest
  • Took 0 min 21 sec . View more details here
  • Description: mage build unitTest
x-pack/winlogbeat-windows-2016-windows-2016 - mage build unitTest
  • Took 0 min 17 sec . View more details here
  • Description: mage build unitTest
x-pack/winlogbeat-windows-2016-windows-2016 - mage build unitTest
  • Took 0 min 17 sec . View more details here
  • Description: mage build unitTest
Error signal
  • Took 0 min 0 sec . View more details here
  • Description: Error 'hudson.AbortException: script returned exit code 1'

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

Signed-off-by: Tetiana Kravchenko <[email protected]>
@mergify mergify bot requested a review from a team as a code owner December 28, 2023 10:44
@@ -233,6 +233,7 @@ require (
cloud.google.com/go/iam v1.1.1 // indirect
cloud.google.com/go/longrunning v0.5.1 // indirect
code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f // indirect
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
Copy link
Contributor

Choose a reason for hiding this comment

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

was introduced when github.com/elastic/elastic-agent-autodiscover was upgraded from 0.6.4 to 0.6.5 #37273

@elasticmachine
Copy link
Collaborator

💔 Tests Failed

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-12-28T10:45:10.351+0000

  • Duration: 66 min 23 sec

Test stats 🧪

Test Results
Failed 8
Passed 27839
Skipped 1842
Total 29689

Test errors 8

Expand to view the tests failures

Build&Test / auditbeat-unitTest / TestExeObjParser/executableObject_macho_garble – github.com/elastic/beats/v7/auditbeat/module/file_integrity
    Expand to view the error details

     Failed 
    

    Expand to view the stacktrace

     === RUN   TestExeObjParser/executableObject_macho_garble
        exeobjparser_test.go:50: unexpected error calling exeObjParser.Parse: open ./testdata/garble_macho_executable: no such file or directory
        exeobjparser_test.go:76: unexpected error for garble_macho macho.import_hash: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.symhash: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.imports: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.imports_names_entropy: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.imports_names_var_entropy: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.go_import_hash: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.go_imports: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.go_imports_names_entropy: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.go_imports_names_var_entropy: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.go_stripped: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.sections: got:key not found want:<nil>
    --- FAIL: TestExeObjParser/executableObject_macho_garble (0.00s)
     
    

Build&Test / auditbeat-unitTest / TestExeObjParser – github.com/elastic/beats/v7/auditbeat/module/file_integrity
    Expand to view the error details

     Failed 
    

    Expand to view the stacktrace

     === RUN   TestExeObjParser
    --- FAIL: TestExeObjParser (0.05s)
     
    

Build&Test / auditbeat-rhel-9-rhel-9 / TestExeObjParser/executableObject_macho_garble – github.com/elastic/beats/v7/auditbeat/module/file_integrity
    Expand to view the error details

     Failed 
    

    Expand to view the stacktrace

     === RUN   TestExeObjParser/executableObject_macho_garble
        exeobjparser_test.go:50: unexpected error calling exeObjParser.Parse: open ./testdata/garble_macho_executable: no such file or directory
        exeobjparser_test.go:76: unexpected error for garble_macho macho.import_hash: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.symhash: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.imports: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.imports_names_entropy: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.imports_names_var_entropy: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.go_import_hash: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.go_imports: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.go_imports_names_entropy: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.go_imports_names_var_entropy: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.go_stripped: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.sections: got:key not found want:<nil>
    --- FAIL: TestExeObjParser/executableObject_macho_garble (0.00s)
     
    

Build&Test / auditbeat-rhel-9-rhel-9 / TestExeObjParser – github.com/elastic/beats/v7/auditbeat/module/file_integrity
    Expand to view the error details

     Failed 
    

    Expand to view the stacktrace

     === RUN   TestExeObjParser
    --- FAIL: TestExeObjParser (0.04s)
     
    

Build&Test / auditbeat-windows-2016-windows-2016 / TestExeObjParser/executableObject_macho_garble – github.com/elastic/beats/v7/auditbeat/module/file_integrity
    Expand to view the error details

     Failed 
    

    Expand to view the stacktrace

     === RUN   TestExeObjParser/executableObject_macho_garble
        exeobjparser_test.go:50: unexpected error calling exeObjParser.Parse: open ./testdata/garble_macho_executable: The system cannot find the file specified.
        exeobjparser_test.go:76: unexpected error for garble_macho macho.import_hash: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.symhash: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.imports: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.imports_names_entropy: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.imports_names_var_entropy: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.go_import_hash: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.go_imports: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.go_imports_names_entropy: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.go_imports_names_var_entropy: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.go_stripped: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.sections: got:key not found want:<nil>
    --- FAIL: TestExeObjParser/executableObject_macho_garble (0.00s)
     
    

Build&Test / auditbeat-windows-2016-windows-2016 / TestExeObjParser – github.com/elastic/beats/v7/auditbeat/module/file_integrity
    Expand to view the error details

     Failed 
    

    Expand to view the stacktrace

     === RUN   TestExeObjParser
    --- FAIL: TestExeObjParser (0.04s)
     
    

Build&Test / auditbeat-windows-2022-windows-2022 / TestExeObjParser/executableObject_macho_garble – github.com/elastic/beats/v7/auditbeat/module/file_integrity
    Expand to view the error details

     Failed 
    

    Expand to view the stacktrace

     === RUN   TestExeObjParser/executableObject_macho_garble
        exeobjparser_test.go:50: unexpected error calling exeObjParser.Parse: open ./testdata/garble_macho_executable: The system cannot find the file specified.
        exeobjparser_test.go:76: unexpected error for garble_macho macho.import_hash: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.symhash: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.imports: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.imports_names_entropy: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.imports_names_var_entropy: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.go_import_hash: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.go_imports: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.go_imports_names_entropy: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.go_imports_names_var_entropy: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.go_stripped: got:key not found want:<nil>
        exeobjparser_test.go:76: unexpected error for garble_macho macho.sections: got:key not found want:<nil>
    --- FAIL: TestExeObjParser/executableObject_macho_garble (0.00s)
     
    

Build&Test / auditbeat-windows-2022-windows-2022 / TestExeObjParser – github.com/elastic/beats/v7/auditbeat/module/file_integrity
    Expand to view the error details

     Failed 
    

    Expand to view the stacktrace

     === RUN   TestExeObjParser
    --- FAIL: TestExeObjParser (0.05s)
     
    

Steps errors 13

Expand to view the steps failures

Show only the first 10 steps failures

auditbeat-rhel-9-rhel-9 - mage build unitTest
  • Took 3 min 41 sec . View more details here
  • Description: mage build unitTest
auditbeat-rhel-9-rhel-9 - mage build unitTest
  • Took 1 min 42 sec . View more details here
  • Description: mage build unitTest
auditbeat-rhel-9-rhel-9 - mage build unitTest
  • Took 1 min 42 sec . View more details here
  • Description: mage build unitTest
auditbeat-windows-2022-windows-2022 - mage build unitTest
  • Took 3 min 28 sec . View more details here
  • Description: mage build unitTest
auditbeat-windows-2022-windows-2022 - mage build unitTest
  • Took 1 min 45 sec . View more details here
  • Description: mage build unitTest
auditbeat-windows-2022-windows-2022 - mage build unitTest
  • Took 1 min 46 sec . View more details here
  • Description: mage build unitTest
auditbeat-windows-2016-windows-2016 - mage build unitTest
  • Took 3 min 14 sec . View more details here
  • Description: mage build unitTest
auditbeat-windows-2016-windows-2016 - mage build unitTest
  • Took 1 min 43 sec . View more details here
  • Description: mage build unitTest
auditbeat-windows-2016-windows-2016 - mage build unitTest
  • Took 1 min 43 sec . View more details here
  • Description: mage build unitTest
Error signal
  • Took 0 min 0 sec . View more details here
  • Description: Error 'hudson.AbortException: script returned exit code 1'

🐛 Flaky test report

❕ There are test failures but not known flaky tests.

Expand to view the summary

Genuine test errors 8

💔 There are test failures but not known flaky tests, most likely a genuine test failure.

  • Name: Build&Test / auditbeat-unitTest / TestExeObjParser/executableObject_macho_garble – github.com/elastic/beats/v7/auditbeat/module/file_integrity
  • Name: Build&Test / auditbeat-unitTest / TestExeObjParser – github.com/elastic/beats/v7/auditbeat/module/file_integrity
  • Name: Build&Test / auditbeat-rhel-9-rhel-9 / TestExeObjParser/executableObject_macho_garble – github.com/elastic/beats/v7/auditbeat/module/file_integrity
  • Name: Build&Test / auditbeat-rhel-9-rhel-9 / TestExeObjParser – github.com/elastic/beats/v7/auditbeat/module/file_integrity
  • Name: Build&Test / auditbeat-windows-2016-windows-2016 / TestExeObjParser/executableObject_macho_garble – github.com/elastic/beats/v7/auditbeat/module/file_integrity
  • Name: Build&Test / auditbeat-windows-2016-windows-2016 / TestExeObjParser – github.com/elastic/beats/v7/auditbeat/module/file_integrity
  • Name: Build&Test / auditbeat-windows-2022-windows-2022 / TestExeObjParser/executableObject_macho_garble – github.com/elastic/beats/v7/auditbeat/module/file_integrity
  • Name: Build&Test / auditbeat-windows-2022-windows-2022 / TestExeObjParser – github.com/elastic/beats/v7/auditbeat/module/file_integrity

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

@elasticmachine
Copy link
Collaborator

💚 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-12-29T11:25:14.595+0000

  • Duration: 122 min 54 sec

Test stats 🧪

Test Results
Failed 0
Passed 27877
Skipped 1864
Total 29741

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

Copy link
Contributor Author

mergify bot commented Jan 1, 2024

This pull request has not been merged yet. Could you please review and merge it @tetianakravchenko? 🙏

@tetianakravchenko tetianakravchenko merged commit 5043c44 into 8.11 Jan 2, 2024
121 checks passed
@tetianakravchenko tetianakravchenko deleted the mergify/bp/8.11/pr-37458 branch January 2, 2024 09:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants