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.x](backport #28287) Add the cluster_uuid field to Enterprise search stats metricset #28505

Merged
merged 2 commits into from
Oct 18, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 18, 2021

This is an automatic backport of pull request #28287 done by Mergify.
Cherry-pick of 78bcab3 has failed:

On branch mergify/bp/7.x/pr-28287
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit 78bcab36c7.
  (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:   metricbeat/docs/modules/enterprisesearch.asciidoc
	modified:   metricbeat/docs/modules/enterprisesearch/health.asciidoc
	modified:   metricbeat/docs/modules/enterprisesearch/stats.asciidoc
	modified:   metricbeat/docs/modules_list.asciidoc
	modified:   x-pack/metricbeat/metricbeat.reference.yml
	modified:   x-pack/metricbeat/module/enterprisesearch/_meta/fields.yml
	modified:   x-pack/metricbeat/module/enterprisesearch/fields.go
	modified:   x-pack/metricbeat/module/enterprisesearch/health/_meta/docs.asciidoc
	modified:   x-pack/metricbeat/module/enterprisesearch/health/_meta/fields.yml
	modified:   x-pack/metricbeat/module/enterprisesearch/health/_meta/testdata/health.json-expected.json
	modified:   x-pack/metricbeat/module/enterprisesearch/health/data.go
	modified:   x-pack/metricbeat/module/enterprisesearch/health/health.go
	modified:   x-pack/metricbeat/module/enterprisesearch/stats/_meta/docs.asciidoc
	modified:   x-pack/metricbeat/module/enterprisesearch/stats/_meta/fields.yml
	modified:   x-pack/metricbeat/module/enterprisesearch/stats/_meta/testdata/stats.json
	modified:   x-pack/metricbeat/module/enterprisesearch/stats/_meta/testdata/stats.json-expected.json
	modified:   x-pack/metricbeat/module/enterprisesearch/stats/data.go
	modified:   x-pack/metricbeat/module/enterprisesearch/stats/stats.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   metricbeat/docs/fields.asciidoc

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.io/

* Add the cluster_uuid field to Enterprise search stats metricset to make it easier to correlate with health metricset events

* Make Enterprise Search module field docs prettier

* Updated the docs

* Move cluster_uuid to the module level to make it easier to filter those events in Stack monitoring

* Add product usage metrics to the stats event

* Update mb docs following the addition of new fields

* Remove duplicate uuid fields now that we put the uuid at the module level

(cherry picked from commit 78bcab3)

# Conflicts:
#	metricbeat/docs/fields.asciidoc
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 18, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 18, 2021
@botelastic
Copy link

botelastic bot commented Oct 18, 2021

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 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-10-18T15:59:04.648+0000

  • Duration: 112 min 36 sec

  • Commit: 321f5f3

Test stats 🧪

Test Results
Failed 0
Passed 9622
Skipped 2449
Total 12071

💚 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.

@kovyrin kovyrin merged commit fec84a4 into 7.x Oct 18, 2021
@kovyrin kovyrin deleted the mergify/bp/7.x/pr-28287 branch October 18, 2021 17:55
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