Skip to content

[8.1](backport #31785) Feature/cache expiration#31976

Merged
gsantoro merged 3 commits into8.1from
mergify/bp/8.1/pr-31785
Jun 20, 2022
Merged

[8.1](backport #31785) Feature/cache expiration#31976
gsantoro merged 3 commits into8.1from
mergify/bp/8.1/pr-31785

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jun 17, 2022 •
edited by zube bot
Loading

This is an automatic backport of pull request #31785 done by Mergify.
Cherry-pick of 4b625fc has failed:

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

You are currently cherry-picking commit 4b625fc411.
  (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/cache.go
	modified:   metricbeat/module/kubernetes/container/container_test.go
	modified:   metricbeat/module/kubernetes/kubernetes.go
	modified:   metricbeat/module/kubernetes/node/node.go
	modified:   metricbeat/module/kubernetes/pod/pod_test.go
	modified:   metricbeat/module/kubernetes/state_container/state_container.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_resourcequota/state_resourcequota.go
	modified:   metricbeat/module/kubernetes/state_service/state_service.go
	modified:   metricbeat/module/kubernetes/state_statefulset/state_statefulset.go
	modified:   metricbeat/module/kubernetes/state_storageclass/state_storageclass.go
	modified:   metricbeat/module/kubernetes/util/metrics_cache.go
	modified:   metricbeat/module/kubernetes/util/metrics_cache_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   metricbeat/module/kubernetes/container/container.go
	both modified:   metricbeat/module/kubernetes/pod/pod.go
	both modified:   metricbeat/module/kubernetes/state_cronjob/state_cronjob.go
	both modified:   metricbeat/module/kubernetes/state_daemonset/state_daemonset.go
	both modified:   metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume.go
	both modified:   metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim.go
	both modified:   metricbeat/module/kubernetes/util/kubernetes.go
	both modified:   metricbeat/module/kubernetes/volume/volume.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

@gsantoro @mergify
Feature/cache expiration (#31785)
ac37f32 
* fixed cache expiration bug

(cherry picked from commit 4b625fc)

# Conflicts:
#	metricbeat/module/kubernetes/container/container.go
#	metricbeat/module/kubernetes/pod/pod.go
#	metricbeat/module/kubernetes/state_cronjob/state_cronjob.go
#	metricbeat/module/kubernetes/state_daemonset/state_daemonset.go
#	metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume.go
#	metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim.go
#	metricbeat/module/kubernetes/util/kubernetes.go
#	metricbeat/module/kubernetes/volume/volume.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 17, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 17, 2022
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jun 17, 2022 •
edited by jenkins-beats-ci bot
Loading

💚 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-06-20T10:05:22.753+0000

  • Duration: 122 min 38 sec

Test stats 🧪

Test Results
Failed 0
Passed 24683
Skipped 1802
Total 26485

💚 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
Copy Markdown
Contributor Author

mergify bot commented Jun 20, 2022

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

ChrsMark
ChrsMark requested changes Jun 20, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@ChrsMark ChrsMark left a comment

Choose a reason for hiding this comment

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

Some fixes are needed to resolve conflicts.

CHANGELOG.next.asciidoc Outdated
*Metricbeat*

- Improve handling of disabled commands in Zookeeper Metricbeat module. {pull}31013[#31013]
- make `system/filesystem` code sensitive to `hostfs` and migrate libraries to `elastic-agent-opts` {pull}31001[31001]
Copy link
Copy Markdown
Member

@ChrsMark ChrsMark Jun 20, 2022

Choose a reason for hiding this comment

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

Needs fix.

metricbeat/module/kubernetes/container/container.go Outdated
return
}

<<<<<<< HEAD
Copy link
Copy Markdown
Member

@ChrsMark ChrsMark Jun 20, 2022

Choose a reason for hiding this comment

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

Conflict to be fixed.

@gsantoro gsantoro added the Team:Cloudnative-Monitoring Label for the Cloud Native Monitoring team label Jun 20, 2022
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 20, 2022
ChrsMark
ChrsMark approved these changes Jun 20, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@ChrsMark ChrsMark left a comment

Choose a reason for hiding this comment

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

👍🏼 WFG and merge!

@gsantoro gsantoro merged commit 9d8bf3b into 8.1 Jun 20, 2022
@gsantoro gsantoro deleted the mergify/bp/8.1/pr-31785 branch June 20, 2022 12:12
@v1v v1v mentioned this pull request Jun 24, 2022
Merged
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
@mergify
[8.1](backport elastic#31785) Feature/cache expiration (elastic#31976)
924001d 
* Feature/cache expiration (elastic#31785)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ChrsMark ChrsMark ChrsMark approved these changes

Assignees

@gsantoro gsantoro

Labels

backport conflicts There is a conflict in the backported pull request 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

@elasticmachine @ChrsMark @gsantoro