Skip to content

Align k8s metadata configurations in Kubernetes module: add addResourceMetadata config (backport #29133)#33148

Closed
mergify[bot] wants to merge 1 commit into7.17from
mergify/bp/7.17/pr-29133
Closed

Align k8s metadata configurations in Kubernetes module: add addResourceMetadata config (backport #29133)#33148
mergify[bot] wants to merge 1 commit into7.17from
mergify/bp/7.17/pr-29133

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Sep 21, 2022

This is an automatic backport of pull request #29133 done by Mergify.
Cherry-pick of 95bdebf has failed:

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

You are currently cherry-picking commit 95bdebf7cf.
  (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:   CHANGELOG.next.asciidoc
	modified:   libbeat/common/kubernetes/metadata/namespace_test.go
	modified:   libbeat/common/kubernetes/metadata/resource.go
	modified:   libbeat/processors/add_kubernetes_metadata/kubernetes.go
	modified:   metricbeat/module/kubernetes/_meta/config.yml
	modified:   metricbeat/module/kubernetes/util/kubernetes_test.go
	modified:   metricbeat/modules.d/kubernetes.yml.disabled

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   libbeat/autodiscover/providers/kubernetes/pod.go
	both modified:   libbeat/autodiscover/providers/kubernetes/pod_test.go
	both modified:   libbeat/common/kubernetes/metadata/metadata.go
	both modified:   libbeat/common/kubernetes/metadata/pod.go
	both modified:   libbeat/common/kubernetes/metadata/pod_test.go
	both modified:   libbeat/processors/add_kubernetes_metadata/indexers_test.go
	both modified:   metricbeat/docs/modules/kubernetes.asciidoc
	both modified:   metricbeat/metricbeat.reference.yml
	both modified:   metricbeat/module/kubernetes/_meta/config.reference.yml
	both modified:   metricbeat/module/kubernetes/util/kubernetes.go
	both modified:   x-pack/elastic-agent/pkg/composable/providers/kubernetes/pod.go
	both modified:   x-pack/metricbeat/metricbeat.reference.yml

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

@tetianakravchenko @mergify
Align k8s metadata configurations in Kubernetes module: add addResour…
2f7f614 
…ceMetadata config (#29133)

* use addResourceMetadata config instead of hardcoded bool

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

* revert config for local dev

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

* update doc; use common function to create all watchers; add nodeWatcher and nsWatcher to enricher

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

* revert ek_stack

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

* add stop watchers; adjust test for dedoting labels; fix overriding config that leads to 'failed to parse field' error

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

* adjust log messages; check that watcher is not nil

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

* fix error message format; rename getPodMetadataWatchers -> getResourceMetadataWatchers; return resource watcher if nodeWatcher/nsWatcher failed to be created

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

* add changelog

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
(cherry picked from commit 95bdebf)

# Conflicts:
#	libbeat/autodiscover/providers/kubernetes/pod.go
#	libbeat/autodiscover/providers/kubernetes/pod_test.go
#	libbeat/common/kubernetes/metadata/metadata.go
#	libbeat/common/kubernetes/metadata/pod.go
#	libbeat/common/kubernetes/metadata/pod_test.go
#	libbeat/processors/add_kubernetes_metadata/indexers_test.go
#	metricbeat/docs/modules/kubernetes.asciidoc
#	metricbeat/metricbeat.reference.yml
#	metricbeat/module/kubernetes/_meta/config.reference.yml
#	metricbeat/module/kubernetes/util/kubernetes.go
#	x-pack/elastic-agent/pkg/composable/providers/kubernetes/pod.go
#	x-pack/metricbeat/metricbeat.reference.yml
@mergify mergify bot requested review from a team as code owners September 21, 2022 12:53
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Sep 21, 2022
@mergify mergify bot requested review from AndersonQ and removed request for a team September 21, 2022 12:53
@mergify mergify bot mentioned this pull request Sep 21, 2022
Merged
6 tasks
@mergify mergify bot requested review from belimawr, michalpristas and rdner and removed request for a team September 21, 2022 12:53
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 21, 2022
@botelastic
Copy link
Copy Markdown

botelastic bot commented Sep 21, 2022

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

@MichaelKatsoulis MichaelKatsoulis requested review from MichaelKatsoulis and removed request for a team, AndersonQ, belimawr, michalpristas and rdner September 21, 2022 12:54
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Sep 21, 2022

💔 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: 2022-09-21T12:53:39.153+0000

  • Duration: 30 min 51 sec

Test stats 🧪

Test Results
Failed 0
Passed 3
Skipped 0
Total 3

Steps errors 5

Expand to view the steps failures

libbeat-shipping-to-next-major - STACK_ENVIRONMENT=next-major mage pythonIntegTest
  • Took 8 min 58 sec . View more details here
  • Description: STACK_ENVIRONMENT=next-major mage pythonIntegTest
libbeat-shipping-to-next-major - STACK_ENVIRONMENT=next-major mage pythonIntegTest
  • Took 7 min 34 sec . View more details here
  • Description: STACK_ENVIRONMENT=next-major mage pythonIntegTest
libbeat-shipping-to-next-major - STACK_ENVIRONMENT=next-major mage pythonIntegTest
  • Took 2 min 23 sec . View more details here
  • Description: STACK_ENVIRONMENT=next-major mage pythonIntegTest
x-pack/elastic-agent-lint - make -C x-pack/elastic-agent check;make -C x-pack/elastic-agent update;
  • Took 0 min 11 sec . View more details here
  • Description: make -C x-pack/elastic-agent check;make -C x-pack/elastic-agent update;make check-no-changes;
Error signal
  • Took 0 min 0 sec . View more details here
  • Description: Error 'hudson.AbortException: script returned exit code 2'

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

@mergify mergify bot deleted the mergify/bp/7.17/pr-29133 branch September 21, 2022 14:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MichaelKatsoulis MichaelKatsoulis Awaiting requested review from MichaelKatsoulis

Assignees

No one assigned

Labels

conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@elasticmachine @MichaelKatsoulis @tetianakravchenko