fix expectes

elastic · Apr 16, 2018 · 670ed57 · 670ed57
1 parent 07f941f
commit 670ed57
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 24 deletions.
diff --git a/filebeat/module/nginx/access/ingest/default.json b/filebeat/module/nginx/access/ingest/default.json
@@ -15,8 +15,8 @@
     "grok": {
       "field": "nginx.access.info",
       "patterns": [
-          "",
-          "(?:%{WORD:nginx.access.method} )(?:%{DATA:nginx.access.url} )(?:HTTP/%{NUMBER:nginx.access.http_version})"
+          "%{WORD:nginx.access.method} %{DATA:nginx.access.url} HTTP/%{NUMBER:nginx.access.http_version}",
+          ""
       ],
       "ignore_missing": true
     }

diff --git a/filebeat/module/nginx/access/test/test.log-expected.json b/filebeat/module/nginx/access/test/test.log-expected.json
@@ -369,28 +369,26 @@
     "_id" : "AVxWUuZ8OMOtqbaTipsE",
     "_score" : 1.0,
     "_source": {
-        "@timestamp": "2018-04-12T07:48:40.000Z",
-        "nginx": {
-		  "access": {
-		    "body_sent": {
-		  	  "bytes": "0"
-		    },
-		    "referrer": "-",
-		    "remote_ip": "127.0.0.1",
-		    "remote_ip_list": [
-		  	  "127.0.0.1"
-		    ],
-		    "response_code": "400",
-		    "url": "",
-		    "user_agent": {
-		  	  "device": "Other",
-		  	  "name": "Other",
-		  	  "os": "Other",
-		  	  "os_name": "Other"
-		    },
-		    "user_name": "-"
-		  }
-        }
+      "@timestamp": "2018-04-12T07:48:40.000Z",
+      "nginx": {
+      "access": {
+        "body_sent": {
+          "bytes": "0"
+        },
+        "referrer": "-",
+        "remote_ip": "127.0.0.1",
+        "remote_ip_list": [
+          "127.0.0.1"
+        ],
+        "response_code": "400",
+        "user_agent": {
+         "device": "Other",
+         "name": "Other",
+         "os": "Other",
+         "os_name": "Other"
+        },
+        "user_name": "-"
+      }
       },
       "beat" : {
         "hostname" : "a-mac-with-esc-key-2.local",