Skip to content

Commit 84561b5

Browse files
pmpailispmpailis
committed
Merge remote-tracking branch 'origin/main' into add_coordinator_rewrite_profile
2 parents 8f27a20 + 70d9f09 commit 84561b5

File tree

92 files changed

+4668
-2100
lines changed

Some content is hidden

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

92 files changed

+4668
-2100
lines changed

‎build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/PublishPluginFuncTest.groovy‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
7070
<distribution>repo</distribution>
7171
</license>
7272
<license>
73-
<name>Server Side Public License, v 1</name>
74-
<url>https://www.mongodb.com/licensing/server-side-public-license</url>
73+
<name>GNU Affero General Public License Version 3</name>
74+
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v1.0/licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt</url>
7575
<distribution>repo</distribution>
7676
</license>
7777
<license>
78-
<name>The OSI-approved Open Source license Version 3.0</name>
79-
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v1.0/licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt</url>
78+
<name>Server Side Public License, v 1</name>
79+
<url>https://www.mongodb.com/licensing/server-side-public-license</url>
8080
<distribution>repo</distribution>
8181
</license>
8282
</licenses>
@@ -150,13 +150,13 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
150150
<distribution>repo</distribution>
151151
</license>
152152
<license>
153-
<name>Server Side Public License, v 1</name>
154-
<url>https://www.mongodb.com/licensing/server-side-public-license</url>
153+
<name>GNU Affero General Public License Version 3</name>
154+
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v1.0/licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt</url>
155155
<distribution>repo</distribution>
156156
</license>
157157
<license>
158-
<name>The OSI-approved Open Source license Version 3.0</name>
159-
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v1.0/licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt</url>
158+
<name>Server Side Public License, v 1</name>
159+
<url>https://www.mongodb.com/licensing/server-side-public-license</url>
160160
<distribution>repo</distribution>
161161
</license>
162162
</licenses>
@@ -239,13 +239,13 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
239239
<distribution>repo</distribution>
240240
</license>
241241
<license>
242-
<name>Server Side Public License, v 1</name>
243-
<url>https://www.mongodb.com/licensing/server-side-public-license</url>
242+
<name>GNU Affero General Public License Version 3</name>
243+
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v1.0/licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt</url>
244244
<distribution>repo</distribution>
245245
</license>
246246
<license>
247-
<name>The OSI-approved Open Source license Version 3.0</name>
248-
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v1.0/licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt</url>
247+
<name>Server Side Public License, v 1</name>
248+
<url>https://www.mongodb.com/licensing/server-side-public-license</url>
249249
<distribution>repo</distribution>
250250
</license>
251251
</licenses>
@@ -337,13 +337,13 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
337337
<distribution>repo</distribution>
338338
</license>
339339
<license>
340-
<name>Server Side Public License, v 1</name>
341-
<url>https://www.mongodb.com/licensing/server-side-public-license</url>
340+
<name>GNU Affero General Public License Version 3</name>
341+
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v1.0/licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt</url>
342342
<distribution>repo</distribution>
343343
</license>
344344
<license>
345-
<name>The OSI-approved Open Source license Version 3.0</name>
346-
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v1.0/licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt</url>
345+
<name>Server Side Public License, v 1</name>
346+
<url>https://www.mongodb.com/licensing/server-side-public-license</url>
347347
<distribution>repo</distribution>
348348
</license>
349349
</licenses>
@@ -415,13 +415,13 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
415415
<distribution>repo</distribution>
416416
</license>
417417
<license>
418-
<name>Server Side Public License, v 1</name>
419-
<url>https://www.mongodb.com/licensing/server-side-public-license</url>
418+
<name>GNU Affero General Public License Version 3</name>
419+
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v2.0/licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt</url>
420420
<distribution>repo</distribution>
421421
</license>
422422
<license>
423-
<name>The OSI-approved Open Source license Version 3.0</name>
424-
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v2.0/licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt</url>
423+
<name>Server Side Public License, v 1</name>
424+
<url>https://www.mongodb.com/licensing/server-side-public-license</url>
425425
<distribution>repo</distribution>
426426
</license>
427427
</licenses>

