From b132bfbb9ff46052a21c4353db4d9eb2a01a4143 Mon Sep 17 00:00:00 2001 From: Dan Kortschak Date: Thu, 6 Oct 2022 10:38:54 +1030 Subject: [PATCH] gcp,google_workspace: remove duplicate fields --- packages/gcp/changelog.yml | 5 +++ .../gcp/data_stream/redis/fields/agent.yml | 38 ------------------- packages/gcp/docs/redis.md | 2 +- packages/gcp/manifest.yml | 2 +- packages/google_workspace/changelog.yml | 5 +++ .../data_stream/admin/fields/agent.yml | 5 --- .../data_stream/drive/fields/agent.yml | 5 --- .../data_stream/groups/fields/agent.yml | 5 --- .../data_stream/login/fields/agent.yml | 5 --- .../data_stream/saml/fields/agent.yml | 5 --- .../user_accounts/fields/agent.yml | 5 --- packages/google_workspace/manifest.yml | 2 +- 12 files changed, 13 insertions(+), 71 deletions(-) diff --git a/packages/gcp/changelog.yml b/packages/gcp/changelog.yml index 6ea618559dc..8cee436c6d7 100644 --- a/packages/gcp/changelog.yml +++ b/packages/gcp/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "2.12.1" + changes: + - description: Remove duplicate fields. + type: bugfix + link: https://github.com/elastic/integrations/pull/4397 - version: "2.12.0" changes: - description: Add GCP Redis diff --git a/packages/gcp/data_stream/redis/fields/agent.yml b/packages/gcp/data_stream/redis/fields/agent.yml index 2a31d79f494..8e686410afb 100644 --- a/packages/gcp/data_stream/redis/fields/agent.yml +++ b/packages/gcp/data_stream/redis/fields/agent.yml @@ -5,49 +5,11 @@ footnote: 'Examples: If Metricbeat is running on an GCP Compute VM and fetches data from its host, the cloud info contains the data about this machine. If Metricbeat runs on a remote machine outside the cloud and fetches data from a service running in the cloud, the field contains cloud data from the machine the service is running on.' type: group fields: - - name: account.id - level: extended - type: keyword - ignore_above: 1024 - description: 'The cloud account or organization id used to identify different entities in a multi-tenant environment. - - Examples: AWS account id, Google Cloud ORG Id, or other unique identifier.' - example: 666777888999 - - name: availability_zone - level: extended - type: keyword - ignore_above: 1024 - description: Availability zone in which this host is running. - example: us-east-1c - - name: instance.id - level: extended - type: keyword - ignore_above: 1024 - description: Instance ID of the host machine. - example: i-1234567890abcdef0 - name: instance.name level: extended type: keyword ignore_above: 1024 description: Instance name of the host machine. - - name: machine.type - level: extended - type: keyword - ignore_above: 1024 - description: Machine type of the host machine. - example: t2.medium - - name: provider - level: extended - type: keyword - ignore_above: 1024 - description: Name of the cloud provider. Example values are aws, azure, gcp, or digitalocean. - example: aws - - name: region - level: extended - type: keyword - ignore_above: 1024 - description: Region in which this host is running. - example: us-east-1 - name: project.id type: keyword description: Name of the project in Google Cloud. diff --git a/packages/gcp/docs/redis.md b/packages/gcp/docs/redis.md index 9760f9540d1..ef195746819 100644 --- a/packages/gcp/docs/redis.md +++ b/packages/gcp/docs/redis.md @@ -70,7 +70,7 @@ An example event for `redis` looks as following: | cloud | Fields related to the cloud or infrastructure the events are coming from. | group | | | | cloud.account.id | The cloud account or organization id used to identify different entities in a multi-tenant environment. Examples: AWS account id, Google Cloud ORG Id, or other unique identifier. | keyword | | | | cloud.account.name | The cloud account name or alias used to identify different entities in a multi-tenant environment. Examples: AWS account name, Google Cloud ORG display name. | keyword | | | -| cloud.availability_zone | Availability zone in which this host is running. | keyword | | | +| cloud.availability_zone | Availability zone in which this host, resource, or service is located. | keyword | | | | cloud.image.id | Image ID for the cloud instance. | keyword | | | | cloud.instance.id | Instance ID of the host machine. | keyword | | | | cloud.instance.name | Instance name of the host machine. | keyword | | | diff --git a/packages/gcp/manifest.yml b/packages/gcp/manifest.yml index 94054e2b10c..f24b1eeb10d 100644 --- a/packages/gcp/manifest.yml +++ b/packages/gcp/manifest.yml @@ -1,6 +1,6 @@ name: gcp title: Google Cloud Platform -version: "2.12.0" +version: "2.12.1" release: ga description: Collect logs from Google Cloud Platform with Elastic Agent. type: integration diff --git a/packages/google_workspace/changelog.yml b/packages/google_workspace/changelog.yml index 07352e974a2..c96049f2fdb 100644 --- a/packages/google_workspace/changelog.yml +++ b/packages/google_workspace/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "1.7.2" + changes: + - description: Remove duplicate fields. + type: bugfix + link: https://github.com/elastic/integrations/pull/4397 - version: "1.7.1" changes: - description: Use ECS geo.location definition. diff --git a/packages/google_workspace/data_stream/admin/fields/agent.yml b/packages/google_workspace/data_stream/admin/fields/agent.yml index e313ec82874..616523c9e12 100644 --- a/packages/google_workspace/data_stream/admin/fields/agent.yml +++ b/packages/google_workspace/data_stream/admin/fields/agent.yml @@ -77,11 +77,6 @@ type: object object_type: keyword description: Image labels. - - name: name - level: extended - type: keyword - ignore_above: 1024 - description: Container name. - name: host title: Host group: 2 diff --git a/packages/google_workspace/data_stream/drive/fields/agent.yml b/packages/google_workspace/data_stream/drive/fields/agent.yml index e313ec82874..616523c9e12 100644 --- a/packages/google_workspace/data_stream/drive/fields/agent.yml +++ b/packages/google_workspace/data_stream/drive/fields/agent.yml @@ -77,11 +77,6 @@ type: object object_type: keyword description: Image labels. - - name: name - level: extended - type: keyword - ignore_above: 1024 - description: Container name. - name: host title: Host group: 2 diff --git a/packages/google_workspace/data_stream/groups/fields/agent.yml b/packages/google_workspace/data_stream/groups/fields/agent.yml index e313ec82874..616523c9e12 100644 --- a/packages/google_workspace/data_stream/groups/fields/agent.yml +++ b/packages/google_workspace/data_stream/groups/fields/agent.yml @@ -77,11 +77,6 @@ type: object object_type: keyword description: Image labels. - - name: name - level: extended - type: keyword - ignore_above: 1024 - description: Container name. - name: host title: Host group: 2 diff --git a/packages/google_workspace/data_stream/login/fields/agent.yml b/packages/google_workspace/data_stream/login/fields/agent.yml index e313ec82874..616523c9e12 100644 --- a/packages/google_workspace/data_stream/login/fields/agent.yml +++ b/packages/google_workspace/data_stream/login/fields/agent.yml @@ -77,11 +77,6 @@ type: object object_type: keyword description: Image labels. - - name: name - level: extended - type: keyword - ignore_above: 1024 - description: Container name. - name: host title: Host group: 2 diff --git a/packages/google_workspace/data_stream/saml/fields/agent.yml b/packages/google_workspace/data_stream/saml/fields/agent.yml index e313ec82874..616523c9e12 100644 --- a/packages/google_workspace/data_stream/saml/fields/agent.yml +++ b/packages/google_workspace/data_stream/saml/fields/agent.yml @@ -77,11 +77,6 @@ type: object object_type: keyword description: Image labels. - - name: name - level: extended - type: keyword - ignore_above: 1024 - description: Container name. - name: host title: Host group: 2 diff --git a/packages/google_workspace/data_stream/user_accounts/fields/agent.yml b/packages/google_workspace/data_stream/user_accounts/fields/agent.yml index e313ec82874..616523c9e12 100644 --- a/packages/google_workspace/data_stream/user_accounts/fields/agent.yml +++ b/packages/google_workspace/data_stream/user_accounts/fields/agent.yml @@ -77,11 +77,6 @@ type: object object_type: keyword description: Image labels. - - name: name - level: extended - type: keyword - ignore_above: 1024 - description: Container name. - name: host title: Host group: 2 diff --git a/packages/google_workspace/manifest.yml b/packages/google_workspace/manifest.yml index 15f824e828c..1e94bc0bdbd 100644 --- a/packages/google_workspace/manifest.yml +++ b/packages/google_workspace/manifest.yml @@ -1,6 +1,6 @@ name: google_workspace title: Google Workspace -version: 1.7.1 +version: 1.7.2 release: ga description: Collect logs from Google Workspace with Elastic Agent. type: integration