Skip to content

Commit

Permalink
Add metrics collection from cost explorer into aws/billing metricset (e…
Browse files Browse the repository at this point in the history
…lastic#20527)

* Add cost metricset for aws module
* Add cost_explorer_config for billing metricset with group_by_dimension_keys and group_by_tag_keys
  • Loading branch information
kaiyan-sheng authored Sep 14, 2020
1 parent 50ea11a commit a0f8041
Show file tree
Hide file tree
Showing 17 changed files with 1,536 additions and 203 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -677,6 +677,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Add state_daemonset metricset for Kubernetes Metricbeat module {pull}20649[20649]
- Add host inventory metrics to azure compute_vm metricset. {pull}20641[20641]
- Add host inventory metrics to googlecloud compute metricset. {pull}20391[20391]
- Add billing data collection from Cost Explorer into aws billing metricset. {pull}20527[20527] {issue}20103[20103]
- Migrate `compute_vm` metricset to a light one, map `cloud.instance.id` field. {pull}20889[20889]
- Request prometheus endpoints to be gzipped by default {pull}20766[20766]
- Release all kubernetes `state` metricsets as GA {pull}20901[20901]
Expand Down
163 changes: 161 additions & 2 deletions metricbeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -1569,8 +1569,7 @@ type: object




*`aws.billing.metrics.EstimatedCharges.max`*::
*`aws.billing.EstimatedCharges`*::
+
--
Maximum estimated charges for AWS acccount.
Expand All @@ -1579,6 +1578,166 @@ type: long

--

*`aws.billing.Currency`*::
+
--
Estimated charges currency unit.

type: keyword

--

*`aws.billing.ServiceName`*::
+
--
Service name for the maximum estimated charges.

type: keyword

--


*`aws.billing.AmortizedCost.amount`*::
+
--
Amortized cost amount

type: double

--

*`aws.billing.AmortizedCost.unit`*::
+
--
Amortized cost unit

type: keyword

--


*`aws.billing.BlendedCost.amount`*::
+
--
Blended cost amount

type: double

--

*`aws.billing.BlendedCost.unit`*::
+
--
Blended cost unit

type: keyword

--


*`aws.billing.NormalizedUsageAmount.amount`*::
+
--
Normalized usage amount

type: double

--

*`aws.billing.NormalizedUsageAmount.unit`*::
+
--
Normalized usage amount unit

type: keyword

--


*`aws.billing.UnblendedCost.amount`*::
+
--
Unblended cost amount

type: double

--

*`aws.billing.UnblendedCost.unit`*::
+
--
Unblended cost unit

type: keyword

--


*`aws.billing.UsageQuantity.amount`*::
+
--
Usage quantity amount

type: double

--

*`aws.billing.UsageQuantity.unit`*::
+
--
Usage quantity unit

type: keyword

--

*`aws.billing.start_date`*::
+
--
Start date for retrieving AWS costs

type: keyword

--

*`aws.billing.end_date`*::
+
--
End date for retrieving AWS costs

type: keyword

--


*`aws.billing.group_definition.key`*::
+
--
The string that represents a key for a specified group

type: keyword

--

*`aws.billing.group_definition.type`*::
+
--
The string that represents the type of group

type: keyword

--

*`aws.billing.group_by.*`*::
+
--
Cost explorer group by key values


type: object

--

[float]
=== cloudwatch

Expand Down
Binary file modified metricbeat/docs/images/metricbeat-aws-billing-overview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions x-pack/metricbeat/include/list.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions x-pack/metricbeat/module/aws/_meta/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,16 @@
- sns
- sqs
- module: aws
period: 12h
period: 24h
metricsets:
- billing
regions:
- us-east-1
cost_explorer_config:
group_by_dimension_keys:
- "AZ"
- "INSTANCE_TYPE"
- "SERVICE"
# group_by_tag_keys:
# - "aws:createdBy"
- module: aws
period: 24h
metricsets:
Expand Down
Loading

0 comments on commit a0f8041

Please sign in to comment.