‎docs/changelog/112905.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 112905
2+
summary: "[ES|QL] Named parameter for field names and field name patterns"
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

‎docs/changelog/114386.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114386
2+
summary: Improve handling of failure to create persistent task
3+
area: Task Management
4+
type: bug
5+
issues: []

‎docs/changelog/114429.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114429
2+
summary: Add chunking settings configuration to `ElasticsearchService/ELSER`
3+
area: Machine Learning
4+
type: enhancement
5+
issues: []

‎docs/changelog/114464.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114464
2+
summary: Stream Azure Completion
3+
area: Machine Learning
4+
type: enhancement
5+
issues: []

‎docs/changelog/114527.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114527
2+
summary: Verify Maxmind database types in the geoip processor
3+
area: Ingest Node
4+
type: enhancement
5+
issues: []

‎docs/reference/cluster/allocation-explain.asciidoc‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ node.
162162
====== Maximum number of retries exceeded
163163

164164
The following response contains an allocation explanation for an unassigned
165-
primary shard that has reached the maximum number of allocation retry attempts.
165+
primary shard that has reached the maximum number of allocation retry attempts.
166166

167167
[source,js]
168168
----
@@ -204,9 +204,10 @@ primary shard that has reached the maximum number of allocation retry attempts.
204204
----
205205
// NOTCONSOLE
206206

207-
If decider message indicates a transient allocation issue, use
208-
<<cluster-reroute,the cluster reroute API>> to retry allocation.
207+
If decider message indicates a transient allocation issue, use
208+
the <<cluster-reroute,cluster reroute>> API to retry allocation.
209209

210+
[[no-valid-shard-copy]]
210211
====== No valid shard copy
211212

212213
The following response contains an allocation explanation for an unassigned
@@ -334,7 +335,7 @@ queued to allocate but currently waiting on other queued shards.
334335
----
335336
// NOTCONSOLE
336337

337-
This is a transient message that might appear when a large amount of shards are allocating.
338+
This is a transient message that might appear when a large amount of shards are allocating.
338339

339340
===== Assigned shard
340341

@@ -437,7 +438,7 @@ cluster balance.
437438
===== No arguments
438439

439440
If you call the API with no arguments, {es} retrieves an allocation explanation
440-
for an arbitrary unassigned primary or replica shard, returning any unassigned primary shards first.
441+
for an arbitrary unassigned primary or replica shard, returning any unassigned primary shards first.
441442

442443
[source,console]
443444
----

‎docs/reference/security/ccs-clients-integrations/index.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ be secured as well, or at least communicate with the cluster in a secured way:
1313
* <<hadoop, Apache Hadoop>>
1414
* {auditbeat-ref}/securing-auditbeat.html[Auditbeat]
1515
* {filebeat-ref}/securing-filebeat.html[Filebeat]
16+
* {fleet-guide}/secure.html[{fleet} & {agent}]
1617
* {heartbeat-ref}/securing-heartbeat.html[Heartbeat]
1718
* {kibana-ref}/using-kibana-with-security.html[{kib}]
1819
* {logstash-ref}/ls-security.html[Logstash]

‎modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/ReloadingDatabasesWhilePerformingGeoLookupsIT.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import java.util.concurrent.atomic.AtomicInteger;
3333
import java.util.concurrent.atomic.AtomicReference;
3434

