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

[7.16](backport #27355) [Metricbeat] Add Linux pressure metricset #29036

Merged
merged 3 commits into from
Nov 19, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 18, 2021

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

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

You are currently cherry-picking commit e49f2579c2.
  (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/docs/fields.asciidoc
	modified:   metricbeat/docs/modules/linux.asciidoc
	new file:   metricbeat/docs/modules/linux/pressure.asciidoc
	modified:   metricbeat/include/list_common.go
	modified:   metricbeat/metricbeat.reference.yml
	modified:   metricbeat/module/linux/_meta/config.yml
	new file:   metricbeat/module/linux/pressure/_meta/data.json
	new file:   metricbeat/module/linux/pressure/_meta/docs.asciidoc
	new file:   metricbeat/module/linux/pressure/_meta/fields.yml
	new file:   metricbeat/module/linux/pressure/_meta/testdata/proc/pressure/cpu
	new file:   metricbeat/module/linux/pressure/_meta/testdata/proc/pressure/io
	new file:   metricbeat/module/linux/pressure/_meta/testdata/proc/pressure/memory
	new file:   metricbeat/module/linux/pressure/pressure_test.go
	modified:   metricbeat/modules.d/linux.yml.disabled
	modified:   x-pack/metricbeat/metricbeat.reference.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   metricbeat/docs/modules_list.asciidoc
	both modified:   metricbeat/module/linux/fields.go
	both added:      metricbeat/module/linux/pressure/pressure.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

* Adds new linux pressure metricset

* Tidy up code

* Be consistent in default config

* Run integration tests

* Make update

* make update v3

* Address comments

* Format tests

* Remove unused imports from tests

* Mage format

* Update changelog

* simplify loop

* Fix fields/mapping

(cherry picked from commit e49f257)

# Conflicts:
#	metricbeat/docs/modules_list.asciidoc
#	metricbeat/module/linux/fields.go
#	metricbeat/module/linux/pressure/pressure.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 18, 2021
@mergify mergify bot assigned b-deam Nov 18, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 18, 2021
@botelastic
Copy link

botelastic bot commented Nov 18, 2021

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Nov 18, 2021

💚 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: 2021-11-19T00:51:34.714+0000

  • Duration: 89 min 27 sec

  • Commit: a1efd40

Test stats 🧪

Test Results
Failed 0
Passed 9310
Skipped 2344
Total 11654

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

@b-deam
Copy link
Member

b-deam commented Nov 19, 2021

@fearful-symmetry - am I good to squash & merge here?

@fearful-symmetry fearful-symmetry merged commit 0ea1244 into 7.16 Nov 19, 2021
@mergify mergify bot deleted the mergify/bp/7.16/pr-27355 branch November 19, 2021 17:25
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.

3 participants