Skip to content

Commit ccb3cdf

Browse files
duongauduongau
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into afdrouting
2 parents 5d8a478 + 715be5e commit ccb3cdf

File tree

12 files changed

+123
-170
lines changed

12 files changed

+123
-170
lines changed

‎articles/azure-arc/kubernetes/tutorial-use-gitops-connected-cluster.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
---
22
title: 'Tutorial: Deploy configurations using GitOps on an Azure Arc-enabled Kubernetes cluster'
33
description: This tutorial demonstrates applying configurations on an Azure Arc-enabled Kubernetes cluster. For a conceptual take on this process, see the Configurations and GitOps - Azure Arc-enabled Kubernetes article.
4-
author: csand-msft
5-
ms.author: csand
64
ms.service: azure-arc
75
ms.topic: tutorial
86
ms.date: 05/24/2022

‎articles/cognitive-services/language-service/personally-identifiable-information/includes/identification-entities.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ This category contains the following entity:
114114

115115
IBAN codes for payment instruction information. Also returned with `domain=phi`.
116116

117-
To get this entity category, add `InternationalBankingAccountNumber` to the `piiCategories` parameter. `InternationlBankingAccountNumber` will be returned in the API response if detected.
117+
To get this entity category, add `InternationalBankingAccountNumber` to the `piiCategories` parameter. `InternationalBankingAccountNumber` will be returned in the API response if detected.
118118
119119
:::column-end:::
120120
:::column span="2":::

‎articles/cosmos-db/nosql/includes/clean-up-resources.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,29 @@ services: cosmos-db
55
author: seesharprun
66
ms.service: cosmos-db
77
ms.topic: include
8-
ms.date: 09/22/2022
8+
ms.date: 11/07/2022
99
ms.author: sidandrews
1010
ms.reviewer: mjbrown
1111
ms.custom: include file, ignite-2022
1212
---
1313

14-
When you no longer need the Azure Cosmos DB SQL API account, you can delete the corresponding resource group.
14+
When you no longer need the API for NoSQL account, you can delete the corresponding resource group.
1515

16-
### [Azure CLI / Resource Manager template](#tab/azure-cli+azure-resource-manager)
16+
### [Portal](#tab/azure-portal)
17+
18+
1. Navigate to the resource group you previously created in the Azure portal.
19+
20+
> [!TIP]
21+
> In this quickstart, we recommended the name ``msdocs-cosmos-quickstart-rg``.
22+
1. Select **Delete resource group**.
23+
24+
:::image type="content" source="../media/delete-account-portal/delete-resource-group-option.png" lightbox="../media/delete-account-portal/delete-resource-group-option.png" alt-text="Screenshot of the Delete resource group option in the navigation bar for a resource group.":::
25+
26+
1. On the **Are you sure you want to delete** dialog, enter the name of the resource group, and then select **Delete**.
27+
28+
:::image type="content" source="../media/delete-account-portal/delete-confirmation.png" lightbox="../media/delete-account-portal/delete-confirmation.png" alt-text="Screenshot of the delete confirmation page for a resource group.":::
29+
30+
### [Azure CLI](#tab/azure-cli)
1731

