Skip to content

Commit b8f7cf1

Browse files
authored
Merge pull request #296106 from MicrosoftDocs/main
3/11/2025 AM Publish
2 parents c063d8f + 1329fc2 commit b8f7cf1

27 files changed

+238
-201
lines changed

articles/azure-netapp-files/azure-netapp-files-quickstart-set-up-account-create-volumes.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -407,11 +407,6 @@ The following code snippets show how to set up a VNet and create an Azure NetApp
407407
408408
:::code language="terraform" source="~/terraform_samples/quickstart/101-azure-netapp-files/main.tf" range="21-46,64-84":::
409409
410-
> [!IMPORTANT]
411-
> To prevent accidental deletion of the volume, set `prevent_destroy` to **true** when declaring the provider.
412-
413-
:::code language="terraform" source="~/terraform_samples/quickstart/101-azure-netapp-files/providers.tf" highlight="19":::
414-
415410
---
416411
417412
## Clean up resources
@@ -478,7 +473,7 @@ Use the Azure portal, PowerShell, or the Azure CLI to delete the resource group.
478473
479474
# [Terraform](#tab/terraform)
480475
481-
Use the Azure portal, Azure PowerShell, or the Azure CLI to delete the resource group.
476+
[!INCLUDE [Terraform destroy](~/azure-dev-docs-pr/articles/terraform/includes/terraform-plan-destroy.md)]
482477
483478
---
484479

articles/azure-vmware/attach-azure-netapp-files-to-azure-vmware-solution-hosts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ There are some important best practices to follow for optimal performance of NFS
9191
- Based on your performance requirements, select the correct service level needed for the Azure NetApp Files capacity pool. See [Service levels for Azure NetApp Files](../azure-netapp-files/azure-netapp-files-service-levels.md) to understand the throughput allowed per provisioned TiB for each service level.
9292

9393
>[!IMPORTANT]
94-
> If you've changed the Azure NetApp Files volumes performance tier after creating the volume and datastore, see [Service level change for Azure NetApp files datastore](#service-level-change-for-azure-netapp-files-datastore) to ensure that volume/datastore metadata is in sync to avoid unexpected behavior in the portal or the API due to metadata mismatch.
94+
> If you've changed the Azure NetApp Files volumes performance tier or the volume size after creating the volume and datastore, see [Service level change for Azure NetApp files datastore](#service-level-change-for-azure-netapp-files-datastore) to ensure that volume/datastore metadata is in sync to avoid unexpected behavior in the portal or the API due to metadata mismatch. To do any kind of change to the volume you can use Azure Portal or any other supported solution (CLI\Powershell\API).
9595
9696
- Create one or more volumes based on the required throughput and capacity. See [Performance considerations](../azure-netapp-files/azure-netapp-files-performance-considerations.md) for Azure NetApp Files to understand how volume size, service level, and capacity pool QoS type determines volume throughput. For assistance calculating workload capacity and performance requirements, contact your Azure VMware Solution or Azure NetApp Files field expert. The default maximum number of Azure NetApp Files datastores is 8, but it can be increased to a maximum of 256 by submitting a support ticket. To submit a support ticket, see [Create an Azure support request](/azure/azure-portal/supportability/how-to-create-azure-support-request).
9797
- Ensure that the Azure VMware Solution private cloud and the Azure NetApp Files volumes are deployed within the same [availability zone](../reliability/availability-zones-overview.md) using the [the availability zone volume placement](../azure-netapp-files/manage-availability-zone-volume-placement.md) in the same subscription. Information regarding your AVS private cloud's availability zone can be viewed from the overview pane within the AVS private cloud.

articles/confidential-computing/quick-create-confidential-vm-arm.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ Use this example to create a custom parameter file for a Linux-based confidentia
173173
New-MgServicePrincipal -AppId bf7b6499-ff71-4aa2-97a4-f372087be7f0 -DisplayName "Confidential VM Orchestrator"
174174
```
175175
176-
1. Set up your Azure key vault. For how to use an Azure Key Vault Managed HSM instead, see the next step.
176+
1. Set up your Azure Key Vault. For how to use an Azure Key Vault Managed HSM instead, see the next step.
177177
178178
1. Create a resource group for your key vault. Your key vault instance and your confidential VM must be in the same Azure region.
179179
@@ -198,7 +198,7 @@ Use this example to create a custom parameter file for a Linux-based confidentia
198198
az keyvault set-policy --name $KeyVault --object-id $cvmAgent.Id --key-permissions get release
199199
```
200200
201-
1. (Optional) If you don't want to use an Azure key vault, you can create an Azure Key Vault Managed HSM instead.
201+
1. (Optional) If you don't want to use an Azure Key Vault, you can create an Azure Key Vault Managed HSM instead.
202202
203203
1. Follow the [quickstart to create an Azure Key Vault Managed HSM](/azure/key-vault/managed-hsm/quick-create-cli) to provision and activate Azure Key Vault Managed HSM.
204204
1. Enable purge protection on the Azure Managed HSM. This step is required to enable key release.

