Update Filebeat module expected logs files (elastic#21454)

Elasticsearch added country_name to the list of default field for geo in elastic/elasticsearch#62915. So the expected files needed updated. (cherry picked from commit 13a5463)
andrewkroh · Oct 7, 2020 · f6e6db6 · f6e6db6
1 parent 979414e
commit f6e6db6
Show file tree

Hide file tree

Showing 117 changed files with 2,942 additions and 1,963 deletions.
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
@@ -76,6 +76,7 @@
  "source.geo.city_name": "Germersheim",
  "source.geo.continent_name": "Europe",
  "source.geo.country_iso_code": "DE",
+ "source.geo.country_name": "Germany",
  "source.geo.location.lat": 49.2231,
  "source.geo.location.lon": 8.3639,
  "source.geo.region_iso_code": "DE-RP",
@@ -105,6 +106,7 @@
  "source.geo.city_name": "Germersheim",
  "source.geo.continent_name": "Europe",
  "source.geo.country_iso_code": "DE",
+ "source.geo.country_name": "Germany",
  "source.geo.location.lat": 49.2231,
  "source.geo.location.lon": 8.3639,
  "source.geo.region_iso_code": "DE-RP",
@@ -134,6 +136,7 @@
  "source.geo.city_name": "Germersheim",
  "source.geo.continent_name": "Europe",
  "source.geo.country_iso_code": "DE",
+ "source.geo.country_name": "Germany",
  "source.geo.location.lat": 49.2231,
  "source.geo.location.lon": 8.3639,
  "source.geo.region_iso_code": "DE-RP",

diff --git a/filebeat/module/apache/access/test/ssl-request.log-expected.json b/filebeat/module/apache/access/test/ssl-request.log-expected.json
@@ -38,6 +38,7 @@
  "source.address": "11.19.0.217",
  "source.geo.continent_name": "North America",
  "source.geo.country_iso_code": "US",
+ "source.geo.country_name": "United States",
  "source.geo.location.lat": 37.751,
  "source.geo.location.lon": -97.822,
  "source.ip": "11.19.0.217",

diff --git a/filebeat/module/apache/error/test/test.log-expected.json b/filebeat/module/apache/error/test/test.log-expected.json
@@ -56,6 +56,7 @@
  "source.geo.city_name": "Newnan",
  "source.geo.continent_name": "North America",
  "source.geo.country_iso_code": "US",
+ "source.geo.country_name": "United States",
  "source.geo.location.lat": 33.3708,
  "source.geo.location.lon": -84.8154,
  "source.geo.region_iso_code": "US-GA",
@@ -84,6 +85,7 @@
  "source.geo.city_name": "Beijing",
  "source.geo.continent_name": "Asia",
  "source.geo.country_iso_code": "CN",
+ "source.geo.country_name": "China",
  "source.geo.location.lat": 39.9288,
  "source.geo.location.lon": 116.3889,
  "source.geo.region_iso_code": "CN-BJ",

diff --git a/filebeat/module/haproxy/log/test/default.log-expected.json b/filebeat/module/haproxy/log/test/default.log-expected.json
@@ -30,6 +30,7 @@
  "source.geo.city_name": "Moscow",
  "source.geo.continent_name": "Europe",
  "source.geo.country_iso_code": "RU",
+ "source.geo.country_name": "Russia",
  "source.geo.location.lat": 55.7527,
  "source.geo.location.lon": 37.6172,
  "source.geo.region_iso_code": "RU-MOW",

diff --git a/filebeat/module/haproxy/log/test/haproxy.log-expected.json b/filebeat/module/haproxy/log/test/haproxy.log-expected.json
@@ -47,6 +47,7 @@
  "source.geo.city_name": "Moscow",
  "source.geo.continent_name": "Europe",
  "source.geo.country_iso_code": "RU",
+ "source.geo.country_name": "Russia",
  "source.geo.location.lat": 55.7527,
  "source.geo.location.lon": 37.6172,
  "source.geo.region_iso_code": "RU-MOW",

diff --git a/filebeat/module/iis/access/test/test.log-expected.json b/filebeat/module/iis/access/test/test.log-expected.json
@@ -34,6 +34,7 @@
  "source.geo.city_name": "Berlin",
  "source.geo.continent_name": "Europe",
  "source.geo.country_iso_code": "DE",
+ "source.geo.country_name": "Germany",
  "source.geo.location.lat": 52.4473,
  "source.geo.location.lon": 13.4531,
  "source.geo.region_iso_code": "DE-BE",
@@ -127,6 +128,7 @@
  "source.geo.city_name": "Berlin",
  "source.geo.continent_name": "Europe",
  "source.geo.country_iso_code": "DE",
+ "source.geo.country_name": "Germany",
  "source.geo.location.lat": 52.4473,
  "source.geo.location.lon": 13.4531,
  "source.geo.region_iso_code": "DE-BE",

diff --git a/filebeat/module/iis/error/test/iis_error_url.log-expected.json b/filebeat/module/iis/error/test/iis_error_url.log-expected.json
@@ -30,6 +30,7 @@
  "source.address": "149.42.83.135",
  "source.geo.continent_name": "North America",
  "source.geo.country_iso_code": "US",
+ "source.geo.country_name": "United States",
  "source.geo.location.lat": 37.751,
  "source.geo.location.lon": -97.822,
  "source.ip": "149.42.83.135",
@@ -67,6 +68,7 @@
  "source.address": "149.42.83.135",
  "source.geo.continent_name": "North America",
  "source.geo.country_iso_code": "US",
+ "source.geo.country_name": "United States",
  "source.geo.location.lat": 37.751,
  "source.geo.location.lon": -97.822,
  "source.ip": "149.42.83.135",
@@ -104,6 +106,7 @@
  "source.address": "149.42.83.135",
  "source.geo.continent_name": "North America",
  "source.geo.country_iso_code": "US",
+ "source.geo.country_name": "United States",
  "source.geo.location.lat": 37.751,
  "source.geo.location.lon": -97.822,
  "source.ip": "149.42.83.135",
@@ -141,6 +144,7 @@
  "source.address": "149.42.83.135",
  "source.geo.continent_name": "North America",
  "source.geo.country_iso_code": "US",
+ "source.geo.country_name": "United States",
  "source.geo.location.lat": 37.751,
  "source.geo.location.lon": -97.822,
  "source.ip": "149.42.83.135",
@@ -178,6 +182,7 @@
  "source.address": "149.42.83.135",
  "source.geo.continent_name": "North America",
  "source.geo.country_iso_code": "US",
+ "source.geo.country_name": "United States",
  "source.geo.location.lat": 37.751,
  "source.geo.location.lon": -97.822,
  "source.ip": "149.42.83.135",
@@ -215,6 +220,7 @@
  "source.address": "149.42.83.135",
  "source.geo.continent_name": "North America",
  "source.geo.country_iso_code": "US",
+ "source.geo.country_name": "United States",
  "source.geo.location.lat": 37.751,
  "source.geo.location.lon": -97.822,
  "source.ip": "149.42.83.135",
@@ -252,6 +258,7 @@
  "source.address": "149.42.83.135",
  "source.geo.continent_name": "North America",
  "source.geo.country_iso_code": "US",
+ "source.geo.country_name": "United States",
  "source.geo.location.lat": 37.751,
  "source.geo.location.lon": -97.822,
  "source.ip": "149.42.83.135",
@@ -289,6 +296,7 @@
  "source.address": "149.42.83.135",
  "source.geo.continent_name": "North America",
  "source.geo.country_iso_code": "US",
+ "source.geo.country_name": "United States",
  "source.geo.location.lat": 37.751,
  "source.geo.location.lon": -97.822,
  "source.ip": "149.42.83.135",

diff --git a/filebeat/module/iis/error/test/test.log-expected.json b/filebeat/module/iis/error/test/test.log-expected.json
@@ -66,6 +66,7 @@
  "source.geo.city_name": "Berlin",
  "source.geo.continent_name": "Europe",
  "source.geo.country_iso_code": "DE",
+ "source.geo.country_name": "Germany",
  "source.geo.location.lat": 52.4473,
  "source.geo.location.lon": 13.4531,
  "source.geo.region_iso_code": "DE-BE",
@@ -108,6 +109,7 @@
  "source.geo.city_name": "Berlin",
  "source.geo.continent_name": "Europe",
  "source.geo.country_iso_code": "DE",
+ "source.geo.country_name": "Germany",
  "source.geo.location.lat": 52.4473,
  "source.geo.location.lon": 13.4531,
  "source.geo.region_iso_code": "DE-BE",
@@ -146,6 +148,7 @@
  "source.geo.city_name": "Berlin",
  "source.geo.continent_name": "Europe",
  "source.geo.country_iso_code": "DE",
+ "source.geo.country_name": "Germany",
  "source.geo.location.lat": 52.4473,
  "source.geo.location.lon": 13.4531,
  "source.geo.region_iso_code": "DE-BE",

diff --git a/filebeat/module/nginx/access/test/access.log-expected.json b/filebeat/module/nginx/access/test/access.log-expected.json
@@ -32,6 +32,7 @@
  "source.geo.city_name": "Germersheim",
  "source.geo.continent_name": "Europe",
  "source.geo.country_iso_code": "DE",
+ "source.geo.country_name": "Germany",
  "source.geo.location.lat": 49.2231,
  "source.geo.location.lon": 8.3639,
  "source.geo.region_iso_code": "DE-RP",
@@ -80,6 +81,7 @@
  "source.geo.city_name": "Germersheim",
  "source.geo.continent_name": "Europe",
  "source.geo.country_iso_code": "DE",
+ "source.geo.country_name": "Germany",
  "source.geo.location.lat": 49.2231,
  "source.geo.location.lon": 8.3639,
  "source.geo.region_iso_code": "DE-RP",
@@ -127,6 +129,7 @@
  "source.geo.city_name": "Germersheim",
  "source.geo.continent_name": "Europe",
  "source.geo.country_iso_code": "DE",
+ "source.geo.country_name": "Germany",
  "source.geo.location.lat": 49.2231,
  "source.geo.location.lon": 8.3639,
  "source.geo.region_iso_code": "DE-RP",
@@ -174,6 +177,7 @@
  "source.geo.city_name": "Germersheim",
  "source.geo.continent_name": "Europe",
  "source.geo.country_iso_code": "DE",
+ "source.geo.country_name": "Germany",
  "source.geo.location.lat": 49.2231,
  "source.geo.location.lon": 8.3639,
  "source.geo.region_iso_code": "DE-RP",
@@ -222,6 +226,7 @@
  "source.geo.city_name": "Germersheim",
  "source.geo.continent_name": "Europe",
  "source.geo.country_iso_code": "DE",
+ "source.geo.country_name": "Germany",
  "source.geo.location.lat": 49.2231,
  "source.geo.location.lon": 8.3639,
  "source.geo.region_iso_code": "DE-RP",
@@ -269,6 +274,7 @@
  "source.geo.city_name": "Germersheim",
  "source.geo.continent_name": "Europe",
  "source.geo.country_iso_code": "DE",
+ "source.geo.country_name": "Germany",
  "source.geo.location.lat": 49.2231,
  "source.geo.location.lon": 8.3639,
  "source.geo.region_iso_code": "DE-RP",
@@ -316,6 +322,7 @@
  "source.geo.city_name": "Germersheim",
  "source.geo.continent_name": "Europe",
  "source.geo.country_iso_code": "DE",
+ "source.geo.country_name": "Germany",
  "source.geo.location.lat": 49.2231,
  "source.geo.location.lon": 8.3639,
  "source.geo.region_iso_code": "DE-RP",
@@ -363,6 +370,7 @@
  "source.geo.city_name": "Germersheim",
  "source.geo.continent_name": "Europe",
  "source.geo.country_iso_code": "DE",
+ "source.geo.country_name": "Germany",
  "source.geo.location.lat": 49.2231,
  "source.geo.location.lon": 8.3639,
  "source.geo.region_iso_code": "DE-RP",

diff --git a/filebeat/module/nginx/access/test/test-with-host.log-expected.json b/filebeat/module/nginx/access/test/test-with-host.log-expected.json
@@ -115,6 +115,7 @@
  "source.geo.city_name": "Berlin",
  "source.geo.continent_name": "Europe",
  "source.geo.country_iso_code": "DE",
+ "source.geo.country_name": "Germany",
  "source.geo.location.lat": 52.4473,
  "source.geo.location.lon": 13.4531,
  "source.geo.region_iso_code": "DE-BE",
@@ -164,6 +165,7 @@
  "source.geo.city_name": "Berlin",
  "source.geo.continent_name": "Europe",
  "source.geo.country_iso_code": "DE",
+ "source.geo.country_name": "Germany",
  "source.geo.location.lat": 52.4473,
  "source.geo.location.lon": 13.4531,
  "source.geo.region_iso_code": "DE-BE",
@@ -216,6 +218,7 @@
  "source.geo.city_name": "Springfield",
  "source.geo.continent_name": "North America",
  "source.geo.country_iso_code": "US",
+ "source.geo.country_name": "United States",
  "source.geo.location.lat": 39.7647,
  "source.geo.location.lon": -89.7379,
  "source.geo.region_iso_code": "US-IL",
@@ -260,6 +263,7 @@
  "source.address": "2a03:0000:10ff:f00f:0000:0000:0:8000",
  "source.geo.continent_name": "Europe",
  "source.geo.country_iso_code": "PT",
+ "source.geo.country_name": "Portugal",
  "source.geo.location.lat": 39.5,
  "source.geo.location.lon": -8.0,
  "source.ip": "2a03:0000:10ff:f00f:0000:0000:0:8000",

diff --git a/filebeat/module/nginx/access/test/test.log-expected.json b/filebeat/module/nginx/access/test/test.log-expected.json
@@ -112,6 +112,7 @@
  "source.geo.city_name": "Berlin",
  "source.geo.continent_name": "Europe",
  "source.geo.country_iso_code": "DE",
+ "source.geo.country_name": "Germany",
  "source.geo.location.lat": 52.4473,
  "source.geo.location.lon": 13.4531,
  "source.geo.region_iso_code": "DE-BE",
@@ -159,6 +160,7 @@
  "source.geo.city_name": "Berlin",
  "source.geo.continent_name": "Europe",
  "source.geo.country_iso_code": "DE",
+ "source.geo.country_name": "Germany",
  "source.geo.location.lat": 52.4473,
  "source.geo.location.lon": 13.4531,
  "source.geo.region_iso_code": "DE-BE",
@@ -209,6 +211,7 @@
  "source.geo.city_name": "Springfield",
  "source.geo.continent_name": "North America",
  "source.geo.country_iso_code": "US",
+ "source.geo.country_name": "United States",
  "source.geo.location.lat": 39.7647,
  "source.geo.location.lon": -89.7379,
  "source.geo.region_iso_code": "US-IL",
@@ -251,6 +254,7 @@
  "source.address": "2a03:0000:10ff:f00f:0000:0000:0:8000",
  "source.geo.continent_name": "Europe",
  "source.geo.country_iso_code": "PT",
+ "source.geo.country_name": "Portugal",
  "source.geo.location.lat": 39.5,
  "source.geo.location.lon": -8.0,
  "source.ip": "2a03:0000:10ff:f00f:0000:0000:0:8000",

diff --git a/filebeat/module/nginx/ingress_controller/test/test.log-expected.json b/filebeat/module/nginx/ingress_controller/test/test.log-expected.json
@@ -1322,4 +1322,4 @@
  "user_agent.os.version": "10.14",
  "user_agent.version": "72.0."
  }
-]
+]