Skip to content

[Metricbeat] Create elb metricset using light weight module #12952

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.

Sign up for GitHub

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

Merged
kaiyan-sheng merged 14 commits into from
Aug 5, 2019
Merged

[Metricbeat] Create elb metricset using light weight module #12952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
104db67
Try using light weight module for aws elb
Jul 8, 2019
a5e9d65
Create aws_light module for elb metricset
Jul 17, 2019
c110852
Move elb metricset back into aws module
Jul 17, 2019
f97424f
replace elb_test.go use elb.go
Jul 17, 2019
5a8f38b
Change to use aws.cloudwatch.metrics
Jul 18, 2019
76199b8
Change getConfigForTest back
Jul 18, 2019
1fe788c
Add fields
Jul 19, 2019
2c91924
Rebase and regenerate data.json
Jul 30, 2019
919665f
Fix service.type for all metricsets in aws module
Jul 31, 2019
6e8b70c
Add dashboard
Jul 31, 2019
092b76d
Fix unit test
Jul 31, 2019
c1bd713
Add elb dashboard overview screenshot and specify statistic methods i…
Aug 1, 2019
034dbe2
Fix visualization title
Aug 2, 2019
1172251
Change visualization title
Aug 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Add support to load default aws config file to get credentials. {pull}12727[12727] {issue}12708[12708]
- Add statistic option into cloudwatch metricset. {issue}12370[12370] {pull}12840[12840]
- Add cgroup memory stats to docker/memory metricset {pull}12916[12916]
- Add AWS elb metricset. {pull}12952[12952] {issue}11701[11701]

*Packetbeat*

Expand Down
6 changes: 6 additions & 0 deletions metricbeat/docs/fields.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1155,6 +1155,12 @@ type: integer

--

[float]
=== elb

`elb` contains the metrics that were scraped from AWS CloudWatch which contains monitoring metrics sent by AWS ELB.


[float]
=== rds

Expand Down
Binary file added metricbeat/docs/images/metricbeat-aws-elb-overview.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions metricbeat/docs/modules/aws.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ The following metricsets are available:

* <<metricbeat-metricset-aws-ec2,ec2>>

* <<metricbeat-metricset-aws-elb,elb>>

* <<metricbeat-metricset-aws-rds,rds>>

* <<metricbeat-metricset-aws-s3_daily_storage,s3_daily_storage>>
Expand All @@ -175,6 +177,8 @@ include::aws/cloudwatch.asciidoc[]

include::aws/ec2.asciidoc[]

include::aws/elb.asciidoc[]

include::aws/rds.asciidoc[]

include::aws/s3_daily_storage.asciidoc[]
Expand Down
23 changes: 23 additions & 0 deletions metricbeat/docs/modules/aws/elb.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
////
This file is generated! See scripts/mage/docs_collector.go
////

[[metricbeat-metricset-aws-elb]]
=== aws elb metricset

beta[]

include::../../../../x-pack/metricbeat/module/aws/elb/_meta/docs.asciidoc[]


==== Fields

For a description of each field in the metricset, see the
<<exported-fields-aws,exported fields>> section.

Here is an example document generated by this metricset:

[source,json]
----
include::../../../../x-pack/metricbeat/module/aws/elb/_meta/data.json[]
----
6 changes: 6 additions & 0 deletions metricbeat/docs/modules/cockroachdb/status.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,9 @@ include::../../../../x-pack/metricbeat/module/cockroachdb/status/_meta/docs.asci
For a description of each field in the metricset, see the
<<exported-fields-cockroachdb,exported fields>> section.

Here is an example document generated by this metricset:

[source,json]
----
include::../../../../x-pack/metricbeat/module/cockroachdb/status/_meta/data.json[]
----
Comment thread
kaiyan-sheng marked this conversation as resolved.
Outdated
3 changes: 2 additions & 1 deletion metricbeat/docs/modules_list.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ This file is generated! See scripts/mage/docs_collector.go
|<<metricbeat-module-apache,Apache>> |image:./images/icon-yes.png[Prebuilt dashboards are available] |
.1+| .1+| |<<metricbeat-metricset-apache-status,status>>
|<<metricbeat-module-aws,aws>> |image:./images/icon-yes.png[Prebuilt dashboards are available] |
.6+| .6+| |<<metricbeat-metricset-aws-cloudwatch,cloudwatch>> beta[]
.7+| .7+| |<<metricbeat-metricset-aws-cloudwatch,cloudwatch>> beta[]
|<<metricbeat-metricset-aws-ec2,ec2>>
|<<metricbeat-metricset-aws-elb,elb>> beta[]
|<<metricbeat-metricset-aws-rds,rds>> beta[]
|<<metricbeat-metricset-aws-s3_daily_storage,s3_daily_storage>> beta[]
|<<metricbeat-metricset-aws-s3_request,s3_request>> beta[]
Expand Down
2 changes: 1 addition & 1 deletion x-pack/metricbeat/magefile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func TestPackages() error {
devtools.WithModules(),

// To be increased or removed when more light modules are added
devtools.MinModules(1))
devtools.MinModules(2))
Comment thread
kaiyan-sheng marked this conversation as resolved.
Outdated
}

// Fields generates a fields.yml and fields.go for each module.
Expand Down
Loading