articles/container-apps/TOC.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,10 +390,10 @@
390390
- name: Launch your first Java app
391391
items:
392392
- name: Dockerfile
393-
href: /azure/developer/java/toolkit-for-intellij/java-get-started-dockerfile.md
393+
href: /azure/developer/java/toolkit-for-intellij/java-get-started-dockerfile
394394
displayName: java
395395
- name: Github repository
396-
href: /azure/developer/java/toolkit-for-intellij/java-get-started-github-repository.md
396+
href: /azure/developer/java/toolkit-for-intellij/java-get-started-github-repository
397397
displayName: java
398398
- name: IntelliJ
399399
href: /azure/developer/java/toolkit-for-intellij/create-container-apps-intellij?toc=/azure/container-apps/toc.json&bc=/azure/container-apps/breadcrumb/toc.json

articles/event-hubs/event-hubs-emulator-whats-new.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,20 @@ This article provides a detailed overview of the enhancements introduced in the
1919
> Kindly report any problems or suggestions in the emulator's [GitHub installer repository](https://github.com/Azure/azure-event-hubs-emulator-installer/issues).
2020
2121

22-
## Latest version ``2.0.1``
22+
## Latest version ``2.1.0``
2323

24-
> *Released November 19th, 2024*
24+
> *Released March 11th, 2025*
2525
26-
This release introduces Apache Kafka support in Event Hubs emulator.
27-
- The producer and consumer APIs are now compatible with the Event Hubs emulator.
26+
This release introduces health check API in Event Hubs emulator.
27+
- Health check API can be accessed at *http://localhost:5300/health*
2828

2929
## Previous releases
3030

31+
### ``2.0.1`` (November 19th,2024)
32+
33+
This release introduces Apache Kafka support in Event Hubs emulator.
34+
- The producer and consumer APIs are now compatible with the Event Hubs emulator.
35+
3136
### ``1.2.4`` (July 1st,2024)
3237

3338
This release provides enhanced connectivity fixes for Emulator.

articles/event-hubs/test-locally-with-event-hub-emulator.md

Lines changed: 53 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,20 @@ Before you run an automated script, clone the emulator's [GitHub installer repos
3333

3434
### Windows
3535

