Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into fix_116520
Browse files Browse the repository at this point in the history
  • Loading branch information
jakelandis committed Nov 11, 2024
2 parents bd6e7c7 + 9d8240b commit 3101be7
Show file tree
Hide file tree
Showing 82 changed files with 2,011 additions and 1,017 deletions.
5 changes: 5 additions & 0 deletions docs/changelog/114193.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 114193
summary: Add postal_code support to the City and Enterprise databases
area: Ingest Node
type: enhancement
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/114268.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 114268
summary: Support more maxmind fields in the geoip processor
area: Ingest Node
type: enhancement
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/114521.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 114521
summary: Add support for registered country fields for maxmind geoip databases
area: Ingest Node
type: enhancement
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/116447.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 116447
summary: Adding a deprecation info API warning for data streams with old indices
area: Data streams
type: enhancement
issues: []
7 changes: 7 additions & 0 deletions docs/changelog/116583.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pr: 116583
summary: Fix NPE in `EnrichLookupService` on mixed clusters with <8.14 versions
area: ES|QL
type: bug
issues:
- 116529
- 116544
5 changes: 2 additions & 3 deletions docs/reference/datatiers.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@ TIP: The performance of an {es} node is often limited by the performance of the
For example hardware profiles, refer to Elastic Cloud's {cloud}/ec-reference-hardware.html[instance configurations].
Review our recommendations for optimizing your storage for <<indexing-use-faster-hardware,indexing>> and <<search-use-faster-hardware,search>>.

IMPORTANT: {es} generally expects nodes within a data tier to share the same
hardware profile. Variations not following this recommendation should be
carefully architected to avoid <<hotspotting,hot spotting>>.
IMPORTANT: {es} assumes nodes within a data tier share the same hardware profile (such as CPU, RAM, disk capacity).
Data tiers with unequally resourced nodes have a higher risk of <<hotspotting,hot spotting>>.

The way data tiers are used often depends on the data's category:

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/esql/functions/kibana/docs/repeat.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 10 additions & 6 deletions docs/reference/ingest/processors/geoip.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,12 @@ field instead.
*Depends on what is available in `database_file`:

* If a GeoLite2 City or GeoIP2 City database is used, then the following fields may be added under the `target_field`: `ip`,
`country_iso_code`, `country_name`, `continent_code`, `continent_name`, `region_iso_code`, `region_name`, `city_name`, `timezone`,
and `location`. The fields actually added depend on what has been found and which properties were configured in `properties`.
`country_iso_code`, `country_name`, `country_in_european_union`, `registered_country_iso_code`, `registered_country_name`, `registered_country_in_european_union`,
`continent_code`, `continent_name`, `region_iso_code`, `region_name`, `city_name`, `postal_code`, `timezone`,
`location`, and `accuracy_radius`. The fields actually added depend on what has been found and which properties were configured in `properties`.
* If a GeoLite2 Country or GeoIP2 Country database is used, then the following fields may be added under the `target_field`: `ip`,
`country_iso_code`, `country_name`, `continent_code`, and `continent_name`. The fields actually added depend on what has been found
`country_iso_code`, `country_name`, `country_in_european_union`, `registered_country_iso_code`, `registered_country_name`, `registered_country_in_european_union`,
`continent_code`, and `continent_name`. The fields actually added depend on what has been found
and which properties were configured in `properties`.
* If the GeoLite2 ASN database is used, then the following fields may be added under the `target_field`: `ip`,
`asn`, `organization_name` and `network`. The fields actually added depend on what has been found and which properties were configured
Expand All @@ -70,10 +72,12 @@ The fields actually added depend on what has been found and which properties wer
`organization_name`, `network`, `isp`, `isp_organization_name`, `mobile_country_code`, and `mobile_network_code`. The fields actually added
depend on what has been found and which properties were configured in `properties`.
* If the GeoIP2 Enterprise database is used, then the following fields may be added under the `target_field`: `ip`,
`country_iso_code`, `country_name`, `continent_code`, `continent_name`, `region_iso_code`, `region_name`, `city_name`, `timezone`,
`location`, `asn`, `organization_name`, `network`, `hosting_provider`, `tor_exit_node`, `anonymous_vpn`, `anonymous`, `public_proxy`,
`country_iso_code`, `country_name`, `country_in_european_union`, `registered_country_iso_code`, `registered_country_name`, `registered_country_in_european_union`,
`continent_code`, `continent_name`, `region_iso_code`, `region_name`, `city_name`, `postal_code`, `timezone`,
`location`, `accuracy_radius`, `country_confidence`, `city_confidence`, `postal_confidence`, `asn`, `organization_name`, `network`,
`hosting_provider`, `tor_exit_node`, `anonymous_vpn`, `anonymous`, `public_proxy`,
`residential_proxy`, `domain`, `isp`, `isp_organization_name`, `mobile_country_code`, `mobile_network_code`, `user_type`, and
`connection_type`. The fields actually added depend on what has been found and which properties were configured in `properties`.
`connection_type`. The fields actually added depend on what has been found and which properties were configured in `properties`.

preview::["Do not use the GeoIP2 Anonymous IP, GeoIP2 Connection Type, GeoIP2 Domain, GeoIP2 ISP, and GeoIP2 Enterprise databases in production environments. This functionality is in technical preview and may be changed or removed in a future release. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features."]

Expand Down
Loading

0 comments on commit 3101be7

Please sign in to comment.