Skip to content

Commit 3a301a8

Browse files
Add support for region/zone for Vertex AI service in GCP module (#41551) (#41564)
* Add support for Vertex AI service in GCP module * update changelog (cherry picked from commit 8cd6feb) Co-authored-by: Ishleen Kaur <[email protected]>
1 parent 85f03bc commit 3a301a8

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

CHANGELOG.next.asciidoc

+1
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
378378
- Add `id` field to all the vSphere metricsets. {pull}41097[41097]
379379
- Bump aerospike-client-go to version v7.7.1 and add support for basic auth in Aerospike module {pull}41233[41233]
380380
- Only watch metadata for ReplicaSets in metricbeat k8s module {pull}41289[41289]
381+
- Add support for region/zone for Vertex AI service in GCP module {pull}41551[41551]
381382

382383
*Metricbeat*
383384

x-pack/metricbeat/module/gcp/constants.go

+9-7
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ const (
2727
ServiceDataproc = "dataproc"
2828
ServiceCloudSQL = "cloudsql"
2929
ServiceRedis = "redis"
30+
ServiceAIPlatform = "aiplatform"
3031
)
3132

3233
// Paths within the GCP monitoring.TimeSeries response, if converted to JSON, where you can find each ECS field required for the output event
@@ -81,13 +82,14 @@ const (
8182

8283
// NOTE: if you are adding labels make sure to update tests in metrics/metrics_requester_test.go.
8384
const (
84-
DefaultResourceLabel = "resource.label.zone"
85-
ComputeResourceLabel = "resource.labels.zone"
86-
GKEResourceLabel = "resource.label.location"
87-
StorageResourceLabel = "resource.label.location"
88-
CloudSQLResourceLabel = "resource.labels.region"
89-
DataprocResourceLabel = "resource.label.region"
90-
RedisResourceLabel = "resource.label.region"
85+
DefaultResourceLabel = "resource.label.zone"
86+
ComputeResourceLabel = "resource.labels.zone"
87+
GKEResourceLabel = "resource.label.location"
88+
StorageResourceLabel = "resource.label.location"
89+
CloudSQLResourceLabel = "resource.labels.region"
90+
DataprocResourceLabel = "resource.label.region"
91+
RedisResourceLabel = "resource.label.region"
92+
AIPlatformResourceLabel = "resource.label.location"
9193
)
9294

9395
// AlignersMapToGCP map contains available perSeriesAligner

x-pack/metricbeat/module/gcp/metrics/metrics_requester.go

+2
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,8 @@ func getServiceLabelFor(serviceName string) string {
196196
return gcp.CloudSQLResourceLabel
197197
case gcp.ServiceRedis:
198198
return gcp.RedisResourceLabel
199+
case gcp.ServiceAIPlatform:
200+
return gcp.AIPlatformResourceLabel
199201
default:
200202
return gcp.DefaultResourceLabel
201203
}

x-pack/metricbeat/module/gcp/metrics/metrics_requester_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ func TestIsAGlobalService(t *testing.T) {
222222
{"Dataproc service", gcp.ServiceDataproc, false},
223223
{"CloudSQL service", gcp.ServiceCloudSQL, false},
224224
{"Redis service", gcp.ServiceRedis, false},
225+
{"AIPlatform service", gcp.ServiceAIPlatform, false},
225226
}
226227
for _, c := range cases {
227228
t.Run(c.title, func(t *testing.T) {
@@ -249,6 +250,7 @@ func TestGetServiceLabelFor(t *testing.T) {
249250
{"Dataproc service", gcp.ServiceDataproc, "resource.label.region"},
250251
{"CloudSQL service", gcp.ServiceCloudSQL, "resource.labels.region"},
251252
{"Redis service", gcp.ServiceRedis, "resource.label.region"},
253+
{"AIPlatform service", gcp.ServiceAIPlatform, "resource.label.location"},
252254
}
253255

254256
for _, c := range cases {

0 commit comments

Comments
 (0)