Skip to content

[8.0](backport #27355) [Metricbeat] Add Linux pressure metricset#29037

Merged
fearful-symmetry merged 2 commits into8.0from
mergify/bp/8.0/pr-27355
Nov 19, 2021
Merged

[8.0](backport #27355) [Metricbeat] Add Linux pressure metricset#29037
fearful-symmetry merged 2 commits into8.0from
mergify/bp/8.0/pr-27355

Conversation

@mergify
Copy link
Copy Markdown
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/8.0/pr-27355
Your branch is up to date with 'origin/8.0'.

You are currently cherry-picking commit e49f2579c.
  (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

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   metricbeat/docs/fields.asciidoc
	both modified:   metricbeat/docs/modules/linux.asciidoc
	both added:      metricbeat/docs/modules/linux/pressure.asciidoc
	both modified:   metricbeat/docs/modules_list.asciidoc
	both modified:   metricbeat/include/list_common.go
	both modified:   metricbeat/metricbeat.reference.yml
	both modified:   metricbeat/module/linux/_meta/config.yml
	both modified:   metricbeat/module/linux/fields.go
	both added:      metricbeat/module/linux/pressure/pressure.go
	both added:      metricbeat/module/linux/pressure/pressure_test.go
	both modified:   metricbeat/modules.d/linux.yml.disabled
	both modified:   x-pack/metricbeat/metricbeat.reference.yml

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/fields.asciidoc
#	metricbeat/docs/modules/linux.asciidoc
#	metricbeat/docs/modules/linux/pressure.asciidoc
#	metricbeat/docs/modules_list.asciidoc
#	metricbeat/include/list_common.go
#	metricbeat/metricbeat.reference.yml
#	metricbeat/module/linux/_meta/config.yml
#	metricbeat/module/linux/fields.go
#	metricbeat/module/linux/pressure/pressure.go
#	metricbeat/module/linux/pressure/pressure_test.go
#	metricbeat/modules.d/linux.yml.disabled
#	x-pack/metricbeat/metricbeat.reference.yml
@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
Copy Markdown

botelastic bot commented Nov 18, 2021

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

@elasticmachine
Copy link
Copy Markdown
Contributor

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

  • Duration: 84 min 54 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!)

@fearful-symmetry fearful-symmetry merged commit 932d1e4 into 8.0 Nov 19, 2021
@mergify mergify bot deleted the mergify/bp/8.0/pr-27355 branch November 19, 2021 17:24
# - conntrack
# - iostat
# - pressure
<<<<<<< HEAD
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@fearful-symmetry This and below looks a lot like something went wrong during merging. Can you clean it up in the 8.0 branch?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Fix is already here: #29326

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.

4 participants