Skip to content

Commit 13a5463

Browse files
andrewkrohandrewkroh
authored
Update Filebeat module expected logs files (#21454)
Elasticsearch added country_name to the list of default field for geo in elastic/elasticsearch#62915. So the expected files needed updated.
1 parent 8e9298e commit 13a5463

File tree

117 files changed

+2951
-1968
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+2951
-1968
lines changed

‎filebeat/module/apache/access/test/darwin-2.4.23.log-expected.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
"source.geo.city_name": "Germersheim",
7777
"source.geo.continent_name": "Europe",
7878
"source.geo.country_iso_code": "DE",
79+
"source.geo.country_name": "Germany",
7980
"source.geo.location.lat": 49.2231,
8081
"source.geo.location.lon": 8.3639,
8182
"source.geo.region_iso_code": "DE-RP",
@@ -105,6 +106,7 @@
105106
"source.geo.city_name": "Germersheim",
106107
"source.geo.continent_name": "Europe",
107108
"source.geo.country_iso_code": "DE",
109+
"source.geo.country_name": "Germany",
108110
"source.geo.location.lat": 49.2231,
109111
"source.geo.location.lon": 8.3639,
110112
"source.geo.region_iso_code": "DE-RP",
@@ -134,6 +136,7 @@
134136
"source.geo.city_name": "Germersheim",
135137
"source.geo.continent_name": "Europe",
136138
"source.geo.country_iso_code": "DE",
139+
"source.geo.country_name": "Germany",
137140
"source.geo.location.lat": 49.2231,
138141
"source.geo.location.lon": 8.3639,
139142
"source.geo.region_iso_code": "DE-RP",

‎filebeat/module/apache/access/test/ssl-request.log-expected.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"source.address": "11.19.0.217",
3939
"source.geo.continent_name": "North America",
4040
"source.geo.country_iso_code": "US",
41+
"source.geo.country_name": "United States",
4142
"source.geo.location.lat": 37.751,
4243
"source.geo.location.lon": -97.822,
4344
"source.ip": "11.19.0.217",

‎filebeat/module/apache/error/test/test.log-expected.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
"source.geo.city_name": "Newnan",
5757
"source.geo.continent_name": "North America",
5858
"source.geo.country_iso_code": "US",
59+
"source.geo.country_name": "United States",
5960
"source.geo.location.lat": 33.3708,
6061
"source.geo.location.lon": -84.8154,
6162
"source.geo.region_iso_code": "US-GA",
@@ -84,6 +85,7 @@
8485
"source.geo.city_name": "Beijing",
8586
"source.geo.continent_name": "Asia",
8687
"source.geo.country_iso_code": "CN",
88+
"source.geo.country_name": "China",
8789
"source.geo.location.lat": 39.9288,
8890
"source.geo.location.lon": 116.3889,
8991
"source.geo.region_iso_code": "CN-BJ",

‎filebeat/module/haproxy/log/test/default.log-expected.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"source.geo.city_name": "Moscow",
3131
"source.geo.continent_name": "Europe",
3232
"source.geo.country_iso_code": "RU",
33+
"source.geo.country_name": "Russia",
3334
"source.geo.location.lat": 55.7527,
3435
"source.geo.location.lon": 37.6172,
3536
"source.geo.region_iso_code": "RU-MOW",

‎filebeat/module/haproxy/log/test/haproxy.log-expected.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
"source.geo.city_name": "Moscow",
4848
"source.geo.continent_name": "Europe",
4949
"source.geo.country_iso_code": "RU",
50+
"source.geo.country_name": "Russia",
5051
"source.geo.location.lat": 55.7527,
5152
"source.geo.location.lon": 37.6172,
5253
"source.geo.region_iso_code": "RU-MOW",

‎filebeat/module/iis/access/test/test.log-expected.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"source.geo.city_name": "Berlin",
3535
"source.geo.continent_name": "Europe",
3636
"source.geo.country_iso_code": "DE",
37+
"source.geo.country_name": "Germany",
3738
"source.geo.location.lat": 52.4473,
3839
"source.geo.location.lon": 13.4531,
3940
"source.geo.region_iso_code": "DE-BE",
@@ -127,6 +128,7 @@
127128
"source.geo.city_name": "Berlin",
128129
"source.geo.continent_name": "Europe",
129130
"source.geo.country_iso_code": "DE",
131+
"source.geo.country_name": "Germany",
130132
"source.geo.location.lat": 52.4473,
131133
"source.geo.location.lon": 13.4531,
132134
"source.geo.region_iso_code": "DE-BE",

‎filebeat/module/iis/error/test/iis_error_url.log-expected.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"source.address": "149.42.83.135",
3131
"source.geo.continent_name": "North America",
3232
"source.geo.country_iso_code": "US",
33+
"source.geo.country_name": "United States",
3334
"source.geo.location.lat": 37.751,
3435
"source.geo.location.lon": -97.822,
3536
"source.ip": "149.42.83.135",
@@ -67,6 +68,7 @@
6768
"source.address": "149.42.83.135",
6869
"source.geo.continent_name": "North America",
6970
"source.geo.country_iso_code": "US",
71+
"source.geo.country_name": "United States",
7072
"source.geo.location.lat": 37.751,
7173
"source.geo.location.lon": -97.822,
7274
"source.ip": "149.42.83.135",
@@ -104,6 +106,7 @@
104106
"source.address": "149.42.83.135",
105107
"source.geo.continent_name": "North America",
106108
"source.geo.country_iso_code": "US",
109+
"source.geo.country_name": "United States",
107110
"source.geo.location.lat": 37.751,
108111
"source.geo.location.lon": -97.822,
109112
"source.ip": "149.42.83.135",
@@ -141,6 +144,7 @@
141144
"source.address": "149.42.83.135",
142145
"source.geo.continent_name": "North America",
143146
"source.geo.country_iso_code": "US",
147+
"source.geo.country_name": "United States",
144148
"source.geo.location.lat": 37.751,
145149
"source.geo.location.lon": -97.822,
146150
"source.ip": "149.42.83.135",
@@ -178,6 +182,7 @@
178182
"source.address": "149.42.83.135",
179183
"source.geo.continent_name": "North America",
180184
"source.geo.country_iso_code": "US",
185+
"source.geo.country_name": "United States",
181186
"source.geo.location.lat": 37.751,
182187
"source.geo.location.lon": -97.822,
183188
"source.ip": "149.42.83.135",
@@ -215,6 +220,7 @@
215220
"source.address": "149.42.83.135",
216221
"source.geo.continent_name": "North America",
217222
"source.geo.country_iso_code": "US",
223+
"source.geo.country_name": "United States",
218224
"source.geo.location.lat": 37.751,
219225
"source.geo.location.lon": -97.822,
220226
"source.ip": "149.42.83.135",
@@ -252,6 +258,7 @@
252258
"source.address": "149.42.83.135",
253259
"source.geo.continent_name": "North America",
254260
"source.geo.country_iso_code": "US",
261+
"source.geo.country_name": "United States",
255262
"source.geo.location.lat": 37.751,
256263
"source.geo.location.lon": -97.822,
257264
"source.ip": "149.42.83.135",
@@ -289,6 +296,7 @@
289296
"source.address": "149.42.83.135",
290297
"source.geo.continent_name": "North America",
291298
"source.geo.country_iso_code": "US",
299+
"source.geo.country_name": "United States",
292300
"source.geo.location.lat": 37.751,
293301
"source.geo.location.lon": -97.822,
294302
"source.ip": "149.42.83.135",

‎filebeat/module/iis/error/test/test.log-expected.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
"source.geo.city_name": "Berlin",
6767
"source.geo.continent_name": "Europe",
6868
"source.geo.country_iso_code": "DE",
69+
"source.geo.country_name": "Germany",
6970
"source.geo.location.lat": 52.4473,
7071
"source.geo.location.lon": 13.4531,
7172
"source.geo.region_iso_code": "DE-BE",
@@ -108,6 +109,7 @@
108109
"source.geo.city_name": "Berlin",
109110
"source.geo.continent_name": "Europe",
110111
"source.geo.country_iso_code": "DE",
112+
"source.geo.country_name": "Germany",
111113
"source.geo.location.lat": 52.4473,
112114
"source.geo.location.lon": 13.4531,
113115
"source.geo.region_iso_code": "DE-BE",
@@ -146,6 +148,7 @@
146148
"source.geo.city_name": "Berlin",
147149
"source.geo.continent_name": "Europe",
148150
"source.geo.country_iso_code": "DE",
151+
"source.geo.country_name": "Germany",
149152
"source.geo.location.lat": 52.4473,
150153
"source.geo.location.lon": 13.4531,
151154
"source.geo.region_iso_code": "DE-BE",

‎filebeat/module/nginx/access/test/access.log-expected.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"source.geo.city_name": "Germersheim",
3333
"source.geo.continent_name": "Europe",
3434
"source.geo.country_iso_code": "DE",
35+
"source.geo.country_name": "Germany",
3536
"source.geo.location.lat": 49.2231,
3637
"source.geo.location.lon": 8.3639,
3738
"source.geo.region_iso_code": "DE-RP",
@@ -80,6 +81,7 @@
8081
"source.geo.city_name": "Germersheim",
8182
"source.geo.continent_name": "Europe",
8283
"source.geo.country_iso_code": "DE",
84+
"source.geo.country_name": "Germany",
8385
"source.geo.location.lat": 49.2231,
8486
"source.geo.location.lon": 8.3639,
8587
"source.geo.region_iso_code": "DE-RP",
@@ -127,6 +129,7 @@
127129
"source.geo.city_name": "Germersheim",
128130
"source.geo.continent_name": "Europe",
129131
"source.geo.country_iso_code": "DE",
132+
"source.geo.country_name": "Germany",
130133
"source.geo.location.lat": 49.2231,
131134
"source.geo.location.lon": 8.3639,
132135
"source.geo.region_iso_code": "DE-RP",
@@ -174,6 +177,7 @@
174177
"source.geo.city_name": "Germersheim",
175178
"source.geo.continent_name": "Europe",
176179
"source.geo.country_iso_code": "DE",
180+
"source.geo.country_name": "Germany",
177181
"source.geo.location.lat": 49.2231,
178182
"source.geo.location.lon": 8.3639,
179183
"source.geo.region_iso_code": "DE-RP",
@@ -222,6 +226,7 @@
222226
"source.geo.city_name": "Germersheim",
223227
"source.geo.continent_name": "Europe",
224228
"source.geo.country_iso_code": "DE",
229+
"source.geo.country_name": "Germany",
225230
"source.geo.location.lat": 49.2231,
226231
"source.geo.location.lon": 8.3639,
227232
"source.geo.region_iso_code": "DE-RP",
@@ -269,6 +274,7 @@
269274
"source.geo.city_name": "Germersheim",
270275
"source.geo.continent_name": "Europe",
271276
"source.geo.country_iso_code": "DE",
277+
"source.geo.country_name": "Germany",
272278
"source.geo.location.lat": 49.2231,
273279
"source.geo.location.lon": 8.3639,
274280
"source.geo.region_iso_code": "DE-RP",
@@ -316,6 +322,7 @@
316322
"source.geo.city_name": "Germersheim",
317323
"source.geo.continent_name": "Europe",
318324
"source.geo.country_iso_code": "DE",
325+
"source.geo.country_name": "Germany",
319326
"source.geo.location.lat": 49.2231,
320327
"source.geo.location.lon": 8.3639,
321328
"source.geo.region_iso_code": "DE-RP",
@@ -363,6 +370,7 @@
363370
"source.geo.city_name": "Germersheim",
364371
"source.geo.continent_name": "Europe",
365372
"source.geo.country_iso_code": "DE",
373+
"source.geo.country_name": "Germany",
366374
"source.geo.location.lat": 49.2231,
367375
"source.geo.location.lon": 8.3639,
368376
"source.geo.region_iso_code": "DE-RP",

‎filebeat/module/nginx/access/test/test-with-host.log-expected.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@
115115
"source.geo.city_name": "Berlin",
116116
"source.geo.continent_name": "Europe",
117117
"source.geo.country_iso_code": "DE",
118+
"source.geo.country_name": "Germany",
118119
"source.geo.location.lat": 52.4473,
119120
"source.geo.location.lon": 13.4531,
120121
"source.geo.region_iso_code": "DE-BE",
@@ -164,6 +165,7 @@
164165
"source.geo.city_name": "Berlin",
165166
"source.geo.continent_name": "Europe",
166167
"source.geo.country_iso_code": "DE",
168+
"source.geo.country_name": "Germany",
167169
"source.geo.location.lat": 52.4473,
168170
"source.geo.location.lon": 13.4531,
169171
"source.geo.region_iso_code": "DE-BE",
@@ -216,6 +218,7 @@
216218
"source.geo.city_name": "Springfield",
217219
"source.geo.continent_name": "North America",
218220
"source.geo.country_iso_code": "US",
221+
"source.geo.country_name": "United States",
219222
"source.geo.location.lat": 39.7647,
220223
"source.geo.location.lon": -89.7379,
221224
"source.geo.region_iso_code": "US-IL",
@@ -260,6 +263,7 @@
260263
"source.address": "2a03:0000:10ff:f00f:0000:0000:0:8000",
261264
"source.geo.continent_name": "Europe",
262265
"source.geo.country_iso_code": "PT",
266+
"source.geo.country_name": "Portugal",
263267
"source.geo.location.lat": 39.5,
264268
"source.geo.location.lon": -8.0,
265269
"source.ip": "2a03:0000:10ff:f00f:0000:0000:0:8000",

0 commit comments

Comments
 (0)