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.5](backport #33263) Remove incorrect ES field #33298

Merged
merged 2 commits into from
Oct 12, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 11, 2022

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

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

You are currently cherry-picking commit 1032646360.
  (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/module/elasticsearch/node_stats/_meta/fields.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   metricbeat/module/elasticsearch/fields.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

* Remove incorrect ES field

Removes elasticsearch.node_stats.indices.bulk.avg_time.bytes

The field doesn't exist in https://github.com/klacabane/elasticsearch/blob/fede65858555e4106027b7498f6dfda85df87c8e/x-pack/plugin/core/src/main/resources/monitoring-es-mb.json and also doesn't make sense that we'd have bytes under a time grouping.

* Changelog entry

* More whitespace fiddling

(cherry picked from commit 1032646)

# Conflicts:
#	metricbeat/module/elasticsearch/fields.go
@mergify mergify bot requested a review from a team as a code owner October 11, 2022 03:20
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 11, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 11, 2022
@botelastic
Copy link

botelastic bot commented Oct 11, 2022

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 11, 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-10-11T05:06:54.541+0000

  • Duration: 53 min 50 sec

Test stats 🧪

Test Results
Failed 0
Passed 3883
Skipped 884
Total 4767

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the 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!)

@matschaffer matschaffer merged commit f280dd7 into 8.5 Oct 12, 2022
@matschaffer matschaffer deleted the mergify/bp/8.5/pr-33263 branch October 12, 2022 02:19
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