Skip to content

Commit 479bc14

Browse files
alexbuckgitalexbuckgit
authored
Revert "[BULK] - DocuTune - Rebranding of Azure Active Directory to Microsoft Entra (part 7)"
1 parent 26c2f29 commit 479bc14

50 files changed

Lines changed: 320 additions & 356 deletions

File tree

Some content is hidden

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

‎docs/azure-data-studio/azure-connectivity.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.topic: "overview"
1010
---
1111
# Azure Data Studio - Azure connectivity
1212

13-
Azure Data Studio uses the Microsoft Authentication Library (MSAL) by default to acquire an access token from Microsoft Entra ID. The settings that apply to Azure authentication are discussed, along with commonly observed issues and their solutions.
13+
Azure Data Studio uses the Microsoft Authentication Library (MSAL) by default to acquire an access token from Azure Active Directory. The settings that apply to Azure authentication are discussed, along with commonly observed issues and their solutions.
1414

1515
## Azure: Authentication library
1616

@@ -64,7 +64,7 @@ When both options are checked, users are prompted to select one of the two authe
6464

6565
## Azure account configuration
6666

67-
Azure Data Studio supports Microsoft Entra authentication with National clouds. **Azure Public Cloud** is enabled by default, but users can enable other national clouds as needed:
67+
Azure Data Studio supports Azure Active Directory (Azure AD) authentication with National clouds. **Azure Public Cloud** is enabled by default, but users can enable other national clouds as needed:
6868

6969
`Settings.json`
7070

@@ -197,7 +197,7 @@ Azure Data Studio's default behavior includes validating system's root CA certif
197197
"http.systemCertificates": true
198198
```
199199

200-
If a system's Root CA certificate is expired, authentication requests to Microsoft Entra ID will fail and an error like below would be captured in 'Azure Account' logs:
200+
If a system's Root CA certificate is expired, authentication requests to Azure Active Directory will fail and an error like below would be captured in 'Azure Account' logs:
201201

202202
`error: certificate is expired`
203203

@@ -249,7 +249,7 @@ This setting disables system keychain integration to prevent repeated keychain a
249249

250250
## Clear Azure account token cache
251251

252-
Azure Data Studio maintains a cache of access tokens to prevent the throttling of token requests to Microsoft Entra ID. It's possible that Azure Data Studio's token cache may be outdated, which requires cleaning up expired access tokens from the application cache.
252+
Azure Data Studio maintains a cache of access tokens to prevent the throttling of token requests to Azure Active Directory (Azure AD). It's possible that Azure Data Studio's token cache may be outdated, which requires cleaning up expired access tokens from the application cache.
253253

254254
Execute this command from **Command Palette (Ctrl/CMD + Shift + P)** to clear access tokens for linked Azure accounts:
255255

@@ -259,4 +259,4 @@ Execute this command from **Command Palette (Ctrl/CMD + Shift + P)** to clear ac
259259

260260
Execute this command from **Command Palette (Ctrl/CMD + Shift + P)** to remove all linked Azure accounts from Azure Data Studio:
261261

262-
**Clear all saved accounts (clearSavedAccounts)**
262+
**Clear all saved accounts (clearSavedAccounts)**

‎docs/azure-data-studio/connect.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ After a user upgrades to Azure Data Studio 1.44 and higher, the initial launch o
2222
--change this below
2323
:::image type="content" source="connect/connect-update-after-upgrade-no-tenant.png" alt-text="Screenshot of message about tenant list box removal after upgrading Azure Data Studio.":::
2424

25-
With the Sql Authentication Provider, selection of a tenant is no longer required. The Microsoft Entra tenant list box has been removed from the Connection dialog because it's now handled by the underlying driver. This change also allows for improved token refresh for Azure SQL Database connections.
25+
With the Sql Authentication Provider, selection of a tenant is no longer required. The Azure AD tenant list box has been removed from the Connection dialog because it's now handled by the underlying driver. This change also allows for improved token refresh for Azure SQL Database connections.
2626

2727
The **Mssql: Enable Sql Authentication Provider** option can be disabled within **File** > **Preferences** > **Settings**.
2828

‎docs/azure-data-studio/extensions/azure-monitor-logs-extension.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ To set up an Azure Monitor Log workspace, follow the steps below.
5555
2. Fill in the **Connection Details** information.
5656
1. For **Connection type**, select *Azure Monitor Logs*.
5757
2. For **Workspace ID**, enter in your Log Analytics Workspace ID.
58-
3. For **Authentication type**, use the default - *Microsoft Entra ID - Universal with MFA account*.
58+
3. For **Authentication type**, use the default - *Azure Active Directory - Universal with MFA account*.
5959
4. For **Account**, use your account information.
6060
5. For **Database**, select the same Workspace ID.
6161
6. For **Server group**, use *Default*.

‎docs/azure-data-studio/extensions/kusto-extension.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ To set up an Azure Data Explorer cluster to connect to, follow the steps below.
6363
2. Fill in the **Connection Details** information.
6464
1. For **Connection type**, select *Kusto*.
6565
2. For **Cluster**, enter in your Azure Data Explorer cluster address (for example, `https://mydataexplorercluster.kusto.windows.net`).
66-
3. For **Authentication Type**, use the default - *Microsoft Entra ID - Universal with MFA account*.
66+
3. For **Authentication Type**, use the default - *Azure Active Directory - Universal with MFA account*.
6767
4. For **Account**, use your account information.
6868
5. For **Database**, use *Default*. If your account does not have access to the *Default* database, you can use any database that you have access to.
6969
6. For **Server Group**, use *Default*.

‎docs/azure-data-studio/extensions/mysql-extension.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ With the MySQL extension for Azure Data Studio, you can now connect to, query an
1616
The Azure Data Studio functionality available for MySQL includes:
1717

1818
- Connection manager, allowing you to connect to any MySQL server hosted on-premises, on virtual machines, on managed MySQL in other clouds, and on Azure Database for MySQL – Flexible Server.
19-
- Option to choose your preferred authentication method (MySQL native authentication and Microsoft Entra authentication)
19+
- Option to choose your preferred authentication method (MySQL native authentication and Azure Active Directory authentication)
2020
- Searchable object explorer view for database objects, with auto-completion
2121
- Query authoring and editing with Intellisense, syntax highlighting and code snippets
2222
- Ability to query results and save to csv, JSON, xml, or Excel

‎docs/azure-data-studio/quickstart-azure-cosmos-db-mongodb.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ To complete this quickstart, you need Azure Data Studio and an Azure Cosmos DB A
4141
| --- | --- | --- |
4242
| **Connection type** | *Mongo account* | Set this value to *Mongo account* to use with Azure Cosmos DB API for MongoDB. |
4343
| **Mongo account** | *\[cosmos-account-name\]* | Name of Azure Cosmos DB account. |
44-
| **Authentication type** | *Microsoft Entra ID - Universal with MFA support* | Choose between *Microsoft Entra ID* or *Basic* authentication options. |
45-
| **Account** | *\[current-aad-user-name\]* | Only visible if using *Microsoft Entra ID* authentication. Select the Microsoft Entra account that you wish to use for authentication. |
44+
| **Authentication type** | *Azure Active Directory - Universal with MFA support* | Choose between *Azure Active Directory* or *Basic* authentication options. |
45+
| **Account** | *\[current-aad-user-name\]* | Only visible if using *Azure Active Directory* authentication. Select the Azure AD account that you wish to use for authentication. |
4646
| **Username** | | Only visible if using *Basic* authentication. Enter the username for authentication. |
4747
| **Connection String** | | Only visible if using *Basic* authentication. Enter the connection string for authentication. |
4848
| **Server group** | *\<Default\>* | |
@@ -53,7 +53,7 @@ To complete this quickstart, you need Azure Data Studio and an Azure Cosmos DB A
5353
1. Select **Connect**.
5454

5555
> [!IMPORTANT]
56-
> If you selected *Microsoft Entra ID* authentication, you may be prompted to select a MongoDB connection string value to use for your connection.
56+
> If you selected *Azure Active Directory* authentication, you may be prompted to select a MongoDB connection string value to use for your connection.
5757
5858
Your server will open in the **SERVERS** sidebar after you've successfully connected.
5959

@@ -152,4 +152,4 @@ In this quickstart, you've learned how to create an API for MongoDB account, cre
152152
- Interested in importing MongoDB data into Azure Cosmos DB? See [Migrate MongoDB to Azure Cosmos DB's API for MongoDB](/azure/cosmos-db/mongodb/tutorial-mongotools-cosmos-db)
153153
- Trying to do capacity planning for a migration to Azure Cosmos DB? You can use information about your existing database cluster for capacity planning.
154154
- If all you know is the number of vCores and servers in your existing database cluster, read about [estimating request units using vCores or vCPUs](/azure/cosmos-db/convert-vcore-to-request-unit)
155-
- If you know typical request rates for your current database workload, read about [estimating request units using Azure Cosmos DB capacity planner](/azure/cosmos-db/sql/estimate-ru-with-capacity-planner)
155+
- If you know typical request rates for your current database workload, read about [estimating request units using Azure Cosmos DB capacity planner](/azure/cosmos-db/sql/estimate-ru-with-capacity-planner)

‎docs/azure-data-studio/quickstart-mysql.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ To complete this quickstart, you need Azure Data Studio, the MySQL extension for
3939
| Setting | Example value | Description |
4040
| ------------ | ------------------ | ------------------------------------------------- |
4141
| **Server name** | localhost / exampleserver.mysql.database.azure.con | The fully qualified server name. |
42-
| **Authentication type** | Password | The authentication method for accessing your MySQL server. This option lets you choose between MySQL native authentication (Password) and Microsoft Entra authentication.|
42+
| **Authentication type** | Password | The authentication method for accessing your MySQL server. This option lets you choose between MySQL native authentication (Password) and Azure Active Directory authentication.|
4343
| **User name** | exampleuser | The user name you want to sign in with. |
4444
| **Password** | *password* | The password for the account you're logging in with. |
4545
| **Remember Password** | *Check* | Check this box if you don't want to enter the password each time you connect. |

‎docs/azure-data-studio/quickstart-sql-database.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Use Azure Data Studio to establish a connection to your Azure SQL Database serve
3636

3737
![Screenshot showing the Welcome Azure Data Studio dialog box with the Next connection option called out.](media/quickstart-sql-database/new-connection-icon.png)
3838

39-
2. This article uses SQL sign-in, but for Azure SQL Database, Microsoft Entra Universal MFA authentication is also supported. Fill in the following fields using the server name, user name, and password for your Azure SQL server:
39+
2. This article uses SQL sign-in, but for Azure SQL Database, Azure AD Universal MFA authentication is also supported. Fill in the following fields using the server name, user name, and password for your Azure SQL server:
4040

4141
| Setting | Suggested value | Description |
4242
| ------------ | ------------------ | ------------------------------------------------- |

‎docs/azure-data-studio/settings-list.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ Determines the default authentication type to use when connecting to Azure resou
120120
The **Sql: Default Authentication Type** setting (`sql.defaultAuthenticationType` entry in `settings.json`) can have the values:
121121

122122
- `SqlLogin` Uses SQL authentication.
123-
- `AzureMFA` Uses Microsoft Entra ID - Universal with MFA Support authentication.
124-
- `AzureMFAandUser` Uses Microsoft Entra ID - Password authentication.
123+
- `AzureMFA` Uses Azure Active Directory - Universal with MFA Support authentication.
124+
- `AzureMFAandUser` Uses Azure Active Directory - Password authentication.
125125
- `Integrated` Uses Windows authentication.
126126

127127
## Window: Restore Windows

‎docs/big-data-cluster/big-data-cluster-faq.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ sections:
196196
Please refer to the licensing guide which goes into much more detail, [download the PDF](https://aka.ms/sql-bdc-licensing).<BR>For a summary, watch the video [SQL Server Licensing: Big Data Clusters | Data Exposed](https://channel9.msdn.com/Shows/Data-Exposed/SQL-Server-Licensing-Big-Data-Clusters--Data-Exposed).
197197
- name: Security
198198
questions:
199-
- question: Does Big Data Cluster support Microsoft Entra ID?
199+
- question: Does Big Data Cluster support Azure Active Directory?
200200
answer: |
201201
Not at this time.
202202
- question: Can we connect to Big Data Cluster master using integrated authentication?
@@ -254,4 +254,4 @@ sections:
254254
(PDF)[Case Study: SQL Workloads running on Apache Spark in MS SQL Server 2019 Big Data Cluster](https://aka.ms/sql-bdc-spark-perf)<BR>
255255
additionalContent: |
256256
## See also
257-
- [SQL Server Big Data Clusters](big-data-cluster-overview.md)
257+
- [SQL Server Big Data Clusters](big-data-cluster-overview.md)

0 commit comments

Comments
 (0)