Skip to content

Commit f7518b8

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into us401764-cli-posh-nat-firewall
2 parents dc77f9f + b6e0d0e commit f7518b8

File tree

256 files changed

+7904
-6952
lines changed

Some content is hidden

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

256 files changed

+7904
-6952
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2819,6 +2819,11 @@
28192819
"redirect_url": "/azure/bastion/bastion-connect-vm-ssh-linux",
28202820
"redirect_document_id": false
28212821
},
2822+
{
2823+
"source_path_from_root": "/articles/bastion/quickstart-developer-sku.md",
2824+
"redirect_url": "/azure/bastion/quickstart-developer",
2825+
"redirect_document_id": false
2826+
},
28222827
{
28232828
"source_path_from_root": "/articles/bastion/bastion-connect-vm-rdp.md",
28242829
"redirect_url": "/azure/bastion/bastion-connect-vm-rdp-windows",
@@ -6289,6 +6294,11 @@
62896294
"redirect_url": "/azure/virtual-network/vnet-integration-for-azure-services",
62906295
"redirect_document_id": false
62916296
},
6297+
{
6298+
"source_path_from_root": "/articles/cyclecloud/how-to/ccws/cleanup-roles.md",
6299+
"redirect_url": "/azure/cyclecloud/how-to/ccws/deploy-with-cli",
6300+
"redirect_document_id": false
6301+
},
62926302
{
62936303
"source_path": "articles/cloud-services/applications-dont-support-tls-1-2.md",
62946304
"redirect_url": "/previous-versions/azure/cloud-services/applications-dont-support-tls-1-2",

articles/api-center/enable-platform-api-catalog-vscode-extension.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ First, configure an app registration in your Microsoft Entra ID tenant. The app
6060
1. On the **Configure platforms** page, select **Mobile and desktop applications**.
6161
1. On the **Configure Desktop + devices** page, enter the following redirect URI and select **Configure**:
6262

63-
`https://vscode.dev/redirect`
64-
63+
`https://vscode.dev/redirect` , `http://localhost` and `ms-appx-web://Microsoft.AAD.BrokerPlugin/<application-client-id>`
64+
6565
1. In the left menu, under **Manage**, select **API permissions** > **+ Add a permission**.
6666
1. On the **Request API permissions** page, do the following:
6767
1. Select the **APIs my organization uses** tab.

articles/api-management/migrate-stv1-to-stv2-vnet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: dlepow
66
ms.service: azure-api-management
77
ms.custom:
88
ms.topic: how-to
9-
ms.date: 02/19/2025
9+
ms.date: 03/10/2025
1010
ms.author: danlep
1111
---
1212

articles/app-service/configure-language-java-deploy-run.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ See respective sections below for details as well as opportunities to customize
549549
- The Keystore of the Java runtime is updated with any public and private certificates defined in Azure portal.
550550
- Public certificates are provided by the platform in the */var/ssl/certs* directory, and they're loaded to *$JRE_HOME/lib/security/cacerts*.
551551
- Private certificates are provided by the platform in the */var/ssl/private* directory, and they're loaded to *$JRE_HOME/lib/security/client.jks*.
552-
- If any certificates are loaded in the Java keystore in this step, the properties `javax.net.ssl.keyStore`, `javax.net.ssl.keyStorePassword` and `javax.net.ssl.keyStoreType` are added to the `JAVA_TOOL_OPTIONS` environment variable.
552+
- If any certificates are loaded in the Java keystore in this step, the properties `javax.net.ssl.keyStore`, `javax.net.ssl.keyStorePassword` and `javax.net.ssl.keyStoreType` are added to the `JAVA_OPTS` environment variable.
553553
- Some initial JVM configuration is determined such as logging directories and Java memory heap parameters:
554554
- If you provide the `–Xms` or `–Xmx` flags for memory in the app setting `JAVA_OPTS`, these values override the ones provided by the platform.
555555
- If you configure the app setting `WEBSITES_CONTAINER_STOP_TIME_LIMIT`, the value is passed to the runtime property `org.wildfly.sigterm.suspend.timeout`, which controls the maximum shutdown wait time (in seconds) when JBoss is being stopped.

articles/application-gateway/for-containers/alb-controller-release-notes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ Instructions for new or existing deployments of ALB Controller are found in the
2626

2727
| ALB Controller Version | Gateway API Version | Kubernetes Version | Release Notes |
2828
| ---------------------- | ------------------- | ------------------ | ------------- |
29-
| 1.4.12 | v1.1.1 | v1.26, v1.27, v1.28, v1.29, v1.30 | Updated to Gateway API version 1.1.1, Regex match support for path and header match in HTTP and GRPC routes, [Wildcard hostname fix](https://github.com/Azure/AKS/issues/4713), Misc. bug fixes and improvements |
30-
29+
| 1.4.14 | v1.1.1 | v1.26, v1.27, v1.28, v1.29, v1.30 | Bug fixes, including [issue #4086](https://github.com/Azure/AKS/issues/4086) |
3130
## Release history
3231

3332
| ALB Controller Version | Gateway API Version | Kubernetes Version | Release Notes |
3433
| ---------------------- | ------------------- | ------------------ | ------------- |
34+
| 1.4.12 | v1.1.1 | v1.26, v1.27, v1.28, v1.29, v1.30 | Updated to Gateway API version 1.1.1, Regex match support for path and header match in HTTP and GRPC routes, [Wildcard hostname fix](https://github.com/Azure/AKS/issues/4713), Misc. bug fixes and improvements |
3535
| 1.3.7| v1.1 | v1.26, v1.27, v1.28, v1.29, v1.30 | Minor fixes and improvements |
3636
| 1.2.3| v1.1 | v1.26, v1.27, v1.28, v1.29, v1.30 | Gateway API v1.1, gRPC support, frontend mutual authentication, readiness probe fixes, custom health probe port and TLS mode |
3737
| 1.0.2| v1 | v1.26, v1.27, v1.28, v1.29 | ECDSA + RSA certificate support for both Ingress and Gateway API, Ingress fixes, Server-sent events support |

articles/application-gateway/for-containers/quickstart-deploy-application-gateway-for-containers-alb-controller.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ You need to complete the following tasks before deploying Application Gateway fo
146146
az aks get-credentials --resource-group $RESOURCE_GROUP --name $AKS_NAME
147147
helm install alb-controller oci://mcr.microsoft.com/application-lb/charts/alb-controller \
148148
--namespace $HELM_NAMESPACE \
149-
--version 1.4.12 \
149+
--version 1.4.14 \
150150
--set albController.namespace=$CONTROLLER_NAMESPACE \
151151
--set albController.podIdentity.clientID=$(az identity show -g $RESOURCE_GROUP -n azure-alb-identity --query clientId -o tsv)
152152
```
@@ -164,7 +164,7 @@ You need to complete the following tasks before deploying Application Gateway fo
164164
az aks get-credentials --resource-group $RESOURCE_GROUP --name $AKS_NAME
165165
helm upgrade alb-controller oci://mcr.microsoft.com/application-lb/charts/alb-controller \
166166
--namespace $HELM_NAMESPACE \
167-
--version 1.4.12 \
167+
--version 1.4.14 \
168168
--set albController.namespace=$CONTROLLER_NAMESPACE \
169169
--set albController.podIdentity.clientID=$(az identity show -g $RESOURCE_GROUP -n azure-alb-identity --query clientId -o tsv)
170170
```

articles/application-gateway/for-containers/troubleshooting-guide.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ Example output:
2525

2626
| NAME | READY | UP-TO-DATE | AVAILABLE | AGE | CONTAINERS | IMAGES | SELECTOR |
2727
| ------------------------ | ----- | ---------- | --------- | ---- | ----------------------- | ------------------------------------------------------------------------------- | -------- |
28-
| alb-controller | 2/2 | 2 | 2 | 18d | alb-controller | mcr.microsoft.com/application-lb/images/alb-controller:**1.4.12** | app=alb-controller |
29-
| alb-controller-bootstrap | 1/1 | 1 | 1 | 18d | alb-controller-bootstrap | mcr.microsoft.com/application-lb/images/alb-controller-bootstrap:**1.4.12** | app=alb-controller-bootstrap |
28+
| alb-controller | 2/2 | 2 | 2 | 18d | alb-controller | mcr.microsoft.com/application-lb/images/alb-controller:**1.4.14** | app=alb-controller |
29+
| alb-controller-bootstrap | 1/1 | 1 | 1 | 18d | alb-controller-bootstrap | mcr.microsoft.com/application-lb/images/alb-controller-bootstrap:**1.4.14** | app=alb-controller-bootstrap |
3030

31-
In this example, the ALB controller version is **1.4.12**.
31+
In this example, the ALB controller version is **1.4.14**.
3232

3333
The ALB Controller version can be upgraded by running the `helm upgrade alb-controller` command. For more information, see [Install the ALB Controller](quickstart-deploy-application-gateway-for-containers-alb-controller.md#install-the-alb-controller).
3434

articles/automation/automation-use-azure-ad.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Before installing the Microsoft Entra modules on your computer:
4141
4242
1. Install Windows Management Framework (WMF) 5.1. See [Install and Configure WMF 5.1](/powershell/scripting/wmf/setup/install-configure).
4343

44-
2. Install AzureRM and/or Az using instructions in [Install Azure PowerShell on Windows with PowerShellGet](/powershell/azure/azurerm/install-azurerm-ps).
44+
2. Install AzureRM and/or Az using instructions in [Install Azure PowerShell on Windows with PowerShellGet](/powershell/azure/install-azure-powershell).
4545

4646
### Install the MSOnline module
4747

articles/automation/overview.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: Azure Automation overview
33
description: This article tells what Azure Automation is and how to use it to automate the lifecycle of infrastructure and applications.
44
services: automation
5-
keywords: azure automation, DSC, powershell, state configuration, update management, change tracking, DSC, inventory, runbooks, python, graphical
6-
ms.date: 11/05/2024
5+
keywords: azure automation, DSC, powershell, state configuration, change tracking, DSC, inventory, runbooks, python, graphical
6+
ms.date: 03/17/2025
77
ms.topic: overview
88
ms.custom: linux-related-content
99
---
@@ -16,7 +16,7 @@ Automation is needed in three broad areas of cloud operations:
1616
* Response - Create event-based automation to diagnose and resolve issues.
1717
* Orchestrate - Orchestrate and integrate your automation with other Azure or third party services and products.
1818

19-
Azure Automation delivers a cloud-based automation, operating system updates, and configuration service that supports consistent management across your Azure and non-Azure environments. It includes process automation, configuration management, update management, shared capabilities, and heterogeneous features.
19+
Azure Automation delivers a cloud-based automation, operating system updates, and configuration service that supports consistent management across your Azure and non-Azure environments. It includes process automation, configuration management, shared capabilities, and heterogeneous features.
2020

2121
:::image type="content" source="./media/overview/automation-overview.png" alt-text="Diagram shows the Automation capabilities." lightbox="./media/overview/automation-overview.png":::
2222

@@ -69,7 +69,7 @@ Azure Automation supports [source control integration](source-control-integratio
6969

7070
Automation is designed to work across Windows and Linux physical servers and virtual machines outside of Azure, on your corporate network, or other cloud provider. It delivers a consistent way to automate and configure deployed workloads and the operating systems that run them. The Hybrid Runbook Worker feature of Azure Automation enables running runbooks directly on the non-Azure physical server or virtual machine hosting the role, and against resources in the environment to manage those local resources.
7171

72-
Through [Arc-enabled servers](/azure/azure-arc/servers/overview), it provides a consistent deployment and management experience for your non-Azure machines. It enables integration with the Automation service using the VM extension framework to deploy the Hybrid Runbook Worker role, and simplify onboarding to Update Management and Change Tracking and Inventory.
72+
Through [Arc-enabled servers](/azure/azure-arc/servers/overview), it provides a consistent deployment and management experience for your non-Azure machines. It enables integration with the Automation service using the VM extension framework to deploy the Hybrid Runbook Worker role, and simplify onboarding Change Tracking and Inventory using AMA.
7373

7474
## Common scenarios
7575

@@ -108,9 +108,9 @@ Azure Automation supports management throughout the lifecycle of your infrastruc
108108

109109
Depending on your requirements, one or more of the following Azure services integrate with or complement Azure Automation to help fulfill them:
110110

111-
* [Azure Arc-enabled servers](/azure/azure-arc/servers/overview) enables simplified onboarding of hybrid machines to Update Management, Change Tracking and Inventory, and the Hybrid Runbook Worker role.
111+
* [Azure Arc-enabled servers](/azure/azure-arc/servers/overview) enables simplified onboarding of hybrid machines to Change Tracking and Inventory using AMA, and the Hybrid Runbook Worker role.
112112
* [Azure Alerts action groups](/azure/azure-monitor/alerts/action-groups) can initiate an Automation runbook when an alert is raised.
113-
* [Azure Monitor](/azure/azure-monitor/overview) to collect metrics and log data from your Automation account for further analysis and take action on the telemetry. Automation features such as Update Management and Change Tracking and Inventory rely on the Log Analytics workspace to deliver elements of their functionality.
113+
* [Azure Monitor](/azure/azure-monitor/overview) to collect metrics and log data from your Automation account for further analysis and take action on the telemetry.
114114
* [Azure Policy](../governance/policy/samples/built-in-policies.md) includes initiative definitions to help establish and maintain compliance with different security standards for your Automation account.
115115
* [Azure Site Recovery](../site-recovery/site-recovery-runbook-automation.md) can use Azure Automation runbooks to automate recovery plans.
116116

articles/azure-cache-for-redis/cache-migration-guide.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ description: Learn how to migrate your existing cache to Azure Cache for Redis
77
ms.topic: conceptual
88
ms.custom:
99
- ignite-2024
10+
- migration
11+
- aws-to-azure
1012
ms.date: 11/17/2021
1113
---
1214
# Migrate to Azure Cache for Redis

0 commit comments

Comments
 (0)