1832
Use the [``az group delete``](/cli/azure/group#az-group-delete) command to delete the resource group.
1933

@@ -32,18 +46,4 @@ $parameters = @{
3246
Remove-AzResourceGroup @parameters
3347
```
3448

35-
### [Portal](#tab/azure-portal)
36-
37-
1. Navigate to the resource group you previously created in the Azure portal.
38-
39-
> [!TIP]
40-
> In this quickstart, we recommended the name ``msdocs-cosmos-quickstart-rg``.
41-
1. Select **Delete resource group**.
42-
43-
:::image type="content" source="../media/delete-account-portal/delete-resource-group-option.png" lightbox="../media/delete-account-portal/delete-resource-group-option.png" alt-text="Screenshot of the Delete resource group option in the navigation bar for a resource group.":::
44-
45-
1. On the **Are you sure you want to delete** dialog, enter the name of the resource group, and then select **Delete**.
46-
47-
:::image type="content" source="../media/delete-account-portal/delete-confirmation.png" lightbox="../media/delete-account-portal/delete-confirmation.png" alt-text="Screenshot of the delete confirmation page for a resource group.":::
48-
4949
---

‎articles/cosmos-db/nosql/includes/create-resources.md

Lines changed: 62 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,60 @@ services: cosmos-db
55
author: seesharprun
66
ms.service: cosmos-db
77
ms.topic: include
8-
ms.date: 09/22/2022
8+
ms.date: 11/07/2022
99
ms.author: sidandrews
1010
ms.reviewer: mjbrown
1111
ms.custom: include file, ignite-2022
1212
---
1313

14-
This quickstart will create a single Azure Cosmos DB account using the SQL API.
14+
This quickstart will create a single Azure Cosmos DB account using the API for NoSQL.
15+
16+
#### [Portal](#tab/azure-portal)
17+
18+
> [!TIP]
19+
> For this quickstart, we recommend using the resource group name ``msdocs-cosmos-quickstart-rg``.
20+
21+
1. Sign in to the [Azure portal](https://portal.azure.com).
22+
23+
1. From the Azure portal menu or the **Home page**, select **Create a resource**.
24+
25+
1. On the **New** page, search for and select **Azure Cosmos DB**.
26+
27+
1. On the **Select API option** page, select the **Create** option within the **NoSQL** section. Azure Cosmos DB has six APIs: NoSQL, MongoDB, PostgreSQL, Apache Cassandra, Apache Gremlin, and Table. [Learn more about the API for NoSQL](../index.yml).
28+
29+
:::image type="content" source="../media/create-account-portal/cosmos-api-choices.png" lightbox="../media/create-account-portal/cosmos-api-choices.png" alt-text="Screenshot of select API option page for Azure Cosmos DB.":::
30+
31+
1. On the **Create Azure Cosmos DB Account** page, enter the following information:
32+
33+
| Setting | Value | Description |
34+
| --- | --- | --- |
35+
| Subscription | Subscription name | Select the Azure subscription that you wish to use for this Azure Cosmos account. |
36+
| Resource Group | Resource group name | Select a resource group, or select **Create new**, then enter a unique name for the new resource group. |
37+
| Account Name | A unique name | Enter a name to identify your Azure Cosmos account. The name will be used as part of a fully qualified domain name (FQDN) with a suffix of *documents.azure.com*, so the name must be globally unique. The name can only contain lowercase letters, numbers, and the hyphen (-) character. The name must also be between 3-44 characters in length. |
38+
| Location | The region closest to your users | Select a geographic location to host your Azure Cosmos DB account. Use the location that is closest to your users to give them the fastest access to the data. |
39+
| Capacity mode |Provisioned throughput or Serverless|Select **Provisioned throughput** to create an account in [provisioned throughput](../../set-throughput.md) mode. Select **Serverless** to create an account in [serverless](../../serverless.md) mode. |
40+
| Apply Azure Cosmos DB free tier discount | **Apply** or **Do not apply** | Enable Azure Cosmos DB free tier. With Azure Cosmos DB free tier, you'll get the first 1000 RU/s and 25 GB of storage for free in an account. Learn more about [free tier](https://azure.microsoft.com/pricing/details/cosmos-db/). |
41+
42+
> [!NOTE]
43+
> You can have up to one free tier Azure Cosmos DB account per Azure subscription and must opt-in when creating the account. If you do not see the option to apply the free tier discount, this means another account in the subscription has already been enabled with free tier.
44+
45+
:::image type="content" source="../media/create-account-portal/new-cosmos-account-page.png" lightbox="../media/create-account-portal/new-cosmos-account-page.png" alt-text="Screenshot of new account page for API for NoSQL.":::
46+
47+
1. Select **Review + create**.
48+
49+
1. Review the settings you provide, and then select **Create**. It takes a few minutes to create the account. Wait for the portal page to display **Your deployment is complete** before moving on.
50+
51+
1. Select **Go to resource** to go to the Azure Cosmos DB account page.
52+
53+
:::image type="content" source="../media/create-account-portal/cosmos-deployment-complete.png" lightbox="../media/create-account-portal/cosmos-deployment-complete.png" alt-text="Screenshot of deployment page for API for NoSQL resource.":::
54+
55+
1. From the API for NoSQL account page, select the **Keys** navigation menu option.
56+
57+
:::image type="content" source="../media/get-credentials-portal/cosmos-keys-option.png" lightbox="../media/get-credentials-portal/cosmos-keys-option.png" alt-text="Screenshot of an API for NoSQL account page. The Keys option is highlighted in the navigation menu.":::
58+
59+
1. Record the values from the **URI** and **PRIMARY KEY** fields. You'll use these values in a later step.
60+
61+
:::image type="content" source="../media/get-credentials-portal/cosmos-endpoint-key-credentials.png" lightbox="../media/get-credentials-portal/cosmos-endpoint-key-credentials.png" alt-text="Screenshot of Keys page with various credentials for an API for NoSQL account.":::
1562

1663
#### [Azure CLI](#tab/azure-cli)
1764

@@ -37,16 +84,20 @@ This quickstart will create a single Azure Cosmos DB account using the SQL API.
3784
--location $location
3885
```
3986
40-
1. Use the [``az cosmosdb create``](/cli/azure/cosmosdb#az-cosmosdb-create) command to create a new Azure Cosmos DB SQL API account with default settings.
87+
1. Use the [``az cosmosdb create``](/cli/azure/cosmosdb#az-cosmosdb-create) command to create a new API for NoSQL account with default settings.
4188
4289
```azurecli-interactive
4390
az cosmosdb create \
4491
--resource-group $resourceGroupName \
4592
--name $accountName \
46-
--locations regionName=$location
93+
--locations regionName=$location \
94+
--enable-free-tier true
4795
```
4896
49-
1. Get the SQL API endpoint *URI* for the account using the [``az cosmosdb show``](/cli/azure/cosmosdb#az-cosmosdb-show) command.
97+
> [!NOTE]
98+
> You can have up to one free tier Azure Cosmos DB account per Azure subscription and must opt-in when creating the account. If you do not see the option to apply the free tier discount, this means another account in the subscription has already been enabled with free tier. To find other free-tier enabled accounts, see [find an existing Azure Cosmos DB free-tier account in a subscription](../../scripts/cli/common/free-tier.md#run-the-script).
99+
100+
1. Get the API for NoSQL endpoint *URI* for the account using the [``az cosmosdb show``](/cli/azure/cosmosdb#az-cosmosdb-show) command.
50101
51102
```azurecli-interactive
52103
az cosmosdb show \
@@ -93,18 +144,22 @@ This quickstart will create a single Azure Cosmos DB account using the SQL API.
93144
New-AzResourceGroup @parameters
94145
```
95146
96-
1. Use the [``New-AzCosmosDBAccount``](/powershell/module/az.cosmosdb/new-azcosmosdbaccount) cmdlet to create a new Azure Cosmos DB SQL API account with default settings.
147+
1. Use the [``New-AzCosmosDBAccount``](/powershell/module/az.cosmosdb/new-azcosmosdbaccount) cmdlet to create a new API for NoSQL account with default settings.
97148
98149
```azurepowershell-interactive
99150
$parameters = @{
100151
ResourceGroupName = $RESOURCE_GROUP_NAME
101152
Name = $ACCOUNT_NAME
102153
Location = $LOCATION
154+
EnableFreeTier = true
103155
}
104156
New-AzCosmosDBAccount @parameters
105157
```
106158
107-
1. Get the SQL API endpoint *URI* for the account using the [``Get-AzCosmosDBAccount``](/powershell/module/az.cosmosdb/get-azcosmosdbaccount) cmdlet.
159+
> [!NOTE]
160+
> You can have up to one free tier Azure Cosmos DB account per Azure subscription and must opt-in when creating the account. If you do not see the option to apply the free tier discount, this means another account in the subscription has already been enabled with free tier.
161+
162+
1. Get the API for NoSQL endpoint *URI* for the account using the [``Get-AzCosmosDBAccount``](/powershell/module/az.cosmosdb/get-azcosmosdbaccount) cmdlet.
108163
109164
```azurepowershell-interactive
110165
$parameters = @{
@@ -129,106 +184,4 @@ This quickstart will create a single Azure Cosmos DB account using the SQL API.
129184
130185
1. Record the *URI* and *PRIMARY KEY* values. You'll use these credentials later.
131186
132-
#### [Portal](#tab/azure-portal)
133-
134-
> [!TIP]
135-
> For this quickstart, we recommend using the resource group name ``msdocs-cosmos-quickstart-rg``.
136-
137-
1. Sign in to the [Azure portal](https://portal.azure.com).
138-
139-
1. From the Azure portal menu or the **Home page**, select **Create a resource**.
140-
141-
1. On the **New** page, search for and select **Azure Cosmos DB**.
142-
143-
1. On the **Select API option** page, select the **Create** option within the **Core (SQL) - Recommend** section. Azure Cosmos DB has five APIs: SQL, MongoDB, Gremlin, Table, and Cassandra. [Learn more about the SQL API](../index.yml).
144-
145-
:::image type="content" source="../media/create-account-portal/cosmos-api-choices.png" lightbox="../media/create-account-portal/cosmos-api-choices.png" alt-text="Screenshot of select API option page for Azure Cosmos DB.":::
146-
147-
1. On the **Create Azure Cosmos DB Account** page, enter the following information:
148-
149-
| Setting | Value | Description |
150-
| --- | --- | --- |
151-
| Subscription | Subscription name | Select the Azure subscription that you wish to use for this Azure Cosmos account. |
152-
| Resource Group | Resource group name | Select a resource group, or select **Create new**, then enter a unique name for the new resource group. |
153-
| Account Name | A unique name | Enter a name to identify your Azure Cosmos account. The name will be used as part of a fully qualified domain name (FQDN) with a suffix of *documents.azure.com*, so the name must be globally unique. The name can only contain lowercase letters, numbers, and the hyphen (-) character. The name must also be between 3-44 characters in length. |
154-
| Location | The region closest to your users | Select a geographic location to host your Azure Cosmos DB account. Use the location that is closest to your users to give them the fastest access to the data. |
155-
| Capacity mode |Provisioned throughput or Serverless|Select **Provisioned throughput** to create an account in [provisioned throughput](../../set-throughput.md) mode. Select **Serverless** to create an account in [serverless](../../serverless.md) mode. |
156-
| Apply Azure Cosmos DB free tier discount | **Apply** or **Do not apply** |With Azure Cosmos DB free tier, you'll get the first 1000 RU/s and 25 GB of storage for free in an account. Learn more about [free tier](https://azure.microsoft.com/pricing/details/cosmos-db/). |
157-
158-
> [!NOTE]
159-
> You can have up to one free tier Azure Cosmos DB account per Azure subscription and must opt-in when creating the account. If you do not see the option to apply the free tier discount, this means another account in the subscription has already been enabled with free tier.
160-
161-
:::image type="content" source="../media/create-account-portal/new-cosmos-account-page.png" lightbox="../media/create-account-portal/new-cosmos-account-page.png" alt-text="Screenshot of new account page for Azure Cosmos DB SQL API.":::
162-
163-
1. Select **Review + create**.
164-
165-
1. Review the settings you provide, and then select **Create**. It takes a few minutes to create the account. Wait for the portal page to display **Your deployment is complete** before moving on.
166-
167-
1. Select **Go to resource** to go to the Azure Cosmos DB account page.
168-
169-
:::image type="content" source="../media/create-account-portal/cosmos-deployment-complete.png" lightbox="../media/create-account-portal/cosmos-deployment-complete.png" alt-text="Screenshot of deployment page for Azure Cosmos DB SQL API resource.":::
170-
171-
1. From the Azure Cosmos DB SQL API account page, select the **Keys** navigation menu option.
172-
173-
:::image type="content" source="../media/get-credentials-portal/cosmos-keys-option.png" lightbox="../media/get-credentials-portal/cosmos-keys-option.png" alt-text="Screenshot of an Azure Cosmos DB SQL API account page. The Keys option is highlighted in the navigation menu.":::
174-
175-
1. Record the values from the **URI** and **PRIMARY KEY** fields. You'll use these values in a later step.
176-
177-
:::image type="content" source="../media/get-credentials-portal/cosmos-endpoint-key-credentials.png" lightbox="../media/get-credentials-portal/cosmos-endpoint-key-credentials.png" alt-text="Screenshot of Keys page with various credentials for an Azure Cosmos DB SQL API account.":::
178-
179-
#### [Resource Manager template](#tab/azure-resource-manager)
180-
181-
> [!NOTE]
182-
> Azure Resource Manager templates are written in two syntaxes, JSON and Bicep. This sample uses the [Bicep](../../../azure-resource-manager/bicep/overview.md) syntax. To learn more about the two syntaxes, see [comparing JSON and Bicep for templates](../../../azure-resource-manager/bicep/compare-template-syntax.md).
183-
184-
1. Create shell variables for *accountName*, *resourceGroupName*, and *location*.
185-
186-
```azurecli-interactive
187-
# Variable for resource group name
188-
resourceGroupName="msdocs-cosmos"
189-
190-
# Variable for location
191-
location="westus"
192-
193-
# Variable for account name with a randomly generated suffix
194-
let suffix=$RANDOM*$RANDOM
195-
accountName="msdocs-$suffix"
196-
```
197-
198-
1. If you haven't already, sign in to the Azure CLI using the [``az login``](/cli/azure/reference-index#az-login) command.
199-
200-
1. Use the [``az group create``](/cli/azure/group#az-group-create) command to create a new resource group in your subscription.
201-
202-
```azurecli-interactive
203-
az group create \
204-
--name $resourceGroupName \
205-
--location $location
206-
```
207-
208-
1. Create a new ``.bicep`` file with the deployment template in the Bicep syntax.
209-
210-
:::code language="bicep" source="~/quickstart-templates/quickstarts/microsoft.documentdb/cosmosdb-sql-minimal/main.bicep":::
211-
212-
1. Deploy the Azure Resource Manager (ARM) template with [``az deployment group create``](/cli/azure/deployment/group#az-deployment-group-create)
213-
specifying the filename using the **template-file** parameter and the name ``initial-bicep-deploy`` using the **name** parameter.
214-
215-
```azurecli-interactive
216-
az deployment group create \
217-
--resource-group $resourceGroupName \
218-
--name initial-bicep-deploy \
219-
--template-file main.bicep \
220-
--parameters accountName=$accountName
221-
```
222-
223-
> [!NOTE]
224-
> In this example, we assume that the name of the Bicep file is **main.bicep**.
225-
226-
1. Validate the deployment by showing metadata from the newly created account using [``az cosmosdb show``](/cli/azure/cosmosdb#az-cosmosdb-show).
227-
228-
```azurecli-interactive
229-
az cosmosdb show \
230-
--resource-group $resourceGroupName \
231-
--name $accountName
232-
```
233-
234187
---

‎articles/cosmos-db/nosql/quickstart-dotnet.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: cosmos-db
77
ms.subservice: nosql
88
ms.devlang: csharp
99
ms.topic: quickstart
10-
ms.date: 11/03/2022
10+
ms.date: 11/07/2022
1111
ms.custom: devx-track-csharp, ignite-2022, cosmos-dev-refresh, cosmos-dev-dotnet-path
1212
---
1313

@@ -27,8 +27,7 @@ Get started with the Azure Cosmos DB client library for .NET to create databases
2727
## Prerequisites
2828

2929
- An Azure account with an active subscription.
30-
- If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
31-
- Alternatively, you can [try Azure Cosmos DB free](../try-free.md) before you commit.
30+
- No Azure subscription? You can [try Azure Cosmos DB free](../try-free.md) with no credit card required.
3231
- [.NET 6.0 or later](https://dotnet.microsoft.com/download)
3332
- [Azure Command-Line Interface (CLI)](/cli/azure/) or [Azure PowerShell](/powershell/azure/)
3433

@@ -44,7 +43,7 @@ This section walks you through creating an Azure Cosmos DB account and setting u
4443
### <a id="create-account"></a>Create an Azure Cosmos DB account
4544

4645
> [!TIP]
47-
> Alternatively, you can [try Azure Cosmos DB free](../try-free.md) before you commit. If you create an account using the free trial, you can safely skip this section.
46+
> No Azure subscription? You can [try Azure Cosmos DB free](../try-free.md) with no credit card required. If you create an account using the free trial, you can safely skip ahead to the [Create a new .NET app](#create-a-new-net-app) section.
4847
4948
[!INCLUDE [Create resource tabbed conceptual - ARM, Azure CLI, PowerShell, Portal](./includes/create-resources.md)]
5049

0 commit comments

Comments
 (0)