Skip to content

Commit 276558b

Browse files
committed
Document new ip_location APIs (#116611)
1 parent 4a057ef commit 276558b

File tree

7 files changed

+150
-112
lines changed

7 files changed

+150
-112
lines changed

docs/changelog/114548.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114548
2+
summary: Support IPinfo database configurations
3+
area: Ingest Node
4+
type: enhancement
5+
issues: []
Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
[[delete-geoip-database-api]]
2-
=== Delete geoip database configuration API
1+
[[delete-ip-location-database-api]]
2+
=== Delete IP geolocation database configuration API
33
++++
4-
<titleabbrev>Delete geoip database configuration</titleabbrev>
4+
<titleabbrev>Delete IP geolocation database configuration</titleabbrev>
55
++++
66

7-
Deletes a geoip database configuration.
7+
Deletes a IP geolocation database configuration.
88

99
[source,console]
1010
----
11-
DELETE /_ingest/geoip/database/my-database-id
11+
DELETE /_ingest/ip_location/database/my-database-id
1212
----
1313
// TEST[skip:we don't want to leak the enterprise-geoip-downloader task, which touching these APIs would cause. Therefore, skip this test.]
1414

1515

16-
[[delete-geoip-database-api-request]]
16+
[[delete-ip-location-database-api-request]]
1717
==== {api-request-title}
1818

19-
`DELETE /_ingest/geoip/database/<database>`
19+
`DELETE /_ingest/ip_location/database/<database>`
2020

21-
[[delete-geoip-database-api-prereqs]]
21+
[[delete-ip-location-database-api-prereqs]]
2222
==== {api-prereq-title}
2323

2424
* If the {es} {security-features} are enabled, you must have the
2525
`manage` <<privileges-list-cluster,cluster privilege>> to use this API.
2626

27-
[[delete-geoip-database-api-path-params]]
27+
[[delete-ip-location-database-api-path-params]]
2828
==== {api-path-parms-title}
2929

3030
`<database>`::
@@ -35,21 +35,21 @@ DELETE /_ingest/geoip/database/my-database-id
3535
--
3636

3737

38-
[[delete-geoip-database-api-query-params]]
38+
[[delete-ip-location-database-api-query-params]]
3939
==== {api-query-parms-title}
4040

4141
include::{es-ref-dir}/rest-api/common-parms.asciidoc[tag=timeoutparms]
4242

4343

44-
[[delete-geoip-database-api-example]]
44+
[[delete-ip-location-database-api-example]]
4545
==== {api-examples-title}
4646

4747

48-
[[delete-geoip-database-api-specific-ex]]
49-
===== Delete a specific geoip database configuration
48+
[[delete-ip-location-database-api-specific-ex]]
49+
===== Delete a specific IP geolocation database configuration
5050

5151
[source,console]
5252
----
53-
DELETE /_ingest/geoip/database/example-database-id
53+
DELETE /_ingest/ip_location/database/example-database-id
5454
----
5555
// TEST[skip:we don't want to leak the enterprise-geoip-downloader task, which touching these APIs would cause. Therefore, skip this test.]

docs/reference/ingest/apis/get-geoip-database.asciidoc renamed to docs/reference/ingest/apis/get-ip-location-database.asciidoc

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
[[get-geoip-database-api]]
2-
=== Get geoip database configuration API
1+
[[get-ip-location-database-api]]
2+
=== Get IP geolocation database configuration API
33
++++
4-
<titleabbrev>Get geoip database configuration</titleabbrev>
4+
<titleabbrev>Get IP geolocation database configuration</titleabbrev>
55
++++
66

7-
Returns information about one or more geoip database configurations.
7+
Returns information about one or more IP geolocation database configurations.
88

99
[source,console]
1010
----
11-
GET /_ingest/geoip/database/my-database-id
11+
GET /_ingest/ip_location/database/my-database-id
1212
----
1313
// TEST[skip:we don't want to leak the enterprise-geoip-downloader task, which touching these APIs would cause. Therefore, skip this test.]
1414

1515

1616

17-
[[get-geoip-database-api-request]]
17+
[[get-ip-location-database-api-request]]
1818
==== {api-request-title}
1919

20-
`GET /_ingest/geoip/database/<database>`
20+
`GET /_ingest/ip_location/database/<database>`
2121

22-
`GET /_ingest/geoip/database`
22+
`GET /_ingest/ip_location/database`
2323

24-
[[get-geoip-database-api-prereqs]]
24+
[[get-ip-location-database-api-prereqs]]
2525
==== {api-prereq-title}
2626

2727
* If the {es} {security-features} are enabled, you must have the
2828
`manage` <<privileges-list-cluster,cluster privilege>> to use this API.
2929

30-
[[get-geoip-database-api-path-params]]
30+
[[get-ip-location-database-api-path-params]]
3131
==== {api-path-parms-title}
3232

3333
`<database>`::
@@ -38,22 +38,22 @@ supported.
3838
To get all database configurations, omit this parameter or use `*`.
3939

4040

41-
[[get-geoip-database-api-query-params]]
41+
[[get-ip-location-database-api-query-params]]
4242
==== {api-query-parms-title}
4343

4444
include::{es-ref-dir}/rest-api/common-parms.asciidoc[tag=master-timeout]
4545

4646

47-
[[get-geoip-database-api-example]]
47+
[[get-ip-location-database-api-example]]
4848
==== {api-examples-title}
4949

5050

51-
[[get-geoip-database-api-specific-ex]]
52-
===== Get information for a specific geoip database configuration
51+
[[get-ip-location-database-api-specific-ex]]
52+
===== Get information for a specific IP geolocation database configuration
5353

5454
[source,console]
5555
----
56-
GET /_ingest/geoip/database/my-database-id
56+
GET /_ingest/ip_location/database/my-database-id
5757
----
5858
// TEST[skip:we don't want to leak the enterprise-geoip-downloader task, which touching these APIs would cause. Therefore, skip this test.]
5959

docs/reference/ingest/apis/index.asciidoc

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,21 @@ Use the following APIs to get statistics about ingest processing:
2525
the <<geoip-processor,`geoip` processor>>.
2626

2727
[discrete]
28-
[[ingest-geoip-database-apis]]
29-
=== Ingest GeoIP Database APIs
30-
31-
preview::["The commercial IP geolocation database download management APIs are in technical preview and may be changed or removed in a future release. Elastic will work to fix any issues, but this feature is not subject to the support SLA of official GA features."]
28+
[[ingest-ip-location-database-apis]]
29+
=== Ingest IP Location Database APIs
3230

3331
Use the following APIs to configure and manage commercial IP geolocation database downloads:
3432

35-
* <<put-geoip-database-api>> to create or update a database configuration
36-
* <<get-geoip-database-api>> to retrieve a database configuration
37-
* <<delete-geoip-database-api>> to delete a database configuration
33+
* <<put-ip-location-database-api>> to create or update a database configuration
34+
* <<get-ip-location-database-api>> to retrieve a database configuration
35+
* <<delete-ip-location-database-api>> to delete a database configuration
3836

3937
include::put-pipeline.asciidoc[]
4038
include::get-pipeline.asciidoc[]
4139
include::delete-pipeline.asciidoc[]
4240
include::simulate-pipeline.asciidoc[]
4341
include::simulate-ingest.asciidoc[]
4442
include::geoip-stats.asciidoc[]
45-
include::put-geoip-database.asciidoc[]
46-
include::get-geoip-database.asciidoc[]
47-
include::delete-geoip-database.asciidoc[]
43+
include::put-ip-location-database.asciidoc[]
44+
include::get-ip-location-database.asciidoc[]
45+
include::delete-ip-location-database.asciidoc[]

docs/reference/ingest/apis/put-geoip-database.asciidoc

Lines changed: 0 additions & 72 deletions
This file was deleted.
Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
[[put-ip-location-database-api]]
2+
=== Create or update IP geolocation database configuration API
3+
++++
4+
<titleabbrev>Create or update IP geolocation database configuration</titleabbrev>
5+
++++
6+
7+
Creates or updates an IP geolocation database configuration.
8+
9+
IMPORTANT: The Maxmind `account_id` shown below requires a license key. Because the license key is sensitive information,
10+
it is stored as a <<secure-settings,secure setting>> in {es} named `ingest.geoip.downloader.maxmind.license_key`. Only
11+
one Maxmind license key is currently allowed per {es} cluster. A valid license key must be in the secure settings in order
12+
to download from Maxmind. The license key setting does not take effect until all nodes are restarted or a
13+
<<cluster-nodes-reload-secure-settings, `reload_secure_settings`>> request is executed.
14+
15+
[source,console]
16+
----
17+
PUT _ingest/ip_location/database/my-database-1
18+
{
19+
"name": "GeoIP2-Domain",
20+
"maxmind": {
21+
"account_id": "1234567"
22+
}
23+
}
24+
----
25+
// TEST[skip:we don't want to leak the enterprise-geoip-downloader task, which touching these APIs would cause. Therefore, skip this test.]
26+
27+
IMPORTANT: The IPinfo configuration shown below requires a token. Because the token is sensitive information,
28+
it is stored as a <<secure-settings,secure setting>> in {es} named `ingest.ip_location.downloader.ipinfo.token`. Only
29+
one IPinfo token is currently allowed per {es} cluster. A valid token must be in the secure settings in order
30+
to download from IPinfo. The token setting does not take effect until all nodes are restarted or a
31+
<<cluster-nodes-reload-secure-settings, `reload_secure_settings`>> request is executed.
32+
33+
[source,console]
34+
----
35+
PUT _ingest/ip_location/database/my-database-2
36+
{
37+
"name": "standard_location",
38+
"ipinfo": {
39+
}
40+
}
41+
----
42+
// TEST[skip:we don't want to leak the enterprise-geoip-downloader task, which touching these APIs would cause. Therefore, skip this test.]
43+
44+
45+
[[put-ip-location-database-api-request]]
46+
==== {api-request-title}
47+
48+
`PUT /_ingest/ip_location/database/<database>`
49+
50+
[[put-ip-location-database-api-prereqs]]
51+
==== {api-prereq-title}
52+
53+
* If the {es} {security-features} are enabled, you must have the
54+
`manage` <<privileges-list-cluster,cluster privilege>> to use this API.
55+
56+
57+
[[put-ip-location-database-api-path-params]]
58+
==== {api-path-parms-title}
59+
60+
`<database>`::
61+
+
62+
__
63+
(Required, string) ID of the database configuration to create or update.
64+
65+
[[put-ip-location-database-api-query-params]]
66+
==== {api-query-parms-title}
67+
68+
include::{es-ref-dir}/rest-api/common-parms.asciidoc[tag=timeoutparms]
69+
70+
[[put-ip-location-database-api-request-body]]
71+
==== {api-request-body-title}
72+
73+
// tag::ip-location-database-object[]
74+
`name`::
75+
(Required, string)
76+
The provider-assigned name of the IP geolocation database to download.
77+
78+
`<provider>`::
79+
(Required, a provider object and its associated configuration)
80+
The configuration necessary to identify which IP geolocation provider to use to download
81+
the database, as well as any provider-specific configuration necessary for such downloading.
82+
+
83+
At present, the only supported providers are `maxmind` and `ipinfo`. The maxmind provider
84+
requires that an `account_id` (string) is configured. The ipinfo provider does not require
85+
additional configuration in the request body.
86+
// end::ip-location-database-object[]
87+
88+
[[ip-location-database-configuration-licensing]]
89+
==== Licensing
90+
91+
Downloading databases from third party providers is a commercial feature that requires an
92+
appropriate license. For more information, refer to https://www.elastic.co/subscriptions.

docs/reference/redirects.asciidoc

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1926,4 +1926,19 @@ Refer to <<remote-clusters>>.
19261926
[role="exclude",id="remote-clusters-privileges"]
19271927
=== Configure roles and users for remote clusters
19281928

1929-
Refer to <<remote-clusters>>.
1929+
Refer to <<remote-clusters>>.
1930+
1931+
[role="exclude",id="put-geoip-database-api"]
1932+
=== Create or update geoip database configuration API
1933+
1934+
Refer to <<put-ip-location-database-api>>.
1935+
1936+
[role="exclude",id="get-geoip-database-api"]
1937+
=== Get geoip database configuration
1938+
1939+
Refer to <<get-ip-location-database-api>>.
1940+
1941+
[role="exclude",id="delete-geoip-database-api"]
1942+
=== Delete geoip database configuration API
1943+
1944+
Refer to <<delete-ip-location-database-api>>.

0 commit comments

Comments
 (0)