35+
import static org.elasticsearch.ingest.geoip.GeoIpProcessor.GEOIP_TYPE;
3536
import static org.elasticsearch.ingest.geoip.GeoIpTestUtils.copyDatabase;
3637
import static org.elasticsearch.ingest.geoip.GeoIpTestUtils.copyDefaultDatabases;
3738
import static org.hamcrest.Matchers.equalTo;
@@ -66,7 +67,7 @@ public void test() throws Exception {
6667
ClusterService clusterService = mock(ClusterService.class);
6768
when(clusterService.state()).thenReturn(ClusterState.EMPTY_STATE);
6869
DatabaseNodeService databaseNodeService = createRegistry(geoIpConfigDir, geoIpTmpDir, clusterService);
69-
GeoIpProcessor.Factory factory = new GeoIpProcessor.Factory(databaseNodeService);
70+
GeoIpProcessor.Factory factory = new GeoIpProcessor.Factory(GEOIP_TYPE, databaseNodeService);
7071
copyDatabase("GeoLite2-City-Test.mmdb", geoIpTmpDir.resolve("GeoLite2-City.mmdb"));
7172
copyDatabase("GeoLite2-City-Test.mmdb", geoIpTmpDir.resolve("GeoLite2-City-Test.mmdb"));
7273
databaseNodeService.updateDatabase("GeoLite2-City.mmdb", "md5", geoIpTmpDir.resolve("GeoLite2-City.mmdb"));

‎modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/Database.java‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@ enum Database {
4343
Property.TIMEZONE,
4444
Property.LOCATION,
4545
Property.POSTAL_CODE,
46-
Property.ACCURACY_RADIUS
46+
Property.ACCURACY_RADIUS,
47+
Property.REGISTERED_COUNTRY_IN_EUROPEAN_UNION,
48+
Property.REGISTERED_COUNTRY_ISO_CODE,
49+
Property.REGISTERED_COUNTRY_NAME
4750
),
4851
Set.of(
4952
Property.COUNTRY_ISO_CODE,
@@ -62,7 +65,10 @@ enum Database {
6265
Property.CONTINENT_NAME,
6366
Property.COUNTRY_NAME,
6467
Property.COUNTRY_IN_EUROPEAN_UNION,
65-
Property.COUNTRY_ISO_CODE
68+
Property.COUNTRY_ISO_CODE,
69+
Property.REGISTERED_COUNTRY_IN_EUROPEAN_UNION,
70+
Property.REGISTERED_COUNTRY_ISO_CODE,
71+
Property.REGISTERED_COUNTRY_NAME
6672
),
6773
Set.of(Property.CONTINENT_NAME, Property.COUNTRY_NAME, Property.COUNTRY_ISO_CODE)
6874
),
@@ -124,7 +130,10 @@ enum Database {
124130
Property.CONNECTION_TYPE,
125131
Property.POSTAL_CODE,
126132
Property.POSTAL_CONFIDENCE,
127-
Property.ACCURACY_RADIUS
133+
Property.ACCURACY_RADIUS,
134+
Property.REGISTERED_COUNTRY_IN_EUROPEAN_UNION,
135+
Property.REGISTERED_COUNTRY_ISO_CODE,
136+
Property.REGISTERED_COUNTRY_NAME
128137
),
129138
Set.of(
130139
Property.COUNTRY_ISO_CODE,
@@ -182,6 +191,10 @@ enum Database {
182191
),
183192
Set.of(Property.COUNTRY_ISO_CODE, Property.REGION_NAME, Property.CITY_NAME, Property.LOCATION)
184193
),
194+
CountryV2(
195+
Set.of(Property.IP, Property.CONTINENT_CODE, Property.CONTINENT_NAME, Property.COUNTRY_NAME, Property.COUNTRY_ISO_CODE),
196+
Set.of(Property.CONTINENT_NAME, Property.COUNTRY_NAME, Property.COUNTRY_ISO_CODE)
197+
),
185198
PrivacyDetection(
186199
Set.of(Property.IP, Property.HOSTING, Property.PROXY, Property.RELAY, Property.TOR, Property.VPN, Property.SERVICE),
187200
Set.of(Property.HOSTING, Property.PROXY, Property.RELAY, Property.TOR, Property.VPN, Property.SERVICE)
@@ -272,7 +285,10 @@ enum Property {
272285
PROXY,
273286
RELAY,
274287
VPN,
275-
SERVICE;
288+
SERVICE,
289+
REGISTERED_COUNTRY_IN_EUROPEAN_UNION,
290+
REGISTERED_COUNTRY_ISO_CODE,
291+
REGISTERED_COUNTRY_NAME;
276292

277293
/**
278294
* Parses a string representation of a property into an actual Property instance. Not all properties that exist are

0 commit comments

Comments
 (0)