Skip to content

Commit f491e7b

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into patricka-memory-profile
2 parents 9a6274e + d3fa873 commit f491e7b

File tree

254 files changed

+7744
-5115
lines changed

Some content is hidden

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

254 files changed

+7744
-5115
lines changed

.openpublishing.redirection.json

Lines changed: 15 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",
@@ -6618,6 +6628,11 @@
66186628
"source_path": "articles/reliability/migrate-sql-managed-instance.md",
66196629
"redirect_url": "/azure/azure-sql/managed-instance/instance-zone-redundancy-configure",
66206630
"redirect_document_id": false
6631+
},
6632+
{
6633+
"source_path": "articles/operational-excellence/relocation-managed-identity.md",
6634+
"redirect_url": "/entra/identity/managed-identities-azure-resources/how-to-managed-identity-regional-move",
6635+
"redirect_document_id": false
66216636
}
66226637
]
66236638
}

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-center/frequently-asked-questions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ sections:
3232
For APIs that are managed using an API management solution, Azure API Center can store metadata such as the runtime environment and deployment details. You can also link Azure API Management services as API sources for you inventory.
3333
3434
- question: Does Azure API Center provide a developer portal?
35-
answer: Yes, you have an option to build and self-host a developer portal where developers can discover APIs in your API center and view API details. A reference implementation is available in the [API Center portal starter](https://github.com/Azure/APICenter-Portal-Starter.git) repository. [Learn more](enable-api-center-portal.md).
35+
answer: Yes, you enable the [API Center portal](set-up-api-center-portal.md), where developers can discover and filter APIs in your API center and view API details.
3636

3737
In the Azure API Center extension for Visual Studio Code, you can also provide an [API catalog](enable-platform-api-catalog-vscode-extension.md) view for app developers in your organization to discover APIs in your API center.
3838

articles/api-center/resources.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ This article links to open-source code resources for Azure API Center solutions.
1919

2020
* [API analyzer](https://github.com/Azure/APICenter-Analyzer) - Enable linting and analysis of API definitions in your API center.
2121

22-
* [Azure API Center portal starter](https://github.com/Azure/APICenter-Portal-Starter) - Self-host an API portal to enable API consumers to discover APIs in your API center.
23-
2422
* [Expose SAP APIs](https://github.com/Azure-Samples/azd-apic-sap/) - Govern SAP APIs in various API management solutions in a single place with your API center.
2523

2624
## Labs
@@ -33,6 +31,6 @@ This article links to open-source code resources for Azure API Center solutions.
3331

3432
## Related content
3533

36-
* [Enable linting and analysis in your API center](enable-api-analysis-linting.md)
37-
* [Self-host the Azure API Center portal](enable-api-center-portal.md)
38-
* [azd template library](https://azure.github.io/awesome-azd/)
34+
* [Enable linting and analysis in your API center](enable-managed-api-analysis-linting.md)
35+
* [Enable the Azure API Center portal](set-up-api-center-portal.md)
36+
* [azd template library](https://azure.github.io/awesome-azd/)

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/app-service/overview-vnet-integration.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Integrate your app with an Azure virtual network
33
description: Integrate your app in Azure App Service with Azure virtual networks.
44
author: madsd
55
ms.topic: conceptual
6-
ms.date: 04/05/2024
6+
ms.date: 03/14/2025
77
ms.author: madsd
88
ms.custom: UpdateFrequency3
99

@@ -20,15 +20,15 @@ This article describes the Azure App Service virtual network integration feature
2020
App Service has two variations:
2121

2222
* The dedicated compute pricing tiers, which include the Basic, Standard, Premium, Premium v2, and Premium v3.
23-
* The App Service Environment, which deploys directly into your virtual network with dedicated supporting infrastructure and is using the Isolated and Isolated v2 pricing tiers.
23+
* The App Service Environment, which deploys directly into your virtual network with dedicated supporting infrastructure and is using the Isolated v2 pricing tiers.
2424

2525
The virtual network integration feature is used in Azure App Service dedicated compute pricing tiers. If your app is in an [App Service Environment](./environment/overview.md), it already integrates with a virtual network and doesn't require you to configure virtual network integration feature to reach resources in the same virtual network. For more information on all the networking features, see [App Service networking features](./networking-features.md).
2626

2727
Virtual network integration gives your app access to resources in your virtual network, but it doesn't grant inbound private access to your app from the virtual network. Private site access refers to making an app accessible only from a private network, such as from within an Azure virtual network. Virtual network integration is used only to make outbound calls from your app into your virtual network. Refer to [private endpoint](./networking/private-endpoint.md) for inbound private access.
2828

2929
The virtual network integration feature:
3030

31-
* Requires a [supported Basic or Standard](./overview-vnet-integration.md#limitations), Premium, Premium v2, Premium v3, or Elastic Premium App Service pricing tier.
31+
* Requires a Basic, Standard, Premium, Premium v2, Premium v3, or Elastic Premium App Service pricing tier.
3232
* Supports TCP and UDP.
3333
* Works with App Service apps, function apps, and Logic apps.
3434

@@ -211,9 +211,6 @@ After your app integrates with your virtual network, it uses the same DNS server
211211

212212
There are some limitations with using virtual network integration:
213213

214-
* The feature is available from all App Service deployments in Premium v2 and Premium v3. It's also available in Basic and Standard tier but only from newer App Service deployments. If you're on an older deployment, you can only use the feature from a Premium v2 App Service plan. If you want to make sure you can use the feature in a Basic or Standard App Service plan, create your app in a Premium v3 App Service plan. Those plans are only supported on our newest deployments. You can scale down if you want after the plan is created.
215-
* The feature isn't available for Isolated plan apps in an App Service Environment.
216-
* You can't reach resources across peering connections with classic virtual networks.
217214
* The feature requires an unused subnet that's an IPv4 `/28` block or larger in an Azure Resource Manager virtual network. MPSJ requires a `/26` block or larger.
218215
* The app and the virtual network must be in the same region.
219216
* The integration virtual network can't have IPv6 address spaces defined.

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

0 commit comments

Comments
 (0)