Govendor ECS 1.0.1 (elastic#12317)

Updates vendor dependency to ECS 1.0.1. Field definitions were already imported in elastic#12284. Removes `ecs.version` from Filebeat golden files.
andrewvc · Jun 12, 2019 · 4fc44ee · 4fc44ee
1 parent 1f00ab3
commit 4fc44ee
Show file tree

Hide file tree

Showing 125 changed files with 14 additions and 2,710 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -12,7 +12,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 
 - Update to Golang 1.12.1. {pull}11330[11330]
 - Update to Golang 1.12.4. {pull}11782[11782]
-- Update to ECS 1.0.1. {pull}12284[12284]
+- Update to ECS 1.0.1. {pull}12284[12284] {pull}12317[12317]
 
 *Auditbeat*
 

diff --git a/NOTICE.txt b/NOTICE.txt
@@ -639,8 +639,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 --------------------------------------------------------------------
 Dependency: github.com/elastic/ecs
-Version: 1.0
-Revision: b9f735dd33b0bbb95dbca4229397c9b7f81f8f53
+Version: v1.0.1
+Revision: ab5e966864a6e2d4bc9fd6e2343e8d7f05f648fb
 License type (autodetected): Apache-2.0
 ./vendor/github.com/elastic/ecs/LICENSE.txt:
 --------------------------------------------------------------------

diff --git a/filebeat/module/apache/access/test/darwin-2.4.23.log-expected.json b/filebeat/module/apache/access/test/darwin-2.4.23.log-expected.json
@@ -1,7 +1,6 @@
 [
     {
         "@timestamp": "2016-12-26T14:16:28.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.access",
         "event.module": "apache",
         "fileset.name": "access",
@@ -19,7 +18,6 @@
     },
     {
         "@timestamp": "2016-12-26T14:16:29.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.access",
         "event.module": "apache",
         "fileset.name": "access",
@@ -37,7 +35,6 @@
     },
     {
         "@timestamp": "2016-12-26T14:16:48.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.access",
         "event.module": "apache",
         "fileset.name": "access",
@@ -51,7 +48,6 @@
     },
     {
         "@timestamp": "2016-12-26T16:23:35.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.access",
         "event.module": "apache",
         "fileset.name": "access",
@@ -73,7 +69,6 @@
     },
     {
         "@timestamp": "2016-12-26T16:23:41.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.access",
         "event.module": "apache",
         "fileset.name": "access",
@@ -95,7 +90,6 @@
     },
     {
         "@timestamp": "2016-12-26T16:23:45.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.access",
         "event.module": "apache",
         "fileset.name": "access",

diff --git a/filebeat/module/apache/access/test/ssl-request.log-expected.json b/filebeat/module/apache/access/test/ssl-request.log-expected.json
@@ -3,7 +3,6 @@
         "@timestamp": "2018-08-10T07:45:56.000Z",
         "apache.access.ssl.cipher": "ECDHE-RSA-AES128-GCM-SHA256",
         "apache.access.ssl.protocol": "TLSv1.2",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.access",
         "event.module": "apache",
         "fileset.name": "access",

diff --git a/filebeat/module/apache/access/test/test.log-expected.json b/filebeat/module/apache/access/test/test.log-expected.json
@@ -1,7 +1,6 @@
 [
     {
         "@timestamp": "2016-12-26T14:16:29.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.access",
         "event.module": "apache",
         "fileset.name": "access",
@@ -19,7 +18,6 @@
     },
     {
         "@timestamp": "2016-12-26T16:22:13.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.access",
         "event.module": "apache",
         "fileset.name": "access",
@@ -45,7 +43,6 @@
     },
     {
         "@timestamp": "2016-12-26T14:16:48.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.access",
         "event.module": "apache",
         "fileset.name": "access",
@@ -59,7 +56,6 @@
     },
     {
         "@timestamp": "2017-05-29T19:02:48.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.access",
         "event.module": "apache",
         "fileset.name": "access",
@@ -83,7 +79,6 @@
     },
     {
         "@timestamp": "2017-05-29T19:02:48.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.access",
         "event.module": "apache",
         "fileset.name": "access",
@@ -107,7 +102,6 @@
     },
     {
         "@timestamp": "2019-02-02T04:38:45.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.access",
         "event.module": "apache",
         "fileset.name": "access",

diff --git a/filebeat/module/apache/access/test/ubuntu-2.2.22.log-expected.json b/filebeat/module/apache/access/test/ubuntu-2.2.22.log-expected.json
@@ -1,7 +1,6 @@
 [
     {
         "@timestamp": "2016-12-26T16:18:09.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.access",
         "event.module": "apache",
         "fileset.name": "access",
@@ -24,7 +23,6 @@
     },
     {
         "@timestamp": "2016-12-26T16:22:00.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.access",
         "event.module": "apache",
         "fileset.name": "access",
@@ -50,7 +48,6 @@
     },
     {
         "@timestamp": "2016-12-26T16:22:00.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.access",
         "event.module": "apache",
         "fileset.name": "access",
@@ -76,7 +73,6 @@
     },
     {
         "@timestamp": "2016-12-26T16:22:08.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.access",
         "event.module": "apache",
         "fileset.name": "access",
@@ -102,7 +98,6 @@
     },
     {
         "@timestamp": "2016-12-26T16:22:08.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.access",
         "event.module": "apache",
         "fileset.name": "access",
@@ -128,7 +123,6 @@
     },
     {
         "@timestamp": "2016-12-26T16:22:08.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.access",
         "event.module": "apache",
         "fileset.name": "access",
@@ -154,7 +148,6 @@
     },
     {
         "@timestamp": "2016-12-26T16:22:10.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.access",
         "event.module": "apache",
         "fileset.name": "access",
@@ -180,7 +173,6 @@
     },
     {
         "@timestamp": "2016-12-26T16:22:13.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.access",
         "event.module": "apache",
         "fileset.name": "access",
@@ -206,7 +198,6 @@
     },
     {
         "@timestamp": "2016-12-26T16:22:17.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.access",
         "event.module": "apache",
         "fileset.name": "access",

diff --git a/filebeat/module/apache/error/test/darwin-2.4.23.log-expected.json b/filebeat/module/apache/error/test/darwin-2.4.23.log-expected.json
@@ -2,7 +2,6 @@
     {
         "@timestamp": "2016-12-26T16:15:55.103Z",
         "apache.error.module": "mpm_prefork",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.error",
         "event.module": "apache",
         "fileset.name": "error",
@@ -16,7 +15,6 @@
     {
         "@timestamp": "2016-12-26T16:15:55.103Z",
         "apache.error.module": "core",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.error",
         "event.module": "apache",
         "fileset.name": "error",

diff --git a/filebeat/module/apache/error/test/test.log-expected.json b/filebeat/module/apache/error/test/test.log-expected.json
@@ -1,7 +1,6 @@
 [
     {
         "@timestamp": "2016-12-26T16:22:08.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.error",
         "event.module": "apache",
         "fileset.name": "error",
@@ -16,7 +15,6 @@
     {
         "@timestamp": "2016-12-26T16:15:55.103Z",
         "apache.error.module": "core",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.error",
         "event.module": "apache",
         "fileset.name": "error",
@@ -30,7 +28,6 @@
     {
         "@timestamp": "2011-09-09T10:42:29.902Z",
         "apache.error.module": "core",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.error",
         "event.module": "apache",
         "fileset.name": "error",

diff --git a/filebeat/module/apache/error/test/ubuntu-2.2.22.log-expected.json b/filebeat/module/apache/error/test/ubuntu-2.2.22.log-expected.json
@@ -1,7 +1,6 @@
 [
     {
         "@timestamp": "2016-12-26T16:17:53.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.error",
         "event.module": "apache",
         "fileset.name": "error",
@@ -13,7 +12,6 @@
     },
     {
         "@timestamp": "2016-12-26T16:22:00.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.error",
         "event.module": "apache",
         "fileset.name": "error",
@@ -27,7 +25,6 @@
     },
     {
         "@timestamp": "2016-12-26T16:22:08.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.error",
         "event.module": "apache",
         "fileset.name": "error",
@@ -41,7 +38,6 @@
     },
     {
         "@timestamp": "2016-12-26T16:22:08.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.error",
         "event.module": "apache",
         "fileset.name": "error",
@@ -55,7 +51,6 @@
     },
     {
         "@timestamp": "2016-12-26T16:22:10.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.error",
         "event.module": "apache",
         "fileset.name": "error",
@@ -69,7 +64,6 @@
     },
     {
         "@timestamp": "2016-12-26T16:22:13.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.error",
         "event.module": "apache",
         "fileset.name": "error",
@@ -83,7 +77,6 @@
     },
     {
         "@timestamp": "2016-12-26T16:22:17.000Z",
-        "ecs.version": "1.0.0",
         "event.dataset": "apache.error",
         "event.module": "apache",
         "fileset.name": "error",

diff --git a/filebeat/module/auditd/log/test/audit-rhel6.log-expected.json b/filebeat/module/auditd/log/test/audit-rhel6.log-expected.json
@@ -3,7 +3,6 @@
         "@timestamp": "2017-03-14T19:20:30.178Z",
         "auditd.log.sequence": 19600327,
         "auditd.log.ses": "11988",
-        "ecs.version": "1.0.0",
         "event.action": "user_end",
         "event.dataset": "auditd.log",
         "event.module": "auditd",
@@ -23,7 +22,6 @@
         "@timestamp": "2017-03-14T19:20:30.178Z",
         "auditd.log.sequence": 19600328,
         "auditd.log.ses": "11988",
-        "ecs.version": "1.0.0",
         "event.action": "cred_disp",
         "event.dataset": "auditd.log",
         "event.module": "auditd",
@@ -43,7 +41,6 @@
         "@timestamp": "2017-03-14T19:20:56.192Z",
         "auditd.log.sequence": 19600329,
         "auditd.log.ses": "11988",
-        "ecs.version": "1.0.0",
         "event.action": "user_cmd",
         "event.dataset": "auditd.log",
         "event.module": "auditd",
@@ -66,7 +63,6 @@
         "@timestamp": "2017-03-14T19:20:56.193Z",
         "auditd.log.sequence": 19600330,
         "auditd.log.ses": "11988",
-        "ecs.version": "1.0.0",
         "event.action": "cred_acq",
         "event.dataset": "auditd.log",
         "event.module": "auditd",
@@ -86,7 +82,6 @@
         "@timestamp": "2017-03-14T19:20:56.193Z",
         "auditd.log.sequence": 19600331,
         "auditd.log.ses": "11988",
-        "ecs.version": "1.0.0",
         "event.action": "user_start",
         "event.dataset": "auditd.log",
         "event.module": "auditd",
@@ -110,7 +105,6 @@
         "auditd.log.ses": "4294967295",
         "auditd.log.src_prefixlen": "16",
         "destination.address": "10.100.4.0",
-        "ecs.version": "1.0.0",
         "event.action": "mac_ipsec_event",
         "event.dataset": "auditd.log",
         "event.module": "auditd",
@@ -136,7 +130,6 @@
         "auditd.log.success": "yes",
         "auditd.log.syscall": "44",
         "auditd.log.tty": "(none)",
-        "ecs.version": "1.0.0",
         "event.action": "syscall",
         "event.dataset": "auditd.log",
         "event.module": "auditd",
@@ -166,7 +159,6 @@
         "auditd.log.old_auid": "700",
         "auditd.log.old_ses": "6793",
         "auditd.log.sequence": 19623791,
-        "ecs.version": "1.0.0",
         "event.action": "login",
         "event.dataset": "auditd.log",
         "event.module": "auditd",
@@ -188,7 +180,6 @@
         "auditd.log.sequence": 19623788,
         "auditd.log.ses": "6793",
         "auditd.log.spid": "28282",
-        "ecs.version": "1.0.0",
         "event.action": "crypto_key_user",
         "event.dataset": "auditd.log",
         "event.module": "auditd",
@@ -209,7 +200,6 @@
         "auditd.log.addr": "96.241.146.97",
         "auditd.log.sequence": 19623789,
         "auditd.log.ses": "6793",
-        "ecs.version": "1.0.0",
         "event.action": "user_auth",
         "event.dataset": "auditd.log",
         "event.module": "auditd",
@@ -230,7 +220,6 @@
         "@timestamp": "2017-03-16T04:02:57.804Z",
         "auditd.log.sequence": 19623807,
         "auditd.log.ses": "12286",
-        "ecs.version": "1.0.0",
         "event.action": "user_auth",
         "event.dataset": "auditd.log",
         "event.module": "auditd",
@@ -251,7 +240,6 @@
         "@timestamp": "2017-03-16T04:02:57.805Z",
         "auditd.log.sequence": 19623808,
         "auditd.log.ses": "12286",
-        "ecs.version": "1.0.0",
         "event.action": "user_acct",
         "event.dataset": "auditd.log",
         "event.module": "auditd",