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

[Metricbeat] Add collecting Application ELB and Network ELB into elb metricset #14123

Merged
merged 14 commits into from
Nov 16, 2019
Merged

[Metricbeat] Add collecting Application ELB and Network ELB into elb metricset #14123

merged 14 commits into from
Nov 16, 2019

Conversation

kaiyan-sheng
Copy link
Contributor

@kaiyan-sheng kaiyan-sheng commented Oct 17, 2019

This PR is add support for application ELB and network ELB both into elb metricset. Now elb metricset should collect all cloudwatch metrics from classic ELB, application ELB and network ELB.

With this implementation, when elb metricset is enabled, metrics from all three different kinds of ELBs will be collected. This way is more consistent with Filebeat elb fileset.

closes #13538 and #13539

@kaiyan-sheng kaiyan-sheng added Team:Integrations Label for the Integrations team Metricbeat Metricbeat labels Oct 17, 2019
@kaiyan-sheng kaiyan-sheng self-assigned this Oct 17, 2019
@kaiyan-sheng kaiyan-sheng added test-plan Add this PR to be manual test plan v7.6.0 labels Oct 28, 2019
@kaiyan-sheng kaiyan-sheng marked this pull request as ready for review October 29, 2019 22:02
@kaiyan-sheng kaiyan-sheng requested a review from a team as a code owner October 29, 2019 22:02
Copy link
Member

@jsoriano jsoriano left a comment

Choose a reason for hiding this comment

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

LGTM, could we have some example data.json?

@kaiyan-sheng
Copy link
Contributor Author

@jsoriano Will do! And update the docs.

@kaiyan-sheng
Copy link
Contributor Author

@jsoriano I regenerated the data.json https://github.com/elastic/beats/pull/14123/files#diff-30cbed3a1b919647b6d2d2ad59e5292b but since there are three different namespaces used in this metricset, we will get three separate metrics.
Are we expecting only one metric here?

@jsoriano
Copy link
Member

@jsoriano I regenerated the data.json https://github.com/elastic/beats/pull/14123/files#diff-30cbed3a1b919647b6d2d2ad59e5292b but since there are three different namespaces used in this metricset, we will get three separate metrics.
Are we expecting only one metric here?

It is possible to select different events to be written in different files from TestData with WriteEventsCond (instead of WriteEvents). I don't think we are using it yet in other places, but with the old API there are some examples like this one: https://github.com/elastic/beats/blob/v7.4.2/metricbeat/module/system/socket/socket_test.go#L72

@kaiyan-sheng kaiyan-sheng merged commit 61b5102 into elastic:master Nov 16, 2019
@kaiyan-sheng kaiyan-sheng deleted the alb_nlb branch November 16, 2019 16:12
kaiyan-sheng added a commit that referenced this pull request Nov 18, 2019
…B and Network ELB into elb metricset (#14577)

* [Metricbeat] Add collecting Application ELB and Network ELB into elb metricset (#14123)

* Add alb and nlb into elb metricset
* Generate different data.json file for different load balancers

(cherry picked from commit 61b5102)

* Update changelog
@kaiyan-sheng kaiyan-sheng removed their assignment Jan 14, 2020
@jsoriano jsoriano added test-plan-ok This PR passed manual testing and removed needs testing notes labels Jan 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Metricbeat Metricbeat Team:Integrations Label for the Integrations team test-plan Add this PR to be manual test plan test-plan-ok This PR passed manual testing v7.6.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Metricbeat] Adding AWS Application ELB Metricset
3 participants