Skip to content

Commit ce30371

Browse files
mrodmmrodm
authored
Update GeoIP databases with more documentation ranges (#2476)
This PR adds two more documentation ranges into the GeoIP databases used in system tests by elastic-package: "3fff::/20" (https://datatracker.ietf.org/doc/rfc9637/) and "233.252.0.0/20" (https://datatracker.ietf.org/doc/rfc6676/)
1 parent 0bec960 commit ce30371

File tree

7 files changed

+206
-3
lines changed

7 files changed

+206
-3
lines changed

‎internal/stack/_static/GeoLite2-ASN.mmdb‎

280 Bytes
Binary file not shown.

‎internal/stack/_static/GeoLite2-City.mmdb‎

427 Bytes
Binary file not shown.

‎internal/stack/_static/GeoLite2-Country.mmdb‎

306 Bytes
Binary file not shown.

‎internal/stack/_static/geoip_source/GeoLite2-ASN-Test.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,24 @@
1717
"autonomous_system_organization" : "Documentation ASN"
1818
}
1919
},
20+
{
21+
"233.252.0.0/24" : {
22+
"autonomous_system_number" : 64503,
23+
"autonomous_system_organization" : "Documentation ASN"
24+
}
25+
},
2026
{
2127
"2001:db8::/32" : {
2228
"autonomous_system_number" : 65551,
2329
"autonomous_system_organization" : "Documentation ASN"
2430
}
2531
},
32+
{
33+
"3fff::/20" : {
34+
"autonomous_system_number" : 65552,
35+
"autonomous_system_organization" : "Documentation ASN"
36+
}
37+
},
2638
{
2739
"1.128.0.0/11" : {
2840
"autonomous_system_number" : 1221,

‎internal/stack/_static/geoip_source/GeoLite2-City-Test.json‎

Lines changed: 108 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,8 @@
145145
"city": {
146146
"geoname_id" : 3117735 ,
147147
"names" : {
148-
"en" : "Madrid"
148+
"en" : "Madrid",
149+
"es" : "Madrid"
149150
}
150151
},
151152
"continent" : {
@@ -209,6 +210,66 @@
209210
]
210211
}
211212
},
213+
{
214+
"233.252.0.0/24": {
215+
"city": {
216+
"geoname_id" : 2964180,
217+
"names" : {
218+
"en" : "Galway"
219+
}
220+
},
221+
"continent" : {
222+
"code" : "EU",
223+
"geoname_id" : 6255148,
224+
"names" : {
225+
"de" : "Europa",
226+
"en" : "Europe",
227+
"es" : "Europa",
228+
"fr" : "Europe",
229+
"ja" : "ヨーロッパ",
230+
"pt-BR" : "Europa",
231+
"ru" : "Европа",
232+
"zh-CN" : "欧洲"
233+
}
234+
},
235+
"country" : {
236+
"geoname_id" : 2963597,
237+
"is_in_european_union" : true,
238+
"iso_code" : "IE",
239+
"names" : {
240+
"de" : "Irland",
241+
"en" : "Ireland",
242+
"es" : "República de Irlanda",
243+
"fr" : "Irlande",
244+
"ja" : "アイルランド",
245+
"pt-BR" : "Irlanda",
246+
"ru" : "Ирландия",
247+
"zh-CN" : "爱尔兰"
248+
}
249+
},
250+
"location" : {
251+
"accuracy_radius" : 10,
252+
"latitude" : 53.27245,
253+
"longitude" : -9.05095,
254+
"time_zone" : "Europe/Dublin"
255+
},
256+
"registered_country" : {
257+
"geoname_id" : 2963597,
258+
"is_in_european_union" : true,
259+
"iso_code" : "IE",
260+
"names" : {
261+
"de" : "Irland",
262+
"en" : "Ireland",
263+
"es" : "República de Irlanda",
264+
"fr" : "Irlande",
265+
"ja" : "アイルランド",
266+
"pt-BR" : "Irlanda",
267+
"ru" : "Ирландия",
268+
"zh-CN" : "爱尔兰"
269+
}
270+
}
271+
}
272+
},
212273
{
213274
"2001:db8::/32" : {
214275
"city" : {
@@ -258,6 +319,52 @@
258319
]
259320
}
260321
},
322+
{
323+
"3fff::/20": {
324+
"city" : {
325+
"geoname_id" : 2267057,
326+
"names" : {
327+
"en" : "Lisbon",
328+
"es" : "Lisboa"
329+
}
330+
},
331+
"continent" : {
332+
"code" : "EU",
333+
"geoname_id" : 6255148,
334+
"names" : {
335+
"de" : "Europa",
336+
"en" : "Europe",
337+
"es" : "Europa",
338+
"fr" : "Europe",
339+
"ja" : "ヨーロッパ",
340+
"pt-BR" : "Europa",
341+
"ru" : "Европа",
342+
"zh-CN" : "欧洲"
343+
}
344+
},
345+
"country" : {
346+
"geoname_id" : 2264397,
347+
"iso_code" : "PT",
348+
"names" : {
349+
"en" : "Portugal",
350+
"es" : "Portugal"
351+
}
352+
},
353+
"location" : {
354+
"accuracy_radius" : 0,
355+
"latitude" : 38.71667,
356+
"longitude" : -9.13333
357+
},
358+
"registered_country" : {
359+
"geoname_id" : 2264397,
360+
"iso_code" : "PT",
361+
"names" : {
362+
"en" : "Portugal",
363+
"es" : "Portugal"
364+
}
365+
}
366+
}
367+
},
261368
{
262369
"2.125.160.216/29" : {
263370
"city" : {

‎internal/stack/_static/geoip_source/GeoLite2-Country-Test.json‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,54 @@
141141
}
142142
}
143143
},
144+
{
145+
"233.252.0.0/24" : {
146+
"continent" : {
147+
"code" : "EU",
148+
"geoname_id" : 6255148,
149+
"names" : {
150+
"de" : "Europa",
151+
"en" : "Europe",
152+
"es" : "Europa",
153+
"fr" : "Europe",
154+
"ja" : "ヨーロッパ",
155+
"pt-BR" : "Europa",
156+
"ru" : "Европа",
157+
"zh-CN" : "欧洲"
158+
}
159+
},
160+
"country" : {
161+
"geoname_id" : 2963597,
162+
"is_in_european_union" : true,
163+
"iso_code" : "IE",
164+
"names" : {
165+
"de" : "Irland",
166+
"en" : "Ireland",
167+
"es" : "República de Irlanda",
168+
"fr" : "Irlande",
169+
"ja" : "アイルランド",
170+
"pt-BR" : "Irlanda",
171+
"ru" : "Ирландия",
172+
"zh-CN" : "爱尔兰"
173+
}
174+
},
175+
"registered_country" : {
176+
"geoname_id" : 2963597,
177+
"is_in_european_union" : true,
178+
"iso_code" : "IE",
179+
"names" : {
180+
"de" : "Irland",
181+
"en" : "Ireland",
182+
"es" : "República de Irlanda",
183+
"fr" : "Irlande",
184+
"ja" : "アイルランド",
185+
"pt-BR" : "Irlanda",
186+
"ru" : "Ирландия",
187+
"zh-CN" : "爱尔兰"
188+
}
189+
}
190+
}
191+
},
144192
{
145193
"2001:db8::/32" : {
146194
"continent" : {
@@ -166,6 +214,42 @@
166214
}
167215
}
168216
},
217+
{
218+
"3fff::/20": {
219+
"continent" : {
220+
"code" : "EU",
221+
"geoname_id" : 6255148,
222+
"names" : {
223+
"de" : "Europa",
224+
"en" : "Europe",
225+
"es" : "Europa",
226+
"fr" : "Europe",
227+
"ja" : "ヨーロッパ",
228+
"pt-BR" : "Europa",
229+
"ru" : "Европа",
230+
"zh-CN" : "欧洲"
231+
}
232+
},
233+
"country" : {
234+
"geoname_id" : 2264397,
235+
"is_in_european_union" : true,
236+
"iso_code" : "PT",
237+
"names" : {
238+
"en" : "Portugal",
239+
"es" : "Portugal"
240+
}
241+
},
242+
"registered_country" : {
243+
"geoname_id" : 2264397,
244+
"is_in_european_union" : true,
245+
"iso_code" : "PT",
246+
"names" : {
247+
"en" : "Portugal",
248+
"es" : "Portugal"
249+
}
250+
}
251+
}
252+
},
169253
{
170254
"2.125.160.216/29" : {
171255
"continent" : {

‎internal/stack/_static/geoip_source/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ These databases must also include GeoIP data for the address ranges for document
1212
Including those documentation ranges allows developers to set documentation IPs in their pipeline or
1313
system tests that could be enriched thanks to the geoip known data added by the `geoip` processor in the ingest pipeline.
1414
The documentation ranges (address blocks) are defined in:
15-
- IPv4: https://datatracker.ietf.org/doc/rfc5737/
16-
- IPv6: https://datatracker.ietf.org/doc/rfc3849/
15+
- IPv4: https://datatracker.ietf.org/doc/rfc5737/ and https://datatracker.ietf.org/doc/rfc6676/
16+
- IPv6: https://datatracker.ietf.org/doc/rfc3849/ and https://datatracker.ietf.org/doc/rfc9637/
1717

1818
The ASN to be used for those documentation purposes are defined in [RFC5398](https://datatracker.ietf.org/doc/rfc5398/).
1919

0 commit comments

Comments
 (0)