36-
Use the following steps to run the Event Hubs emulator locally on Windows:
37-
38-
1. Allow the execution of unsigned scripts by running this command in the PowerShell window:
39-
40-
`$>Start-Process powershell -Verb RunAs -ArgumentList 'Set-ExecutionPolicy Bypass –Scope CurrentUser'`
41-
42-
1. Run the setup script *LaunchEmulator.ps1*. Running the script brings up two containers: the Event Hubs emulator and Azurite (a dependency for the emulator).
36+
Use the following steps to run the Event Hubs emulator locally on Windows.
37+
38+
1. **Open PowerShell** and navigate to the directory where the [common](https://github.com/Azure/azure-event-hubs-emulator-installer/tree/main/EventHub-Emulator/Scripts/Common) scripts folder is cloned using `cd`:
39+
```powershell
40+
cd <path to your common scripts folder> # Update this path
41+
42+
2. Issue wsl command to open WSL at this directory.
43+
```powershell
44+
wsl
45+
46+
3. **Run the setup script** *./LaunchEmulator.sh* Running the script brings up two containers: the Event Hubs emulator and Azurite (a dependency for the emulator).
47+
```bash
48+
./Launchemulator.sh
49+
4350
4451
### Linux and macOS
4552
@@ -81,41 +88,45 @@ To run the Event Hubs emulator locally on Linux or macOS:
8188

8289
2. To spin up containers for Event Hubs emulator, Save the following .yaml file as *docker-compose.yaml*.
8390

84-
```
85-
name: microsoft-azure-eventhubs
86-
services:
87-
emulator:
88-
container_name: "eventhubs-emulator"
89-
image: "mcr.microsoft.com/azure-messaging/eventhubs-emulator:latest"
90-
volumes:
91-
- "${CONFIG_PATH}:/Eventhubs_Emulator/ConfigFiles/Config.json"
92-
ports:
93-
- "5672:5672"
94-
- "9092:9092"
95-
environment:
96-
BLOB_SERVER: azurite
97-
METADATA_SERVER: azurite
98-
ACCEPT_EULA: ${ACCEPT_EULA}
99-
depends_on:
100-
- azurite
101-
networks:
102-
eh-emulator:
103-
aliases:
104-
- "eventhubs-emulator"
105-
azurite:
106-
container_name: "azurite"
107-
image: "mcr.microsoft.com/azure-storage/azurite:latest"
108-
ports:
109-
- "10000:10000"
110-
- "10001:10001"
111-
- "10002:10002"
112-
networks:
113-
eh-emulator:
114-
aliases:
115-
- "azurite"
116-
networks:
117-
eh-emulator:
118-
```
91+
```
92+
name: microsoft-azure-eventhubs
93+
services:
94+
emulator:
95+
container_name: "eventhubs-emulator"
96+
image: "mcr.microsoft.com/azure-messaging/eventhubs-emulator:latest"
97+
pull_policy: always
98+
volumes:
99+
- "${CONFIG_PATH}:/Eventhubs_Emulator/ConfigFiles/Config.json"
100+
ports:
101+
- "5672:5672"
102+
- "9092:9092"
103+
- "5300:5300"
104+
environment:
105+
BLOB_SERVER: azurite
106+
METADATA_SERVER: azurite
107+
ACCEPT_EULA: ${ACCEPT_EULA}
108+
depends_on:
109+
- azurite
110+
networks:
111+
eh-emulator:
112+
aliases:
113+
- "eventhubs-emulator"
114+
azurite:
115+
container_name: "azurite"
116+
image: "mcr.microsoft.com/azure-storage/azurite:latest"
117+
pull_policy: always
118+
ports:
119+
- "10000:10000"
120+
- "10001:10001"
121+
- "10002:10002"
122+
networks:
123+
eh-emulator:
124+
aliases:
125+
- "azurite"
126+
networks:
127+
eh-emulator:
128+
129+
```
119130

120131
3. Create an .env file to declare the environment variables for the Event Hubs emulator:
121132

articles/hdinsight/interactive-query/apache-hive-warehouse-connector.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: reachnijel
55
ms.author: nijelsf
66
ms.service: azure-hdinsight
77
ms.topic: how-to
8-
ms.date: 01/02/2025
8+
ms.date: 03/11/2025
99
---
1010

1111
# Integrate Apache Spark and Apache Hive with Hive Warehouse Connector in Azure HDInsight
@@ -57,6 +57,7 @@ Hive Warehouse Connector needs separate clusters for Spark and Interactive Query
5757
|:---:|:---:|---|
5858
| v1 | Spark 2.4 \| HDI 4.0 | Interactive Query 3.1 \| HDI 4.0 |
5959
| v2 | Spark 3.1 \| HDI 5.0 | Interactive Query 3.1 \| HDI 5.0 |
60+
| v2.1 | Spark 3.3.0 \| HDI 5.1 | Interactive Query 3.1 \| HDI 5.1 |
6061

6162
### Create clusters
6263

@@ -170,9 +171,9 @@ This is a way to run Spark interactively through a modified version of the Scala
170171
171172
### Spark-submit
172173
173-
Spark-submit is a utility to submit any Spark program (or job) to Spark clusters.
174+
`Spark-submit` is a utility to submit any Spark program (or job) to Spark clusters.
174175
175-
The spark-submit job will set up and configure Spark and Hive Warehouse Connector as per our instructions, execute the program we pass to it, then cleanly release the resources that were being used.
176+
The `spark-submit` job will set up and configure Spark and Hive Warehouse Connector as per our instructions, execute the program we pass to it, then cleanly release the resources that were being used.
176177
177178
Once you build the scala/java code along with the dependencies into an assembly jar, use the below command to launch a Spark application. Replace `<VERSION>`, and `<APP_JAR_PATH>` with the actual values.
178179

articles/iot-operations/deploy-iot-ops/howto-enable-secure-settings.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ This article provides instructions for enabling secure settings if you didn't do
3535

3636
## Enable the cluster for secure settings
3737

38-
To enable secrets synchronization for your Azure IoT Operations instance, your cluster must be enabled as an OIDC issuer and for workload identity federation. This configuration is required for the Secret Store extension to sync the secrets from an Azure key vault and store them on the edge as Kubernetes secrets.
38+
To enable secrets synchronization for your Azure IoT Operations instance, your cluster must be enabled as an OIDC issuer and for workload identity federation. This configuration is required for the Secret Store extension to sync the secrets from an Azure Key Vault and store them on the edge as Kubernetes secrets.
3939

4040
For Azure Kubernetes Service (AKS) clusters, the OIDC issuer and workload identity features can be enabled only at the time of cluster creation. For clusters on AKS Edge Essentials, the automated script enables these features by default. For AKS clusters on Azure Local, follow the steps to [Deploy and configure workload identity on an AKS enabled by Azure Arc cluster](/azure/aks/aksarc/workload-identity) to create a new cluster if you don't have one with the required features.
4141

@@ -85,16 +85,16 @@ For k3s clusters on Kubernetes, you can update an existing cluster. To enable an
8585
8686
## Set up secrets management
8787
88-
Secrets management for Azure IoT Operations uses the Secret Store extension to sync the secrets from an Azure key vault and store them on the edge as Kubernetes secrets. The Secret Store extension requires a user-assigned managed identity with access to the Azure key vault where secrets are stored. To learn more, see [What are managed identities for Azure resources?](/entra/identity/managed-identities-azure-resources/overview).
88+
Secrets management for Azure IoT Operations uses the Secret Store extension to sync the secrets from an Azure Key Vault and store them on the edge as Kubernetes secrets. The Secret Store extension requires a user-assigned managed identity with access to the Azure Key Vault where secrets are stored. To learn more, see [What are managed identities for Azure resources?](/entra/identity/managed-identities-azure-resources/overview).
8989
9090
To set up secrets management:
9191
92-
1. [Create an Azure key vault](/azure/key-vault/secrets/quick-create-cli#create-a-key-vault) that's used to store secrets, and [give your user account permissions to manage secrets](/azure/key-vault/secrets/quick-create-cli#give-your-user-account-permissions-to-manage-secrets-in-key-vault) with the `Key Vault Secrets Officer` role.
92+
1. [Create an Azure Key Vault](/azure/key-vault/secrets/quick-create-cli#create-a-key-vault) that's used to store secrets, and [give your user account permissions to manage secrets](/azure/key-vault/secrets/quick-create-cli#give-your-user-account-permissions-to-manage-secrets-in-key-vault) with the `Key Vault Secrets Officer` role.
9393
1. [Create a user-assigned managed identity](/entra/identity/managed-identities-azure-resources/how-manage-user-assigned-managed-identities?pivots=identity-mi-methods-azp#create-a-user-assigned-managed-identity) for the *secret store* extension to use to access the key vault.
9494
1. Use the [az iot ops secretsync enable](/cli/azure/iot/ops/secretsync#az-iot-ops-secretsync-enable) command to set up the Azure IoT Operations instance for secret synchronization. This command:
9595
9696
- Creates a federated identity credential by using the user-assigned managed identity.
97-
- Adds a role assignment to the user-assigned managed identity for access to the Azure key vault.
97+
- Adds a role assignment to the user-assigned managed identity for access to the Azure Key Vault.
9898
- Adds a minimum secret provider class associated with the Azure IoT Operations instance.
9999
100100
# [Bash](#tab/bash)

articles/logic-apps/secure-single-tenant-workflow-virtual-network-private-endpoint.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ To secure outbound traffic from your logic app, you can integrate your logic app
132132
|-------------|------------------|--------|-------------|----------|---------|
133133
| * | 443 | Subnet integrated with Standard logic app | Storage account | TCP | Storage account |
134134
| * | 445 | Subnet integrated with Standard logic app | Storage account | TCP | Server Message Block (SMB) File Share |
135+
| * | 20000-30000 | Subnet integrated with Standard logic app | Worker process | TCP | Communication between App Service Plan and Standard logic app nodes |
135136

136137
- For Azure-hosted managed connectors to work, you need to have an uninterrupted connection to the managed API service. With virtual network integration, make sure that no firewall or network security policy blocks these connections. If your virtual network uses a network security group (NSG), user-defined route table (UDR), or a firewall, make sure that the virtual network allows outbound connections to [all managed connector IP addresses](/connectors/common/outbound-ip-addresses#azure-logic-apps) in the corresponding region. Otherwise, Azure-managed connectors won't work.
137138

articles/network-watcher/frequently-asked-questions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
ms.date: 03/10/2025
1010
title: "Network Watcher frequently asked questions (FAQ)"
1111
summary: |
12-
This article provides answers to the most frequently asked questions asked about Azure Network Watcher.
12+
This article provides answers to the most frequently asked questions about Azure Network Watcher.
1313
1414
1515
sections:

0 commit comments

Comments
 (0)