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.3](backport #32979) Add missing cluster metadata to multiple k8s metricsests #33019

Merged
merged 17 commits into from
Sep 12, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 8, 2022

This is an automatic backport of pull request #32979 done by Mergify.
Cherry-pick of 1f5b863 has failed:

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

You are currently cherry-picking commit 1f5b863424.
  (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:   metricbeat/module/kubernetes/proxy/_meta/test/metrics.proxy.1.14.expected
	modified:   metricbeat/module/kubernetes/proxy/proxy.go
	modified:   metricbeat/module/kubernetes/scheduler/_meta/test/metrics.scheduler.1.14.expected
	modified:   metricbeat/module/kubernetes/scheduler/_meta/test/metrics.scheduler.1.17.expected
	modified:   metricbeat/module/kubernetes/scheduler/scheduler.go
	modified:   metricbeat/module/kubernetes/system/system.go
	modified:   metricbeat/module/kubernetes/util/kubernetes.go
	modified:   metricbeat/module/kubernetes/util/prometheus.go
	modified:   metricbeat/module/kubernetes/volume/volume.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   metricbeat/module/kubernetes/apiserver/_meta/test/metrics.1.14.expected
	both modified:   metricbeat/module/kubernetes/apiserver/apiserver.go
	both modified:   metricbeat/module/kubernetes/apiserver/metricset.go
	deleted by us:   metricbeat/module/kubernetes/controllermanager/_meta/test/metrics.1.20.expected
	both modified:   metricbeat/module/kubernetes/controllermanager/controllermanager.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

* add missing field

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

* update log message

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

* fix tests

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

* add pr number

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

* volume metricset: replace adding ECS orchestrator fields with util.AddClusterECSMeta

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

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

# Conflicts:
#	metricbeat/module/kubernetes/apiserver/_meta/test/metrics.1.14.expected
#	metricbeat/module/kubernetes/apiserver/apiserver.go
#	metricbeat/module/kubernetes/apiserver/metricset.go
#	metricbeat/module/kubernetes/controllermanager/_meta/test/metrics.1.20.expected
#	metricbeat/module/kubernetes/controllermanager/controllermanager.go
@mergify mergify bot requested a review from a team as a code owner September 8, 2022 09:23
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 8, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 8, 2022
@botelastic
Copy link

botelastic bot commented Sep 8, 2022

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Sep 8, 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-09-11T15:51:58.611+0000

  • Duration: 54 min 5 sec

Test stats 🧪

Test Results
Failed 0
Passed 3545
Skipped 869
Total 4414

💚 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 Sep 12, 2022

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

@tetianakravchenko tetianakravchenko merged commit 0520908 into 8.3 Sep 12, 2022
@tetianakravchenko tetianakravchenko deleted the mergify/bp/8.3/pr-32979 branch September 12, 2022 07:54
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