diff --git a/CHANGELOG-developer.next.asciidoc b/CHANGELOG-developer.next.asciidoc index fa51e66313ab..8ed6da30f1af 100644 --- a/CHANGELOG-developer.next.asciidoc +++ b/CHANGELOG-developer.next.asciidoc @@ -131,6 +131,7 @@ The list below covers the major changes between 7.0.0-rc2 and master only. - Add support for `credentials_json` in `gcp` module, all metricsets {pull}29584[29584] - Add gcp firestore metricset. {pull}29918[29918] - Added TESTING_FILEBEAT_FILEPATTERN option for filebeat module pytests {pull}30103[30103] +- Add gcp dataproc metricset. {pull}30008[30008] ==== Deprecated diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index 340b8f3bf6a9..5285c535cc1e 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -34394,6 +34394,246 @@ type: long -- [float] +<<<<<<< HEAD +======= +=== dataproc + +Google Cloud Dataproc metrics + + +*`gcp.dataproc.batch.spark.executors.count`*:: ++ +-- +Indicates the number of Batch Spark executors. + +type: long + +-- + +*`gcp.dataproc.cluster.hdfs.datanodes.count`*:: ++ +-- +Indicates the number of HDFS DataNodes that are running inside a cluster. + +type: long + +-- + +*`gcp.dataproc.cluster.hdfs.storage_capacity.value`*:: ++ +-- +Indicates capacity of HDFS system running on cluster in GB. + +type: double + +-- + +*`gcp.dataproc.cluster.hdfs.storage_utilization.value`*:: ++ +-- +The percentage of HDFS storage currently used. + +type: double + +-- + +*`gcp.dataproc.cluster.hdfs.unhealthy_blocks.count`*:: ++ +-- +Indicates the number of unhealthy blocks inside the cluster. + +type: long + +-- + +*`gcp.dataproc.cluster.job.completion_time.value`*:: ++ +-- +The time jobs took to complete from the time the user submits a job to the time Dataproc reports it is completed. + +type: long + +-- + +*`gcp.dataproc.cluster.job.duration.value`*:: ++ +-- +The time jobs have spent in a given state. + +type: long + +-- + +*`gcp.dataproc.cluster.job.failed.count`*:: ++ +-- +Indicates the number of jobs that have failed on a cluster. + +type: long + +-- + +*`gcp.dataproc.cluster.job.running.count`*:: ++ +-- +Indicates the number of jobs that are running on a cluster. + +type: long + +-- + +*`gcp.dataproc.cluster.job.submitted.count`*:: ++ +-- +Indicates the number of jobs that have been submitted to a cluster. + +type: long + +-- + +*`gcp.dataproc.cluster.operation.completion_time.value`*:: ++ +-- +The time operations took to complete from the time the user submits a operation to the time Dataproc reports it is completed. + +type: long + +-- + +*`gcp.dataproc.cluster.operation.duration.value`*:: ++ +-- +The time operations have spent in a given state. + +type: long + +-- + +*`gcp.dataproc.cluster.operation.failed.count`*:: ++ +-- +Indicates the number of operations that have failed on a cluster. + +type: long + +-- + +*`gcp.dataproc.cluster.operation.running.count`*:: ++ +-- +Indicates the number of operations that are running on a cluster. + +type: long + +-- + +*`gcp.dataproc.cluster.operation.submitted.count`*:: ++ +-- +Indicates the number of operations that have been submitted to a cluster. + +type: long + +-- + +*`gcp.dataproc.cluster.yarn.allocated_memory_percentage.value`*:: ++ +-- +The percentage of YARN memory is allocated. + +type: double + +-- + +*`gcp.dataproc.cluster.yarn.apps.count`*:: ++ +-- +Indicates the number of active YARN applications. + +type: long + +-- + +*`gcp.dataproc.cluster.yarn.containers.count`*:: ++ +-- +Indicates the number of YARN containers. + +type: long + +-- + +*`gcp.dataproc.cluster.yarn.memory_size.value`*:: ++ +-- +Indicates the YARN memory size in GB. + +type: double + +-- + +*`gcp.dataproc.cluster.yarn.nodemanagers.count`*:: ++ +-- +Indicates the number of YARN NodeManagers running inside cluster. + +type: long + +-- + +*`gcp.dataproc.cluster.yarn.pending_memory_size.value`*:: ++ +-- +The current memory request, in GB, that is pending to be fulfilled by the scheduler. + +type: double + +-- + +*`gcp.dataproc.cluster.yarn.virtual_cores.count`*:: ++ +-- +Indicates the number of virtual cores in YARN. + +type: long + +-- + +[float] +=== firestore + +Google Cloud Firestore metrics + + +*`gcp.firestore.document.delete.count`*:: ++ +-- +The number of successful document deletes. + +type: long + +-- + +*`gcp.firestore.document.read.count`*:: ++ +-- +The number of successful document reads from queries or lookups. + +type: long + +-- + +*`gcp.firestore.document.write.count`*:: ++ +-- +The number of successful document writes. + +type: long + +-- + +[float] +>>>>>>> e61173f979 ([Metricbeat] gcp: add dataproc metricset (#30008)) === gke `gke` contains the metrics that we scraped from GCP Stackdriver API containing monitoring metrics for GCP GKE diff --git a/metricbeat/docs/modules/gcp.asciidoc b/metricbeat/docs/modules/gcp.asciidoc index 164a7829c87a..eb127404e068 100644 --- a/metricbeat/docs/modules/gcp.asciidoc +++ b/metricbeat/docs/modules/gcp.asciidoc @@ -275,6 +275,11 @@ metricbeat.modules: metricsets: - pubsub - loadbalancing +<<<<<<< HEAD +======= + - firestore + - dataproc +>>>>>>> e61173f979 ([Metricbeat] gcp: add dataproc metricset (#30008)) zone: "us-central1-a" project_id: "your project id" credentials_file_path: "your JSON credentials file path" @@ -339,6 +344,13 @@ The following metricsets are available: * <> +<<<<<<< HEAD +======= +* <> + +* <> + +>>>>>>> e61173f979 ([Metricbeat] gcp: add dataproc metricset (#30008)) * <> * <> @@ -353,6 +365,13 @@ include::gcp/billing.asciidoc[] include::gcp/compute.asciidoc[] +<<<<<<< HEAD +======= +include::gcp/dataproc.asciidoc[] + +include::gcp/firestore.asciidoc[] + +>>>>>>> e61173f979 ([Metricbeat] gcp: add dataproc metricset (#30008)) include::gcp/gke.asciidoc[] include::gcp/loadbalancing.asciidoc[] diff --git a/metricbeat/docs/modules/gcp/dataproc.asciidoc b/metricbeat/docs/modules/gcp/dataproc.asciidoc new file mode 100644 index 000000000000..e289049ca43e --- /dev/null +++ b/metricbeat/docs/modules/gcp/dataproc.asciidoc @@ -0,0 +1,24 @@ +//// +This file is generated! See scripts/mage/docs_collector.go +//// + +[[metricbeat-metricset-gcp-dataproc]] +[role="xpack"] +=== Google Cloud Platform dataproc metricset + +beta[] + +include::../../../../x-pack/metricbeat/module/gcp/dataproc/_meta/docs.asciidoc[] + + +==== 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/gcp/dataproc/_meta/data.json[] +---- diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc index ad5d929514f9..ecff241a93c7 100644 --- a/metricbeat/docs/modules_list.asciidoc +++ b/metricbeat/docs/modules_list.asciidoc @@ -116,8 +116,15 @@ This file is generated! See scripts/mage/docs_collector.go |<> |<> |<> beta[] |image:./images/icon-yes.png[Prebuilt dashboards are available] | +<<<<<<< HEAD .7+| .7+| |<> beta[] |<> beta[] +======= +.9+| .9+| |<> beta[] +|<> beta[] +|<> beta[] +|<> beta[] +>>>>>>> e61173f979 ([Metricbeat] gcp: add dataproc metricset (#30008)) |<> beta[] |<> beta[] |<> beta[] diff --git a/x-pack/metricbeat/metricbeat.reference.yml b/x-pack/metricbeat/metricbeat.reference.yml index 311d44ae7cf9..8cadfb31a866 100644 --- a/x-pack/metricbeat/metricbeat.reference.yml +++ b/x-pack/metricbeat/metricbeat.reference.yml @@ -539,6 +539,11 @@ metricbeat.modules: metricsets: - pubsub - loadbalancing +<<<<<<< HEAD +======= + - firestore + - dataproc +>>>>>>> e61173f979 ([Metricbeat] gcp: add dataproc metricset (#30008)) zone: "us-central1-a" project_id: "your project id" credentials_file_path: "your JSON credentials file path" diff --git a/x-pack/metricbeat/module/gcp/_meta/config.yml b/x-pack/metricbeat/module/gcp/_meta/config.yml index 00295e795d4d..5b8526fe22f5 100644 --- a/x-pack/metricbeat/module/gcp/_meta/config.yml +++ b/x-pack/metricbeat/module/gcp/_meta/config.yml @@ -11,6 +11,11 @@ metricsets: - pubsub - loadbalancing +<<<<<<< HEAD +======= + - firestore + - dataproc +>>>>>>> e61173f979 ([Metricbeat] gcp: add dataproc metricset (#30008)) zone: "us-central1-a" project_id: "your project id" credentials_file_path: "your JSON credentials file path" diff --git a/x-pack/metricbeat/module/gcp/constants.go b/x-pack/metricbeat/module/gcp/constants.go index 3776263b7b6a..7c235a7e53e7 100644 --- a/x-pack/metricbeat/module/gcp/constants.go +++ b/x-pack/metricbeat/module/gcp/constants.go @@ -22,6 +22,11 @@ const ( ServiceLoadBalancing = "loadbalancing" ServicePubsub = "pubsub" ServiceStorage = "storage" +<<<<<<< HEAD +======= + ServiceFirestore = "firestore" + ServiceDataproc = "dataproc" +>>>>>>> e61173f979 ([Metricbeat] gcp: add dataproc metricset (#30008)) ) //Paths within the GCP monitoring.TimeSeries response, if converted to JSON, where you can find each ECS field required for the output event diff --git a/x-pack/metricbeat/module/gcp/dataproc/_meta/data.json b/x-pack/metricbeat/module/gcp/dataproc/_meta/data.json new file mode 100644 index 000000000000..9daed1f80b20 --- /dev/null +++ b/x-pack/metricbeat/module/gcp/dataproc/_meta/data.json @@ -0,0 +1,41 @@ +{ + "@timestamp": "2016-05-23T08:05:34.853Z", + "cloud": { + "account": { + "id": "elastic-apm" + }, + "provider": "gcp" + }, + "event": { + "dataset": "gcp.dataproc", + "duration": 115000, + "module": "gcp" + }, + "gcp": { + "labels": { + "metrics": { + "storage_class": "MULTI_REGIONAL" + }, + "resource": { + "bucket_name": "artifacts.elastic-apm.appspot.com", + "location": "us" + } + }, + "dataproc": { + "cluster": { + "hdfs": { + "datanodes": { + "value": 15 + } + } + } + } + }, + "metricset": { + "name": "dataproc", + "period": 10000 + }, + "service": { + "type": "gcp" + } +} diff --git a/x-pack/metricbeat/module/gcp/dataproc/_meta/data_cluster.json b/x-pack/metricbeat/module/gcp/dataproc/_meta/data_cluster.json new file mode 100644 index 000000000000..9daed1f80b20 --- /dev/null +++ b/x-pack/metricbeat/module/gcp/dataproc/_meta/data_cluster.json @@ -0,0 +1,41 @@ +{ + "@timestamp": "2016-05-23T08:05:34.853Z", + "cloud": { + "account": { + "id": "elastic-apm" + }, + "provider": "gcp" + }, + "event": { + "dataset": "gcp.dataproc", + "duration": 115000, + "module": "gcp" + }, + "gcp": { + "labels": { + "metrics": { + "storage_class": "MULTI_REGIONAL" + }, + "resource": { + "bucket_name": "artifacts.elastic-apm.appspot.com", + "location": "us" + } + }, + "dataproc": { + "cluster": { + "hdfs": { + "datanodes": { + "value": 15 + } + } + } + } + }, + "metricset": { + "name": "dataproc", + "period": 10000 + }, + "service": { + "type": "gcp" + } +} diff --git a/x-pack/metricbeat/module/gcp/dataproc/_meta/docs.asciidoc b/x-pack/metricbeat/module/gcp/dataproc/_meta/docs.asciidoc new file mode 100644 index 000000000000..ff94b21fc363 --- /dev/null +++ b/x-pack/metricbeat/module/gcp/dataproc/_meta/docs.asciidoc @@ -0,0 +1,32 @@ +Dataproc metricset fetches metrics from https://cloud.google.com/dataproc/[Dataproc] in Google Cloud Platform. + +The `dataproc` metricset contains all metrics exported from the https://cloud.google.com/monitoring/api/metrics_gcp#gcp-dataproc[GCP Dataproc 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. + +[float] +=== Metrics +Here is a list of metrics collected by `dataproc` metricset: + +- `dataproc.batch.spark.executors`: Indicates the number of Batch Spark executors. +- `dataproc.cluster.hdfs.datanodes`: Indicates the number of HDFS DataNodes that are running inside a cluster. +- `dataproc.cluster.hdfs.storage_capacity`: Indicates capacity of HDFS system running on cluster in GB. +- `dataproc.cluster.hdfs.storage_utilization`: The percentage of HDFS storage currently used. +- `dataproc.cluster.hdfs.unhealthy_blocks`: Indicates the number of unhealthy blocks inside the cluster. +- `dataproc.cluster.job.completion_time`: The time jobs took to complete from the time the user submits a job to the time Dataproc reports it is completed. +- `dataproc.cluster.job.duration`: The time jobs have spent in a given state. +- `dataproc.cluster.job.failed_count`: Indicates the number of jobs that have failed on a cluster. +- `dataproc.cluster.job.running_count`: Indicates the number of jobs that are running on a cluster. +- `dataproc.cluster.job.submitted_count`: Indicates the number of jobs that have been submitted to a cluster. +- `dataproc.cluster.operation.completion_time`: The time operations took to complete from the time the user submits a operation to the time Dataproc reports it is completed. +- `dataproc.cluster.operation.duration`: The time operations have spent in a given state. +- `dataproc.cluster.operation.failed_count`: Indicates the number of operations that have failed on a cluster. +- `dataproc.cluster.operation.running_count`: Indicates the number of operations that are running on a cluster. +- `dataproc.cluster.operation.submitted_count`: Indicates the number of operations that have been submitted to a cluster. +- `dataproc.cluster.yarn.allocated_memory_percentage`: The percentage of YARN memory is allocated. +- `dataproc.cluster.yarn.apps`: Indicates the number of active YARN applications. +- `dataproc.cluster.yarn.containers`: Indicates the number of YARN containers. +- `dataproc.cluster.yarn.memory_size`: Indicates the YARN memory size in GB. Sampled every 60 seconds. +- `dataproc.cluster.yarn.nodemanagers`: Indicates the number of YARN NodeManagers running inside cluster. +- `dataproc.cluster.yarn.pending_memory_size`: The current memory request, in GB, that is pending to be fulfilled by the scheduler. +- `dataproc.cluster.yarn.virtual_cores`: Indicates the number of virtual cores in YARN. diff --git a/x-pack/metricbeat/module/gcp/dataproc/_meta/fields.yml b/x-pack/metricbeat/module/gcp/dataproc/_meta/fields.yml new file mode 100644 index 000000000000..9131d0ba45a7 --- /dev/null +++ b/x-pack/metricbeat/module/gcp/dataproc/_meta/fields.yml @@ -0,0 +1,71 @@ +- name: dataproc + description: Google Cloud Dataproc metrics + release: beta + type: group + fields: + - name: batch.spark.executors.count + type: long + description: Indicates the number of Batch Spark executors. + - name: cluster.hdfs.datanodes.count + type: long + description: Indicates the number of HDFS DataNodes that are running inside a cluster. + - name: cluster.hdfs.storage_capacity.value + type: double + description: Indicates capacity of HDFS system running on cluster in GB. + - name: cluster.hdfs.storage_utilization.value + type: double + description: The percentage of HDFS storage currently used. + - name: cluster.hdfs.unhealthy_blocks.count + type: long + description: Indicates the number of unhealthy blocks inside the cluster. + - name: cluster.job.completion_time.value + type: long + description: The time jobs took to complete from the time the user submits a job to the time Dataproc reports it is completed. + - name: cluster.job.duration.value + type: long + description: The time jobs have spent in a given state. + - name: cluster.job.failed.count + type: long + description: Indicates the number of jobs that have failed on a cluster. + - name: cluster.job.running.count + type: long + description: Indicates the number of jobs that are running on a cluster. + - name: cluster.job.submitted.count + type: long + description: Indicates the number of jobs that have been submitted to a cluster. + - name: cluster.operation.completion_time.value + type: long + description: The time operations took to complete from the time the user submits a operation to the time Dataproc reports it is completed. + - name: cluster.operation.duration.value + type: long + description: The time operations have spent in a given state. + - name: cluster.operation.failed.count + type: long + description: Indicates the number of operations that have failed on a cluster. + - name: cluster.operation.running.count + type: long + description: Indicates the number of operations that are running on a cluster. + - name: cluster.operation.submitted.count + type: long + description: Indicates the number of operations that have been submitted to a cluster. + - name: cluster.yarn.allocated_memory_percentage.value + type: double + description: The percentage of YARN memory is allocated. + - name: cluster.yarn.apps.count + type: long + description: Indicates the number of active YARN applications. + - name: cluster.yarn.containers.count + type: long + description: Indicates the number of YARN containers. + - name: cluster.yarn.memory_size.value + type: double + description: Indicates the YARN memory size in GB. + - name: cluster.yarn.nodemanagers.count + type: long + description: Indicates the number of YARN NodeManagers running inside cluster. + - name: cluster.yarn.pending_memory_size.value + type: double + description: The current memory request, in GB, that is pending to be fulfilled by the scheduler. + - name: cluster.yarn.virtual_cores.count + type: long + description: Indicates the number of virtual cores in YARN. diff --git a/x-pack/metricbeat/module/gcp/dataproc/dataproc_integration_test.go b/x-pack/metricbeat/module/gcp/dataproc/dataproc_integration_test.go new file mode 100644 index 000000000000..ce1a58821f7e --- /dev/null +++ b/x-pack/metricbeat/module/gcp/dataproc/dataproc_integration_test.go @@ -0,0 +1,59 @@ +// 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. + +//go:build integration && gcp +// +build integration,gcp + +package dataproc + +import ( + "fmt" + "testing" + + "github.com/stretchr/testify/assert" + + "github.com/elastic/beats/v7/libbeat/common" + mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" +) + +func TestFetch(t *testing.T) { + config := metrics.GetConfigForTest(t, "dataproc") + fmt.Printf("%+v\n", config) + + metricSet := mbtest.NewReportingMetricSetV2WithContext(t, config) + events, errs := mbtest.ReportingFetchV2WithContext(metricSet) + if len(errs) > 0 { + t.Fatalf("Expected 0 error, had %d. %v\n", len(errs), errs) + } + + assert.NotEmpty(t, events) + mbtest.TestMetricsetFieldsDocumented(t, metricSet, events) +} + +func TestData(t *testing.T) { + metricPrefixIs := func(metricPrefix string) func(e common.MapStr) bool { + return func(e common.MapStr) bool { + v, err := e.GetValue(metricPrefix) + return err == nil && v != nil + } + } + + dataFiles := []struct { + metricPrefix string + path string + }{ + {"gcp.dataproc", "./_meta/data.json"}, + {"gcp.dataproc.cluster", "./_meta/data_cluster.json"}, + } + + config := metrics.GetConfigForTest(t, "dataproc") + + for _, df := range dataFiles { + metricSet := mbtest.NewFetcher(t, config) + t.Run(fmt.Sprintf("metric prefix: %s", df.metricPrefix), func(t *testing.T) { + metricSet.WriteEventsCond(t, df.path, metricPrefixIs(df.metricPrefix)) + }) + } +} diff --git a/x-pack/metricbeat/module/gcp/dataproc/dataproc_test.go b/x-pack/metricbeat/module/gcp/dataproc/dataproc_test.go new file mode 100644 index 000000000000..8d8ceafe47e5 --- /dev/null +++ b/x-pack/metricbeat/module/gcp/dataproc/dataproc_test.go @@ -0,0 +1,20 @@ +// 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 dataproc + +import ( + "os" + + "github.com/elastic/beats/v7/metricbeat/mb" + + // Register input module and metricset + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" +) + +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/gcp/dataproc/manifest.yml b/x-pack/metricbeat/module/gcp/dataproc/manifest.yml new file mode 100644 index 000000000000..6d457c0efae3 --- /dev/null +++ b/x-pack/metricbeat/module/gcp/dataproc/manifest.yml @@ -0,0 +1,30 @@ +default: false +input: + module: gcp + metricset: metrics + defaults: + metrics: + - service: dataproc + metric_types: + - "batch/spark/executors" + - "cluster/hdfs/datanodes" + - "cluster/hdfs/storage_capacity" + - "cluster/hdfs/storage_utilization" + - "cluster/hdfs/unhealthy_blocks" + - "cluster/job/completion_time" + - "cluster/job/duration" + - "cluster/job/failed_count" + - "cluster/job/running_count" + - "cluster/job/submitted_count" + - "cluster/operation/completion_time" + - "cluster/operation/duration" + - "cluster/operation/failed_count" + - "cluster/operation/running_count" + - "cluster/operation/submitted_count" + - "cluster/yarn/allocated_memory_percentage" + - "cluster/yarn/apps" + - "cluster/yarn/containers" + - "cluster/yarn/memory_size" + - "cluster/yarn/nodemanagers" + - "cluster/yarn/pending_memory_size" + - "cluster/yarn/virtual_cores" diff --git a/x-pack/metricbeat/module/gcp/fields.go b/x-pack/metricbeat/module/gcp/fields.go index a5b2d2a836aa..04263d62a29b 100644 --- a/x-pack/metricbeat/module/gcp/fields.go +++ b/x-pack/metricbeat/module/gcp/fields.go @@ -19,5 +19,9 @@ func init() { // AssetGcp returns asset data. // This is the base64 encoded zlib format compressed contents of module/gcp. func AssetGcp() string { +<<<<<<< HEAD return "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" +======= + return "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" +>>>>>>> e61173f979 ([Metricbeat] gcp: add dataproc metricset (#30008)) } diff --git a/x-pack/metricbeat/module/gcp/metrics/metrics_requester.go b/x-pack/metricbeat/module/gcp/metrics/metrics_requester.go index d518acc0014a..bf48562f66c7 100644 --- a/x-pack/metricbeat/module/gcp/metrics/metrics_requester.go +++ b/x-pack/metricbeat/module/gcp/metrics/metrics_requester.go @@ -124,7 +124,11 @@ func (r *metricsRequester) getFilterForMetric(serviceName, m string) (f string) } f = fmt.Sprintf("%s AND resource.label.location=starts_with(\"%s\")", f, zone) } +<<<<<<< HEAD case gcp.ServicePubsub, gcp.ServiceLoadBalancing, gcp.ServiceCloudFunctions: +======= + case gcp.ServicePubsub, gcp.ServiceLoadBalancing, gcp.ServiceCloudFunctions, gcp.ServiceFirestore, gcp.ServiceDataproc: +>>>>>>> e61173f979 ([Metricbeat] gcp: add dataproc metricset (#30008)) return case gcp.ServiceStorage: if r.config.Region == "" { diff --git a/x-pack/metricbeat/module/gcp/metrics/response_parser.go b/x-pack/metricbeat/module/gcp/metrics/response_parser.go index 02fa9893cad5..f55e1a236eaa 100644 --- a/x-pack/metricbeat/module/gcp/metrics/response_parser.go +++ b/x-pack/metricbeat/module/gcp/metrics/response_parser.go @@ -213,6 +213,37 @@ var reMapping = map[string]string{ "storage.object_count.value": "storage.object.count", "storage.total_byte_seconds.value": "storage.total_byte_seconds.bytes", "storage.total_bytes.value": "storage.total.bytes", +<<<<<<< HEAD +======= + + // gcp.firestore metricset + "document.delete_count.value": "document.delete.count", + "document.read_count.value": "document.read.count", + "document.write_count.value": "document.write.count", + // gcp.dataproc + "batch.spark.executors.value": "batch.spark.executors.count", + "cluster.hdfs.datanodes.value": "cluster.hdfs.datanodes.count", + "cluster.hdfs.storage_capacity.value": "cluster.hdfs.storage_capacity.value", + "cluster.hdfs.storage_utilization.value": "cluster.hdfs.storage_utilization.value", + "cluster.hdfs.unhealthy_blocks.value": "cluster.hdfs.unhealthy_blocks.count", + "cluster.job.completion_time.value": "cluster.job.completion_time.value", + "cluster.job.duration.value": "cluster.job.duration.value", + "cluster.job.failed_count.value": "cluster.job.failed.count", + "cluster.job.running_count.value": "cluster.job.running.count", + "cluster.job.submitted_count.value": "cluster.job.submitted.count", + "cluster.operation.completion_time.value": "cluster.operation.completion_time.value", + "cluster.operation.duration.value": "cluster.operation.duration.value", + "cluster.operation.failed_count.value": "cluster.operation.failed.count", + "cluster.operation.running_count.value": "cluster.operation.running.count", + "cluster.operation.submitted_count.value": "cluster.operation.submitted.count", + "cluster.yarn.allocated_memory_percentage.value": "cluster.yarn.allocated_memory_percentage.value", + "cluster.yarn.apps.value": "cluster.yarn.apps.count", + "cluster.yarn.containers.value": "cluster.yarn.containers.count", + "cluster.yarn.memory_size.value": "cluster.yarn.memory_size.value", + "cluster.yarn.nodemanagers.value": "cluster.yarn.nodemanagers.count", + "cluster.yarn.pending_memory_size.value": "cluster.yarn.pending_memory_size.value", + "cluster.yarn.virtual_cores.value": "cluster.yarn.virtual_cores.count", +>>>>>>> e61173f979 ([Metricbeat] gcp: add dataproc metricset (#30008)) } func remap(l *logp.Logger, s string) string { diff --git a/x-pack/metricbeat/module/gcp/module.yml b/x-pack/metricbeat/module/gcp/module.yml index 6a3ecf77e584..df8f5de2949f 100644 --- a/x-pack/metricbeat/module/gcp/module.yml +++ b/x-pack/metricbeat/module/gcp/module.yml @@ -5,6 +5,11 @@ metricsets: - loadbalancing - storage - gke +<<<<<<< HEAD +======= + - firestore + - dataproc +>>>>>>> e61173f979 ([Metricbeat] gcp: add dataproc metricset (#30008)) dashboards: - id: Metricbeat-gcp-gke-overview file: 1ae960c0-f9f8-11eb-bc38-79936db7c106.json diff --git a/x-pack/metricbeat/modules.d/gcp.yml.disabled b/x-pack/metricbeat/modules.d/gcp.yml.disabled index d7d873be6d1b..557f73765ea3 100644 --- a/x-pack/metricbeat/modules.d/gcp.yml.disabled +++ b/x-pack/metricbeat/modules.d/gcp.yml.disabled @@ -14,6 +14,11 @@ metricsets: - pubsub - loadbalancing +<<<<<<< HEAD +======= + - firestore + - dataproc +>>>>>>> e61173f979 ([Metricbeat] gcp: add dataproc metricset (#30008)) zone: "us-central1-a" project_id: "your project id" credentials_file_path: "your JSON credentials file path"