Skip to content

Commit

Permalink
Merge pull request #1677 from MicrosoftDocs/main
Browse files Browse the repository at this point in the history
Publish main to live, 01/08/25, 3:30 PM PT
  • Loading branch information
Ruchika-mittal01 authored Jan 8, 2025
2 parents 1fac679 + badb463 commit ed32364
Show file tree
Hide file tree
Showing 18 changed files with 268 additions and 143 deletions.
2 changes: 1 addition & 1 deletion MicrosoftSearch/azure-devops-connector.md
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ Use the preview results button to verify the sample values of the selected prope

[![Screenshot that shows Sync tab where you can configure crawl frequency.](media/ado-workitems-sync-tab.png)](media/ado-workitems-sync-tab.png#lightbox)

The refresh interval determines how often your data is synced between the data source and the Graph connector index. There are two types of refresh intervals - full crawl and incremental crawl. For more information, see [refresh settings](configure-connector.md#step-8-refresh-settings).
The refresh interval determines how often your data is synced between the data source and the Graph connector index. There are two types of refresh intervals - full crawl and incremental crawl. For more information, see [refresh settings](configure-connector.md#guidelines-for-sync-settings).

You can change the default values of refresh interval from here if you want to.

Expand Down
2 changes: 1 addition & 1 deletion MicrosoftSearch/azure-devops-wiki-connector.md
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ Use the preview results button to verify the sample values of the selected prope

[![Screenshot that shows Sync tab where you can configure crawl frequency.](media/ado-wiki-sync-tab.png)](media/ado-wiki-sync-tab.png#lightbox)

The refresh interval determines how often your data is synced between the data source and the Graph connector index. There are two types of refresh intervals - full crawl and incremental crawl. For more information, see [refresh settings](configure-connector.md#step-8-refresh-settings).
The refresh interval determines how often your data is synced between the data source and the Graph connector index. There are two types of refresh intervals - full crawl and incremental crawl. For more information, see [refresh settings](configure-connector.md#guidelines-for-sync-settings).

You can change the default values of refresh interval from here if you want to.

Expand Down
215 changes: 119 additions & 96 deletions MicrosoftSearch/configure-connector.md

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions MicrosoftSearch/confluence-cloud-connector.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ This article is intended for Microsoft 365 administrators and who are responsibl
- Doesn't index attachment files, or comments.

>[!IMPORTANT]
> * Atlassian is deprecating a set of Confluence cloud APIs (V1 version) and releasing new APIs (V2 version). You may read about their announcements [here](https://developer.atlassian.com/cloud/confluence/changelog/#CHANGE-864) or [here](https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fcommunity.developer.atlassian.com%2Ft%2Frfc-19-deprecation-of-confluence-cloud-rest-api-v1-endpoints%2F71752&data=05%7C01%7Cvivg%40microsoft.com%7Cb8d049f07c3544de6b2c08dbe98b2a02%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C638360556187110970%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=DIw8xhEwulo59mAm8T0f0TTKvbtRr4tIMTMpQYgPDDQ%3D&reserved=0). Some of these deprecating v1 APIs are used by the connector for **OAuth connections** only. Hence, post this change your existing Confluence connection(s) may stop working. This change is scheduled for Jan’24.
> * Atlassian is deprecating a set of Confluence cloud APIs (V1 version) and releasing new APIs (V2 version). You may read about their announcements [here](https://developer.atlassian.com/cloud/confluence/changelog/#CHANGE-864) or [here](https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fcommunity.developer.atlassian.com%2Ft%2Frfc-19-deprecation-of-confluence-cloud-rest-api-v1-endpoints%2F71752&data=05%7C01%7Cvivg%40microsoft.com%7Cb8d049f07c3544de6b2c08dbe98b2a02%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C638360556187110970%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=DIw8xhEwulo59mAm8T0f0TTKvbtRr4tIMTMpQYgPDDQ%3D&reserved=0). Some of these deprecating v1 APIs are used by the connector for **OAuth connections** only. Hence, post this change your existing Confluence connections may stop working. This change is scheduled for Jan’24.
> * The change to migrate to new v2 APIs was released to all customers in **December 2023**. Post this release, your existing connections need to be reauthenticated. The new v2 APIs also require some more scopes (as compared to previous v1 APIs) which need to be provided during re-authentication. A new set of scopes required (complete list) – `read:group:confluence`, `read:user:confluence`, `read:content-details:confluence`, `Read:space:confluence`, `Read:permission:confluence`, `read:audit-log:confluence`, `read:content.metadata:confluence` and `read:page:confluence`.
## Get Started
Expand All @@ -56,7 +56,7 @@ To authenticate and synchronize content from Confluence On-prem, choose **one of
>Make sure the service **account has view access** to the Confluence content you want to index.
**a. Basic authentication** <br>
Enter your account's username (usually email ID) and API token to authenticate using basic auth. To learn more about generating an API token, refer to Atlassian's documentation on how to [manage API tokens for your Atlassian account](https://support.atlassian.com/atlassian-account/docs/manage-api-tokens-for-your-atlassian-account/).
To authenticate using basic auth, enter your username (usually your email) and API token. To help generating an API token, see Atlassian's [guide](https://support.atlassian.com/atlassian-account/docs/manage-api-tokens-for-your-atlassian-account/).

**b. OAuth 2.0 (recommended)** <br>
Register an app in Confluence Cloud so that the Microsoft Search app and Microsoft 365 Copilot can access the instance. To learn more, see Atlassian Support documentation on how to [Enable OAuth 2.0](https://developer.atlassian.com/cloud/confluence/oauth-2-3lo-apps/#enabling-oauth-2-0--3lo-).
Expand Down Expand Up @@ -142,7 +142,7 @@ To identify which option is suitable for your organization:

**Include or exclude data which you want to index**

With a Confluence Query Language (CQL) string, you can specify conditions for syncing pages. It's like a **Where** clause in a **SQL Select** statement. For example, you can choose to index only the pages that have been modified in the last two years. To learn about creating your own query string, see [Advanced Searching using CQL](https://developer.atlassian.com/server/confluence/advanced-searching-using-cql/). All blogs and pages are indexed by the connector by default.
With a Confluence Query Language (CQL) string, you can specify conditions for syncing pages. It's like a **Where** clause in a **SQL Select** statement. For example, you can choose to index only the pages that were modified in the last two years. To learn about creating your own query string, see [Advanced Searching using CQL](https://developer.atlassian.com/server/confluence/advanced-searching-using-cql/). The connector indexes all blogs and pages by default.

>[!TIP]
>You may use the CQL filter to index **content modified after a certain time** using, *lastModified >= "2018/12/31"*
Expand All @@ -151,7 +151,7 @@ Use the preview results button to verify the sample values of the selected prope

**Manage Properties**

In this step, you can add or remove available properties from your Confluence data source. Microsoft 365 has selected a few properties by default.
In this step, you can add or remove available properties from your Confluence data source. A few properties are selected by default.
*The list of properties that you select here, can impact how you can filter, search and view your results in Microsoft 365 Copilot.*


Expand All @@ -172,7 +172,7 @@ Use the preview results button to verify selected properties and filters.

### Sync

The refresh interval determines how often your data is synchronized between the data source and the Graph connector index. There are two types of refresh intervals – full crawl and incremental crawl. For more details, click [here](./configure-connector.md#step-8-refresh-settings).
The refresh interval determines how often your data is synchronized between the data source and the Graph connector index. There are two types of refresh intervals – full crawl and incremental crawl. For more details, click [here](configure-connector.md#guidelines-for-sync-settings).
You can change the default values of refresh interval from here if you want to.

### Review and Test your connection
Expand All @@ -181,6 +181,6 @@ You can change the default values of refresh interval from here if you want to.
- Search and validate your indexed content and permissions using [Index browser](./connectors-index-search.md)
- You may find answers to common questions in our [FAQ section](./frequently-asked-questions.md)

For MS Search, if you need to customize the search results page. To learn about customizing search results, see [Customize the search results page](./configure-connector.md#step-11-customize-the-search-results-page).
For MS Search, if you need to customize the search results page. To learn about customizing search results, see [Customize the search results page](customize-search-page.md).

If you have issues or want to provide feedback, contact [Microsoft Graph | Support](https://developer.microsoft.com/graph/support).
22 changes: 11 additions & 11 deletions MicrosoftSearch/confluence-onpremises-connector.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ This article is intended for Microsoft 365 administrators and who are responsibl
> **Recommended : The Confluence Global Administrator should create the connection** </br>
>
> **Who is the confluence global administrator?**
> A Confluence Administrator is a user who has been granted full administrative permissions. </br>
> * To check this: Go to **Administration** > **General Configuration** > **Global Permissions** </br>
> * Look for the group **Confluence-administrators**, which has all permissions enabled, including - Can Use, Personal Space, Create Space(s), Confluence Administrator, and System Administrator.
> A Confluence Administrator is a user who has full administrative permissions. </br>
> * To check permissions: Go to **Administration** > **General Configuration** > **Global Permissions** </br>
> * Look for the group **Confluence-administrators**, which has all permissions enabled, including - Can Use, Personal Space, Create Space, Confluence Administrator, and System Administrator.
> * Any user creating a token must be a member of this group
## Get Started
Expand All @@ -59,8 +59,8 @@ To connect to your Confluence On-premises data, you need your organization's Con
To index your Confluence server or data center content, you must install and register the connector agent. See [Install the Microsoft Graph connector agent](./graph-connector-agent.md) for details. You must be the administrator for your organization's Microsoft 365 tenant and the administrator for your organization's Confluence site.

>[!NOTE]
> GCA can be installed on a different Windows machine and need not be on the same machine as that of the On-premises server. The machine can help generate App ID and secret which can be used for the setup. You must ensure that the GCA machine is on during the crawling.
> You may find answers to common GCA realted questions in [FAQ section](./frequently-asked-questions.md) .
> GCA can be installed on a different Windows machine and need not be on the same machine as the On-premises server. The machine can help generate App ID and secret which can be used for the setup. You must ensure that the GCA machine is on during the crawling.
> You may find answers to common GCA related questions in [FAQ section](./frequently-asked-questions.md) .
### 4. Install the Confluence on-premises plugin

Expand Down Expand Up @@ -146,7 +146,7 @@ To identify which option is suitable for your organization:
>[!IMPORTANT]
>
> * If you choose Microsoft Entra ID as the type of identity source, the connector maps the email IDs of users obtained from Confluence directly to UPN property from Microsoft Entra ID.
> * If you chose "non-AAD" for the identity type see [Map your non-Azure AD Identities](map-non-aad.md) for instructions on mapping the identities. You can use this option to provide the mapping regular expression from email ID to UPN.
> * If you chose "non-AAD" for the identity type, see [Map your non-Azure AD Identities](map-non-aad.md) for instructions on mapping the identities. You can use this option to provide the mapping regular expression from email ID to UPN.
> * Updates to users or groups governing access permissions are synced in full crawls only. Incremental crawls do not currently support the processing of updates to permissions.
### Content
Expand All @@ -167,7 +167,7 @@ In this step, you can specify the date range for indexing your documents. The pa
>[!IMPORTANT]
>
> * Ensure that the dates are in chronological order. The "Last Created Date" should not be later than the "Last Modified Date."
> * If no dates are specified, all documents will be considered for indexing.
> * If no dates are specified, all documents are considered for indexing.
**Manage Properties**

Expand All @@ -191,11 +191,11 @@ Here, you can add or remove available properties from your Confluence On-prem da

Use the preview results button to verify selected properties and filters.
>[!NOTE]
> Note that the preview only respects space-level filtering.
> The preview only respects space-level filtering.
### Synchronization

The refresh interval determines how often your data is synchronized between the data source and the Graph connector index. There are two types of refresh intervals – full crawl and incremental crawl. For more details, click [here](./configure-connector.md#step-8-refresh-settings).
The refresh interval determines how often your data is synchronized between the data source and the Graph connector index. There are two types of refresh intervals – full crawl and incremental crawl. For more details, click [here](configure-connector.md#guidelines-for-sync-settings).
You can change the default values of refresh interval from here if you want to.

### Review and Test your connection
Expand All @@ -204,12 +204,12 @@ You can change the default values of refresh interval from here if you want to.
- Search and validate your indexed content and permissions using [Index browser](./connectors-index-search.md).
- Find answers to common questions in our [FAQ section](./frequently-asked-questions.md).

For MS Search, if you need to customize the search results page. To learn about customizing search results, see [Customize the search results page](./configure-connector.md#step-11-customize-the-search-results-page).
For MS Search, if you need to customize the search results page. To learn about customizing search results, see [Customize the search results page](customize-search-page.md).

## Limitations
- Doesn't index blogs, attachment files, or comments.
- Only indexes current pages; archived pages are excluded.
- CQL[Confluence Query Language] isn't supported for Confluence on-premises howevere we support a space and page level filter
- CQL (Confluence Query Language) isn't supported for Confluence on-premises however we support a space and page level filter

## Troubleshooting
After publishing your connection, you can review the status under the **Data sources** tab in the [admin center](https://admin.microsoft.com). To learn how to make updates and deletions, see [Manage your connector](manage-connector.md).
Expand Down
8 changes: 4 additions & 4 deletions MicrosoftSearch/enterprise-web-connector-onprem.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ description: "Set up the Enterprise Websites on-premises Microsoft Graph connect

The Enterprise Websites on premises Microsoft Graph connector allows your organization to index webpages and **content from your company-owned websites**. After you configure the connector and index content from the websites, end users can search for that content from in Microsoft Search and Microsoft 365 Copilot.

This article is for Microsoft 365 administrators or anyone who configures, runs, and monitors a Enterprise Websites on-premises Microsoft Graph connector.
This article is for Microsoft 365 administrators or anyone who configures, runs, and monitors an Enterprise Websites on-premises Microsoft Graph connector.

## Capabilities
- Index webpages from on-premises or private cloud hosted websites.
Expand Down Expand Up @@ -115,14 +115,14 @@ c. **Windows** <br>
Windows authentication requires a username, domain, and password. You need to provide the username and domain in the **Username** field, in any of the following formats: domain\username, or username@domain. A password must be entered in the **Password** field. For Windows authentication, the username provided must also be an administrator in the server where the agent is installed.

d. **SiteMinder** <br>
Siteminder authentication requires a properly formatted URL, `https://custom_siteminder_hostname/smapi/rest/createsmsession`, a username, and a password.
SiteMinder authentication requires a properly formatted URL, `https://custom_siteminder_hostname/smapi/rest/createsmsession`, a username, and a password.

e. **Microsoft Entra OAuth 2.0 Client credentials** <br>
OAuth 2.0 with [Microsoft Entra ID](/azure/active-directory/) requires a resource ID, client ID, and a client secret.

The resource ID, client ID, and client secret values depend on how you did the setup for Microsoft Entra ID-based authentication for your website. One of the two specified options might be suitable for your website:

1. If you're using an Microsoft Entra application both as an identity provider and the client app to access the website, the client ID and the resource ID are the application ID of this single application, and the client secret is the secret that you generated in this application.
1. If you're using a Microsoft Entra application both as an identity provider and the client app to access the website, the client ID and the resource ID are the application ID of this single application, and the client secret is the secret that you generated in this application.

> [!NOTE]
> For detailed steps to configure a client application as an Identity provider, see [Quickstart: Register an application with the Microsoft identity platform and Configure your App Service or Azure Functions app to use Microsoft Entra login](/azure/app-service/configure-authentication-provider-aad).
Expand Down Expand Up @@ -309,7 +309,7 @@ To learn more about regex expressions, see [.NET regular expressions](/dotnet/st

[![Screenshot that shows Sync tab where you can configure crawl frequency.](media/enterprise-web-connector/enterprise-website-onprem-sync-tab.png)](media/enterprise-web-connector/enterprise-website-onprem-sync-tab.png#lightbox)

The refresh interval determines how often your data is synced between the data source and the Graph connector index. There are two types of refresh intervals - full crawl and incremental crawl. For more details, see [refresh settings](configure-connector.md#step-8-refresh-settings).
The refresh interval determines how often your data is synced between the data source and the Graph connector index. There are two types of refresh intervals - full crawl and incremental crawl. For more details, see [refresh settings](configure-connector.md#guidelines-for-sync-settings).

You can change the default values of refresh interval from here if you want to.

Expand Down
Loading

0 comments on commit ed32364

Please sign in to comment.