diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 8de1caab3fc0..37c385c802cf 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -515,6 +515,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Add Kafka JMX metricsets. {pull}14330[14330] - Add metrics to envoyproxy server metricset and support for envoy proxy 1.12. {pull}14416[14416] {issue}13642[13642] - Add module for ActiveMQ. {pull}14788[14788] +- Add billing metricset in aws modules. {pull}14801[14801] {issue}14934[14934] - Add AWS SNS metricset. {pull}14946[14946] *Packetbeat* diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index 4dc7f8c72f33..e4a97fd02bc6 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -1541,6 +1541,12 @@ type: keyword -- +[float] +=== billing + +`billing` contains the estimated charges for your AWS account in Cloudwatch. + + [float] === cloudwatch diff --git a/metricbeat/docs/images/metricbeat-aws-billing-overview.png b/metricbeat/docs/images/metricbeat-aws-billing-overview.png new file mode 100644 index 000000000000..9544b1fa8a88 Binary files /dev/null and b/metricbeat/docs/images/metricbeat-aws-billing-overview.png differ diff --git a/metricbeat/docs/modules/aws.asciidoc b/metricbeat/docs/modules/aws.asciidoc index 836e9529c3f8..2dfe32dc585b 100644 --- a/metricbeat/docs/modules/aws.asciidoc +++ b/metricbeat/docs/modules/aws.asciidoc @@ -149,6 +149,8 @@ metricbeat.modules: The following metricsets are available: +* <> + * <> * <> @@ -167,6 +169,8 @@ The following metricsets are available: * <> +include::aws/billing.asciidoc[] + include::aws/cloudwatch.asciidoc[] include::aws/ebs.asciidoc[] diff --git a/metricbeat/docs/modules/aws/billing.asciidoc b/metricbeat/docs/modules/aws/billing.asciidoc new file mode 100644 index 000000000000..6db84ce54539 --- /dev/null +++ b/metricbeat/docs/modules/aws/billing.asciidoc @@ -0,0 +1,24 @@ +//// +This file is generated! See scripts/mage/docs_collector.go +//// + +[[metricbeat-metricset-aws-billing]] +=== aws billing metricset + +beta[] + +include::../../../../x-pack/metricbeat/module/aws/billing/_meta/docs.asciidoc[] + +This is a default metricset. If the host module is unconfigured, this metricset is enabled by default. + +==== Fields + +For a description of each field in the metricset, see the +<> section. + +Here is an example document generated by this metricset: + +[source,json] +---- +include::../../../../x-pack/metricbeat/module/aws/billing/_meta/data.json[] +---- diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc index c0a0c736d401..ab395cca1b0b 100644 --- a/metricbeat/docs/modules_list.asciidoc +++ b/metricbeat/docs/modules_list.asciidoc @@ -16,7 +16,8 @@ This file is generated! See scripts/mage/docs_collector.go |<> beta[] |image:./images/icon-no.png[No prebuilt dashboards] | .1+| .1+| |<> beta[] |<> |image:./images/icon-yes.png[Prebuilt dashboards are available] | -.9+| .9+| |<> +.10+| .10+| |<> beta[] +|<> |<> |<> |<> beta[] diff --git a/x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-billing-overview.json b/x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-billing-overview.json new file mode 100644 index 000000000000..bafbfedfc855 --- /dev/null +++ b/x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-billing-overview.json @@ -0,0 +1,480 @@ +{ + "objects": [ + { + "attributes": { + "description": "Overview of AWS Billing Metrics", + "hits": 0, + "kibanaSavedObjectMeta": { + "searchSourceJSON": { + "filter": [], + "query": { + "language": "kuery", + "query": "" + } + } + }, + "optionsJSON": { + "hidePanelTitles": false, + "useMargins": true + }, + "panelsJSON": [ + { + "embeddableConfig": { + "title": "AWS Account Filter" + }, + "gridData": { + "h": 5, + "i": "89dccfe8-a25e-44ea-afdb-ff01ab1f05d6", + "w": 16, + "x": 0, + "y": 0 + }, + "panelIndex": "89dccfe8-a25e-44ea-afdb-ff01ab1f05d6", + "panelRefName": "panel_0", + "title": "AWS Account Filter", + "version": "7.5.0" + }, + { + "embeddableConfig": { + "title": "Estimated Billing Chart" + }, + "gridData": { + "h": 16, + "i": "26670498-b079-4447-bbc8-e4ca8215898c", + "w": 32, + "x": 16, + "y": 0 + }, + "panelIndex": "26670498-b079-4447-bbc8-e4ca8215898c", + "panelRefName": "panel_1", + "title": "Estimated Billing Chart", + "version": "7.5.0" + }, + { + "embeddableConfig": { + "title": "Total Estimated Charges" + }, + "gridData": { + "h": 11, + "i": "04159643-33c0-4f01-80f1-fb8d212ed959", + "w": 16, + "x": 0, + "y": 5 + }, + "panelIndex": "04159643-33c0-4f01-80f1-fb8d212ed959", + "panelRefName": "panel_2", + "title": "Total Estimated Charges", + "version": "7.5.0" + }, + { + "embeddableConfig": { + "title": "Top 5 Estimated Billing Per Service Name" + }, + "gridData": { + "h": 15, + "i": "21e91e6b-0ff0-42ba-9132-6f30c5c6bbb7", + "w": 48, + "x": 0, + "y": 16 + }, + "panelIndex": "21e91e6b-0ff0-42ba-9132-6f30c5c6bbb7", + "panelRefName": "panel_3", + "title": "Top 5 Estimated Billing Per Service Name", + "version": "7.5.0" + } + ], + "timeRestore": false, + "title": "[Metricbeat AWS] Billing Overview", + "version": 1 + }, + "id": "e6776b10-1534-11ea-841c-01bf20a6c8ba", + "migrationVersion": { + "dashboard": "7.3.0" + }, + "references": [ + { + "id": "deab0260-2981-11e9-86eb-a3a07a77f530", + "name": "panel_0", + "type": "visualization" + }, + { + "id": "749cd470-1530-11ea-841c-01bf20a6c8ba", + "name": "panel_1", + "type": "visualization" + }, + { + "id": "83f08eb0-1532-11ea-841c-01bf20a6c8ba", + "name": "panel_2", + "type": "visualization" + }, + { + "id": "31a4ea90-152b-11ea-841c-01bf20a6c8ba", + "name": "panel_3", + "type": "visualization" + } + ], + "type": "dashboard", + "updated_at": "2019-12-02T18:54:47.255Z", + "version": "WzU1NywyXQ==" + }, + { + "attributes": { + "description": "", + "kibanaSavedObjectMeta": { + "searchSourceJSON": { + "filter": [], + "query": { + "language": "kuery", + "query": "" + } + } + }, + "title": "AWS Account Filter [Metricbeat AWS]", + "uiStateJSON": {}, + "version": 1, + "visState": { + "aggs": [], + "params": { + "controls": [ + { + "fieldName": "cloud.account.name", + "id": "1549397251041", + "indexPatternRefName": "control_0_index_pattern", + "label": "AWS account", + "options": { + "dynamicOptions": true, + "multiselect": true, + "order": "desc", + "size": 5, + "type": "terms" + }, + "parent": "", + "type": "list" + } + ], + "pinFilters": false, + "updateFiltersOnChange": true, + "useTimeFilter": false + }, + "title": "AWS Account Filter [Metricbeat AWS]", + "type": "input_control_vis" + } + }, + "id": "deab0260-2981-11e9-86eb-a3a07a77f530", + "migrationVersion": { + "visualization": "7.3.1" + }, + "references": [ + { + "id": "metricbeat-*", + "name": "control_0_index_pattern", + "type": "index-pattern" + } + ], + "type": "visualization", + "updated_at": "2019-12-02T18:50:52.450Z", + "version": "WzU1MywyXQ==" + }, + { + "attributes": { + "description": "", + "kibanaSavedObjectMeta": { + "searchSourceJSON": { + "filter": [], + "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.index", + "query": { + "language": "kuery", + "query": "" + } + } + }, + "title": "Estimated Billing Pie Chart [Metricbeat AWS]", + "uiStateJSON": { + "vis": { + "colors": { + "16": "#629E51", + "272": "#DEDAF7", + "80": "#E24D42", + "running": "#7EB26D", + "stopped": "#E24D42" + }, + "legendOpen": true + } + }, + "version": 1, + "visState": { + "aggs": [ + { + "enabled": true, + "id": "1", + "params": { + "customLabel": "", + "field": "aws.metrics.EstimatedCharges.max" + }, + "schema": "metric", + "type": "sum" + }, + { + "enabled": true, + "id": "2", + "params": { + "customLabel": "", + "field": "aws.cloudwatch.dimensions.ServiceName", + "missingBucket": false, + "missingBucketLabel": "Missing", + "order": "desc", + "orderAgg": { + "enabled": true, + "id": "2-orderAgg", + "params": { + "field": "aws.metrics.EstimatedCharges.max" + }, + "schema": "orderAgg", + "type": "avg" + }, + "orderBy": "custom", + "otherBucket": true, + "otherBucketLabel": "Other", + "size": 10 + }, + "schema": "segment", + "type": "terms" + } + ], + "params": { + "addLegend": true, + "addTooltip": true, + "dimensions": { + "buckets": [ + { + "accessor": 0, + "aggType": "terms", + "format": { + "id": "terms", + "params": { + "id": "string", + "missingBucketLabel": "Missing", + "otherBucketLabel": "Other" + } + }, + "params": {} + } + ], + "metric": { + "accessor": 1, + "aggType": "sum", + "format": { + "id": "number" + }, + "params": {} + } + }, + "isDonut": false, + "labels": { + "last_level": true, + "show": true, + "truncate": 100, + "values": true + }, + "legendPosition": "right", + "type": "pie" + }, + "title": "Estimated Billing Pie Chart [Metricbeat AWS]", + "type": "pie" + } + }, + "id": "749cd470-1530-11ea-841c-01bf20a6c8ba", + "migrationVersion": { + "visualization": "7.3.1" + }, + "references": [ + { + "id": "metricbeat-*", + "name": "kibanaSavedObjectMeta.searchSourceJSON.index", + "type": "index-pattern" + } + ], + "type": "visualization", + "updated_at": "2019-12-02T18:53:50.818Z", + "version": "WzU1NSwyXQ==" + }, + { + "attributes": { + "description": "", + "kibanaSavedObjectMeta": { + "searchSourceJSON": { + "filter": [], + "query": { + "language": "kuery", + "query": "" + } + } + }, + "title": "Total Estimated Charges [Metricbeat AWS]", + "uiStateJSON": {}, + "version": 1, + "visState": { + "aggs": [], + "params": { + "axis_formatter": "number", + "axis_position": "left", + "axis_scale": "normal", + "background_color_rules": [ + { + "id": "88a80e30-1530-11ea-961e-c1db9cc6166e" + } + ], + "bar_color_rules": [ + { + "id": "ebb52700-1531-11ea-961e-c1db9cc6166e" + } + ], + "default_index_pattern": "filebeat-*", + "default_timefield": "@timestamp", + "drop_last_bucket": 1, + "gauge_color_rules": [ + { + "id": "e8a045e0-1531-11ea-961e-c1db9cc6166e" + } + ], + "gauge_inner_width": 10, + "gauge_style": "half", + "gauge_width": 10, + "id": "61ca57f0-469d-11e7-af02-69e470af7417", + "index_pattern": "metricbeat-*", + "interval": "12h", + "isModelInvalid": false, + "series": [ + { + "axis_position": "right", + "chart_type": "line", + "color": "#68BC00", + "fill": 0.5, + "filter": { + "language": "kuery", + "query": "aws.cloudwatch.dimensions.ServiceName :* " + }, + "formatter": "number", + "id": "61ca57f1-469d-11e7-af02-69e470af7417", + "label": "Total Estimated Charges", + "line_width": 1, + "metrics": [ + { + "field": "aws.metrics.EstimatedCharges.max", + "id": "61ca57f2-469d-11e7-af02-69e470af7417", + "type": "sum" + } + ], + "point_size": 1, + "separate_axis": 0, + "split_mode": "filter", + "stacked": "none", + "value_template": "${{value}}" + } + ], + "show_grid": 1, + "show_legend": 1, + "time_field": null, + "type": "metric" + }, + "title": "Total Estimated Charges [Metricbeat AWS]", + "type": "metrics" + } + }, + "id": "83f08eb0-1532-11ea-841c-01bf20a6c8ba", + "migrationVersion": { + "visualization": "7.3.1" + }, + "references": [], + "type": "visualization", + "updated_at": "2019-12-02T18:35:29.434Z", + "version": "WzU0NywyXQ==" + }, + { + "attributes": { + "description": "", + "kibanaSavedObjectMeta": { + "searchSourceJSON": { + "filter": [], + "query": { + "language": "kuery", + "query": "" + } + } + }, + "title": "Top 5 Billing per Service Name [Metricbeat AWS]", + "uiStateJSON": {}, + "version": 1, + "visState": { + "aggs": [], + "params": { + "axis_formatter": "number", + "axis_min": 0, + "axis_position": "left", + "axis_scale": "normal", + "default_index_pattern": "filebeat-*", + "default_timefield": "@timestamp", + "drop_last_bucket": 0, + "filter": { + "language": "kuery", + "query": "" + }, + "id": "729af8b0-152a-11ea-ae8f-79fec1a0d4d3", + "index_pattern": "metricbeat-*", + "interval": "12h", + "isModelInvalid": false, + "series": [ + { + "axis_position": "right", + "chart_type": "line", + "color": "#3185FC", + "fill": 0, + "filter": { + "language": "kuery", + "query": "" + }, + "formatter": "number", + "id": "729b1fc0-152a-11ea-ae8f-79fec1a0d4d3", + "label": "avg(aws.metrics.EstimatedCharges.max)", + "line_width": 2, + "metrics": [ + { + "field": "aws.metrics.EstimatedCharges.max", + "id": "729b1fc1-152a-11ea-ae8f-79fec1a0d4d3", + "type": "avg" + } + ], + "point_size": "4", + "separate_axis": 0, + "split_color_mode": "rainbow", + "split_mode": "terms", + "stacked": "none", + "steps": 0, + "terms_field": "aws.cloudwatch.dimensions.ServiceName", + "terms_include": "", + "terms_order_by": "729b1fc1-152a-11ea-ae8f-79fec1a0d4d3", + "terms_size": "5", + "value_template": "${{value}}" + } + ], + "show_grid": 1, + "show_legend": 1, + "time_field": "@timestamp", + "type": "timeseries" + }, + "title": "Top 5 Billing per Service Name [Metricbeat AWS]", + "type": "metrics" + } + }, + "id": "31a4ea90-152b-11ea-841c-01bf20a6c8ba", + "migrationVersion": { + "visualization": "7.3.1" + }, + "references": [], + "type": "visualization", + "updated_at": "2019-12-02T18:49:11.978Z", + "version": "WzU1MSwyXQ==" + } + ], + "version": "7.5.0" +} diff --git a/x-pack/metricbeat/module/aws/billing/_meta/data.json b/x-pack/metricbeat/module/aws/billing/_meta/data.json new file mode 100644 index 000000000000..dc904b0608e4 --- /dev/null +++ b/x-pack/metricbeat/module/aws/billing/_meta/data.json @@ -0,0 +1,37 @@ +{ + "@timestamp": "2017-10-12T08:05:34.853Z", + "aws": { + "cloudwatch": { + "dimensions": { + "Currency": "USD", + "ServiceName": "AmazonEC2" + }, + "namespace": "AWS/Billing" + }, + "metrics": { + "EstimatedCharges": { + "max": 8.43 + } + } + }, + "cloud": { + "account": { + "id": "428152502467", + "name": "elastic-beats" + }, + "provider": "aws", + "region": "us-east-1" + }, + "event": { + "dataset": "aws.billing", + "duration": 115000, + "module": "aws" + }, + "metricset": { + "name": "billing", + "period": 10000 + }, + "service": { + "type": "aws" + } +} \ No newline at end of file diff --git a/x-pack/metricbeat/module/aws/billing/_meta/docs.asciidoc b/x-pack/metricbeat/module/aws/billing/_meta/docs.asciidoc new file mode 100644 index 000000000000..0e0b4ffb6247 --- /dev/null +++ b/x-pack/metricbeat/module/aws/billing/_meta/docs.asciidoc @@ -0,0 +1,50 @@ +You can monitor your estimated AWS charges by using Amazon CloudWatch. When you +enable the monitoring of estimated charges for your AWS account, the estimated +charges are calculated and sent several times daily to CloudWatch as metric data. + +Billing metric data is stored in the US East (N. Virginia) Region and represents +worldwide charges. This data includes the estimated charges for every service in +AWS that you use, in addition to the estimated overall total of your AWS charges. + +This aws `billing` metricset collects these Cloudwatch metrics for monitoring +purposes. + +[float] +=== AWS Permissions +Some specific AWS permissions are required for IAM user to collect estimated +billing metrics. +---- +cloudwatch:GetMetricData +cloudwatch:ListMetrics +tag:getResources +sts:GetCallerIdentity +iam:ListAccountAliases +---- + +[float] +=== Dashboard + +The aws billing metricset comes with a predefined dashboard. For example: + +image::./images/metricbeat-aws-billing-overview.png[] + +[float] +=== Configuration example +[source,yaml] +---- +- module: aws + period: 12h + metricsets: + - billing + # This module uses the aws cloudwatch metricset, all + # the options for this metricset are also available here. +---- + +[float] +=== Metrics +|=== +|Metric Name|Statistic Method +|EstimatedCharges | Maximum +|=== + +Supported dimensions for billing metrics: Currency and ServiceName. diff --git a/x-pack/metricbeat/module/aws/billing/_meta/fields.yml b/x-pack/metricbeat/module/aws/billing/_meta/fields.yml new file mode 100644 index 000000000000..94b06a2f151a --- /dev/null +++ b/x-pack/metricbeat/module/aws/billing/_meta/fields.yml @@ -0,0 +1,6 @@ +- name: billing + type: group + description: > + `billing` contains the estimated charges for your AWS account in Cloudwatch. + release: beta + fields: diff --git a/x-pack/metricbeat/module/aws/billing/billing_integration_test.go b/x-pack/metricbeat/module/aws/billing/billing_integration_test.go new file mode 100644 index 000000000000..f479f57c22a3 --- /dev/null +++ b/x-pack/metricbeat/module/aws/billing/billing_integration_test.go @@ -0,0 +1,24 @@ +// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one +// or more contributor license agreements. Licensed under the Elastic License; +// you may not use this file except in compliance with the Elastic License. + +// +build integration + +package billing + +import ( + "testing" + + mbtest "github.com/elastic/beats/metricbeat/mb/testing" + "github.com/elastic/beats/x-pack/metricbeat/module/aws/mtest" +) + +func TestData(t *testing.T) { + config, info := mtest.GetConfigForTest("billing", "300s") + if info != "" { + t.Skip("Skipping TestData: " + info) + } + + metricSet := mbtest.NewFetcher(t, config) + metricSet.WriteEvents(t, "/") +} diff --git a/x-pack/metricbeat/module/aws/billing/billing_test.go b/x-pack/metricbeat/module/aws/billing/billing_test.go new file mode 100644 index 000000000000..dac7a5e51b05 --- /dev/null +++ b/x-pack/metricbeat/module/aws/billing/billing_test.go @@ -0,0 +1,21 @@ +// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one +// or more contributor license agreements. Licensed under the Elastic License; +// you may not use this file except in compliance with the Elastic License. + +package billing + +import ( + "os" + + "github.com/elastic/beats/metricbeat/mb" + + // Register input module and metricset + _ "github.com/elastic/beats/x-pack/metricbeat/module/aws" + _ "github.com/elastic/beats/x-pack/metricbeat/module/aws/cloudwatch" +) + +func init() { + // To be moved to some kind of helper + os.Setenv("BEAT_STRICT_PERMS", "false") + mb.Registry.SetSecondarySource(mb.NewLightModulesSource("../../../module")) +} diff --git a/x-pack/metricbeat/module/aws/billing/manifest.yml b/x-pack/metricbeat/module/aws/billing/manifest.yml new file mode 100644 index 000000000000..cca412df649d --- /dev/null +++ b/x-pack/metricbeat/module/aws/billing/manifest.yml @@ -0,0 +1,10 @@ +default: true +input: + module: aws + metricset: cloudwatch + defaults: + regions: + - us-east-1 + metrics: + - namespace: AWS/Billing + statistic: ["Maximum"] diff --git a/x-pack/metricbeat/module/aws/fields.go b/x-pack/metricbeat/module/aws/fields.go index fc200fe0a5c7..246cc4fb8fd3 100644 --- a/x-pack/metricbeat/module/aws/fields.go +++ b/x-pack/metricbeat/module/aws/fields.go @@ -19,5 +19,5 @@ func init() { // AssetAws returns asset data. // This is the base64 encoded gzipped contents of module/aws. func AssetAws() string { - return "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" + return "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" } diff --git a/x-pack/metricbeat/module/aws/module.yml b/x-pack/metricbeat/module/aws/module.yml index baffd17b521d..390b17acf74b 100644 --- a/x-pack/metricbeat/module/aws/module.yml +++ b/x-pack/metricbeat/module/aws/module.yml @@ -2,4 +2,5 @@ name: aws metricsets: - elb - ebs + - billing - sns