Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Recover geoip.region_iso_code field in test expectations #8204

Merged
merged 2 commits into from
Sep 5, 2018
Merged

Recover geoip.region_iso_code field in test expectations #8204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f2c4e3
Recover geoip.region_iso_code field in test expectations
jsoriano Sep 3, 2018
45b31e6
Force pull of images on `make start-environment`
jsoriano Sep 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions filebeat/module/iis/access/test/test.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions filebeat/module/iis/error/test/test.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions filebeat/module/nginx/access/test/test.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions filebeat/module/system/auth/test/test.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions filebeat/module/traefik/access/test/test.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions libbeat/scripts/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down