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.4](backport #33032) Add enricher to storageclass metricset #33054

Merged
merged 5 commits into from
Sep 13, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 12, 2022

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

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

You are currently cherry-picking commit d20fff40fa.
  (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:   NOTICE.txt
	modified:   deploy/kubernetes/metricbeat-kubernetes.yaml
	modified:   deploy/kubernetes/metricbeat/metricbeat-daemonset-configmap.yaml
	modified:   deploy/kubernetes/metricbeat/metricbeat-role.yaml
	modified:   metricbeat/module/kubernetes/_meta/test/docs/01_playground/metricbeat.yaml
	modified:   metricbeat/module/kubernetes/state_storageclass/_meta/test/ksm.unit.v1.8.0
	modified:   metricbeat/module/kubernetes/state_storageclass/_meta/test/ksm.unit.v1.8.0.expected
	modified:   metricbeat/module/kubernetes/state_storageclass/_meta/test/ksm.v1.8.0.expected
	modified:   metricbeat/module/kubernetes/state_storageclass/_meta/test/ksm.v2.0.0.expected
	modified:   metricbeat/module/kubernetes/state_storageclass/state_storageclass.go
	modified:   metricbeat/module/kubernetes/util/kubernetes.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	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

* add enricher for storageclass

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

* add pr number

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

* fix check-no-changes] Error 1

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

* generate notice file

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

* readd removed metric from test file

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

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

# Conflicts:
#	go.mod
#	go.sum
@mergify mergify bot requested review from a team as code owners September 12, 2022 09:10
@mergify mergify bot removed the request for review from a team September 12, 2022 09:10
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 12, 2022
@mergify mergify bot requested review from rdner and fearful-symmetry September 12, 2022 09:10
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 12, 2022
@botelastic
Copy link

botelastic bot commented Sep 12, 2022

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Sep 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-09-13T07:44:04.266+0000

  • Duration: 60 min 37 sec

❕ Flaky test report

No test was executed to be analysed.

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

@tetianakravchenko
Copy link
Contributor

/test

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

/test

@tetianakravchenko tetianakravchenko merged commit 16abaa5 into 8.4 Sep 13, 2022
@tetianakravchenko tetianakravchenko deleted the mergify/bp/8.4/pr-33032 branch September 13, 2022 15:56
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