Skip to content

Commit abedf2c

Browse files
authored
Merge branch 'main' into fix-inference-spell
2 parents 381167d + 80729f9 commit abedf2c

File tree

168 files changed

+3621
-1832
lines changed

Some content is hidden

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

168 files changed

+3621
-1832
lines changed

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractGitAwareGradleFuncTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ abstract class AbstractGitAwareGradleFuncTest extends AbstractGradleFuncTest {
2424

2525
def setup() {
2626
remoteGitRepo = new File(setupGitRemote(), '.git')
27-
"git clone ${remoteGitRepo.absolutePath} cloned".execute(Collections.emptyList(), testProjectDir.root).waitFor()
27+
execute("git clone ${remoteGitRepo.absolutePath} cloned", testProjectDir.root)
2828
buildFile = new File(testProjectDir.root, 'cloned/build.gradle')
2929
settingsFile = new File(testProjectDir.root, 'cloned/settings.gradle')
3030
}

distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/SystemJvmOptions.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
import org.elasticsearch.common.settings.Settings;
1313
import org.elasticsearch.common.util.concurrent.EsExecutors;
14+
import org.elasticsearch.core.Booleans;
1415
import org.elasticsearch.core.UpdateForV9;
1516
import org.elasticsearch.jdk.RuntimeVersionFeature;
1617

@@ -26,7 +27,9 @@ final class SystemJvmOptions {
2627
static List<String> systemJvmOptions(Settings nodeSettings, final Map<String, String> sysprops) {
2728
String distroType = sysprops.get("es.distribution.type");
2829
boolean isHotspot = sysprops.getOrDefault("sun.management.compiler", "").contains("HotSpot");
29-
boolean useEntitlements = Boolean.parseBoolean(sysprops.getOrDefault("es.entitlements.enabled", "false"));
30+
boolean entitlementsExplicitlyEnabled = Booleans.parseBoolean(sysprops.getOrDefault("es.entitlements.enabled", "false"));
31+
// java 24+ only supports entitlements, but it may be enabled on earlier versions explicitly
32+
boolean useEntitlements = RuntimeVersionFeature.isSecurityManagerAvailable() == false || entitlementsExplicitlyEnabled;
3033
return Stream.of(
3134
Stream.of(
3235
/*

docs/changelog/118968.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 118968
2+
summary: Configure index sorting through index settings for logsdb
3+
area: Logs
4+
type: enhancement
5+
issues:
6+
- 118686

docs/changelog/119730.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 119730
2+
summary: Enable KQL function as a tech preview
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

docs/changelog/119780.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 119780
2+
summary: Add index and reindex request settings to speed up reindex
3+
area: Data streams
4+
type: enhancement
5+
issues: []

docs/changelog/119798.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 119798
2+
summary: "Add a `PostAnalysisAware,` distribute verification"
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

docs/changelog/119863.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
pr: 119863
2+
summary: Restrict Connector APIs to manage/monitor_connector privileges
3+
area: Extract&Transform
4+
type: breaking
5+
issues: []
6+
breaking:
7+
title: Restrict Connector APIs to manage/monitor_connector privileges
8+
area: REST API
9+
details: Connector APIs now enforce the manage_connector and monitor_connector privileges (introduced in 8.15), replacing the previous reliance on index-level permissions for .elastic-connectors and .elastic-connectors-sync-jobs in API calls.
10+
impact: Connector APIs now require manage_connector and monitor_connector privileges
11+
notable: false

docs/reference/connector/docs/connectors-sharepoint-online.asciidoc

Lines changed: 63 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,10 @@ Follow these steps:
7575
* Leave the *Redirect URIs* blank for now.
7676
* *Register* the application.
7777
* Find and keep the **Application (client) ID** and **Directory (tenant) ID** handy.
78-
* Locate the **Secret** by navigating to **Client credentials: Certificates & Secrets**.
79-
* Select **New client secret**
80-
* Pick a name for your client secret.
81-
Select an expiration date. (At this expiration date, you will need to generate a new secret and update your connector configuration.)
82-
** Save the client secret **Secret ID** before leaving this screen.
83-
** Save the client secret **Value** before leaving this screen.
78+
* Create a certificate and private key. This can, for example, be done by running `openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout azure_app.key -out azure_app.crt` command. Store both in a safe and secure place
79+
* Locate the **Certificates** by navigating to **Client credentials: Certificates & Secrets**.
80+
* Select **Upload certificate**
81+
* Upload the certificate created in one of previous steps: `azure_app.crt`
8482
* Set up the permissions the OAuth App will request from the Azure Portal service account.
8583
** Navigate to **API Permissions** and click **Add Permission**.
8684
** Add **application permissions** until the list looks like the following:
@@ -114,6 +112,24 @@ When entities are not available via the Graph API the connector falls back to us
114112
[discrete#es-connectors-sharepoint-online-oauth-app-permissions]
115113
====== SharePoint permissions
116114
115+
Microsoft is https://learn.microsoft.com/en-us/sharepoint/dev/sp-add-ins/retirement-announcement-for-azure-acs[retiring Azure Access Control Service (ACS)]. This affects permission configuration:
116+
117+
* *Tenants created after November 1st, 2024*: Certificate authentication is required
118+
* *Tenants created before November 1st, 2024*: Secret-based authentication must be migrated to certificate authentication by April 2nd, 2026
119+
120+
[discrete#es-connectors-sharepoint-online-oauth-app-certificate-auth]
121+
===== Certificate Authentication
122+
123+
This authentication method does not require additional setup other than creating and uploading certificates to the OAuth App.
124+
125+
[discrete#es-connectors-sharepoint-online-oauth-app-secret-auth]
126+
===== Secret Authentication
127+
128+
[IMPORTANT]
129+
====
130+
This method is only applicable to tenants created before November 1st, 2024. This method will be fully retired as of April 2nd, 2026.
131+
====
132+
117133
Refer to the following documentation for setting https://learn.microsoft.com/en-us/sharepoint/dev/solution-guidance/security-apponly-azureacs[SharePoint permissions^].
118134
119135
* To set `DisableCustomAppAuthentication` to false, connect to SharePoint using PowerShell and run `set-spotenant -DisableCustomAppAuthentication $false`
@@ -219,8 +235,17 @@ The tenant name for the Azure account hosting the Sharepoint Online instance.
219235
Client ID::
220236
The client id to authenticate with SharePoint Online.
221237
238+
Authentication Method::
239+
Authentication method to use to connector to Sharepoint Online and Rest APIs. `secret` is deprecated and `certificate` is recommended.
240+
222241
Secret value::
223-
The secret value to authenticate with SharePoint Online.
242+
The secret value to authenticate with SharePoint Online, if Authentication Method: `secret` is chosen.
243+
244+
Content of certificate file::
245+
Content of certificate file if Authentication Method: `certificate` is chosen.
246+
247+
Content of private key file::
248+
Content of private key file if Authentication Method: `certificate` is chosen.
224249
225250
Comma-separated list of sites::
226251
List of site collection names or paths to fetch from SharePoint.
@@ -588,12 +613,10 @@ Follow these steps:
588613
* Leave the *Redirect URIs* blank for now.
589614
* *Register* the application.
590615
* Find and keep the **Application (client) ID** and **Directory (tenant) ID** handy.
591-
* Locate the **Secret** by navigating to **Client credentials: Certificates & Secrets**.
592-
* Select **New client secret**
593-
* Pick a name for your client secret.
594-
Select an expiration date. (At this expiration date, you will need to generate a new secret and update your connector configuration.)
595-
** Save the client secret **Secret ID** before leaving this screen.
596-
** Save the client secret **Value** before leaving this screen.
616+
* Create a certificate and private key. This can, for example, be done by running `openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout azure_app.key -out azure_app.crt` command. Store both in a safe and secure place
617+
* Locate the **Certificates** by navigating to **Client credentials: Certificates & Secrets**.
618+
* Select **Upload certificate**
619+
* Upload the certificate created in one of previous steps: `azure_app.crt`
597620
* Set up the permissions the OAuth App will request from the Azure Portal service account.
598621
** Navigate to **API Permissions** and click **Add Permission**.
599622
** Add **application permissions** until the list looks like the following:
@@ -627,6 +650,23 @@ When entities are not available via the Graph API the connector falls back to us
627650
[discrete#es-connectors-sharepoint-online-client-oauth-app-permissions]
628651
====== SharePoint permissions
629652
653+
Microsoft is https://learn.microsoft.com/en-us/sharepoint/dev/sp-add-ins/retirement-announcement-for-azure-acs[retiring Azure Access Control Service (ACS)]. This affects permission configuration:
654+
* *Tenants created after November 1st, 2024*: Certificate authentication is required
655+
* *Tenants created before November 1st, 2024*: Secret-based authentication must be migrated to certificate authentication by April 2nd, 2026
656+
657+
[discrete#es-connectors-sharepoint-online-client-oauth-app-certificate-auth]
658+
===== Certificate Authentication
659+
660+
This authentication method does not require additional setup other than creating and uploading certificates to the OAuth App.
661+
662+
[discrete#es-connectors-sharepoint-online-client-oauth-app-secret-auth]
663+
===== Secret Authentication
664+
665+
[IMPORTANT]
666+
====
667+
This method is only applicable to tenants created before November 1st, 2024. This method will be fully retired as of April 2nd, 2026.
668+
====
669+
630670
Refer to the following documentation for setting https://learn.microsoft.com/en-us/sharepoint/dev/solution-guidance/security-apponly-azureacs[SharePoint permissions^].
631671
632672
* To set `DisableCustomAppAuthentication` to false, connect to SharePoint using PowerShell and run `set-spotenant -DisableCustomAppAuthentication $false`
@@ -742,8 +782,17 @@ The tenant name for the Azure account hosting the Sharepoint Online instance.
742782
`client_id`::
743783
The client id to authenticate with SharePoint Online.
744784
785+
`auth_method`::
786+
Authentication method to use to connector to Sharepoint Online and Rest APIs. `secret` is deprecated and `certificate` is recommended.
787+
745788
`secret_value`::
746-
The secret value to authenticate with SharePoint Online.
789+
The secret value to authenticate with SharePoint Online, if auth_method: `secret` is chosen.
790+
791+
`certificate`::
792+
Content of certificate file if auth_method: `certificate` is chosen.
793+
794+
`private_key`::
795+
Content of private key file if auth_method: `certificate` is chosen.
747796
748797
`site_collections`::
749798
List of site collection names or paths to fetch from SharePoint.

docs/reference/esql/esql-limitations.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ FROM books
150150

151151
Note that, because of <<esql-limitations-text-fields,the way {esql} treats `text` values>>,
152152
any queries on `text` fields that do not explicitly use the full-text functions,
153-
<<esql-match>> or <<esql-qstr>>, will behave as if the fields are actually `keyword` fields:
153+
<<esql-match>>, <<esql-qstr>> or <<esql-kql>>, will behave as if the fields are actually `keyword` fields:
154154
they are case-sensitive and need to match the full string.
155155

156156
[discrete]

docs/reference/esql/functions/kibana/definition/kql.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)