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.2](backport #32539) Feature/remove k8s cache #32668

Closed
wants to merge 6 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 12, 2022

This is an automatic backport of pull request #32539 done by Mergify.
Cherry-pick of 5503761 has failed:

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

You are currently cherry-picking commit 5503761995.
  (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
	new file:   metricbeat/module/kubernetes/_meta/test/stats_summary_multiple_containers.json
	modified:   metricbeat/module/kubernetes/kubernetes.go
	modified:   metricbeat/module/kubernetes/node/node.go
	modified:   metricbeat/module/kubernetes/state_container/state_container.go
	modified:   metricbeat/module/kubernetes/state_cronjob/state_cronjob.go
	modified:   metricbeat/module/kubernetes/state_daemonset/state_daemonset.go
	modified:   metricbeat/module/kubernetes/state_deployment/state_deployment.go
	modified:   metricbeat/module/kubernetes/state_job/state_job.go
	modified:   metricbeat/module/kubernetes/state_node/state_node.go
	modified:   metricbeat/module/kubernetes/state_pod/state_pod.go
	modified:   metricbeat/module/kubernetes/state_replicaset/state_replicaset.go
	modified:   metricbeat/module/kubernetes/state_service/state_service.go
	modified:   metricbeat/module/kubernetes/state_statefulset/state_statefulset.go
	modified:   metricbeat/module/kubernetes/util/kubernetes.go
	deleted:    metricbeat/module/kubernetes/util/metrics_cache.go
	deleted:    metricbeat/module/kubernetes/util/metrics_cache_test.go
	new file:   metricbeat/module/kubernetes/util/metrics_repo.go
	new file:   metricbeat/module/kubernetes/util/metrics_repo_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   metricbeat/module/kubernetes/container/container.go
	both modified:   metricbeat/module/kubernetes/container/container_test.go
	both modified:   metricbeat/module/kubernetes/container/data.go
	both modified:   metricbeat/module/kubernetes/pod/data.go
	both modified:   metricbeat/module/kubernetes/pod/pod.go
	both modified:   metricbeat/module/kubernetes/pod/pod_test.go
	both modified:   metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume.go
	both modified:   metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim.go

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

* replaced internal expiring cache with non expiring dictionary in memory
* fixed a bug that prevented to export pod/container metrics when node/state_node metricsets were disabled

(cherry picked from commit 5503761)

# Conflicts:
#	metricbeat/module/kubernetes/container/container.go
#	metricbeat/module/kubernetes/container/container_test.go
#	metricbeat/module/kubernetes/container/data.go
#	metricbeat/module/kubernetes/pod/data.go
#	metricbeat/module/kubernetes/pod/pod.go
#	metricbeat/module/kubernetes/pod/pod_test.go
#	metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume.go
#	metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim.go
@mergify mergify bot requested a review from a team as a code owner August 12, 2022 11:11
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 12, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 12, 2022
@botelastic
Copy link

botelastic bot commented Aug 12, 2022

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Aug 12, 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-08-15T16:15:14.639+0000

  • Duration: 57 min 2 sec

Test stats 🧪

Test Results
Failed 0
Passed 3586
Skipped 877
Total 4463

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

@mergify
Copy link
Contributor Author

mergify bot commented Aug 15, 2022

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

@gsantoro
Copy link
Contributor

Backport is not necessary anymore

@gsantoro gsantoro closed this Aug 16, 2022
@gsantoro gsantoro deleted the mergify/bp/8.2/pr-32539 branch August 16, 2022 12:27
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