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 #27549) [Metricbeat] Enterprise Search Module #28214

Merged
merged 4 commits into from
Oct 1, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 1, 2021

This is an automatic backport of pull request #27549 done by Mergify.
Cherry-pick of 3c77c9a has failed:

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

You are currently cherry-picking commit 3c77c9a92a.
  (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
	new file:   metricbeat/docs/modules/enterprisesearch.asciidoc
	new file:   metricbeat/docs/modules/enterprisesearch/health.asciidoc
	new file:   metricbeat/docs/modules/enterprisesearch/stats.asciidoc
	modified:   metricbeat/docs/modules_list.asciidoc
	modified:   x-pack/metricbeat/include/list.go
	modified:   x-pack/metricbeat/metricbeat.reference.yml
	new file:   x-pack/metricbeat/module/enterprisesearch/_meta/Dockerfile
	new file:   x-pack/metricbeat/module/enterprisesearch/_meta/config.yml
	new file:   x-pack/metricbeat/module/enterprisesearch/_meta/docker-entrypoint-dependencies.sh
	new file:   x-pack/metricbeat/module/enterprisesearch/_meta/docs.asciidoc
	new file:   x-pack/metricbeat/module/enterprisesearch/_meta/fields.yml
	new file:   x-pack/metricbeat/module/enterprisesearch/_meta/kibana/7/dashboard/Metricbeat-enterprise-search.json
	new file:   x-pack/metricbeat/module/enterprisesearch/doc.go
	new file:   x-pack/metricbeat/module/enterprisesearch/docker-compose.yml
	new file:   x-pack/metricbeat/module/enterprisesearch/fields.go
	new file:   x-pack/metricbeat/module/enterprisesearch/health/_meta/docs.asciidoc
	new file:   x-pack/metricbeat/module/enterprisesearch/health/_meta/fields.yml
	new file:   x-pack/metricbeat/module/enterprisesearch/health/_meta/testdata/config.yml
	new file:   x-pack/metricbeat/module/enterprisesearch/health/_meta/testdata/health.json
	new file:   x-pack/metricbeat/module/enterprisesearch/health/_meta/testdata/health.json-expected.json
	new file:   x-pack/metricbeat/module/enterprisesearch/health/data.go
	new file:   x-pack/metricbeat/module/enterprisesearch/health/data_test.go
	new file:   x-pack/metricbeat/module/enterprisesearch/health/health.go
	new file:   x-pack/metricbeat/module/enterprisesearch/health/health_integration_test.go
	new file:   x-pack/metricbeat/module/enterprisesearch/stats/_meta/docs.asciidoc
	new file:   x-pack/metricbeat/module/enterprisesearch/stats/_meta/fields.yml
	new file:   x-pack/metricbeat/module/enterprisesearch/stats/_meta/testdata/config.yml
	new file:   x-pack/metricbeat/module/enterprisesearch/stats/_meta/testdata/stats.json
	new file:   x-pack/metricbeat/module/enterprisesearch/stats/_meta/testdata/stats.json-expected.json
	new file:   x-pack/metricbeat/module/enterprisesearch/stats/data.go
	new file:   x-pack/metricbeat/module/enterprisesearch/stats/data_test.go
	new file:   x-pack/metricbeat/module/enterprisesearch/stats/stats.go
	new file:   x-pack/metricbeat/module/enterprisesearch/stats/stats_integration_test.go
	new file:   x-pack/metricbeat/module/enterprisesearch/test_enterprisesearch.py
	modified:   x-pack/metricbeat/module/prometheus/collector/_meta/data.json
	new file:   x-pack/metricbeat/modules.d/enterprisesearch.yml.disabled

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/

Added Enterprise Search module with two metricsets: health and stats, each using a corresponding API endpoint

Co-authored-by: Oleksiy Kovyrin <[email protected]>
(cherry picked from commit 3c77c9a)

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

Pinging @elastic/integrations (Team:Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 1, 2021
Added Enterprise Search module with two metricsets: health and stats, each using a corresponding API endpoint

Co-authored-by: Oleksiy Kovyrin <[email protected]>
@kovyrin
Copy link
Contributor

kovyrin commented Oct 1, 2021

@Mergifyio refresh

@mergify
Copy link
Contributor Author

mergify bot commented Oct 1, 2021

Command refresh: success

Pull request refreshed

@kovyrin
Copy link
Contributor

kovyrin commented Oct 1, 2021

@Mergifyio update

@mergify
Copy link
Contributor Author

mergify bot commented Oct 1, 2021

Command update: success

Branch has been successfully updated

@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 1, 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-01T15:38:32.383+0000

  • Duration: 100 min 6 sec

  • Commit: 5339f25

Test stats 🧪

Test Results
Failed 0
Passed 9864
Skipped 2468
Total 12332

💚 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
Copy link
Contributor

kovyrin commented Oct 1, 2021

I pulled this PR, ran make update on metricbeat and checked in the updated files.

@kovyrin
Copy link
Contributor

kovyrin commented Oct 1, 2021

I have no idea what is going on here with those linting checks. I ran make fmt, make update and make check commands both in x-pack and main metricbeat directories and I do not see any updates locally. Need someone from the @elastic/beats team to take a look at this and advise on why CI thinks something needs updating.

@kovyrin kovyrin requested a review from sayden October 1, 2021 13:58
@kovyrin kovyrin assigned kovyrin and unassigned carlosdelest Oct 1, 2021
@kovyrin kovyrin requested a review from ruflin October 1, 2021 14:00
@kovyrin
Copy link
Contributor

kovyrin commented Oct 1, 2021

Spent an hour digging through the issue and what I can see is that the linux/memory metricset is not getting registered at all. Its Init is never called (while I see other metricsets registering as expected). On the master branch I see the Init being called on the linux/memory metricset as expected. I'm not sure what it means, but something seems to be messed up.

@kovyrin
Copy link
Contributor

kovyrin commented Oct 1, 2021

I know what it is! #27381 was never backported to 7.x :-(

@kovyrin kovyrin merged commit d27aa4b into 7.x Oct 1, 2021
@kovyrin kovyrin deleted the mergify/bp/7.x/pr-27549 branch October 1, 2021 17:27
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 Team:Integrations Label for the Integrations team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants