diff --git a/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/addsource.md b/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/addsource.md
index 05a22e0b35..9bed3bf8d1 100644
--- a/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/addsource.md
+++ b/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/addsource.md
@@ -23,8 +23,10 @@ the sources:
- [Add Single Database](/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/addsingledatabase/addsingledatabase.md) (Microsoft SQL Server, MySQL, PostgreSQL, or Oracle database)
- [Add SQL Server](/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/addsqlserversource/addsqlserversource.md) (All Microsoft SQL Server, MySQL, PostgreSQL, or Oracle databases on a server)
- [Dropbox](/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/adddropbox.md)
-- [Exchange Server](/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangeserver.md) or
- [Exchange Mailbox](/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangemailbox.md)
+- [Exchange Server (EWS)](/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangeserverews.md) or
+ [Exchange Mailbox (EWS)](/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangemailboxews.md)
+- [Exchange Server (Graph)](/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangeservergraph.md) or
+ [Exchange Mailbox (Graph)](/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangemailboxgraph.md)
- [File System](/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/overview.md) (includes Folder and File)
- [Google Drive Source](/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/addgdsource.md)
- [Outlook Mail Archive](/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/outlookmailarchive.md)
@@ -33,8 +35,8 @@ the sources:
The **Sources** section lists all your content sources.
:::note
-When adding a source or managing source configuration, the most commonly used source
-settings are displayed by default. However, some source types have additional configuration options
-that can be displayed by clicking the Advanced Settings ("wrench" icon). You can
+When adding a source or managing source configuration, the console displays the most commonly used
+source settings by default. However, some source types have additional configuration options
+that appear when you click the Advanced Settings ("wrench" icon). You can
set the Advanced Settings to display by default in User Preferences, accessible by clicking on the username.
:::
diff --git a/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangemailbox.md b/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangemailboxews.md
similarity index 71%
rename from docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangemailbox.md
rename to docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangemailboxews.md
index fb4bb787ab..b406fed0a9 100644
--- a/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangemailbox.md
+++ b/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangemailboxews.md
@@ -1,18 +1,20 @@
---
-title: "Exchange Mailbox"
-description: "Exchange Mailbox"
+title: "Exchange Mailbox (EWS)"
+description: "Exchange Mailbox (EWS)"
sidebar_position: 30
---
-# Exchange Mailbox
+# Exchange Mailbox (EWS)
-Use the **Exchange Mailbox** source to enable the crawling and classification of content stored in a
-single Exchange mailbox on the on-premises Exchange server or Exchange Online.
+Use the **Exchange Mailbox (EWS)** source to crawl and classify content stored in a
+single Exchange mailbox on an on-premises Exchange server or in Exchange Online using the Exchange Web Services (EWS).
+Due to the imminent deprecation of EWS for connecting to Exchange Online, Netwrix recommends using [Exchange Mailbox (Graph)](/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangemailboxgraph.md)
+for any new sources intended to crawl Exchange Online mailboxes.
**Step 1 –** In Netwrix Data Classification management console, open the **Sources** view and click
**Add**.
-**Step 2 –** Select **Exchange Mailbox** source type and in the properties window specify the
+**Step 2 –** Select the **Exchange Mailbox (EWS)** source type and in the properties window specify the
necessary settings.
## Authentication type: Modern authentication
@@ -22,7 +24,7 @@ specify the following:
| Option | Description |
| ---------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Authentication type | Select **Modern (Exchange Online)** |
+| Authentication type | Select **Modern (O365)** |
| Admin Username | Specify the administrative account for the required Exchange Online organization. The user must have a mailbox connected to it to crawl Exchange. |
| Tenant ID | Enter the **Tenant ID** you obtained at [Step 5: Obtain Tenant ID](/docs/dataclassification/5.7/introduction/introduction/exchange/azureappexchangeonlinemfa.md#step-5-obtain-tenant-id). |
| Certificate thumbprint | Enter the certificate thumbprint you prepared at [Step 4: Configure Certificates & secrets](/docs/dataclassification/5.7/introduction/introduction/exchange/azureappexchangeonlinemfa.md). |
@@ -32,28 +34,28 @@ specify the following:
## Authentication type: Basic
-If you plan to use this authentication type, you will need to specify the following:
+To use this authentication type, specify the following:
| Option | Description | Comments |
| ------------------------ | ------------------------------------------------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Email Address / Password | **Administrator** account that has been assigned both: 1. **Impersonation** right 2. **Discovery Management** role | See [Configure Microsoft Exchange for Crawling and Classification](/docs/dataclassification/5.7/introduction/introduction/exchange/exchange.md) for details on the rights assignment. |
+| Email Address / Password | An **Administrator** account with both: 1. **Impersonation** right 2. **Discovery Management** role | See [Configure Microsoft Exchange for Crawling and Classification](/docs/dataclassification/5.7/introduction/introduction/exchange/exchange.md) for details on the rights assignment. |
## Other configuration settings
-By default, only basic settings are displayed. To view advanced options, click the "wrench" icon at
+By default, only basic settings appear. To view advanced options, click the "wrench" icon at
**Settings** in the bottom.
| Option | Description | Comments |
| ------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| **Basic settings** | | |
-| Mailbox | Mailbox to be crawled. | When using impersonation, the settings can be like the following example:
- Email Address
- administrative account granted Impersonation right, e.g. _administrator@cs.com_
- Mailbox
- target mailbox, e.g. _test@cs.com_.
|
-| Crawl Range | Define what portions of data should be retrieved from the Exchange server: - Select **Date Range** to crawl a static set of data within the required interval.
- Select **Since** if you want to periodically re-crawl content from the specified date, taking into account the last crawl date for each object.
| |
+| Mailbox | The mailbox to crawl. | When you use impersonation, the settings can be like the following example: - Email Address
- administrative account granted Impersonation right, e.g. _administrator@cs.com_
- Mailbox
- target mailbox, e.g. _test@cs.com_.
|
+| Crawl Range | Define the time period to crawl: - Select **Date Range** to crawl a static set of data within the specified interval.
- Select **Since** if you want to periodically re-crawl content from the specified date onwards, taking into account the last crawl date for each object.
| |
| Crawl In-Place Archive | Select this option if you want to crawl Exchange Online in-place archive mailboxes. | Applies to Exchange Online. |
-| OCR Processing Mode | Set the processing mode for document images: - **Disabled**
- document images will not be processed
- **Default**
- defaults to the source setting (if configuring a path) or the global setting (if configured on a source)
- **Normal**
- process the images with normal quality settings
- **Enhanced**
- upscale the images further to allow more accurate results.
| The **Enhanced** mode will provide better accuracy but can lead to longer processing time if the images don't contain text. |
-| Source Group | Select the source group (if any). | |
+| OCR Processing Mode | Set the processing mode for document images: - **Disabled**
- skip processing document images
- **Default**
- defaults to the global setting
- **Normal**
- process the images with normal quality settings
- **Enhanced**
- upscale the images further to allow more accurate results.
| The **Enhanced** mode will provide better accuracy but can lead to longer processing time if the images don't contain text. |
+| Source Group | Select the source group to add this source to. If no source groups exist, the product creates one automatically, named after the source. | |
| Pause source on creation | Select if you want to make other configuration changes before data collection occurs. | |
| **Advanced settings** | | |
-| Build Search Index | Select if you want search index to be created. | |
-| Re-Index Period | Specify how often the source should be checked for changes. Default is **7** days. | Netwrix recommends using default values. |
-| Priority | Set priority for this data source to be crawled. Select the priority level from the list values: - Highest
- High
- Normal
- Low
- Lowest
| |
-| Document Type | Specify a value that you can use to restrict queries when using the Netwrix Data Classification search index. | |
+| Build Search Index | Select to create a search index. | |
+| Re-Index Period | Specify how often to check the source for changes. Default is **7** days. | Netwrix recommends using default values. |
+| Priority | Set the crawl priority for this data source. Select the priority level from the list values: - Highest
- High
- Normal
- Low
- Lowest
| |
+| Document Type | Specify a value to restrict queries when using the Netwrix Data Classification search index. | |
diff --git a/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangemailboxgraph.md b/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangemailboxgraph.md
new file mode 100644
index 0000000000..eb242e8557
--- /dev/null
+++ b/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangemailboxgraph.md
@@ -0,0 +1,49 @@
+---
+title: "Exchange Mailbox (Graph)"
+description: "Exchange Mailbox (Graph)"
+sidebar_position: 35
+---
+
+# Exchange Mailbox (Graph)
+
+Use the Exchange Mailbox (Graph) source to crawl and classify content stored in a single Exchange Online mailbox using the Microsoft Graph API. For on-premises Exchange mailboxes, [Exchange Mailbox (EWS)](/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangemailboxews.md).
+
+**Step 1 –** In Netwrix Data Classification management console, open the **Sources** view and click
+**Add**.
+
+**Step 2 –** Select **Exchange Mailbox (Graph)** source type and in the properties window specify the
+necessary settings.
+
+## Authentication
+
+You must specify the following:
+
+| Option | Description |
+| ---------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Admin Username | Specify the administrative account for the required Exchange Online organization. The user must have a mailbox connected to it to crawl Exchange. |
+| Tenant ID | Enter the **Tenant ID** you obtained at [Step 5: Obtain Tenant ID](/docs/dataclassification/5.7/introduction/introduction/exchange/azureappexchangeonlinemfa.md#step-5-obtain-tenant-id). |
+| Certificate thumbprint | Enter the certificate thumbprint you prepared at [Step 4: Configure Certificates & secrets](/docs/dataclassification/5.7/introduction/introduction/exchange/azureappexchangeonlinemfa.md). |
+| Application ID | Enter the app ID you got at application registration at [Step 2: Create and Register a new app in Azure AD](/docs/dataclassification/5.7/introduction/introduction/exchange/azureappexchangeonlinemfa.md#step-2-create-and-register-a-new-app-in-azure-ad) (you can find it in the Azure AD app properties >**Overview**). |
+
+
+
+## Other configuration settings
+
+By default, only basic settings appear. To view advanced options, click the "wrench" icon at
+**Settings** in the bottom.
+
+| Option | Description | Comments |
+| ------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **Basic settings** | | |
+| Cloud Environment | Select the Azure instance hosting the Exchange Online server. | |
+| Mailbox | The mailbox to crawl. | E.g. _test@cs.com_. |
+| Crawl Range | Define the time period to crawl: - Select **Date Range** to crawl a static set of data within the required interval.
- Select **Since** if you want to periodically re-crawl content from the specified date, taking into account the last crawl date for each object.
| |
+| Crawl In-Place Archive | Select this option if you want to crawl Exchange Online in-place archive mailboxes. | |
+| OCR Processing Mode | Set the processing mode for document images: - **Disabled**
- skip processing document images
- **Default**
- defaults to the global setting
- **Normal**
- process the images with normal quality settings
- **Enhanced**
- upscale the images further to allow more accurate results.
| The **Enhanced** mode will provide better accuracy but can lead to longer processing time if the images don't contain text. |
+| Source Group | Select the source group to add this source to. If no source groups exist, the product creates one automatically, named after the source. | |
+| Pause source on creation | Select if you want to make other configuration changes before data collection occurs. | |
+| **Advanced settings** | | |
+| Build Search Index | Select to create a search index. | |
+| Re-Index Period | Specify how often to check the source for changes. Default is **7** days. | Netwrix recommends using default values. |
+| Priority | Set the crawl priority for this data source. Select the priority level from the list values: - Highest
- High
- Normal
- Low
- Lowest
| |
+| Document Type | Specify a value to restrict queries when using the Netwrix Data Classification search index. | |
diff --git a/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangeserver.md b/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangeserverews.md
similarity index 58%
rename from docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangeserver.md
rename to docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangeserverews.md
index 672ebb45df..7b76a148d7 100644
--- a/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangeserver.md
+++ b/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangeserverews.md
@@ -1,45 +1,42 @@
---
-title: "Exchange Server"
-description: "Exchange Server"
+title: "Exchange Server (EWS)"
+description: "Exchange Server (EWS)"
sidebar_position: 40
---
-# Exchange Server
+# Exchange Server (EWS)
-Use the Exchange Server source configuration screen to enable the crawling and classification
-of multiple Exchange mailboxes from the same Exchange server.
+Use the Exchange Server (EWS) source configuration screen to crawl and classify
+multiple Exchange mailboxes from the same Exchange server, using the Exchange Web Services (EWS).
-**IMPORTANT** Automatic detection, crawling, and classification of multiple Exchange mailboxes from
-the same Exchange server (and, respectively, _Exchange Server_ content source configuration) is only
-supported for Exchange Server 2013 or later due to limitations in the Microsoft APIs. For earlier
-versions, consider using _Exchange Mailbox_ content source.
+:::note
+Automatic detection, crawling, and classification of multiple Exchange mailboxes from
+the same Exchange server—and therefore the _Exchange Server (EWS)_ content source—works
+only with Exchange Server 2013 or later, due to limitations in the Microsoft APIs. For earlier
+versions, consider using the _Exchange Mailbox (EWS)_ content source.
+:::
-You can use Match Rules to include and exclude the certain mailboxes.
+You can use Match Rules to include or exclude specific mailboxes.
-To configure an Exchange Server source, follow these steps.
+To configure an Exchange Server (EWS) source, follow these steps.
**Step 1 –** In Netwrix Data Classification management console, open the **Sources** view and click
**Add**.
-**Step 2 –** Select **Exchange** source type and in the properties window specify the necessary
+**Step 2 –** Select the **Exchange Server (EWS)** source type and in the properties window specify the necessary
settings.
-**Step 3 –** To display all settings, click the "wrench" icon next to **Settings**.
+**Step 3 –** To display all settings, click the "wrench" icon next to Settings in the bottom-left corner.
## Authentication type: Modern authentication
-:::note
-For Email Address / Password, the Administrator account that has been assigned the right
-of the Discovery Management role and be given the Mailbox Search and MailboxSearchApplication
-permissions.
-:::
If you plan to use this authentication type, specify the following:
| Option | Description |
| ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| Authentication type | Select **Modern (Exchange Online)** |
+| Authentication type | Select **Modern (O365)** |
| Admin Username | Specify the administrative account for the required Exchange Online organization. The user must have a mailbox connected to it to crawl Exchange. |
| Tenant ID | Enter the **Tenant ID** you obtained at [Step 5: Obtain Tenant ID](/docs/dataclassification/5.7/introduction/introduction/exchange/azureappexchangeonlinemfa.md#step-5-obtain-tenant-id). |
| Certificate thumbprint | Enter the certificate thumbprint you prepared at [Step 4: Configure Certificates & secrets](/docs/dataclassification/5.7/introduction/introduction/exchange/azureappexchangeonlinemfa.md). |
@@ -49,11 +46,16 @@ If you plan to use this authentication type, specify the following:
## Authentication type: Basic
-If you plan to use this authentication type, you will need to specify the following:
+:::note
+For Email Address / Password, use an Administrator account that has the Discovery Management
+role and the Mailbox Search and MailboxSearchApplication permissions.
+:::
+
+To use this authentication type, specify the following:
| Option | Description |
| ------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Email Address / Password | Administrator account that has been assigned the right of Impersonation as well as the Discovery Management role. See [Configure Microsoft Exchange for Crawling and Classification](/docs/dataclassification/5.7/introduction/introduction/exchange/exchange.md) for details on the rights assignment. |
+| Email Address / Password | Administrator account with the Impersonation right and the Discovery Management role. See [Configure Microsoft Exchange for Crawling and Classification](/docs/dataclassification/5.7/introduction/introduction/exchange/exchange.md) for details on the rights assignment. |
## Other configuration settings
@@ -61,10 +63,10 @@ The following settings are also required in both cases:
| Option | Description |
| ---------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Exchange API URL | By default, the crawling engine will attempt to locate the necessary URL of Exchange Web Services API by using the _Exchange AutoDiscover_ functionality. So, typically, you can leave this field blank. If, however, the _Exchange AutoDiscover_ isn't available, then you should specify the Exchange API URL explicitly as follows: `https:///EWS/Exchange.asmx`. |
-| Crawl Range | Define what portions of data should be retrieved from the Exchange server: - Select **Date Range** to crawl a static set of data within the required interval.
- Select **Since** if you want to periodically re-crawl content from the specified date, taking into account the last crawl date for each artifact.
|
-| Match Rules | Define which mailboxes will be crawled as part of an Exchange Server source. Examples: 1. `.*@netwrix.com`— enter the wildcard (\*) and the domain (here `netwrix.com`) to restrict crawling to a set of domain mailboxes 2. `.*`—enter if you want all mailboxes to be crawled |
-| Detection Period | Specify how often the source should be checked for changes. Default period is 1 day. |
+| Exchange API URL | By default, the crawling engine uses the _Exchange AutoDiscover_ functionality to locate the Exchange Web Services API URL, so you can typically leave this field blank. If _Exchange AutoDiscover_ isn't available, specify the Exchange API URL explicitly: `https:///EWS/Exchange.asmx`. |
+| Crawl Range | Define which portions of data to retrieve from the Exchange server: - Select **Date Range** to crawl a static set of data within the required interval.
- Select **Since** if you want to periodically re-crawl content from the specified date, taking into account the last crawl date for each artifact.
|
+| Match Rules | Define which mailboxes to crawl as part of an Exchange Server source. Examples: 1. `.*@netwrix.com`— enter the wildcard (\*) and the domain (here `netwrix.com`) to restrict crawling to a set of domain mailboxes 2. `.*`—enter to crawl all mailboxes |
+| Detection Period | Specify how often to check the source for changes. Default period is 1 day. |
-Having specified all the necessary settings, click the **Save** button.
+After specifying all the necessary settings, click **Save**.
diff --git a/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangeservergraph.md b/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangeservergraph.md
new file mode 100644
index 0000000000..4531e2c1a7
--- /dev/null
+++ b/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangeservergraph.md
@@ -0,0 +1,49 @@
+---
+title: "Exchange Server (Graph)"
+description: "Exchange Server (Graph)"
+sidebar_position: 45
+---
+
+# Exchange Server (Graph)
+
+Use the Exchange Server (Graph) source configuration screen to crawl and classify
+multiple Exchange mailboxes in the same tenant. The Graph source type connects only to Exchange Online. To crawl mailboxes on an on-premises Exchange server, use Exchange Server (EWS).
+
+You can use Match Rules to include or exclude specific mailboxes.
+
+To configure an Exchange Server (Graph) source, follow these steps.
+
+**Step 1 –** In Netwrix Data Classification management console, open the **Sources** view and click
+**Add**.
+
+**Step 2 –** Select **Exchange Server (Graph)** source type and in the properties window specify the necessary
+settings.
+
+**Step 3 –** To display all settings, click the "wrench" icon next to Settings in the bottom-left corner.
+
+## Authentication
+
+You must specify the following:
+
+| Option | Description |
+| ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| Admin Username | Specify the administrative account for the required Exchange Online organization. The user must have a mailbox connected to it to crawl Exchange. |
+| Tenant ID | Enter the **Tenant ID** you obtained at [Step 5: Obtain Tenant ID](/docs/dataclassification/5.7/introduction/introduction/exchange/azureappexchangeonlinemfa.md#step-5-obtain-tenant-id). |
+| Certificate thumbprint | Enter the certificate thumbprint you prepared at [Step 4: Configure Certificates & secrets](/docs/dataclassification/5.7/introduction/introduction/exchange/azureappexchangeonlinemfa.md). |
+| Application ID | Enter the app ID you got at application registration at [Step 2: Create and Register a new app in Azure AD](/docs/dataclassification/5.7/introduction/introduction/exchange/azureappexchangeonlinemfa.md#step-2-create-and-register-a-new-app-in-azure-ad) (you can find it in the Azure AD app properties >**Overview**). |
+
+
+
+## Other configuration settings
+
+Specify the following settings:
+
+| Option | Description |
+| ---------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Cloud Environment | Select the Azure instance hosting the Exchange Online tenancy. |
+| Crawl Range | Define which portions of data to retrieve from Exchange Online: - Select **Date Range** to crawl a static set of data within the required interval.
- Select **Since** if you want to periodically re-crawl content from the specified date, taking into account the last crawl date for each artifact.
|
+| Match Rules | Define rules with wildcards to limit which mailboxes the product crawls. Examples: 1. `.*@netwrix.com`— enter the wildcard (\*) and the domain (here `netwrix.com`) to restrict crawling to a set of domain mailboxes 2. `.*`—enter to crawl all mailboxes. You must define at least one match rule. |
+| Detection Period | Specify how often to check the source for changes. Default period is 1 day. |
+
+
+After specifying all the necessary settings, click **Save**.
diff --git a/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/sharepointonline.md b/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/sharepointonline.md
index c6a746c0fc..3748bef373 100644
--- a/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/sharepointonline.md
+++ b/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/sharepointonline.md
@@ -6,14 +6,14 @@ sidebar_position: 100
# SharePoint Online
-Office 365 customers can configure the collector service to automatically detect and queue their
-employees SharePoint Online sites hosted in Office 365. An account with Tenant administration rights
-must be supplied, and the frequency of the detection of new SharePoint Online sites must be set. It
-is also possible to provide a filter expression to ensure that certain SharePoint Online paths are
-included and others excluded as required.
-
-Optionally, you can set up the resources necessary to ensure Netwrix Data
-Classification is enabled and configured on the detected SharePoint Online sites. Templating allows
+If you are an Office 365 customer, you can configure the collector service to automatically detect and queue your
+employees' SharePoint Online sites hosted in Office 365. You must supply an account with Tenant
+administration rights and set how often the service detects new SharePoint Online sites. You can
+also provide a filter expression to include certain SharePoint Online paths and exclude others as
+required.
+
+Optionally, you can set up the resources needed to enable and configure Netwrix Data
+Classification on the detected SharePoint Online sites. Templating allows
an administrator to preconfigure classification settings for site collections. For more
information, review the associated templating guide.
@@ -27,11 +27,12 @@ Complete the following fields:
| Option | Description |
| ----------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| SharePoint URL | The root of the site collections to be added, by clicking the “(Multiple Urls)” link you can add multiple SharePoint Online Site Collections to be crawled against the same credentials. |
+| SharePoint URL | The root of the site collections to add. Click the “(Multiple Urls)” link to add multiple SharePoint Online Site Collections that use the same credentials for crawling. |
+| Cloud Environment | Select the Azure instance that hosts your SharePoint Online tenant. |
| Username | Enter username in the following formats: DOMAIN\USERNAME and USERNAME@DOMAIN. |
| Password | Enter your password for SharePoint Online. |
-| Match Rules | Enter the site collections' path for crawling the documents. At least one match rule must be included. Match rules are regular expressions, for example, https:\/\/example.sharepoint.com\/sites\/. |
+| Match Rules | Enter the site collections' path for crawling the documents. You must include at least one match rule. Match rules are regular expressions, for example, https:\/\/example.sharepoint.com\/sites\/. |
| Classification template | Specify the required Classification template for writing classifications. See the [Enable Write Classifications](/docs/dataclassification/5.7/contentconfigurationoverview/taxonomies/enablewriteclassifications.md) and [Working with SharePoint templates](/docs/dataclassification/5.7/contentconfigurationoverview/introduction/manage/introduction/workwithtemplates.md) topics for more information. |
-| Detection Period | Specify how often you will detect new site collections. Default period is 1 day. |
+| Detection Period | Specify how often to detect new site collections. Default period is 1 day. |
After configuring the settings, click the **Save** button.
diff --git a/docs/dataclassification/5.7/introduction/introduction/exchange/exchange.md b/docs/dataclassification/5.7/introduction/introduction/exchange/exchange.md
index 879a987ab8..2573ab1127 100644
--- a/docs/dataclassification/5.7/introduction/introduction/exchange/exchange.md
+++ b/docs/dataclassification/5.7/introduction/introduction/exchange/exchange.md
@@ -9,24 +9,20 @@ sidebar_position: 30
When preparing your Exchange Server for data classification:
:::note
-On-premise Exchange servers support Basic authentication for crawling accounts, while Exchange Online supports either Modern or Basic authentication. The following sections describe both scenarios.
+On-premise Exchange servers support Basic authentication for crawling accounts, while Exchange Online requires Modern authentication. The following sections describe both scenarios.
:::
## Basic Authentication
-This method is supported for Exchange Online and on-premise Exchange organizations. You should
-configure sufficient permissions that will allow the crawling account to impersonate the mailboxes
-that you want to crawl. This requires the setup of two permissions:
+On-premise Exchange servers support this method. Configure sufficient permissions that allow the
+crawling account to impersonate the mailboxes that you want to crawl. This requires two
+permissions:
- ApplicationImpersonation—Allows the crawling account to impersonate each of the mailboxes / users
configured for collection
- Mailbox Search—Allows the crawling account to enumerate mailboxes (automatic discovery of
mailboxes)
-Review the related procedure that corresponds to your Exchange deployment:
-
-- Exchange Online
-- Exchange Server (On-Premise)
### Exchange Online
@@ -40,7 +36,7 @@ Review the related procedure that corresponds to your Exchange deployment:
**Step 4 –** In the Set up basics step, enter the Name and Description
'_NetwrixCrawlerImpersonation_'. Click **Next**.
-**Step 5 –** On the **Add Permission** step, select ApplicationImpersonation and Mailbox Search
+**Step 5 –** On the **Add Permission** step, select the Microsoft.Graph Mail.Read, Mail.ReadWrite, and User.Read.All
permissions. Click **Next**.
**Step 6 –** Select the users to assign to this role group. They will have permissions to manage the
@@ -66,8 +62,8 @@ this Role as well.
ADMINUSERNAME
:::note
-If crawling Microsoft Office 365 for Small Business or many hosted Exchange systems, then
-it isn't possible to set up Application Impersonation.
+If you crawl Microsoft Office 365 for Small Business or many hosted Exchange systems, you can't
+set up Application Impersonation.
:::
@@ -75,24 +71,30 @@ it isn't possible to set up Application Impersonation.
Starting with version 5.5.3, Netwrix Data Classification allows for crawling Microsoft Exchange
Online organization mailboxes using Modern authentication. For that, it uses an Azure AD application
-which can use Microsoft API to connect to Exchange Online organization.
+that connects to the Exchange Online organization through the Microsoft API.
:::note
-To access via Modern Authentication, you need to use an admin username.
+To access Exchange using Modern Authentication, you need to use an admin username.
:::
+Configure sufficient permissions that allow the crawling account to access and read the
+mailboxes that you want to crawl. The permissions required differ between the EWS and Graph implementations.
+
+To use the Graph implementation, you must grant the following permissions:
+
+- Mail.Read-Allows the application to read the full contents of all mailboxes
+- Mail.ReadWrite—Allows the application to move and delete mail in all mailboxes - necessary for the Exchange workflow actions
+- User.Read.All—Allows the application to discover all users associated with an Exchange Online server
-You should configure sufficient permissions that will allow the crawling account to impersonate the
-mailboxes that you want to crawl. This requires the setup of two permissions:
+To use the EWS implementation, you must grant the following permissions:
- ApplicationImpersonation—Allows the crawling account to impersonate each of the mailboxes / users
configured for collection
- Mailbox Search—Allows the crawling account to enumerate mailboxes (automatic discovery of
mailboxes)
-If you plan to implement the scenario that involves modern authentication, you should do the
-following:
+If you plan to use modern authentication, do the following:
1. [Create Azure AD app for Modern Authentication](/docs/dataclassification/5.7/introduction/introduction/exchange/azureappexchangeonlinemfa.md)
-2. Configure [Exchange Server](/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangeserver.md) source
- settings.
+2. Configure [Exchange Server (Graph)](/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangeservergraph.md)
+ or [Exchange Server (EWS)](/docs/dataclassification/5.7/contentconfigurationoverview/introduction/addsource/exchangeserverews.md) source settings.
diff --git a/docs/dataclassification/5.7/introduction/upgrade.md b/docs/dataclassification/5.7/introduction/upgrade.md
index 41f3381356..c848e8a7e1 100644
--- a/docs/dataclassification/5.7/introduction/upgrade.md
+++ b/docs/dataclassification/5.7/introduction/upgrade.md
@@ -24,44 +24,50 @@ Classification resides. If not, download it from Microsoft website:
- In the Object Explorer, right-click the database and select **Tasks** > **Back Up**.
- Wait for the process to complete.
-**Step 3 –** Back up the Index files. Netwrix recommends the following:
+**Step 3 –** Stop all NDC services. Netwrix recommends the following:
- On the computer where Netwrix Data Classification is installed, start the Netwrix Data
Classification Service Viewer tool. Select **Stop** next to each service.
-- Locate the folder containing index files (the default location is _C:\Program
+- If you upgrade a Distributed Query Server (DQS) environment, stop all services on all instances before upgrading any instance.
+
+:::warning
+If any services are running while the upgrade occurs, database schema updates may fail to apply correctly. If this occurs, Netwrix recommends contacting Netwrix Support for assistance with remediation.
+:::
+
+**Step 4 –** Back up the Index files. Locate the folder containing the index files (the default location is _C:\Program
Files\Netwrix\Data Classification\Index_) and back it up.
:::note
-For versions of 5.7 before 5.7.10, all NDC services and the NDC IIS Application Pool had to run as the same service account. For 5.7.10 onwards this is no longer necessary, but if upgrading from an earlier version of 5.7, complete the upgrade to 5.7.10 _before_ changing the service account to prevent any possible issues with the upgrade process.
+For versions of 5.7 before 5.7.10, all NDC services and the NDC IIS Application Pool had to run as the same service account. For 5.7.10 onwards this is no longer necessary, but if you upgrade from an earlier version of 5.7, complete the upgrade to 5.7.10 _before_ changing the service account to avoid upgrade issues.
:::
## Upgrade Process
You can upgrade directly to Netwrix Data Classification 5.7 only from versions 5.5 and newer.
-To upgrade your deployment, after taking the preceding preparatory steps, run the product
-setup and follow the wizard steps. When finished, all solution components will be running.
+After taking the preceding preparatory steps, run the product setup and follow the wizard
+steps. When the upgrade finishes, all solution components are running.
-If you need to upgrade from an earlier version, you will need to perform a staged upgrade: first upgrade
-to version 5.5, then perform a second upgrade to version 5.7.
+To upgrade from an earlier version, perform a staged upgrade: first upgrade to version 5.5, then
+upgrade to version 5.7.
## Upgrading a DQS Environment
-When upgrading an NDC environment which uses the **Distributed Query Server** (DQS) functionality to 5.7.10 or later,
-the primary server must be upgraded before upgrading the secondary instances. Secondary instances will
-attempt to resynchronize with the primary instance during the upgrade process, which will fail if the primary
-instance has not been upgraded.
+When upgrading to 5.7.10 or later in an NDC environment that uses the **Distributed Query Server** (DQS) functionality,
+upgrade the primary server before the secondary instances. Secondary instances
+attempt to resynchronize with the primary instance during the upgrade process, and this resynchronization
+fails if you haven't upgraded the primary instance.
When upgrading to 5.7.10 or later from an earlier version of 5.7, you should
run the installer as the NDC service account if possible so that the installer can synchronize the DQS instances automatically.
-If this isn't done, you will need to perform a DQS resynchronization when upgrading each secondary DQS instance. For further details on this process,
+If you don't, you must resynchronize DQS when upgrading each secondary DQS instance. For further details on this process,
see the [Configuring NDC Servers Cluster and Load Balancing with DQS Mode](/docs/dataclassification/5.7/introduction/deployment/ndcserverandclient/dqsmode.md) page.
## After the Upgrade
During the upgrade from previous versions, Netwrix Data Classification preserves its
configuration, so you can classify your data right after finishing the upgrade. However,
-there are several steps you may need to take after upgrading.
+you may need to take several steps after upgrading.
To update taxonomies manually: