Enable static test runner

go.mod

@@ -4,7 +4,7 @@ go 1.12
 
 require (
 	github.com/blang/semver v3.5.1+incompatible
-	github.com/elastic/elastic-package v0.0.0-20210301141614-adf93024cc49
+	github.com/elastic/elastic-package v0.0.0-20210302155343-7a8f99157a71
 	github.com/elastic/package-registry v0.17.0
 	github.com/magefile/mage v1.11.0
 	github.com/pkg/errors v0.9.1

go.sum

@@ -84,19 +84,18 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
-github.com/elastic/elastic-package v0.0.0-20210301141614-adf93024cc49 h1:7jJqx63yI3YJ/X9mh1h90smgh6g/uO/fRnbbrhCjdqk=
-github.com/elastic/elastic-package v0.0.0-20210301141614-adf93024cc49/go.mod h1:vfHw6DAwhslkjTSrKN7uCl3V9KyJ/2dH2hMi3z0PP9U=
+github.com/elastic/elastic-package v0.0.0-20210302155343-7a8f99157a71 h1:uVs37M0pMJBtRZuiRbRsGxZvNjGdQc4anbyI1VFahuc=
+github.com/elastic/elastic-package v0.0.0-20210302155343-7a8f99157a71/go.mod h1:NjAFCbU9bzFpHIq8bGmcM7ejGNuqJ2KgN8gFb3qcvsU=
 github.com/elastic/go-elasticsearch/v7 v7.9.0 h1:UEau+a1MiiE/F+UrDj60kqIHFWdzU1M2y/YtBU2NC2M=
 github.com/elastic/go-elasticsearch/v7 v7.9.0/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4=
 github.com/elastic/go-licenser v0.3.1/go.mod h1:D8eNQk70FOCVBl3smCGQt/lv7meBeQno2eI1S5apiHQ=
-github.com/elastic/go-ucfg v0.8.3 h1:leywnFjzr2QneZZWhE6uWd+QN/UpP0sdJRHYyuFvkeo=
 github.com/elastic/go-ucfg v0.8.3/go.mod h1:iaiY0NBIYeasNgycLyTvhJftQlQEUO2hpF+FX0JKxzo=
 github.com/elastic/go-ucfg v0.8.4-0.20200415140258-1232bd4774a6 h1:Ehbr7du4rSSEypR8zePr0XRbMhO4PJgcHC9f8fDbgAg=
 github.com/elastic/go-ucfg v0.8.4-0.20200415140258-1232bd4774a6/go.mod h1:iaiY0NBIYeasNgycLyTvhJftQlQEUO2hpF+FX0JKxzo=
 github.com/elastic/package-registry v0.17.0 h1:Gh7u3TlHA3GJh+C/OZ8Pf4EUrFxcCXMAe2kUCjAiYgQ=
 github.com/elastic/package-registry v0.17.0/go.mod h1:fMVt9ozLSPAIgYTDgV23IZrSoDKZma7VKpA4uSkfPts=
-github.com/elastic/package-spec/code/go v0.0.0-20210222225810-541116689fca h1:dEAP2TACrsICd/pMzFlEx2llqqWcB68CjJRfnMhQL8E=
-github.com/elastic/package-spec/code/go v0.0.0-20210222225810-541116689fca/go.mod h1:dog1l3e8NoRYxuB8yIbbOWglE6GSQuU6ZL75wT9pKL8=
+github.com/elastic/package-spec/code/go v0.0.0-20210302092944-28bc03fffa83 h1:MBgnWdr/ygkPsD8cL6INTIjH8TpUmpMZ4RqjmMaJAvk=
+github.com/elastic/package-spec/code/go v0.0.0-20210302092944-28bc03fffa83/go.mod h1:dog1l3e8NoRYxuB8yIbbOWglE6GSQuU6ZL75wT9pKL8=
 github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
 github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -231,7 +230,6 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/magefile/mage v1.9.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
-github.com/magefile/mage v1.10.0 h1:3HiXzCUY12kh9bIuyXShaVe529fJfyqoVM42o/uom2g=
 github.com/magefile/mage v1.10.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
 github.com/magefile/mage v1.11.0 h1:C/55Ywp9BpgVVclD3lRnSYCwXTYxmSppIgLeDYlNuls=
 github.com/magefile/mage v1.11.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
@@ -453,7 +451,6 @@ golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 h1:myAQVi0cGEoqQVR5POX+8RR2mrocKqNN1hmeMqhX27k=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -590,7 +587,6 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
 google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -605,11 +601,9 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

packages/aws/changelog.yml

@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "0.4.1"
+  changes:
+    - description: Correct sample event file.
+      type: bugfix # can be one of: enhancement, bugfix, breaking-change
+      link: https://github.com/elastic/integrations/pull/754
 - version: "0.4.0"
   changes:
     - description: Add changes to use ECS 1.8 fields.

packages/aws/data_stream/billing/fields/fields.yml

@@ -78,3 +78,9 @@
           object_type: keyword
           object_type_mapping_type: "*"
           description: Cost explorer group by key values.
+    - name: cloudwatch
+      type: group
+      fields:
+        - name: namespace
+          type: keyword
+          description: The namespace specified when query cloudwatch api.

packages/aws/data_stream/billing/sample_event.json

@@ -1,67 +1,48 @@
 {
-    "_index": "metrics-aws.billing-default-000001",
-    "_id": "IMxJXHIBpGMSUzkZo-s0",
-    "_version": 1,
-    "_score": null,
-    "_source": {
-        "@timestamp": "2020-05-28T17:17:06.212Z",
-        "cloud": {
-            "provider": "aws",
-            "region": "us-east-1",
-            "account": {
-                "id": "428152502467",
-                "name": "elastic-beats"
-            }
-        },
-        "event": {
-            "dataset": "aws.billing",
-            "module": "aws",
-            "duration": 1938760247
-        },
-        "metricset": {
-            "name": "billing",
-            "period": 43200000
-        },
-        "ecs": {
-            "version": "1.5.0"
-        },
-        "aws": {
-            "billing": {
-                "metrics": {
-                    "EstimatedCharges": {
-                        "max": 1625.41
-                    }
+    "@timestamp": "2020-05-28T17:17:06.212Z",
+    "cloud": {
+        "provider": "aws",
+        "region": "us-east-1",
+        "account": {
+            "id": "428152502467",
+            "name": "elastic-beats"
+        }
+    },
+    "event": {
+        "dataset": "aws.billing",
+        "module": "aws",
+        "duration": 1938760247
+    },
+    "metricset": {
+        "name": "billing",
+        "period": 43200000
+    },
+    "ecs": {
+        "version": "1.5.0"
+    },
+    "aws": {
+        "billing": {
+            "metrics": {
+                "EstimatedCharges": {
+                    "max": 1625.41
                 }
-            },
-            "cloudwatch": {
-                "namespace": "AWS/Billing"
-            },
-            "dimensions": {
-                "Currency": "USD"
             }
         },
-        "service": {
-            "type": "aws"
-        },
-        "stream": {
-            "type": "metrics",
-            "dataset": "aws.billing",
-            "namespace": "default"
+        "cloudwatch": {
+            "namespace": "AWS/Billing"
         },
-        "agent": {
-            "id": "12f376ef-5186-4e8b-a175-70f1140a8f30",
-            "name": "MacBook-Elastic.local",
-            "type": "metricbeat",
-            "version": "8.0.0",
-            "ephemeral_id": "17803f33-b617-4ce9-a9ac-e218c02aeb4b"
+        "dimensions": {
+            "Currency": "USD"
         }
     },
-    "fields": {
-        "@timestamp": [
-            "2020-05-28T17:17:06.212Z"
-        ]
+    "service": {
+        "type": "aws"
     },
-    "sort": [
-        1590686226212
-    ]
+    "agent": {
+        "id": "12f376ef-5186-4e8b-a175-70f1140a8f30",
+        "name": "MacBook-Elastic.local",
+        "type": "metricbeat",
+        "version": "8.0.0",
+        "ephemeral_id": "17803f33-b617-4ce9-a9ac-e218c02aeb4b"
+    }
 }

packages/aws/data_stream/cloudwatch_metrics/sample_event.json

@@ -1,72 +1,53 @@
 {
-    "_index": "metrics-aws.cloudwatch_metrics-default-000001",
-    "_id": "-sxJXHIBpGMSUzkZxex8",
-    "_version": 1,
-    "_score": null,
-    "_source": {
-        "@timestamp": "2020-05-28T17:17:02.812Z",
-        "event": {
-            "duration": 14119105951,
-            "dataset": "aws.cloudwatch",
-            "module": "aws"
-        },
-        "ecs": {
-            "version": "1.5.0"
-        },
-        "agent": {
-            "ephemeral_id": "17803f33-b617-4ce9-a9ac-e218c02aeb4b",
-            "id": "12f376ef-5186-4e8b-a175-70f1140a8f30",
-            "name": "MacBook-Elastic.local",
-            "type": "metricbeat",
-            "version": "8.0.0"
-        },
-        "stream": {
-            "dataset": "aws.cloudwatch_metrics",
-            "namespace": "default",
-            "type": "metrics"
-        },
-        "service": {
-            "type": "aws"
-        },
-        "cloud": {
-            "provider": "aws",
-            "region": "us-west-2",
-            "account": {
-                "name": "elastic-beats",
-                "id": "428152502467"
-            }
+    "@timestamp": "2020-05-28T17:17:02.812Z",
+    "event": {
+        "duration": 14119105951,
+        "dataset": "aws.cloudwatch",
+        "module": "aws"
+    },
+    "ecs": {
+        "version": "1.5.0"
+    },
+    "agent": {
+        "ephemeral_id": "17803f33-b617-4ce9-a9ac-e218c02aeb4b",
+        "id": "12f376ef-5186-4e8b-a175-70f1140a8f30",
+        "name": "MacBook-Elastic.local",
+        "type": "metricbeat",
+        "version": "8.0.0"
+    },
+    "service": {
+        "type": "aws"
+    },
+    "cloud": {
+        "provider": "aws",
+        "region": "us-west-2",
+        "account": {
+            "name": "elastic-beats",
+            "id": "428152502467"
+        }
+    },
+    "aws": {
+        "dimensions": {
+            "InstanceId": "i-0830bfecfa7173cbe"
         },
-        "aws": {
-            "dimensions": {
-                "InstanceId": "i-0830bfecfa7173cbe"
-            },
-            "ec2": {
-                "metrics": {
-                    "DiskWriteOps": {
-                        "avg": 0,
-                        "max": 0
-                    },
-                    "CPUUtilization": {
-                        "avg": 0.7661943132361363,
-                        "max": 0.833333333333333
-                    }
+        "ec2": {
+            "metrics": {
+                "DiskWriteOps": {
+                    "avg": 0,
+                    "max": 0
+                },
+                "CPUUtilization": {
+                    "avg": 0.7661943132361363,
+                    "max": 0.833333333333333
                 }
-            },
-            "cloudwatch": {
-                "namespace": "AWS/EC2"
             }
         },
-        "metricset": {
-            "period": 300000,
-            "name": "cloudwatch"
+        "cloudwatch": {
+            "namespace": "AWS/EC2"
         }
     },
-    "fields": {
-        "@timestamp": [
-            "2020-05-28T17:17:02.812Z"
-        ]
-    },
-    "sort": [
-        1590686222812
-    ]
+    "metricset": {
+        "period": 300000,
+        "name": "cloudwatch"
+    }
 }

packages/aws/data_stream/dynamodb/fields/fields.yml

@@ -107,3 +107,9 @@
           type: double
           description: |
             The percentage of provisioned write capacity utilized by the highest provisioned write table or global secondary index of an account.
+- name: aws.cloudwatch
+  type: group
+  fields:
+    - name: namespace
+      type: keyword
+      description: The namespace specified when query cloudwatch api.