From f982c18af6f977b48020442cacec9b4bfa70d9bd Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Mon, 5 Oct 2020 17:46:19 +0800 Subject: [PATCH] Update to elastic/beats@ef6274d0d1e3 (#4249) (#4257) * Update to elastic/beats@ef6274d0d1e3 Brings in https://github.com/elastic/beats/pull/21113 * tests/system: add geo.country_name to approvals https://github.com/elastic/elasticsearch/issues/61523 * Update docs * systemtest: another country_name approval --- docs/data/elasticsearch/generated/errors.json | 1 + docs/data/elasticsearch/generated/transactions.json | 1 + systemtest/approvals/TestRUMXForwardedFor.approved.json | 1 + tests/system/drop_unsampled_transactions.approved.json | 1 + tests/system/error.approved.json | 1 + tests/system/keep_unsampled_transactions.approved.json | 1 + tests/system/transaction.approved.json | 1 + 7 files changed, 7 insertions(+) diff --git a/docs/data/elasticsearch/generated/errors.json b/docs/data/elasticsearch/generated/errors.json index 84ce2e17d4f..26da94671cf 100644 --- a/docs/data/elasticsearch/generated/errors.json +++ b/docs/data/elasticsearch/generated/errors.json @@ -95,6 +95,7 @@ "geo": { "continent_name": "North America", "country_iso_code": "US", + "country_name": "United States", "location": { "lat": 37.751, "lon": -97.822 diff --git a/docs/data/elasticsearch/generated/transactions.json b/docs/data/elasticsearch/generated/transactions.json index 7a395fddb29..755282d5319 100644 --- a/docs/data/elasticsearch/generated/transactions.json +++ b/docs/data/elasticsearch/generated/transactions.json @@ -298,6 +298,7 @@ "geo": { "continent_name": "North America", "country_iso_code": "US", + "country_name": "United States", "location": { "lat": 37.751, "lon": -97.822 diff --git a/systemtest/approvals/TestRUMXForwardedFor.approved.json b/systemtest/approvals/TestRUMXForwardedFor.approved.json index dabbb2178a4..865865e2398 100644 --- a/systemtest/approvals/TestRUMXForwardedFor.approved.json +++ b/systemtest/approvals/TestRUMXForwardedFor.approved.json @@ -11,6 +11,7 @@ "city_name": "Perth", "continent_name": "Oceania", "country_iso_code": "AU", + "country_name": "Australia", "location": { "lat": -31.9674, "lon": 115.8621 diff --git a/tests/system/drop_unsampled_transactions.approved.json b/tests/system/drop_unsampled_transactions.approved.json index 2fbee8a1080..d93fd09b0dc 100644 --- a/tests/system/drop_unsampled_transactions.approved.json +++ b/tests/system/drop_unsampled_transactions.approved.json @@ -202,6 +202,7 @@ "geo": { "continent_name": "North America", "country_iso_code": "US", + "country_name": "United States", "location": { "lat": 37.751, "lon": -97.822 diff --git a/tests/system/error.approved.json b/tests/system/error.approved.json index 84ce2e17d4f..26da94671cf 100644 --- a/tests/system/error.approved.json +++ b/tests/system/error.approved.json @@ -95,6 +95,7 @@ "geo": { "continent_name": "North America", "country_iso_code": "US", + "country_name": "United States", "location": { "lat": 37.751, "lon": -97.822 diff --git a/tests/system/keep_unsampled_transactions.approved.json b/tests/system/keep_unsampled_transactions.approved.json index 98a47fd6212..5c45cad3ff4 100644 --- a/tests/system/keep_unsampled_transactions.approved.json +++ b/tests/system/keep_unsampled_transactions.approved.json @@ -298,6 +298,7 @@ "geo": { "continent_name": "North America", "country_iso_code": "US", + "country_name": "United States", "location": { "lat": 37.751, "lon": -97.822 diff --git a/tests/system/transaction.approved.json b/tests/system/transaction.approved.json index 7a395fddb29..755282d5319 100644 --- a/tests/system/transaction.approved.json +++ b/tests/system/transaction.approved.json @@ -298,6 +298,7 @@ "geo": { "continent_name": "North America", "country_iso_code": "US", + "country_name": "United States", "location": { "lat": 37.751, "lon": -97.822