elastic · mergify · May 10, 2022 · May 9, 2022 · May 9, 2022 · May 9, 2022
@@ -12,7 +12,7 @@ require (
 	github.com/elastic/go-elasticsearch/v7 v7.17.1
 	github.com/elastic/go-licenser v0.4.0
 	github.com/elastic/go-ucfg v0.8.4
-	github.com/elastic/package-spec v1.7.0
+	github.com/elastic/package-spec v1.8.0
 	github.com/fatih/color v1.13.0
 	github.com/go-git/go-billy/v5 v5.3.1
 	github.com/go-git/go-git/v5 v5.4.2

diff --git a/go.sum b/go.sum
@@ -410,8 +410,8 @@ github.com/elastic/go-licenser v0.4.0 h1:jLq6A5SilDS/Iz1ABRkO6BHy91B9jBora8FwGRs
 github.com/elastic/go-licenser v0.4.0/go.mod h1:V56wHMpmdURfibNBggaSBfqgPxyT1Tldns1i87iTEvU=
 github.com/elastic/go-ucfg v0.8.4 h1:OAHTnubzXKsYYYWVzl8psLcS5mCbNKjXxtMY41itthk=
 github.com/elastic/go-ucfg v0.8.4/go.mod h1:4E8mPOLSUV9hQ7sgLEJ4bvt0KhMuDJa8joDT2QGAEKA=
-github.com/elastic/package-spec v1.7.0 h1:cwWMVz3YIAbyUDFrVOdPfqwn3btZoMPSKSedfT0VlZA=
-github.com/elastic/package-spec v1.7.0/go.mod h1:KzGTSDqCkdhmL1IFpOH2ZQNSSE9JEhNtndxU3ZrQilA=
+github.com/elastic/package-spec v1.8.0 h1:/5P4SwQhJgfULRg1b7I83TOzij4/L+J39o1LJiJTiJ0=
+github.com/elastic/package-spec v1.8.0/go.mod h1:KzGTSDqCkdhmL1IFpOH2ZQNSSE9JEhNtndxU3ZrQilA=
 github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 h1:yUdfgN0XgIJw7foRItutHYUIhlcKzcSf5vDpdhQAKTc=
 github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=

diff --git a/internal/packages/archetype/package_changelog.go b/internal/packages/archetype/package_changelog.go
@@ -9,5 +9,5 @@ const packageChangelogTemplate = `# newer versions go on top
   changes:
     - description: Initial draft of the package
       type: enhancement
-      link: https://github.com/elastic/integrations/pull/0 # FIXME Replace with the real PR link
+      link: https://github.com/elastic/integrations/pull/1 # FIXME Replace with the real PR link
 `
diff --git a/test/packages/other/fields_tests/changelog.yml b/test/packages/other/fields_tests/changelog.yml
@@ -3,4 +3,4 @@
   changes:
     - description: Initial draft of the package
       type: enhancement
-      link: https://github.com/elastic/integrations/pull/0 # FIXME Replace with the real PR link
+      link: https://github.com/elastic/integrations/pull/1 # FIXME Replace with the real PR link
diff --git a/test/packages/other/long_integers/changelog.yml b/test/packages/other/long_integers/changelog.yml
@@ -3,4 +3,4 @@
   changes:
     - description: Initial draft of the package
       type: enhancement
-      link: https://github.com/elastic/integrations/pull/0 # FIXME Replace with the real PR link
+      link: https://github.com/elastic/integrations/pull/1 # FIXME Replace with the real PR link
diff --git a/test/packages/other/multiinput/data_stream/test/fields/base-fields.yml b/test/packages/other/multiinput/data_stream/test/fields/base-fields.yml
@@ -7,9 +7,6 @@
 - name: data_stream.namespace
   type: constant_keyword
   description: Data stream namespace.
-- name: '@timestamp'
-  type: date
-  description: Event timestamp.
 - name: container.id
   description: Unique container id.
   ignore_above: 1024
@@ -31,8 +28,3 @@
 - name: log.offset
   description: Offset of the entry in the log file.
   type: long
-- name: tags
-  description: List of keywords used to tag each event.
-  example: '["production", "env2"]'
-  ignore_above: 1024
-  type: keyword
diff --git a/test/packages/other/number_formats/changelog.yml b/test/packages/other/number_formats/changelog.yml
@@ -3,4 +3,4 @@
   changes:
     - description: Initial draft of the package
       type: enhancement
-      link: https://github.com/elastic/integrations/pull/0 # FIXME Replace with the real PR link
+      link: https://github.com/elastic/integrations/pull/1 # FIXME Replace with the real PR link
diff --git a/test/packages/package-storage/package_storage_candidate/changelog.yml b/test/packages/package-storage/package_storage_candidate/changelog.yml
@@ -3,4 +3,4 @@
   changes:
     - description: Initial draft of the package
       type: enhancement
-      link: https://github.com/elastic/integrations/pull/0 # FIXME Replace with the real PR link
+      link: https://github.com/elastic/integrations/pull/1 # FIXME Replace with the real PR link
diff --git a/test/packages/parallel/apache/data_stream/access/fields/ecs.yml b/test/packages/parallel/apache/data_stream/access/fields/ecs.yml
@@ -86,22 +86,14 @@
   name: user.name
 - external: ecs
   name: user_agent.device.name
-- external: ecs
-  name: user_agent.device.name
-- external: ecs
-  name: user_agent.name
 - external: ecs
   name: user_agent.name
 - external: ecs
   name: user_agent.original
-- external: ecs
-  name: user_agent.original
 - external: ecs
   name: user_agent.os.full
 - external: ecs
   name: user_agent.os.name
-- external: ecs
-  name: user_agent.os.name
 - external: ecs
   name: user_agent.os.version
 - external: ecs

diff --git a/test/packages/parallel/apache/data_stream/error/fields/base-fields.yml b/test/packages/parallel/apache/data_stream/error/fields/base-fields.yml
@@ -10,11 +10,6 @@
 - name: '@timestamp'
   type: date
   description: Event timestamp.
-- name: tags
-  description: List of keywords used to tag each event.
-  example: '["production", "env2"]'
-  ignore_above: 1024
-  type: keyword
 - name: event.module
   type: constant_keyword
   description: Event module

diff --git a/test/packages/parallel/aws/data_stream/ec2_metrics/fields/agent.yml b/test/packages/parallel/aws/data_stream/ec2_metrics/fields/agent.yml
@@ -1,59 +1,3 @@
-- name: cloud
-  title: Cloud
-  group: 2
-  description: Fields related to the cloud or infrastructure the events are coming from.
-  footnote: 'Examples: If Metricbeat is running on an EC2 host 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.
-    - name: image.id
-      type: keyword
-      description: Image ID for the cloud instance.
 - name: container
   title: Container
   group: 2

diff --git a/test/packages/parallel/aws/data_stream/ec2_metrics/fields/ecs.yml b/test/packages/parallel/aws/data_stream/ec2_metrics/fields/ecs.yml
@@ -1,24 +1,8 @@
 - external: ecs
   name: cloud
-- external: ecs
-  name: cloud.account.id
-- external: ecs
-  name: cloud.account.name
-- external: ecs
-  name: cloud.availability_zone
-- external: ecs
-  name: cloud.instance.id
-- external: ecs
-  name: cloud.machine.type
-- external: ecs
-  name: cloud.provider
-- external: ecs
-  name: cloud.region
 - external: ecs
   name: ecs.version
 - external: ecs
   name: error
-- external: ecs
-  name: error.message
 - external: ecs
   name: service.type
diff --git a/test/packages/parallel/aws/data_stream/elb_logs/fields/agent.yml b/test/packages/parallel/aws/data_stream/elb_logs/fields/agent.yml
@@ -1,59 +1,3 @@
-- name: cloud
-  title: Cloud
-  group: 2
-  description: Fields related to the cloud or infrastructure the events are coming from.
-  footnote: 'Examples: If Metricbeat is running on an EC2 host 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.
-    - name: image.id
-      type: keyword
-      description: Image ID for the cloud instance.
 - name: container
   title: Container
   group: 2

diff --git a/test/packages/parallel/aws/data_stream/sns/fields/agent.yml b/test/packages/parallel/aws/data_stream/sns/fields/agent.yml
@@ -1,59 +1,3 @@
-- name: cloud
-  title: Cloud
-  group: 2
-  description: Fields related to the cloud or infrastructure the events are coming from.
-  footnote: 'Examples: If Metricbeat is running on an EC2 host 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.
-    - name: image.id
-      type: keyword
-      description: Image ID for the cloud instance.
 - name: container
   title: Container
   group: 2

diff --git a/test/packages/parallel/aws/data_stream/sns/fields/ecs.yml b/test/packages/parallel/aws/data_stream/sns/fields/ecs.yml
@@ -1,24 +1,8 @@
 - external: ecs
   name: cloud
-- external: ecs
-  name: cloud.account.id
-- external: ecs
-  name: cloud.account.name
-- external: ecs
-  name: cloud.availability_zone
-- external: ecs
-  name: cloud.instance.id
-- external: ecs
-  name: cloud.machine.type
-- external: ecs
-  name: cloud.provider
-- external: ecs
-  name: cloud.region
 - external: ecs
   name: ecs.version
 - external: ecs
   name: error
-- external: ecs
-  name: error.message
 - external: ecs
   name: service.type
diff --git a/test/packages/parallel/aws/data_stream/sns/fields/fields.yml b/test/packages/parallel/aws/data_stream/sns/fields/fields.yml
@@ -7,15 +7,12 @@
         - name: Application
           type: keyword
           description: Filters on application objects, which represent an app and device registered with one of the supported push notification services, such as APNs and FCM.
-        - name: Application,Platform
+        - name: Platform
           type: keyword
           description: Filters on application and platform objects, where the platform objects are for the supported push notification services, such as APNs and FCM.
         - name: Country
           type: keyword
           description: Filters on the destination country or region of an SMS message.
-        - name: Platform
-          type: keyword
-          description: Filters on platform objects for the push notification services, such as APNs and FCM.
         - name: TopicName
           type: keyword
           description: Filters on Amazon SNS topic names.