Skip to content

Commit 2ce281f

Browse files
jaybceejaybcee
authored
Merge branch 'main' into ml-eis-integration-jbc
2 parents ab979a1 + 20a3492 commit 2ce281f

File tree

132 files changed

+1887
-539
lines changed

Some content is hidden

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

132 files changed

+1887
-539
lines changed

‎docs/changelog/116687.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 116687
2+
summary: Add LogsDB option to route on sort fields
3+
area: Logs
4+
type: enhancement
5+
issues: []

‎docs/changelog/118562.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 118562
2+
summary: Update data stream deprecations warnings to new format and filter searchable
3+
snapshots from response
4+
area: Data streams
5+
type: enhancement
6+
issues: []

‎docs/changelog/118823.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 118823
2+
summary: Fix attribute set equals
3+
area: ES|QL
4+
type: bug
5+
issues: []

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

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,58 @@ The application name will appear in the Title box.
133133
</AppPermissionRequests>
134134
----
135135
136+
[discrete#es-connectors-sharepoint-online-sites-selected-permissions]
137+
====== Granting `Sites.Selected` permissions
138+
139+
To configure `Sites.Selected` permissions, follow these steps in the Azure Active Directory portal. These permissions enable precise access control to specific SharePoint sites.
140+
141+
. Sign in to the https://portal.azure.com/[Azure Active Directory portal^].
142+
. Navigate to **App registrations** and locate the application created for the connector.
143+
. Under **API permissions**, click **Add permission**.
144+
. Select **Microsoft Graph** > **Application permissions**, then add `Sites.Selected`.
145+
. Click **Grant admin consent** to approve the permission.
146+
147+
[TIP]
148+
====
149+
Refer to the official https://learn.microsoft.com/en-us/graph/permissions-reference[Microsoft documentation] for managing permissions in Azure AD.
150+
====
151+
152+
To assign access to specific SharePoint sites using `Sites.Selected`:
153+
154+
. Use Microsoft Graph Explorer or PowerShell to grant access.
155+
. To fetch the site ID, run the following Graph API query:
156+
+
157+
[source, http]
158+
----
159+
GET https://graph.microsoft.com/v1.0/sites?select=webUrl,Title,Id&$search="<Name of the site>*"
160+
----
161+
+
162+
This will return the `id` of the site.
163+
164+
. Use the `id` to assign read or write access:
165+
+
166+
[source, http]
167+
----
168+
POST https://graph.microsoft.com/v1.0/sites/<siteId>/permissions
169+
{
170+
"roles": ["read"], // or "write"
171+
"grantedToIdentities": [
172+
{
173+
"application": {
174+
"id": "<App_Client_ID>",
175+
"displayName": "<App_Display_Name>"
176+
}
177+
}
178+
]
179+
}
180+
----
181+
182+
[NOTE]
183+
====
184+
When using the `Comma-separated list of sites` configuration field, ensure the sites specified match those granted `Sites.Selected` permission in SharePoint.
185+
If the `Comma-separated list of sites` field is set to `*` or the `Enumerate all sites` toggle is enabled, the connector will attempt to access all sites. This requires broader permissions, which are not supported with `Sites.Selected`.
186+
====
187+
136188
.Graph API permissions
137189
****
138190
Microsoft recommends using Graph API for all operations with Sharepoint Online. Graph API is well-documented and more efficient at fetching data, which helps avoid throttling.
@@ -594,6 +646,59 @@ The application name will appear in the Title box.
594646
</AppPermissionRequests>
595647
----
596648
649+
[discrete#es-connectors-sharepoint-online-sites-selected-permissions-self-managed]
650+
====== Granting `Sites.Selected` permissions
651+
652+
To configure `Sites.Selected` permissions, follow these steps in the Azure Active Directory portal. These permissions enable precise access control to specific SharePoint sites.
653+
654+
. Sign in to the https://portal.azure.com/[Azure Active Directory portal^].
655+
. Navigate to **App registrations** and locate the application created for the connector.
656+
. Under **API permissions**, click **Add permission**.
657+
. Select **Microsoft Graph** > **Application permissions**, then add `Sites.Selected`.
658+
. Click **Grant admin consent** to approve the permission.
659+
660+
[TIP]
661+
====
662+
Refer to the official https://learn.microsoft.com/en-us/graph/permissions-reference[Microsoft documentation] for managing permissions in Azure AD.
663+
====
664+
665+
666+
To assign access to specific SharePoint sites using `Sites.Selected`:
667+
668+
. Use Microsoft Graph Explorer or PowerShell to grant access.
669+
. To fetch the site ID, run the following Graph API query:
670+
+
671+
[source, http]
672+
----
673+
GET https://graph.microsoft.com/v1.0/sites?select=webUrl,Title,Id&$search="<Name of the site>*"
674+
----
675+
+
676+
This will return the `id` of the site.
677+
678+
. Use the `id` to assign read or write access:
679+
+
680+
[source, http]
681+
----
682+
POST https://graph.microsoft.com/v1.0/sites/<siteId>/permissions
683+
{
684+
"roles": ["read"], // or "write"
685+
"grantedToIdentities": [
686+
{
687+
"application": {
688+
"id": "<App_Client_ID>",
689+
"displayName": "<App_Display_Name>"
690+
}
691+
}
692+
]
693+
}
694+
----
695+
696+
[NOTE]
697+
====
698+
When using the `Comma-separated list of sites` configuration field, ensure the sites specified match those granted `Sites.Selected` permission in SharePoint.
699+
If the `Comma-separated list of sites` field is set to `*` or the `Enumerate all sites` toggle is enabled, the connector will attempt to access all sites. This requires broader permissions, which are not supported with `Sites.Selected`.
700+
====
701+
597702
.Graph API permissions
598703
****
599704
Microsoft recommends using Graph API for all operations with Sharepoint Online. Graph API is well-documented and more efficient at fetching data, which helps avoid throttling.

‎modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/SynonymsAnalysisTests.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public void testSynonymWordDeleteByAnalyzer() throws IOException {
118118
// Test with an index version where lenient should always be false by default
119119
IndexVersion randomNonLenientIndexVersion = IndexVersionUtils.randomVersionBetween(
120120
random(),
121-
IndexVersions.MINIMUM_COMPATIBLE,
121+
IndexVersions.MINIMUM_READONLY_COMPATIBLE,
122122
IndexVersions.INDEX_SORTING_ON_NESTED
123123
);
124124
assertIsNotLenient.accept(randomNonLenientIndexVersion, false);
@@ -177,7 +177,7 @@ public void testSynonymWordDeleteByAnalyzerFromFile() throws IOException {
177177
// Test with an index version where lenient should always be false by default
178178
IndexVersion randomNonLenientIndexVersion = IndexVersionUtils.randomVersionBetween(
179179
random(),
180-
IndexVersions.MINIMUM_COMPATIBLE,
180+
IndexVersions.MINIMUM_READONLY_COMPATIBLE,
181181
IndexVersions.INDEX_SORTING_ON_NESTED
182182
);
183183
assertIsNotLenient.accept(randomNonLenientIndexVersion, false);
@@ -231,7 +231,7 @@ public void testExpandSynonymWordDeleteByAnalyzer() throws IOException {
231231
// Test with an index version where lenient should always be false by default
232232
IndexVersion randomNonLenientIndexVersion = IndexVersionUtils.randomVersionBetween(
233233
random(),
234-
IndexVersions.MINIMUM_COMPATIBLE,
234+
IndexVersions.MINIMUM_READONLY_COMPATIBLE,
235235
IndexVersions.INDEX_SORTING_ON_NESTED
236236
);
237237
assertIsNotLenient.accept(randomNonLenientIndexVersion, false);
@@ -338,7 +338,7 @@ public void testShingleFilters() {
338338
Settings settings = Settings.builder()
339339
.put(
340340
IndexMetadata.SETTING_VERSION_CREATED,
341-
IndexVersionUtils.randomVersionBetween(random(), IndexVersions.MINIMUM_COMPATIBLE, IndexVersion.current())
341+
IndexVersionUtils.randomVersionBetween(random(), IndexVersions.MINIMUM_READONLY_COMPATIBLE, IndexVersion.current())
342342
)
343343
.put("path.home", createTempDir().toString())
344344
.put("index.analysis.filter.synonyms.type", "synonym")
@@ -392,7 +392,7 @@ public void testPreconfiguredTokenFilters() throws IOException {
392392
Settings settings = Settings.builder()
393393
.put(
394394
IndexMetadata.SETTING_VERSION_CREATED,
395-
IndexVersionUtils.randomVersionBetween(random(), IndexVersions.MINIMUM_COMPATIBLE, IndexVersion.current())
395+
IndexVersionUtils.randomVersionBetween(random(), IndexVersions.MINIMUM_READONLY_COMPATIBLE, IndexVersion.current())
396396
)
397397
.put("path.home", createTempDir().toString())
398398
.build();
@@ -424,7 +424,7 @@ public void testDisallowedTokenFilters() throws IOException {
424424
Settings settings = Settings.builder()
425425
.put(
426426
IndexMetadata.SETTING_VERSION_CREATED,
427-
IndexVersionUtils.randomVersionBetween(random(), IndexVersions.MINIMUM_COMPATIBLE, IndexVersion.current())
427+
IndexVersionUtils.randomVersionBetween(random(), IndexVersions.MINIMUM_READONLY_COMPATIBLE, IndexVersion.current())
428428
)
429429
.put("path.home", createTempDir().toString())
430430
.putList("common_words", "a", "b")

‎modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/UniqueTokenFilterTests.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,7 @@ public void testOldVersionGetXUniqueTokenFilter() throws IOException {
124124
Settings settings = Settings.builder()
125125
.put(
126126
IndexMetadata.SETTING_VERSION_CREATED,
127-
IndexVersionUtils.randomVersionBetween(
128-
random(),
129-
IndexVersions.MINIMUM_COMPATIBLE,
130-
IndexVersionUtils.getPreviousVersion(IndexVersions.UNIQUE_TOKEN_FILTER_POS_FIX)
131-
)
127+
IndexVersionUtils.randomPreviousCompatibleVersion(random(), IndexVersions.UNIQUE_TOKEN_FILTER_POS_FIX)
132128
)
133129
.build();
134130
IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings);

0 commit comments

Comments
 (0)