Skip to content

Commit 4b0b772

Browse files
committed
Merge remote-tracking branch 'origin/main' into non-issue/esql-vector-search-functions-basics
2 parents b1d6f85 + 8f6ac25 commit 4b0b772

File tree

92 files changed

+2871
-574
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

+2871
-574
lines changed

.buildkite/pipelines/periodic.template.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,17 @@ steps:
204204
image: family/elasticsearch-ubuntu-2404
205205
machineType: n2-standard-8
206206
buildDirectory: /dev/shm/bk
207+
- label: third-party / ms-graph
208+
command: |
209+
.ci/scripts/run-gradle.sh msGraphThirdPartyTest
210+
env:
211+
USE_3RD_PARTY_MS_GRAPH_CREDENTIALS: "true"
212+
timeout_in_minutes: 30
213+
agents:
214+
provider: gcp
215+
image: family/elasticsearch-ubuntu-2404
216+
machineType: n2-standard-8
217+
buildDirectory: /dev/shm/bk
207218
- group: lucene-compat
208219
steps:
209220
- label: "{{matrix.LUCENE_VERSION}} / lucene-compat"

.buildkite/pipelines/periodic.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -642,6 +642,17 @@ steps:
642642
image: family/elasticsearch-ubuntu-2404
643643
machineType: n2-standard-8
644644
buildDirectory: /dev/shm/bk
645+
- label: third-party / ms-graph
646+
command: |
647+
.ci/scripts/run-gradle.sh msGraphThirdPartyTest
648+
env:
649+
USE_3RD_PARTY_MS_GRAPH_CREDENTIALS: "true"
650+
timeout_in_minutes: 30
651+
agents:
652+
provider: gcp
653+
image: family/elasticsearch-ubuntu-2404
654+
machineType: n2-standard-8
655+
buildDirectory: /dev/shm/bk
645656
- group: lucene-compat
646657
steps:
647658
- label: "{{matrix.LUCENE_VERSION}} / lucene-compat"

.buildkite/scripts/third-party-test-credentials.sh

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,23 @@ if [[ "${USE_3RD_PARTY_GCS_CREDENTIALS:-}" == "true" ]]; then
4848
.buildkite/scripts/third-party-test-credentials.gcs.sh "$google_storage_service_account"
4949
fi
5050

51+
if [[ "${USE_3RD_PARTY_MS_GRAPH_CREDENTIALS:-}" == "true" ]]; then
52+
json=$(vault read -format=json secret/ci/elastic-elasticsearch/ms_graph_thirdparty_test_creds)
5153

54+
MS_GRAPH_TENANT_ID=$(echo "$json" | jq -r .data.tenant_id)
55+
export ms_graph_tenant_id="$MS_GRAPH_TENANT_ID"
56+
57+
MS_GRAPH_CLIENT_ID=$(echo "$json" | jq -r .data.client_id)
58+
export ms_graph_client_id="$MS_GRAPH_CLIENT_ID"
59+
60+
MS_GRAPH_CLIENT_SECRET=$(echo "$json" | jq -r .data.client_secret)
61+
export ms_graph_client_secret="$MS_GRAPH_CLIENT_SECRET"
62+
63+
MS_GRAPH_USERNAME=$(echo "$json" | jq -r .data.username)
64+
export ms_graph_username="$MS_GRAPH_USERNAME"
65+
66+
MS_GRAPH_GROUP_ID=$(echo "$json" | jq -r .data.group_id)
67+
export ms_graph_group_id="$MS_GRAPH_GROUP_ID"
68+
fi
5269

5370
unset json

.github/workflows/docs-preview-comment.yml

Lines changed: 0 additions & 71 deletions
This file was deleted.

docs/changelog/130382.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 130382
2+
summary: Remove vectors from `_source` transparently
3+
area: "Vector Search"
4+
type: enhancement
5+
issues: []

docs/changelog/130452.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 130452
2+
summary: "Aggs: Add cancellation checks to `FilterByFilter` aggregator"
3+
area: Aggregations
4+
type: bug
5+
issues: []

docs/reference/elasticsearch/mapping-reference/mapping-source-field.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,7 @@ PUT my-index-000001
308308
}
309309
```
310310

311-
::::{admonition} Disabling the `_source` field
312-
:class: warning
311+
::::{warning}
313312

314313
Do not disable the `_source` field, unless absolutely necessary. If you disable it, the following critical features will not be supported:
315314

@@ -320,7 +319,6 @@ Do not disable the `_source` field, unless absolutely necessary. If you disable
320319
* The ability to debug queries or aggregations by viewing the original document used at index time.
321320
* Potentially in the future, the ability to repair index corruption automatically.
322321

323-
324322
::::
325323

326324
::::{note}

modules/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/AttachmentProcessorTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.elasticsearch.ingest.Processor;
1616
import org.elasticsearch.ingest.RandomDocumentPicks;
1717
import org.elasticsearch.test.ESTestCase;
18-
import org.elasticsearch.test.ESTestCase.WithoutEntitlements;
1918
import org.junit.Before;
2019

2120
import java.io.InputStream;
@@ -39,7 +38,6 @@
3938
import static org.hamcrest.Matchers.notNullValue;
4039
import static org.hamcrest.Matchers.nullValue;
4140

42-
@WithoutEntitlements // ES-12084
4341
public class AttachmentProcessorTests extends ESTestCase {
4442

4543
private Processor processor;

modules/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/TikaDocTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.apache.tika.metadata.Metadata;
1515
import org.elasticsearch.core.PathUtils;
1616
import org.elasticsearch.test.ESTestCase;
17-
import org.elasticsearch.test.ESTestCase.WithoutEntitlements;
1817

1918
import java.nio.file.DirectoryStream;
2019
import java.nio.file.Files;
@@ -26,7 +25,6 @@
2625
* comes back and no exception.
2726
*/
2827
@SuppressFileSystems("ExtrasFS") // don't try to parse extraN
29-
@WithoutEntitlements // ES-12084
3028
public class TikaDocTests extends ESTestCase {
3129

3230
/** some test files from tika test suite, zipped up */

modules/ingest-attachment/src/test/java/org/elasticsearch/ingest/attachment/TikaImplTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
package org.elasticsearch.ingest.attachment;
1010

1111
import org.elasticsearch.test.ESTestCase;
12-
import org.elasticsearch.test.ESTestCase.WithoutEntitlements;
1312

14-
@WithoutEntitlements // ES-12084
1513
public class TikaImplTests extends ESTestCase {
1614

1715
public void testTikaLoads() throws Exception {

0 commit comments

Comments
 (0)