Skip to content

Commit 127ddb8

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into patricka-block-storage-fix
2 parents cdc4a9f + 65bc424 commit 127ddb8

File tree

71 files changed

+1275
-226
lines changed

Some content is hidden

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

71 files changed

+1275
-226
lines changed

articles/ai-services/immersive-reader/how-to-create-immersive-reader.md

Lines changed: 34 additions & 40 deletions
Large diffs are not rendered by default.

articles/aks/ingress-basic.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ helm install ingress-nginx ingress-nginx/ingress-nginx `
6868
--set controller.service.externalTrafficPolicy=Local
6969
```
7070

71-
> [!NOTE]
72-
> In this tutorial, "service.beta.kubernetes.io/azure-load-balancer-health-probe-request-path" is being set to "/healthz". This means if the response code of the requests to "/healthz" is not "200", the whole ingress controller will be down. You can modify the value to other URI in your own scenario. You cannot delete this part or unset the value, or the ingress controller will still be down.
73-
> The package "ingress-nginx" used in this tutorial, which is provided by [Kubernetes official](https://github.com/kubernetes/ingress-nginx), will always return "200" response code if requesting "/healthz", as it is designed as "[default backend](https://kubernetes.github.io/ingress-nginx/user-guide/default-backend/)" for users to have a quick start, unless it is being overwritten by ingress rules.
74-
7571
---
7672

73+
> [!NOTE]
74+
> In this tutorial, `service.beta.kubernetes.io/azure-load-balancer-health-probe-request-path` is being set to `/healthz`. This means if the response code of the requests to `/healthz` is not `200`, the entire ingress controller will be down. You can modify the value to other URI in your own scenario. You cannot delete this part or unset the value, or the ingress controller will still be down.
75+
> The package `ingress-nginx` used in this tutorial, which is provided by [Kubernetes official](https://github.com/kubernetes/ingress-nginx), will always return `200` response code if requesting `/healthz`, as it is designed as [default backend](https://kubernetes.github.io/ingress-nginx/user-guide/default-backend/) for users to have a quick start, unless it is being overwritten by ingress rules.
76+
7777
## Customized configuration
7878

7979
As an alternative to the basic configuration presented in the above section, the next set of steps will show how to deploy a customized ingress controller. You'll have the option of using an internal static IP address, or using a dynamic public IP address.

articles/azure-cache-for-redis/cache-azure-active-directory-for-authentication.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,17 +90,17 @@ Because most Azure Cache for Redis clients assume that a password and access key
9090

9191
### Microsoft Entra Client Workflow
9292

93-
1. Configure your client application to acquire a Microsoft Entra token for scope, `https://redis.azure.com/.default` or `acca5fbb-b7e4-4009-81f1-37e38fd66d78/.default`, using the [Microsoft Authentication Library (MSAL)](/azure/active-directory/develop/msal-overview).
93+
1. Configure your client application to acquire a Microsoft Entra token for scope, `https://redis.azure.com/.default` or `acca5fbb-b7e4-4009-81f1-37e38fd66d78/.default`, using the [Microsoft Authentication Library (MSAL)](/azure/active-directory/develop/msal-overview).
9494

95-
1. Update your Redis connection logic to use following `UserName` and `Password`:
95+
1. Update your Redis connection logic to use following `User` and `Password`:
9696

97-
`UserName` = Object ID of your managed identity or service principal
98-
`Password` = Microsoft Entra token that you acquired using MSAL
97+
- `User` = Object ID of your managed identity or service principal
98+
- `Password` = Microsoft Entra token that you acquired using MSAL
9999

100100
1. Ensure that your client executes a Redis [AUTH command](https://redis.io/commands/auth/) automatically before your Microsoft Entra token expires using:
101101

102-
`UserName` = Object ID of your managed identity or service principal
103-
`Password` = Microsoft Entra token refreshed periodically
102+
- `User` = Object ID of your managed identity or service principal
103+
- `Password` = Microsoft Entra token refreshed periodically
104104

105105
### Client library support
106106

articles/azure-functions/durable/durable-functions-instance-management.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Manage instances in Durable Functions - Azure
33
description: Learn how to manage instances in the Durable Functions extension for Azure Functions.
44
author: cgillum
55
ms.topic: conceptual
6-
ms.date: 12/07/2022
6+
ms.date: 02/13/2024
77
ms.author: azfuncdf
88
ms.devlang: csharp
99
# ms.devlang: csharp, java, javascript, python
@@ -1109,10 +1109,10 @@ Functions can send instances of these objects to external systems to monitor or
11091109
public static void SendInstanceInfo(
11101110
[ActivityTrigger] IDurableActivityContext ctx,
11111111
[DurableClient] IDurableOrchestrationClient client,
1112-
[DocumentDB(
1112+
[CosmosDB(
11131113
databaseName: "MonitorDB",
1114-
collectionName: "HttpManagementPayloads",
1115-
ConnectionStringSetting = "CosmosDBConnection")]out dynamic document)
1114+
containerName: "HttpManagementPayloads",
1115+
Connection = "CosmosDBConnectionSetting")]out dynamic document)
11161116
{
11171117
HttpManagementPayload payload = client.CreateHttpManagementPayload(ctx.InstanceId);
11181118

articles/azure-functions/functions-add-output-binding-cosmos-db-vs-code.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Connect Azure Functions to Azure Cosmos DB using Visual Studio Code
33
description: Learn how to connect Azure Functions to an Azure Cosmos DB account by adding an output binding to your Visual Studio Code project.
4-
ms.date: 02/09/2023
4+
ms.date: 02/13/2024
55
ms.topic: quickstart
66
zone_pivot_groups: programming-languages-set-functions-temp
77
ms.devlang: csharp
@@ -76,10 +76,10 @@ In the [previous quickstart article](./create-first-function-vs-code-csharp.md),
7676

7777
|Prompt| Selection|
7878
|--|--|
79-
|**Enter new app setting name**| Type `CosmosDbConnectionString`.|
80-
|**Enter value for "CosmosDbConnectionString"**| Paste the connection string of your Azure Cosmos DB account you copied.|
79+
|**Enter new app setting name**| Type `CosmosDbConnectionSetting`.|
80+
|**Enter value for "CosmosDbConnectionSetting"**| Paste the connection string of your Azure Cosmos DB account you copied. You can also configure [Microsoft Entra identity](./functions-bindings-cosmosdb-v2-trigger.md#connections) as an alternative.|
8181

82-
This creates an application setting named connection `CosmosDbConnectionString` in your function app in Azure. Now, you can download this setting to your local.settings.json file.
82+
This creates an application setting named connection `CosmosDbConnectionSetting` in your function app in Azure. Now, you can download this setting to your local.settings.json file.
8383

8484
1. Press <kbd>F1</kbd> again to open the command palette, then search for and run the command `Azure Functions: Download Remote Settings...`.
8585

@@ -97,11 +97,11 @@ Except for HTTP and timer triggers, bindings are implemented as extension packag
9797

9898
# [Isolated worker model](#tab/isolated-process)
9999
```command
100-
dotnet add package Microsoft.Azure.Functions.Worker.Extensions.CosmosDB --version 3.0.9
100+
dotnet add package Microsoft.Azure.Functions.Worker.Extensions.CosmosDB
101101
```
102102
# [In-process model](#tab/in-process)
103103
```command
104-
dotnet add package Microsoft.Azure.WebJobs.Extensions.CosmosDB --version 3.0.10
104+
dotnet add package Microsoft.Azure.WebJobs.Extensions.CosmosDB
105105
```
106106
---
107107
::: zone-end
@@ -141,7 +141,7 @@ The `documentsOut` parameter is an `IAsyncCollector<T>` type, which represents a
141141

142142
---
143143

144-
Specific attributes specify the name of the container and the name of its parent database. The connection string for your Azure Cosmos DB account is set by the `CosmosDbConnectionString`.
144+
Specific attributes specify the name of the container and the name of its parent database. The connection string for your Azure Cosmos DB account is set by the `CosmosDbConnectionSetting`.
145145

146146
::: zone-end
147147

@@ -159,7 +159,7 @@ To create a binding, right-click (Ctrl+select on macOS) the *function.json* file
159159
| **The Azure Cosmos DB database where data will be written** | `my-database` | The name of the Azure Cosmos DB database containing the target container. |
160160
| **Database collection where data will be written** | `my-container` | The name of the Azure Cosmos DB container where the JSON documents will be written. |
161161
| **If true, creates the Azure Cosmos DB database and collection** | `false` | The target database and container already exist. |
162-
| **Select setting from "local.setting.json"** | `CosmosDbConnectionString` | The name of an application setting that contains the connection string for the Azure Cosmos DB account. |
162+
| **Select setting from "local.setting.json"** | `CosmosDbConnectionSetting` | The name of an application setting that contains the connection string for the Azure Cosmos DB account. |
163163
| **Partition key (optional)** | *leave blank* | Only required when the output binding creates the container. |
164164
| **Collection throughput (optional)** | *leave blank* | Only required when the output binding creates the container. |
165165

@@ -171,9 +171,9 @@ A binding is added to the `bindings` array in your *function.json*, which should
171171
"direction": "out",
172172
"name": "outputDocument",
173173
"databaseName": "my-database",
174-
"collectionName": "my-container",
174+
"containerName": "my-container",
175175
"createIfNotExists": "false",
176-
"connectionStringSetting": "CosmosDbConnectionString"
176+
"connection": "CosmosDbConnectionSetting"
177177
}
178178
```
179179

@@ -197,7 +197,7 @@ To create a binding, right-select (Ctrl+select on macOS) the *function.json* fil
197197
| **The Azure Cosmos DB database where data will be written** | `my-database` | The name of the Azure Cosmos DB database containing the target container. |
198198
| **Database collection where data will be written** | `my-container` | The name of the Azure Cosmos DB container where the JSON documents will be written. |
199199
| **If true, creates the Azure Cosmos DB database and collection** | `false` | The target database and container already exist. |
200-
| **Select setting from "local.setting.json"** | `CosmosDbConnectionString` | The name of an application setting that contains the connection string for the Azure Cosmos DB account. |
200+
| **Select setting from "local.setting.json"** | `CosmosDbConnectionSetting` | The name of an application setting that contains the connection string for the Azure Cosmos DB account. |
201201
| **Partition key (optional)** | *leave blank* | Only required when the output binding creates the container. |
202202
| **Collection throughput (optional)** | *leave blank* | Only required when the output binding creates the container. |
203203

@@ -209,9 +209,9 @@ A binding is added to the `bindings` array in your *function.json*, which should
209209
"direction": "out",
210210
"name": "outputDocument",
211211
"databaseName": "my-database",
212-
"collectionName": "my-container",
212+
"containerName": "my-container",
213213
"createIfNotExists": "false",
214-
"connectionStringSetting": "CosmosDbConnectionString"
214+
"connection": "CosmosDbConnectionSetting"
215215
}
216216
```
217217

@@ -221,10 +221,10 @@ Binding attributes are defined directly in the *function_app.py* file. You use t
221221

222222
```python
223223
@app.cosmos_db_output(arg_name="outputDocument", database_name="my-database",
224-
collection_name="my-container", connection_string_setting="CosmosDbConnectionString")
224+
container_name="my-container", connection="CosmosDbConnectionSetting")
225225
```
226226

227-
In this code, `arg_name` identifies the binding parameter referenced in your code, `database_name` and `collection_name` are the database and collection names that the binding writes to, and `connection_string_setting` is the name of an application setting that contains the connection string for the Storage account, which is in the CosmosDbConnectionString setting in the *local.settings.json* file.
227+
In this code, `arg_name` identifies the binding parameter referenced in your code, `database_name` and `container_name` are the database and collection names that the binding writes to, and `connection` is the name of an application setting that contains the connection string for the Azure Cosmos DB account, which is in the `CosmosDbConnectionSetting` setting in the *local.settings.json* file.
228228

229229
---
230230

@@ -265,8 +265,8 @@ public static async Task<IActionResult> Run(
265265
[HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", Route = null)] HttpRequest req,
266266
[CosmosDB(
267267
databaseName: "my-database",
268-
collectionName: "my-container",
269-
ConnectionStringSetting = "CosmosDbConnectionString")]IAsyncCollector<dynamic> documentsOut,
268+
containerName: "my-container",
269+
Connection = "CosmosDbConnectionSetting")]IAsyncCollector<dynamic> documentsOut,
270270
ILogger log)
271271
{
272272
log.LogInformation("C# HTTP trigger function processed a request.");
@@ -392,7 +392,7 @@ app = func.FunctionApp()
392392
@app.function_name(name="HttpTrigger1")
393393
@app.route(route="hello", auth_level=func.AuthLevel.ANONYMOUS)
394394
@app.queue_output(arg_name="msg", queue_name="outqueue", connection="AzureWebJobsStorage")
395-
@app.cosmos_db_output(arg_name="outputDocument", database_name="my-database", collection_name="my-container", connection_string_setting="CosmosDbConnectionString")
395+
@app.cosmos_db_output(arg_name="outputDocument", database_name="my-database", container_name="my-container", connection="CosmosDbConnectionSetting")
396396
def test_function(req: func.HttpRequest, msg: func.Out[func.QueueMessage],
397397
outputDocument: func.Out[func.Document]) -> func.HttpResponse:
398398
logging.info('Python HTTP trigger function processed a request.')

articles/azure-health-insights/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ items:
2424
href: use-containers.md
2525
- name: How to configure the containers
2626
href: configure-containers.md
27+
- name: Reliability in Azure Health Insights
28+
href: ../reliability/reliability-health-insights.md?toc=/azure/health-insights/toc.json
2729
- name: Responsible use of AI
2830
expanded: true
2931
items:

articles/azure-netapp-files/TOC.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@
5151
href: network-file-system-group-memberships.md
5252
- name: Understand file locking
5353
href: understand-file-locks.md
54+
- name: Under volume languages
55+
href: understand-volume-languages.md
56+
- name: Understand file path lengths
57+
href: understand-path-lengths.md
5458
- name: Azure NetApp Files essentials
5559
items:
5660
- name: Storage hierarchy of Azure NetApp Files
8.09 KB
Loading
53.5 KB
Loading
27.9 KB
Loading

0 commit comments

Comments
 (0)