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] Create ebs metricset using light module #13167

Merged
merged 5 commits into from Aug 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Expand Up @@ -301,6 +301,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- 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]
- Add AWS ebs metricset. {pull}13167[13167] {issue}11699[11699]

*Packetbeat*

Expand Down
6 changes: 6 additions & 0 deletions metricbeat/docs/fields.asciidoc
Expand Up @@ -880,6 +880,12 @@ type: object

--

[float]
=== ebs

`ebs` contains the metrics that were scraped from AWS CloudWatch which contains monitoring metrics sent by AWS EBS.


[float]
=== ec2

Expand Down
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
Expand Up @@ -161,6 +161,8 @@ The following metricsets are available:

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

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

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

* <<metricbeat-metricset-aws-elb,elb>>
Expand All @@ -175,6 +177,8 @@ The following metricsets are available:

include::aws/cloudwatch.asciidoc[]

include::aws/ebs.asciidoc[]

include::aws/ec2.asciidoc[]

include::aws/elb.asciidoc[]
Expand Down
23 changes: 23 additions & 0 deletions metricbeat/docs/modules/aws/ebs.asciidoc
@@ -0,0 +1,23 @@
////
This file is generated! See scripts/mage/docs_collector.go
////

[[metricbeat-metricset-aws-ebs]]
=== aws ebs metricset

beta[]

include::../../../../x-pack/metricbeat/module/aws/ebs/_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/ebs/_meta/data.json[]
----
3 changes: 2 additions & 1 deletion metricbeat/docs/modules_list.asciidoc
Expand Up @@ -10,7 +10,8 @@ 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] |
.7+| .7+| |<<metricbeat-metricset-aws-cloudwatch,cloudwatch>> beta[]
.8+| .8+| |<<metricbeat-metricset-aws-cloudwatch,cloudwatch>> beta[]
|<<metricbeat-metricset-aws-ebs,ebs>> beta[]
|<<metricbeat-metricset-aws-ec2,ec2>>
|<<metricbeat-metricset-aws-elb,elb>> beta[]
|<<metricbeat-metricset-aws-rds,rds>> beta[]
Expand Down
2 changes: 1 addition & 1 deletion x-pack/metricbeat/magefile.go
Expand Up @@ -84,7 +84,7 @@ func TestPackages() error {
devtools.WithModules(),

// To be increased or removed when more light modules are added
devtools.MinModules(2))
devtools.MinModules(3))
}

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