From 3f2c4e335feebf60e5be862f14d29522bffe5ce3 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Mon, 3 Sep 2018 19:18:28 +0200 Subject: [PATCH 1/2] Recover geoip.region_iso_code field in test expectations This field appears on ES 6.5.X This reverts part of commit e2298527ce0e9f50c7858807afdf071401c49019. --- filebeat/module/iis/access/test/test.log-expected.json | 2 ++ filebeat/module/iis/error/test/test.log-expected.json | 3 +++ filebeat/module/nginx/access/test/test.log-expected.json | 3 +++ filebeat/module/system/auth/test/test.log-expected.json | 1 + filebeat/module/traefik/access/test/test.log-expected.json | 1 + 5 files changed, 10 insertions(+) diff --git a/filebeat/module/iis/access/test/test.log-expected.json b/filebeat/module/iis/access/test/test.log-expected.json index 7544fbbb01d..78adf0ee379 100644 --- a/filebeat/module/iis/access/test/test.log-expected.json +++ b/filebeat/module/iis/access/test/test.log-expected.json @@ -8,6 +8,7 @@ "iis.access.geoip.country_iso_code": "DE", "iis.access.geoip.location.lat": 52.5167, "iis.access.geoip.location.lon": 13.4, + "iis.access.geoip.region_iso_code": "DE-BE", "iis.access.geoip.region_name": "Land Berlin", "iis.access.method": "GET", "iis.access.port": "80", @@ -73,6 +74,7 @@ "iis.access.geoip.country_iso_code": "DE", "iis.access.geoip.location.lat": 52.5167, "iis.access.geoip.location.lon": 13.4, + "iis.access.geoip.region_iso_code": "DE-BE", "iis.access.geoip.region_name": "Land Berlin", "iis.access.hostname": "example.com", "iis.access.http_version": "1.1", diff --git a/filebeat/module/iis/error/test/test.log-expected.json b/filebeat/module/iis/error/test/test.log-expected.json index 2730859e55b..e565e78cd7b 100644 --- a/filebeat/module/iis/error/test/test.log-expected.json +++ b/filebeat/module/iis/error/test/test.log-expected.json @@ -26,6 +26,7 @@ "iis.error.geoip.country_iso_code": "DE", "iis.error.geoip.location.lat": 52.5167, "iis.error.geoip.location.lon": 13.4, + "iis.error.geoip.region_iso_code": "DE-BE", "iis.error.geoip.region_name": "Land Berlin", "iis.error.http_version": "1.1", "iis.error.method": "GET", @@ -50,6 +51,7 @@ "iis.error.geoip.country_iso_code": "DE", "iis.error.geoip.location.lat": 52.5167, "iis.error.geoip.location.lon": 13.4, + "iis.error.geoip.region_iso_code": "DE-BE", "iis.error.geoip.region_name": "Land Berlin", "iis.error.http_version": "2.0", "iis.error.method": "GET", @@ -74,6 +76,7 @@ "iis.error.geoip.country_iso_code": "DE", "iis.error.geoip.location.lat": 52.5167, "iis.error.geoip.location.lon": 13.4, + "iis.error.geoip.region_iso_code": "DE-BE", "iis.error.geoip.region_name": "Land Berlin", "iis.error.queue_name": "-", "iis.error.reason_phrase": "Timer_MinBytesPerSecond", diff --git a/filebeat/module/nginx/access/test/test.log-expected.json b/filebeat/module/nginx/access/test/test.log-expected.json index 1d8b69e5c70..d169272c44f 100644 --- a/filebeat/module/nginx/access/test/test.log-expected.json +++ b/filebeat/module/nginx/access/test/test.log-expected.json @@ -65,6 +65,7 @@ "nginx.access.geoip.country_iso_code": "DE", "nginx.access.geoip.location.lat": 52.5167, "nginx.access.geoip.location.lon": 13.4, + "nginx.access.geoip.region_iso_code": "DE-BE", "nginx.access.geoip.region_name": "Land Berlin", "nginx.access.http_version": "1.1", "nginx.access.method": "GET", @@ -100,6 +101,7 @@ "nginx.access.geoip.country_iso_code": "DE", "nginx.access.geoip.location.lat": 52.5167, "nginx.access.geoip.location.lon": 13.4, + "nginx.access.geoip.region_iso_code": "DE-BE", "nginx.access.geoip.region_name": "Land Berlin", "nginx.access.http_version": "1.1", "nginx.access.method": "GET", @@ -133,6 +135,7 @@ "nginx.access.geoip.country_iso_code": "US", "nginx.access.geoip.location.lat": 39.772, "nginx.access.geoip.location.lon": -89.6859, + "nginx.access.geoip.region_iso_code": "US-IL", "nginx.access.geoip.region_name": "Illinois", "nginx.access.http_version": "1.1", "nginx.access.method": "GET", diff --git a/filebeat/module/system/auth/test/test.log-expected.json b/filebeat/module/system/auth/test/test.log-expected.json index 276558f363a..93e792d5a2a 100644 --- a/filebeat/module/system/auth/test/test.log-expected.json +++ b/filebeat/module/system/auth/test/test.log-expected.json @@ -61,6 +61,7 @@ "system.auth.ssh.geoip.country_iso_code": "CN", "system.auth.ssh.geoip.location.lat": 22.5333, "system.auth.ssh.geoip.location.lon": 114.1333, + "system.auth.ssh.geoip.region_iso_code": "CN-44", "system.auth.ssh.geoip.region_name": "Guangdong", "system.auth.ssh.ip": "116.31.116.24", "system.auth.ssh.method": "password", diff --git a/filebeat/module/traefik/access/test/test.log-expected.json b/filebeat/module/traefik/access/test/test.log-expected.json index d75a0d93a44..623a948a340 100644 --- a/filebeat/module/traefik/access/test/test.log-expected.json +++ b/filebeat/module/traefik/access/test/test.log-expected.json @@ -35,6 +35,7 @@ "traefik.access.geoip.country_iso_code": "DE", "traefik.access.geoip.location.lat": 52.5167, "traefik.access.geoip.location.lon": 13.4, + "traefik.access.geoip.region_iso_code": "DE-BE", "traefik.access.geoip.region_name": "Land Berlin", "traefik.access.http_version": "1.1", "traefik.access.method": "GET", From 45b31e6a39289c677223e2eb8b421cebe121d187 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Tue, 4 Sep 2018 16:52:38 +0200 Subject: [PATCH 2/2] Force pull of images on `make start-environment` --- libbeat/scripts/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/libbeat/scripts/Makefile b/libbeat/scripts/Makefile index 787e81c753d..19d379cc809 100755 --- a/libbeat/scripts/Makefile +++ b/libbeat/scripts/Makefile @@ -374,6 +374,7 @@ build-image: write-environment # To use it for running the test, set ES_HOST and REDIS_HOST environment variable to the ip of your docker-machine. .PHONY: start-environment start-environment: stop-environment + ${DOCKER_COMPOSE} pull --include-deps ${DOCKER_COMPOSE} up -d .PHONY: stop-environment