Skip to content

Commit 6e5b062

Browse files
committed
Merge branch 'main' into release-build-redis
2 parents 1cfec4f + 124f7c9 commit 6e5b062

File tree

87 files changed

+1346
-1193
lines changed

Some content is hidden

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

87 files changed

+1346
-1193
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3874,6 +3874,11 @@
38743874
"redirect_url": "/azure/firewall/ftp-support",
38753875
"redirect_document_id": false
38763876
},
3877+
{
3878+
"source_path_from_root": "/articles/firewall/long-running-sessions.md",
3879+
"redirect_url": "/azure/firewall/tcp-session-behavior",
3880+
"redirect_document_id": false
3881+
},
38773882
{
38783883
"source_path_from_root": "/articles/firewall/diagnostic-logs.md",
38793884
"redirect_url": "/azure/firewall/monitor-firewall",
-144 KB
Loading

articles/app-service/overview-managed-identity.md

Lines changed: 54 additions & 59 deletions
Large diffs are not rendered by default.

articles/app-service/troubleshoot-diagnostic-logs.md

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

articles/azure-functions/durable/durable-task-scheduler/quickstart-durable-task-scheduler.md

Lines changed: 12 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -72,38 +72,17 @@ Install the latest version of the [Microsoft.Azure.Functions.Worker.Extensions.D
7272

7373
::: zone pivot="other"
7474

75-
Until the durable task scheduler package is added to the extension bundles, you need to manually install the latest version of these packages using [Azure Functions Core Tools](../../functions-run-local.md#install-the-azure-functions-core-tools):
76-
- [Microsoft.Azure.WebJobs.Extensions.DurableTask.AzureManaged](https://www.nuget.org/packages/Microsoft.Azure.WebJobs.Extensions.DurableTask.AzureManaged/)
77-
- [Microsoft.Azure.WebJobs.Extensions.DurableTask](https://www.nuget.org/packages/Microsoft.Azure.WebJobs.Extensions.DurableTask)
75+
In host.json, update the `extensionBundle` property to use the preview version that contains the durable task scheduler package:
7876

79-
For example:
80-
```bash
81-
func extensions install --package Microsoft.Azure.WebJobs.Extensions.DurableTask.AzureManaged --version 0.4.2-alpha
82-
```
83-
```bash
84-
func extensions install --package Microsoft.Azure.WebJobs.Extensions.DurableTask --version 3.0.4
85-
```
86-
87-
These commands should automatically generate a *extensions.csproj* file. If the package references aren't added to the file, check to ensure that `net8.0` is the target framework and run the commands again. The file should have content similar to the following example:
88-
89-
```xml
90-
<Project Sdk="Microsoft.NET.Sdk">
91-
<PropertyGroup>
92-
<TargetFramework>net8.0</TargetFramework>
93-
<WarningsAsErrors></WarningsAsErrors>
94-
<DefaultItemExcludes>**</DefaultItemExcludes>
95-
</PropertyGroup>
96-
<ItemGroup>
97-
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="3.0.4" />
98-
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask.AzureManaged" Version="0.4.2-alpha" />
99-
<PackageReference Include="Microsoft.Azure.WebJobs.Script.ExtensionsMetadataGenerator" Version="1.1.3" />
100-
</ItemGroup>
101-
</Project>
77+
```json
78+
{
79+
"extensionBundle": {
80+
"id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
81+
"version": "[4.29.0, 5.0.0)"
82+
}
83+
}
10284
```
10385

104-
> [!NOTE]
105-
> Remember to remove the reference to extension bundles in `host.json`.
106-
10786
::: zone-end
10887

10988
## Update host.json
@@ -134,7 +113,7 @@ Add connection information for local development:
134113
"Values": {
135114
"FUNCTIONS_WORKER_RUNTIME": "<DEPENDENT ON YOUR PROGRAMMING LANGUAGE>",
136115
"AzureWebJobsStorage": "UseDevelopmentStorage=true",
137-
"DURABLE_TASK_SCHEDULER_CONNECTION_STRING": "Endpoint=http://localhost:<port number>;Authentication=None",
116+
"DURABLE_TASK_SCHEDULER_CONNECTION_STRING": "Endpoint=http://localhost:8080;Authentication=None",
138117
"TASKHUB_NAME": "default"
139118
}
140119
}
@@ -153,23 +132,20 @@ Get the durable task scheduler emulator port number in [the next step](#set-up-d
153132
1. Run the emulator.
154133

155134
```bash
156-
docker run -itP mcr.microsoft.com/dts/dts-emulator:v0.0.5
135+
docker run -d -p 8080:8080 -p 8082:8082 mcr.microsoft.com/dts/dts-emulator:v0.0.5
157136
```
158137

159138
The following output indicates the emulator started successfully.
160139

161140
:::image type="content" source="media/quickstart-durable-task-scheduler/emulator-started.png" alt-text="Screenshot showing emulator started successfully on terminal.":::
162141

163-
1. Make note of the ports exposed on Docker desktop. These static ports are exposed by the container and mapped dynamically by default. The scheduler exposes multiple ports for different purposes:
142+
1. Make note of the ports exposed on Docker desktop. The scheduler exposes multiple ports for different purposes:
164143

165144
- `8080`: gRPC endpoint that allows an app to connect to the scheduler
166145
- `8082`: Endpoint for durable task scheduler dashboard
167146

168147
:::image type="content" source="media/quickstart-durable-task-scheduler/docker-ports.png" alt-text="Screenshot of ports on Docker.":::
169148

170-
1. Update the connection string in *local.settings.json* with the gRPC endpoint port number.
171-
172-
In the previous example, port `55000` is mapped to the gRPC `8080` endpoint, so the connection string should be `Endpoint=http://localhost:55000;Authentication=None`.
173149

174150
## Test locally
175151

@@ -210,9 +186,7 @@ Get the durable task scheduler emulator port number in [the next step](#set-up-d
210186
}
211187
```
212188

213-
1. To view more details about the orchestration instance, go to the Docker desktop app and click the `8082` link to access the durable task scheduler dashboard.
214-
215-
:::image type="content" source="media/quickstart-durable-task-scheduler/docker-ports.png" alt-text="Screenshot of ports on Docker.":::
189+
1. To view more details about the orchestration instance, go to **http://localhost:8082/** access the durable task scheduler dashboard.
216190

217191
1. Click on the *default* task hub to see its dashboard.
218192

articles/azure-netapp-files/azure-netapp-files-set-up-capacity-pool.md

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: azure-netapp-files
55
author: b-hchen
66
ms.service: azure-netapp-files
77
ms.topic: how-to
8-
ms.date: 03/26/2025
8+
ms.date: 03/27/2025
99
ms.author: anfdocs
1010
ms.custom: references_regions
1111
---
@@ -23,20 +23,16 @@ Creating a capacity pool enables you to create volumes within it.
2323
>[!IMPORTANT]
2424
>To create a 1-TiB capacity pool with a tag, you must use API versions `2023-07-01_preview` to `2024-01-01_preview` or stable releases from `2024-01-01`.
2525
* The Standard, Premium, and Ultra service levels are generally available (GA). No registration is required.
26-
* The **Flexible** service level is currently in preview. Before creating a Flexible service level capacity pool, you must first register the feature:
27-
28-
1. Register the feature:
29-
```azurepowershell-interactive
30-
Register-AzProviderFeature -ProviderNamespace Microsoft.NetApp -FeatureName ANFFlexibleServiceLevel
31-
```
32-
2. Check the status of the feature registration:
33-
> [!NOTE]
34-
> The **RegistrationState** may be in the `Registering` state for up to 60 minutes before changing to `Registered`. Wait until the status is **Registered** before continuing.
35-
```azurepowershell-interactive
36-
Get-AzProviderFeature -ProviderNamespace Microsoft.NetApp -FeatureName ANFFlexibleServiceLevel
37-
```
38-
You can also use [Azure CLI commands](/cli/azure/feature) `az feature register` and `az feature show` to register the feature and display the registration status.
26+
* The **Flexible** service level is currently in preview. You must submit a waitlist request to access the Flexible service level by using [the request form](https://aka.ms/ANFFlexibleSLpreviewsignup). After you submit the waitlist request, it can take approximately one week to enable the feature.
27+
28+
Check the status of feature registration with the command:
3929

30+
```azurepowershell-interactive
31+
Get-AzProviderFeature -ProviderNamespace Microsoft.NetApp -FeatureName ANFFlexibleServiceLevel
32+
```
33+
34+
You can also use [Azure CLI commands](/cli/azure/feature) `az feature show` to register the feature and display the registration status.
35+
4036
### <a name="regions"></a> Supported regions for the Flexible service level
4137
4238
>[!NOTE]

articles/deployment-environments/concept-environment-yaml.md

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,24 @@ author: RoseHJM
55
ms.author: rosemalcolm
66
ms.service: azure-deployment-environments
77
ms.topic: concept-article
8-
ms.date: 11/17/2023
8+
ms.date: 03/20/2025
99

10-
# Customer intent: As a developer, I want to know which parameters I can assign for parameters in environment.yaml.
10+
# Customer intent: As a developer, I want to know the properties and parameters that I can use in environment.yaml.
1111

1212
---
1313

14-
# Parameters and data types in environment.yaml
14+
# Properties and parameters in environment.yaml
1515

16-
ADE environment definitions are infrastructure as code (IaC), written in Bicep or Terraform, stored in repositories. Environment definitions can be modified and adapted for your specific requirements and then used to create a deployment environment on Azure. The environment.yaml schema defines and describes the types of Azure resources included in environment definitions.
16+
Azure Deployment Environments environment definitions are infrastructure as code (IaC) that are written in Bicep or Terraform and stored in repositories. You can modify and adapt environment definitions for your requirements and then use them to create a deployment environment on Azure. The environment.yaml schema defines and describes the types of Azure resources included in environment definitions.
1717

1818

1919
## What is environment.yaml?
2020

2121
The environment.yaml file acts as a manifest, describing the resources used and the template location for the environment definition.
2222

2323
### Sample environment.yaml
24-
The following script is a generic example of an environment.yaml required for your environment definition.
24+
25+
The following script is an example of the environment.yaml that's required for your environment definition.
2526

2627
```yml
2728
name: WebApp
@@ -31,26 +32,28 @@ description: Deploys a web app in Azure without a datastore
3132
runner: ARM
3233
templatePath: azuredeploy.json
3334
```
35+
3436
### Definitions
37+
3538
The following table describes the properties that you can use in environment.yaml.
3639
37-
| **Property** | **Type** | **Description** | **Required** | **Examples** |
38-
| ------------ | -------- | -------------------------------------------------- | ------------ | ----------------------------------------------- |
39-
| name | string | The display name of the catalog item. | Yes | |
40-
| version | string | The version of the catalog item. | | 1.0.0 |
41-
| summary | string | A short summary string about the catalog item. | | |
42-
| description | string | A description of the catalog item. | | |
43-
| runner | string | The container image to use when executing actions. | | ARM template </br> Terraform |
44-
| templatePath | string | The relative path of the entry template file. | Yes | main.tf </br> main.bicep </br> azuredeploy.json |
45-
| parameters | array | Input parameters to use when creating the environment and executing actions. | | #/definitions/Parameter |
40+
| Property | Type | Description | Required?|Example|
41+
| ------------ | -------- |------- | ------------ | ---------------- |
42+
| `name` | string | The display name of the catalog item. | Yes | WebApp |
43+
| `version` | string | The version of the catalog item. | No | 1.0.0 |
44+
| `summary` | string | A short string that summarizes the catalog item. | No | Azure Web App Environment |
45+
| `description` | string | A description of the catalog item. | No | Deploys a web app in Azure without a datastore |
46+
| `runner` | string | The container image to use when running actions. | No | ARM template </br> Terraform |
47+
| `templatePath` | string | The relative path of the entry template file. | Yes | main.tf </br> main.bicep </br> azuredeploy.json |
48+
| `parameters` | array | Input parameters to use when creating the environment and running actions. | No | #/definitions/Parameter |
4649

4750
## Parameters in environment.yaml
4851

49-
Parameters enable you to reuse an environment definition in different scenarios. For example, you might want developers in different regions to deploy the same environment. You can define a location parameter to prompt the developer to enter the desired location as they create their environment.
52+
Parameters enable you to reuse an environment definition in different scenarios. For example, you might want developers in different regions to deploy the same environment. You can define a location parameter to prompt developers to enter the desired location as they create their environments.
5053

5154
### Sample environment.yaml with parameters
5255

53-
The following script is an example of a environment.yaml file that includes two parameters; `location` and `name`:
56+
The following script is an example of a environment.yaml file that includes two parameters: `location` and `name`.
5457

5558
```yml
5659
name: WebApp
@@ -79,20 +82,20 @@ The following table describes the data types that you can use in environment.yam
7982

8083
Each parameter can use any of the following properties:
8184

82-
| **Properties** | **Type** | **Description** | **Further Settings** |
83-
| -------------- | -------------- |------------------------------------------------ |--------------------------------------- |
84-
| ID | string | Unique ID of the parameter. | |
85-
| name | string | Display name of the parameter. | |
86-
| description | string | Description of the parameter. | |
87-
| default | array </br> boolean </br> integer </br> number </br> object </br> string | The default value of the parameter. | |
88-
| type | array </br> boolean </br> integer </br> number </br> object </br> string | The data type of the parameter. This data type must match the parameter data type in the ARM template, BICEP file, or Terraform file with the corresponding parameter name. | **Default type:** string |
89-
| readOnly | boolean | Whether or not this parameter is read-only. | |
90-
| required | boolean | Whether or not this parameter is required. | |
91-
| allowed | array | An array of allowed values. | "items": { </br> "type": "string" </br> }, </br> "minItems": 1, </br> "uniqueItems": true, |
85+
| Parameter| Type| Description | Additional settings |
86+
| ----| --- |---------------------- |-------------------- |
87+
| `id ` | string | A unique ID of the parameter. | |
88+
| `name` | string | A display name for the parameter. | |
89+
| `description` | string | A description of the parameter. | |
90+
| `default` | array </br> boolean </br> integer </br> number </br> object </br> string | The default value of the parameter. | |
91+
| `type`| array </br> boolean </br> integer </br> number </br> object </br> string | The data type of the parameter. This data type must match the parameter data type that has the corresponding parameter name in the ARM template, Bicep file, or Terraform file. | **Default type:** string |
92+
| `readOnly`| boolean | Whether the parameter is read-only. | |
93+
| `required` | boolean | Whether the parameter is required. | |
94+
| `allowed` | array | An array of allowed values. | "items": { </br> "type": "string" </br> }, </br> "minItems": 1, </br> "uniqueItems": true, |
9295

9396
## YAML schema
9497

95-
There's a defined schema for Azure Deployment Environments environment.yaml files, which can make editing these files a little easier. You can add the schema definition to the beginning of your environment.yaml file:
98+
There's a defined schema for Azure Deployment Environments environment.yaml files. It can make editing these files a little easier. You can add the schema definition to the beginning of your environment.yaml file:
9699

97100
```yml
98101
# yaml-language-server: $schema=https://github.com/Azure/deployment-environments/releases/download/2022-11-11-preview/manifest.schema.json
@@ -135,7 +138,7 @@ parameters:
135138
default: 'dotnet-isolated'
136139
```
137140

138-
## Related content
141+
## Related resources
139142

140143
- [Add and configure an environment definition in Azure Deployment Environments](configure-environment-definition.md)
141144
- [Parameters in ARM templates](../azure-resource-manager/templates/parameters.md)

articles/devtest-labs/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,4 +277,4 @@
277277
- name: Pricing
278278
href: https://azure.microsoft.com/pricing/details/devtest-lab/
279279
- name: DevTest Labs Developer Community
280-
href: https://aka.ms/dtl/communityforum
280+
href: https://aka.ms/dtl/developer-community-forum

0 commit comments

Comments
 (0)