Fix copy/paste errors

elastic · Feb 26, 2019 · 6c2ad76 · webmat · Feb 26, 2019 · 6c2ad76
1 parent 95d72cd
commit 6c2ad76
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 40 deletions.
diff --git a/testing/environments/snapshot.yml b/testing/environments/snapshot.yml
@@ -3,7 +3,7 @@
 version: '2.3'
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.0.0-SNAPSHOT
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.1.0-SNAPSHOT
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:9200"]
       retries: 300
@@ -16,7 +16,7 @@ services:
     - "xpack.security.enabled=false"
 
   logstash:
-    image: docker.elastic.co/logstash/logstash:7.0.0-SNAPSHOT
+    image: docker.elastic.co/logstash/logstash:7.1.0-SNAPSHOT
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:9600/_node/stats"]
       retries: 600
@@ -26,7 +26,7 @@ services:
       - ./docker/logstash/pki:/etc/pki:ro
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:7.0.0-SNAPSHOT
+    image: docker.elastic.co/kibana/kibana:7.1.0-SNAPSHOT
     healthcheck:
       test: ["CMD-SHELL", 'python -c ''import urllib, json; response = urllib.urlopen("http://localhost:5601/api/status"); data = json.loads(response.read()); exit(1) if data["status"]["overall"]["state"] != "green" else exit(0);''']
       retries: 600

diff --git a/x-pack/filebeat/module/zeek/connection/ingest/pipeline.json b/x-pack/filebeat/module/zeek/connection/ingest/pipeline.json
@@ -25,8 +25,8 @@
     },
     {
       "set": {
-        "field": "ctx.event.id",
-        "value": "{{ctx.zeek.session_id}}",
+        "field": "event.id",
+        "value": "{{zeek.session_id}}",
         "if": "ctx.zeek.session_id != null"
       }
     },

diff --git a/x-pack/filebeat/module/zeek/dns/ingest/pipeline.json b/x-pack/filebeat/module/zeek/dns/ingest/pipeline.json
@@ -9,8 +9,8 @@
     },
     {
       "set": {
-        "field": "ctx.event.id",
-        "value": "{{ctx.zeek.session_id}}",
+        "field": "event.id",
+        "value": "{{zeek.session_id}}",
         "if": "ctx.zeek.session_id != null"
       }
     },

diff --git a/x-pack/filebeat/module/zeek/files/ingest/pipeline.json b/x-pack/filebeat/module/zeek/files/ingest/pipeline.json
@@ -31,8 +31,8 @@
     },
     {
       "set": {
-        "field": "ctx.event.id",
-        "value": "{{ctx.zeek.session_id}}",
+        "field": "event.id",
+        "value": "{{zeek.session_id}}",
         "if": "ctx.zeek.session_id != null"
       }
     }

diff --git a/x-pack/filebeat/module/zeek/http/ingest/pipeline.json b/x-pack/filebeat/module/zeek/http/ingest/pipeline.json
@@ -9,8 +9,8 @@
     },
     {
       "set": {
-        "field": "ctx.event.id",
-        "value": "{{ctx.zeek.session_id}}",
+        "field": "event.id",
+        "value": "{{zeek.session_id}}",
         "if": "ctx.zeek.session_id != null"
       }
     },

diff --git a/x-pack/filebeat/module/zeek/notice/ingest/pipeline.json b/x-pack/filebeat/module/zeek/notice/ingest/pipeline.json
@@ -9,22 +9,22 @@
     },
     {
       "set": {
-        "field": "ctx.destination.ip",
-        "value": "{{ctx.destination.address}}",
+        "field": "destination.ip",
+        "value": "{{destination.address}}",
         "if": "ctx.destination?.address != null"
       }
     },
     {
       "set": {
-        "field": "ctx.source.ip",
-        "value": "{{ctx.source.address}}",
+        "field": "source.ip",
+        "value": "{{source.address}}",
         "if": "ctx.source?.address != null"
       }
     },
     {
       "set": {
-        "field": "ctx.event.id",
-        "value": "{{ctx.zeek.session_id}}",
+        "field": "event.id",
+        "value": "{{zeek.session_id}}",
         "if": "ctx.zeek.session_id != null"
       }
     },

diff --git a/x-pack/filebeat/module/zeek/ssl/ingest/pipeline.json b/x-pack/filebeat/module/zeek/ssl/ingest/pipeline.json
@@ -9,8 +9,8 @@
     },
     {
       "set": {
-        "field": "ctx.event.id",
-        "value": "{{ctx.zeek.session_id}}",
+        "field": "event.id",
+        "value": "{{zeek.session_id}}",
         "if": "ctx.zeek.session_id != null"
       }
     },

diff --git a/x-pack/filebeat/modules.d/zeek.yml.disabled b/x-pack/filebeat/modules.d/zeek.yml.disabled