diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index d9152a8a3bc..2f8a51487f8 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -380,6 +380,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Add aggregation aligner as a config parameter for googlecloud stackdriver metricset. {issue}17141[[17141] {pull}17719[17719] - Move the perfmon metricset to GA. {issue}16608[16608] {pull}17879[17879] - Add static mapping for metricsets under aws module. {pull}17614[17614] {pull}17650[17650] +- Add dashboard for googlecloud storage metricset. {pull}18172[18172] - Collect new `bulk` indexing metrics from Elasticsearch when `xpack.enabled:true` is set. {issue} {pull}17992[17992] - Remove requirement to connect as sysdba in Oracle module {issue}15846[15846] {pull}18182[18182] - Update MSSQL module to fix some SSPI authentication and add brackets to USE statements {pull}17862[17862]] diff --git a/metricbeat/docs/images/metricbeat-googlecloud-storage-overview.png b/metricbeat/docs/images/metricbeat-googlecloud-storage-overview.png new file mode 100644 index 00000000000..a1af2aa8314 Binary files /dev/null and b/metricbeat/docs/images/metricbeat-googlecloud-storage-overview.png differ diff --git a/metricbeat/docs/modules/googlecloud.asciidoc b/metricbeat/docs/modules/googlecloud.asciidoc index 3dcf9b20db9..19d59a9fe8d 100644 --- a/metricbeat/docs/modules/googlecloud.asciidoc +++ b/metricbeat/docs/modules/googlecloud.asciidoc @@ -144,14 +144,14 @@ For example, if Compute Metricset fetches 14 metrics (which is the number of met [float] == Metricsets -Currently, we have `compute`, `loadbalancing`, and `pubsub` metricset in -`googlecloud` module. +Currently, we have `compute`, `loadbalancing`, `pubsub`, `stackdriver` and +`storage` metricset in `googlecloud` module. [float] === `compute` -Compute Metricset to fetch metrics from https://cloud.google.com/compute/[Compute Engine] -Virtual Machines in Google Cloud Platform. The `compute` metricset contains some of the -metrics exported from the https://cloud.google.com/monitoring/api/metrics_gcp#gcp-compute[Stackdriver API]. +This metricset fetches metrics from https://cloud.google.com/compute/[Compute Engine] +Virtual Machines in Google Cloud Platform. The `compute` metricset contains some +of the metrics exported from the https://cloud.google.com/monitoring/api/metrics_gcp#gcp-compute[GCP Compute Monitoring API]. Extra labels and metadata are also extracted using the https://cloud.google.com/compute/docs/reference/rest/v1/instances/get[Compute API]. This is enough to get most of the info associated with a metric like compute labels and metadata and metric specific Labels. @@ -160,6 +160,45 @@ The `compute` metricset comes with a predefined dashboard: image::./images/metricbeat-googlecloud-compute-overview.png[] +[float] +=== `loadbalancing` +This metricset fetches metrics from https://cloud.google.com/load-balancing/[Load Balancing] +in Google Cloud Platform. The `loadbalancing` metricset contains all metrics +exported from the https://cloud.google.com/monitoring/api/metrics_gcp#gcp-loadbalancing[GCP Load Balancing Monitoring API]. + +[float] +=== `pubsub` +This metricset fetches metrics from https://cloud.google.com/pubsub/[Pub/Sub] +topics and subscriptions in Google Cloud Platform. The `pubsub` metricset +contains all GA stage metrics exported from the +https://cloud.google.com/monitoring/api/metrics_gcp#gcp-pubsub[GCP PubSub Monitoring API]. + +The `pubsub` metricset comes with a predefined dashboard: + +image::./images/metricbeat-googlecloud-pubsub-overview.png[] + +[float] +=== `stackdriver` +Stackdriver provides visibility into the performance, uptime, and overall health +of cloud-powered applications. It collects metrics, events, and metadata from +different services from Google Cloud. +This metricset is to collect https://cloud.google.com/monitoring/api/metrics_gcp[monitoring metrics] +from Google Cloud using `ListTimeSeries` API. + +[float] +=== `storage` +This metricset fetches metrics from https://cloud.google.com/storage/[Storage] +in Google Cloud Platform. The `storage` metricset contains all GA metrics +exported from the https://cloud.google.com/monitoring/api/metrics_gcp#gcp-storage[GCP Storage Monitoring API]. + +We recommend users to define `period: 5m` for this metricset because in Google +Cloud, storage monitoring metrics are written every 5-minute sample period with +a 10-minute ingest delay. + +The `storage` metricset comes with a predefined dashboard: + +image::./images/metricbeat-googlecloud-storage-overview.png[] + [float] === Example configuration @@ -173,11 +212,11 @@ metricbeat.modules: - module: googlecloud metricsets: - compute - region: "us-central1" + region: "us-" project_id: "your project id" credentials_file_path: "your JSON credentials file path" exclude_labels: false - period: 300s + period: 1m - module: googlecloud metricsets: @@ -187,25 +226,15 @@ metricbeat.modules: project_id: "your project id" credentials_file_path: "your JSON credentials file path" exclude_labels: false - period: 60s + period: 1m - module: googlecloud metricsets: - storage - region: "us-central1" project_id: "your project id" credentials_file_path: "your JSON credentials file path" exclude_labels: false - period: 300s - -- module: googlecloud - metricsets: - - compute - region: "us-" - project_id: "your project id" - credentials_file_path: "your JSON credentials file path" - exclude_labels: false - period: 60s + period: 5m ---- [float] diff --git a/x-pack/metricbeat/metricbeat.reference.yml b/x-pack/metricbeat/metricbeat.reference.yml index c4edea4a09b..6fe553e5e4d 100644 --- a/x-pack/metricbeat/metricbeat.reference.yml +++ b/x-pack/metricbeat/metricbeat.reference.yml @@ -499,11 +499,11 @@ metricbeat.modules: - module: googlecloud metricsets: - compute - region: "us-central1" + region: "us-" project_id: "your project id" credentials_file_path: "your JSON credentials file path" exclude_labels: false - period: 300s + period: 1m - module: googlecloud metricsets: @@ -513,25 +513,15 @@ metricbeat.modules: project_id: "your project id" credentials_file_path: "your JSON credentials file path" exclude_labels: false - period: 60s + period: 1m - module: googlecloud metricsets: - storage - region: "us-central1" project_id: "your project id" credentials_file_path: "your JSON credentials file path" exclude_labels: false - period: 300s - -- module: googlecloud - metricsets: - - compute - region: "us-" - project_id: "your project id" - credentials_file_path: "your JSON credentials file path" - exclude_labels: false - period: 60s + period: 5m #------------------------------- Graphite Module ------------------------------- - module: graphite diff --git a/x-pack/metricbeat/module/googlecloud/_meta/config.yml b/x-pack/metricbeat/module/googlecloud/_meta/config.yml index 640fd87bc5a..35d252c699f 100644 --- a/x-pack/metricbeat/module/googlecloud/_meta/config.yml +++ b/x-pack/metricbeat/module/googlecloud/_meta/config.yml @@ -1,11 +1,11 @@ - module: googlecloud metricsets: - compute - region: "us-central1" + region: "us-" project_id: "your project id" credentials_file_path: "your JSON credentials file path" exclude_labels: false - period: 300s + period: 1m - module: googlecloud metricsets: @@ -15,22 +15,12 @@ project_id: "your project id" credentials_file_path: "your JSON credentials file path" exclude_labels: false - period: 60s + period: 1m - module: googlecloud metricsets: - storage - region: "us-central1" - project_id: "your project id" - credentials_file_path: "your JSON credentials file path" - exclude_labels: false - period: 300s - -- module: googlecloud - metricsets: - - compute - region: "us-" project_id: "your project id" credentials_file_path: "your JSON credentials file path" exclude_labels: false - period: 60s + period: 5m diff --git a/x-pack/metricbeat/module/googlecloud/_meta/docs.asciidoc b/x-pack/metricbeat/module/googlecloud/_meta/docs.asciidoc index 5a1e4ed62f3..692db78bb55 100644 --- a/x-pack/metricbeat/module/googlecloud/_meta/docs.asciidoc +++ b/x-pack/metricbeat/module/googlecloud/_meta/docs.asciidoc @@ -134,14 +134,14 @@ For example, if Compute Metricset fetches 14 metrics (which is the number of met [float] == Metricsets -Currently, we have `compute`, `loadbalancing`, and `pubsub` metricset in -`googlecloud` module. +Currently, we have `compute`, `loadbalancing`, `pubsub`, `stackdriver` and +`storage` metricset in `googlecloud` module. [float] === `compute` -Compute Metricset to fetch metrics from https://cloud.google.com/compute/[Compute Engine] -Virtual Machines in Google Cloud Platform. The `compute` metricset contains some of the -metrics exported from the https://cloud.google.com/monitoring/api/metrics_gcp#gcp-compute[Stackdriver API]. +This metricset fetches metrics from https://cloud.google.com/compute/[Compute Engine] +Virtual Machines in Google Cloud Platform. The `compute` metricset contains some +of the metrics exported from the https://cloud.google.com/monitoring/api/metrics_gcp#gcp-compute[GCP Compute Monitoring API]. Extra labels and metadata are also extracted using the https://cloud.google.com/compute/docs/reference/rest/v1/instances/get[Compute API]. This is enough to get most of the info associated with a metric like compute labels and metadata and metric specific Labels. @@ -149,3 +149,42 @@ labels and metadata and metric specific Labels. The `compute` metricset comes with a predefined dashboard: image::./images/metricbeat-googlecloud-compute-overview.png[] + +[float] +=== `loadbalancing` +This metricset fetches metrics from https://cloud.google.com/load-balancing/[Load Balancing] +in Google Cloud Platform. The `loadbalancing` metricset contains all metrics +exported from the https://cloud.google.com/monitoring/api/metrics_gcp#gcp-loadbalancing[GCP Load Balancing Monitoring API]. + +[float] +=== `pubsub` +This metricset fetches metrics from https://cloud.google.com/pubsub/[Pub/Sub] +topics and subscriptions in Google Cloud Platform. The `pubsub` metricset +contains all GA stage metrics exported from the +https://cloud.google.com/monitoring/api/metrics_gcp#gcp-pubsub[GCP PubSub Monitoring API]. + +The `pubsub` metricset comes with a predefined dashboard: + +image::./images/metricbeat-googlecloud-pubsub-overview.png[] + +[float] +=== `stackdriver` +Stackdriver provides visibility into the performance, uptime, and overall health +of cloud-powered applications. It collects metrics, events, and metadata from +different services from Google Cloud. +This metricset is to collect https://cloud.google.com/monitoring/api/metrics_gcp[monitoring metrics] +from Google Cloud using `ListTimeSeries` API. + +[float] +=== `storage` +This metricset fetches metrics from https://cloud.google.com/storage/[Storage] +in Google Cloud Platform. The `storage` metricset contains all GA metrics +exported from the https://cloud.google.com/monitoring/api/metrics_gcp#gcp-storage[GCP Storage Monitoring API]. + +We recommend users to define `period: 5m` for this metricset because in Google +Cloud, storage monitoring metrics are written every 5-minute sample period with +a 10-minute ingest delay. + +The `storage` metricset comes with a predefined dashboard: + +image::./images/metricbeat-googlecloud-storage-overview.png[] diff --git a/x-pack/metricbeat/module/googlecloud/_meta/kibana/7/dashboard/Metricbeat-googlecloud-storage-overview.json b/x-pack/metricbeat/module/googlecloud/_meta/kibana/7/dashboard/Metricbeat-googlecloud-storage-overview.json new file mode 100644 index 00000000000..b95662ca7a6 --- /dev/null +++ b/x-pack/metricbeat/module/googlecloud/_meta/kibana/7/dashboard/Metricbeat-googlecloud-storage-overview.json @@ -0,0 +1,619 @@ +{ + "objects": [ + { + "attributes": { + "description": "Overview of Googlecloud Storage Metrics", + "hits": 0, + "kibanaSavedObjectMeta": { + "searchSourceJSON": { + "filter": [], + "query": { + "language": "kuery", + "query": "" + } + } + }, + "optionsJSON": { + "hidePanelTitles": false, + "useMargins": true + }, + "panelsJSON": [ + { + "embeddableConfig": { + "title": "Filters" + }, + "gridData": { + "h": 15, + "i": "8d4e63d8-5747-4ebc-aeae-02d20e304526", + "w": 10, + "x": 0, + "y": 0 + }, + "panelIndex": "8d4e63d8-5747-4ebc-aeae-02d20e304526", + "panelRefName": "panel_0", + "title": "Filters", + "version": "7.6.2" + }, + { + "embeddableConfig": { + "title": "Total Size of Objects" + }, + "gridData": { + "h": 15, + "i": "70c46ee3-be59-4fb1-a437-c8e92a1d0b2a", + "w": 38, + "x": 10, + "y": 0 + }, + "panelIndex": "70c46ee3-be59-4fb1-a437-c8e92a1d0b2a", + "panelRefName": "panel_1", + "title": "Total Size of Objects", + "version": "7.6.2" + }, + { + "embeddableConfig": { + "title": "Total Number of Objects" + }, + "gridData": { + "h": 15, + "i": "ba356b1b-ec2b-4a05-8a70-19a43b3dc3a8", + "w": 24, + "x": 0, + "y": 15 + }, + "panelIndex": "ba356b1b-ec2b-4a05-8a70-19a43b3dc3a8", + "panelRefName": "panel_2", + "title": "Total Number of Objects", + "version": "7.6.2" + }, + { + "embeddableConfig": { + "title": "API Request Count" + }, + "gridData": { + "h": 15, + "i": "77f185ba-74ad-4102-bca7-08587cd1bf6c", + "w": 24, + "x": 24, + "y": 15 + }, + "panelIndex": "77f185ba-74ad-4102-bca7-08587cd1bf6c", + "panelRefName": "panel_3", + "title": "API Request Count", + "version": "7.6.2" + }, + { + "embeddableConfig": { + "title": "Number of Bytes Received Over Network" + }, + "gridData": { + "h": 15, + "i": "f2ab3410-44b0-4b01-bb93-1394d6a64257", + "w": 24, + "x": 0, + "y": 30 + }, + "panelIndex": "f2ab3410-44b0-4b01-bb93-1394d6a64257", + "panelRefName": "panel_4", + "title": "Number of Bytes Received Over Network", + "version": "7.6.2" + }, + { + "embeddableConfig": { + "title": "Number of Bytes Sent Over Network" + }, + "gridData": { + "h": 15, + "i": "75d342a5-f67b-4c61-b31d-b0b2db2ab50a", + "w": 24, + "x": 24, + "y": 30 + }, + "panelIndex": "75d342a5-f67b-4c61-b31d-b0b2db2ab50a", + "panelRefName": "panel_5", + "title": "Number of Bytes Sent Over Network", + "version": "7.6.2" + } + ], + "timeRestore": false, + "title": "[Metricbeat Googlecloud] Storage Overview", + "version": 1 + }, + "id": "ca401040-8e52-11ea-9fa6-4d675d5290dc", + "migrationVersion": { + "dashboard": "7.3.0" + }, + "references": [ + { + "id": "4b44b2b0-8e51-11ea-9fa6-4d675d5290dc", + "name": "panel_0", + "type": "visualization" + }, + { + "id": "239e2290-8e52-11ea-9fa6-4d675d5290dc", + "name": "panel_1", + "type": "visualization" + }, + { + "id": "02b3c620-8e52-11ea-9fa6-4d675d5290dc", + "name": "panel_2", + "type": "visualization" + }, + { + "id": "91eb8d10-8e51-11ea-9fa6-4d675d5290dc", + "name": "panel_3", + "type": "visualization" + }, + { + "id": "d4cc5ec0-8e51-11ea-9fa6-4d675d5290dc", + "name": "panel_4", + "type": "visualization" + }, + { + "id": "e9e44d90-8e51-11ea-9fa6-4d675d5290dc", + "name": "panel_5", + "type": "visualization" + } + ], + "type": "dashboard", + "updated_at": "2020-05-04T22:20:05.420Z", + "version": "WzMyMDUsMV0=" + }, + { + "attributes": { + "description": "", + "kibanaSavedObjectMeta": { + "searchSourceJSON": {} + }, + "title": "Storage Filters [Metricbeat GoogleCloud]", + "uiStateJSON": {}, + "version": 1, + "visState": { + "aggs": [], + "params": { + "controls": [ + { + "fieldName": "googlecloud.labels.resource.bucket_name", + "id": "1588628954328", + "indexPatternRefName": "control_0_index_pattern", + "label": "Bucket Name", + "options": { + "dynamicOptions": true, + "multiselect": true, + "order": "desc", + "size": 5, + "type": "terms" + }, + "parent": "", + "type": "list" + }, + { + "fieldName": "googlecloud.labels.resource.location", + "id": "1588628981768", + "indexPatternRefName": "control_1_index_pattern", + "label": "Location", + "options": { + "dynamicOptions": true, + "multiselect": true, + "order": "desc", + "size": 5, + "type": "terms" + }, + "parent": "", + "type": "list" + }, + { + "fieldName": "googlecloud.labels.metrics.storage_class", + "id": "1588629001851", + "indexPatternRefName": "control_2_index_pattern", + "label": "Storage Class", + "options": { + "dynamicOptions": true, + "multiselect": true, + "order": "desc", + "size": 5, + "type": "terms" + }, + "parent": "", + "type": "list" + } + ], + "pinFilters": false, + "updateFiltersOnChange": false, + "useTimeFilter": false + }, + "title": "Storage Filters [Metricbeat GoogleCloud]", + "type": "input_control_vis" + } + }, + "id": "4b44b2b0-8e51-11ea-9fa6-4d675d5290dc", + "migrationVersion": { + "visualization": "7.4.2" + }, + "references": [ + { + "id": "metricbeat-*", + "name": "control_0_index_pattern", + "type": "index-pattern" + }, + { + "id": "metricbeat-*", + "name": "control_1_index_pattern", + "type": "index-pattern" + }, + { + "id": "metricbeat-*", + "name": "control_2_index_pattern", + "type": "index-pattern" + } + ], + "type": "visualization", + "updated_at": "2020-05-04T21:50:39.450Z", + "version": "WzMxODEsMV0=" + }, + { + "attributes": { + "description": "", + "kibanaSavedObjectMeta": { + "searchSourceJSON": {} + }, + "title": "Storage Total Bytes [Metricbeat GoogleCloud]", + "uiStateJSON": {}, + "version": 1, + "visState": { + "aggs": [], + "params": { + "axis_formatter": "number", + "axis_position": "left", + "axis_scale": "normal", + "background_color_rules": [ + { + "id": "8ec10ba0-8e52-11ea-8164-1ddf506ac7af" + } + ], + "bar_color_rules": [ + { + "id": "8fdd7820-8e52-11ea-8164-1ddf506ac7af" + } + ], + "default_index_pattern": "metricbeat-*", + "default_timefield": "@timestamp", + "drop_last_bucket": 1, + "id": "61ca57f0-469d-11e7-af02-69e470af7417", + "index_pattern": "", + "interval": "15m", + "isModelInvalid": false, + "series": [ + { + "axis_position": "right", + "chart_type": "line", + "color": "#68BC00", + "fill": "0", + "filter": { + "language": "kuery", + "query": "googlecloud.storage.storage.total_bytes.value : * " + }, + "formatter": "bytes", + "id": "61ca57f1-469d-11e7-af02-69e470af7417", + "label": "", + "line_width": "2", + "metrics": [ + { + "field": "googlecloud.storage.storage.total_bytes.value", + "id": "61ca57f2-469d-11e7-af02-69e470af7417", + "type": "avg" + } + ], + "point_size": "3", + "separate_axis": 0, + "split_color_mode": "rainbow", + "split_mode": "terms", + "stacked": "none", + "terms_field": "googlecloud.labels.resource.bucket_name", + "terms_include": "", + "terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417", + "type": "timeseries" + } + ], + "show_grid": 1, + "show_legend": 1, + "time_field": "", + "type": "top_n" + }, + "title": "Storage Total Bytes [Metricbeat GoogleCloud]", + "type": "metrics" + } + }, + "id": "239e2290-8e52-11ea-9fa6-4d675d5290dc", + "migrationVersion": { + "visualization": "7.4.2" + }, + "references": [], + "type": "visualization", + "updated_at": "2020-05-04T22:16:39.457Z", + "version": "WzMyMDIsMV0=" + }, + { + "attributes": { + "description": "", + "kibanaSavedObjectMeta": { + "searchSourceJSON": {} + }, + "title": "Storage Object Count [Metricbeat GoogleCloud]", + "uiStateJSON": {}, + "version": 1, + "visState": { + "aggs": [], + "params": { + "axis_formatter": "number", + "axis_position": "left", + "axis_scale": "normal", + "bar_color_rules": [ + { + "id": "23042750-8e64-11ea-9fba-216938b39761" + } + ], + "default_index_pattern": "metricbeat-*", + "default_timefield": "@timestamp", + "gauge_color_rules": [ + { + "id": "2268f8c0-8e64-11ea-9fba-216938b39761" + } + ], + "gauge_inner_width": 10, + "gauge_style": "half", + "gauge_width": 10, + "id": "61ca57f0-469d-11e7-af02-69e470af7417", + "index_pattern": "", + "interval": "15m", + "isModelInvalid": false, + "series": [ + { + "axis_position": "right", + "chart_type": "line", + "color": "#68BC00", + "fill": "0", + "filter": { + "language": "kuery", + "query": "googlecloud.storage.storage.object_count.value : * " + }, + "formatter": "number", + "id": "61ca57f1-469d-11e7-af02-69e470af7417", + "label": "", + "line_width": "2", + "metrics": [ + { + "field": "googlecloud.storage.storage.object_count.value", + "id": "61ca57f2-469d-11e7-af02-69e470af7417", + "type": "avg" + } + ], + "point_size": "3", + "separate_axis": 0, + "split_color_mode": "rainbow", + "split_mode": "terms", + "stacked": "none", + "terms_field": "googlecloud.labels.resource.bucket_name", + "terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417", + "type": "timeseries" + } + ], + "show_grid": 1, + "show_legend": 1, + "time_field": "", + "type": "top_n" + }, + "title": "Storage Object Count [Metricbeat GoogleCloud]", + "type": "metrics" + } + }, + "id": "02b3c620-8e52-11ea-9fa6-4d675d5290dc", + "migrationVersion": { + "visualization": "7.4.2" + }, + "references": [], + "type": "visualization", + "updated_at": "2020-05-05T00:08:18.595Z", + "version": "WzMyMTksMV0=" + }, + { + "attributes": { + "description": "", + "kibanaSavedObjectMeta": { + "searchSourceJSON": {} + }, + "title": "Storage API Request Count [Metricbeat GoogleCloud]", + "uiStateJSON": {}, + "version": 1, + "visState": { + "aggs": [], + "params": { + "axis_formatter": "number", + "axis_position": "left", + "axis_scale": "normal", + "default_index_pattern": "metricbeat-*", + "default_timefield": "@timestamp", + "id": "61ca57f0-469d-11e7-af02-69e470af7417", + "index_pattern": "", + "interval": "5m", + "isModelInvalid": false, + "series": [ + { + "axis_position": "right", + "chart_type": "line", + "color": "#68BC00", + "fill": "0", + "formatter": "number", + "id": "61ca57f1-469d-11e7-af02-69e470af7417", + "label": "", + "line_width": "2", + "metrics": [ + { + "field": "googlecloud.storage.api.request_count.value", + "id": "61ca57f2-469d-11e7-af02-69e470af7417", + "type": "avg" + } + ], + "point_size": "3", + "separate_axis": 0, + "split_color_mode": "rainbow", + "split_mode": "terms", + "stacked": "none", + "terms_field": "googlecloud.labels.resource.bucket_name", + "terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417", + "type": "timeseries" + } + ], + "show_grid": 1, + "show_legend": 1, + "time_field": "", + "type": "timeseries" + }, + "title": "Storage API Request Count [Metricbeat GoogleCloud]", + "type": "metrics" + } + }, + "id": "91eb8d10-8e51-11ea-9fa6-4d675d5290dc", + "migrationVersion": { + "visualization": "7.4.2" + }, + "references": [], + "type": "visualization", + "updated_at": "2020-05-04T21:52:37.984Z", + "version": "WzMxODMsMV0=" + }, + { + "attributes": { + "description": "", + "kibanaSavedObjectMeta": { + "searchSourceJSON": {} + }, + "title": "Storage Network Received Bytes [Metricbeat GoogleCloud]", + "uiStateJSON": {}, + "version": 1, + "visState": { + "aggs": [], + "params": { + "axis_formatter": "number", + "axis_position": "left", + "axis_scale": "normal", + "default_index_pattern": "metricbeat-*", + "default_timefield": "@timestamp", + "id": "61ca57f0-469d-11e7-af02-69e470af7417", + "index_pattern": "", + "interval": "5m", + "isModelInvalid": false, + "series": [ + { + "axis_position": "right", + "chart_type": "line", + "color": "#68BC00", + "fill": "0", + "formatter": "bytes", + "id": "61ca57f1-469d-11e7-af02-69e470af7417", + "label": "", + "line_width": "2", + "metrics": [ + { + "field": "googlecloud.storage.network.received_bytes_count.value", + "id": "61ca57f2-469d-11e7-af02-69e470af7417", + "type": "avg" + } + ], + "point_size": "3", + "separate_axis": 0, + "split_color_mode": "rainbow", + "split_mode": "terms", + "stacked": "none", + "terms_field": "googlecloud.labels.resource.bucket_name", + "terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417", + "type": "timeseries" + } + ], + "show_grid": 1, + "show_legend": 1, + "time_field": "", + "type": "timeseries" + }, + "title": "Storage Network Received Bytes [Metricbeat GoogleCloud]", + "type": "metrics" + } + }, + "id": "d4cc5ec0-8e51-11ea-9fa6-4d675d5290dc", + "migrationVersion": { + "visualization": "7.4.2" + }, + "references": [], + "type": "visualization", + "updated_at": "2020-05-04T21:54:43.407Z", + "version": "WzMxODUsMV0=" + }, + { + "attributes": { + "description": "", + "kibanaSavedObjectMeta": { + "searchSourceJSON": {} + }, + "title": "Storage Network Sent Bytes [Metricbeat GoogleCloud]", + "uiStateJSON": {}, + "version": 1, + "visState": { + "aggs": [], + "params": { + "axis_formatter": "number", + "axis_position": "left", + "axis_scale": "normal", + "default_index_pattern": "metricbeat-*", + "default_timefield": "@timestamp", + "id": "61ca57f0-469d-11e7-af02-69e470af7417", + "index_pattern": "", + "interval": "5m", + "isModelInvalid": false, + "series": [ + { + "axis_position": "right", + "chart_type": "line", + "color": "#68BC00", + "fill": "0", + "formatter": "bytes", + "id": "61ca57f1-469d-11e7-af02-69e470af7417", + "label": "", + "line_width": "2", + "metrics": [ + { + "field": "googlecloud.storage.network.sent_bytes_count.value", + "id": "61ca57f2-469d-11e7-af02-69e470af7417", + "type": "avg" + } + ], + "point_size": "3", + "separate_axis": 0, + "split_color_mode": "rainbow", + "split_mode": "terms", + "stacked": "none", + "terms_field": "googlecloud.labels.resource.bucket_name", + "terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417", + "type": "timeseries" + } + ], + "show_grid": 1, + "show_legend": 1, + "time_field": "", + "type": "timeseries" + }, + "title": "Storage Network Sent Bytes [Metricbeat GoogleCloud]", + "type": "metrics" + } + }, + "id": "e9e44d90-8e51-11ea-9fa6-4d675d5290dc", + "migrationVersion": { + "visualization": "7.4.2" + }, + "references": [], + "type": "visualization", + "updated_at": "2020-05-04T21:55:05.577Z", + "version": "WzMxODYsMV0=" + } + ], + "version": "7.6.2" +} diff --git a/x-pack/metricbeat/module/googlecloud/loadbalancing/_meta/docs.asciidoc b/x-pack/metricbeat/module/googlecloud/loadbalancing/_meta/docs.asciidoc index 2022b44d1c7..3a76c29e4fe 100644 --- a/x-pack/metricbeat/module/googlecloud/loadbalancing/_meta/docs.asciidoc +++ b/x-pack/metricbeat/module/googlecloud/loadbalancing/_meta/docs.asciidoc @@ -1,4 +1,4 @@ -Load Balancing metricset to fetch metrics from https://cloud.google.com/load-balancing/[Load Balancing] in Google Cloud Platform. +Load Balancing metricset fetches metrics from https://cloud.google.com/load-balancing/[Load Balancing] in Google Cloud Platform. The `loadbalancing` metricset contains all metrics exported from the https://cloud.google.com/monitoring/api/metrics_gcp#gcp-loadbalancing[Stackdriver API]. The field names have been left untouched for people already familiar with them. diff --git a/x-pack/metricbeat/module/googlecloud/pubsub/_meta/docs.asciidoc b/x-pack/metricbeat/module/googlecloud/pubsub/_meta/docs.asciidoc index f8faf2bada0..e75da797e7c 100644 --- a/x-pack/metricbeat/module/googlecloud/pubsub/_meta/docs.asciidoc +++ b/x-pack/metricbeat/module/googlecloud/pubsub/_meta/docs.asciidoc @@ -1,4 +1,4 @@ -PubSub metricsetf to fetch metrics from https://cloud.google.com/pubsub/[Pub/Sub] topics and subscriptions in Google Cloud Platform. +PubSub metricsetf fetches metrics from https://cloud.google.com/pubsub/[Pub/Sub] topics and subscriptions in Google Cloud Platform. The `pubsub` metricset contains all GA stage metrics exported from the https://cloud.google.com/monitoring/api/metrics_gcp#gcp-pubsub[Stackdriver API]. The field names have been left untouched for people already familiar with them. diff --git a/x-pack/metricbeat/module/googlecloud/stackdriver/integration.go b/x-pack/metricbeat/module/googlecloud/stackdriver/integration.go index 68e3750d5a5..9d61cc9a374 100644 --- a/x-pack/metricbeat/module/googlecloud/stackdriver/integration.go +++ b/x-pack/metricbeat/module/googlecloud/stackdriver/integration.go @@ -27,7 +27,7 @@ func GetConfigForTest(t *testing.T, metricSetName string) map[string]interface{} } else { config = map[string]interface{}{ "module": "googlecloud", - "period": "5m", + "period": "1m", "metricsets": []string{metricSetName}, "project_id": projectID, "credentials_file_path": credentialsFilePath, diff --git a/x-pack/metricbeat/module/googlecloud/storage/_meta/docs.asciidoc b/x-pack/metricbeat/module/googlecloud/storage/_meta/docs.asciidoc index d58ceda230f..23eab670ec6 100644 --- a/x-pack/metricbeat/module/googlecloud/storage/_meta/docs.asciidoc +++ b/x-pack/metricbeat/module/googlecloud/storage/_meta/docs.asciidoc @@ -1,6 +1,6 @@ -Storage metricset to fetch metrics from https://cloud.google.com/storage/[Storage] in Google Cloud Platform. +Storage metricset fetches metrics from https://cloud.google.com/storage/[Storage] in Google Cloud Platform. -The `storage` metricset contains all metrics exported from the https://cloud.google.com/monitoring/api/metrics_gcp#gcp-storage[Stackdriver API]. The field names have been left untouched for people already familiar with them. +The `storage` metricset contains all metrics exported from the https://cloud.google.com/monitoring/api/metrics_gcp#gcp-storage[GCP Storage Monitoring API]. The field names have been left untouched for people already familiar with them. You can specify a single region to fetch metrics like `us-central1`. Be aware that GCP Storage does not use zones so `us-central1-a` will return nothing. If no region is specified, it will return metrics from all buckets. diff --git a/x-pack/metricbeat/modules.d/googlecloud.yml.disabled b/x-pack/metricbeat/modules.d/googlecloud.yml.disabled index cd49fdc146f..23e258c0020 100644 --- a/x-pack/metricbeat/modules.d/googlecloud.yml.disabled +++ b/x-pack/metricbeat/modules.d/googlecloud.yml.disabled @@ -4,11 +4,11 @@ - module: googlecloud metricsets: - compute - region: "us-central1" + region: "us-" project_id: "your project id" credentials_file_path: "your JSON credentials file path" exclude_labels: false - period: 300s + period: 1m - module: googlecloud metricsets: @@ -18,22 +18,12 @@ project_id: "your project id" credentials_file_path: "your JSON credentials file path" exclude_labels: false - period: 60s + period: 1m - module: googlecloud metricsets: - storage - region: "us-central1" - project_id: "your project id" - credentials_file_path: "your JSON credentials file path" - exclude_labels: false - period: 300s - -- module: googlecloud - metricsets: - - compute - region: "us-" project_id: "your project id" credentials_file_path: "your JSON credentials file path" exclude_labels: false - period: 60s + period: 5m