Skip to content

Commit 8a26e31

Browse files
committed
Merge branch 'main' into release-preview-sre-agent
2 parents 29fcb13 + 06f9302 commit 8a26e31

File tree

41 files changed

+260
-197
lines changed

Some content is hidden

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

41 files changed

+260
-197
lines changed

articles/app-service/app-service-undelete.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ ms.custom: devx-track-azurepowershell
1212

1313
If you accidentally deleted an app in Azure App Service, you can now restore it by using the Azure portal or PowerShell.
1414

15+
> [!IMPORTANT]
16+
> This feature isn't supported for apps hosted on App Service plans using the Free and Shared tiers.
17+
1518
## Restore a deleted App Service app by using the Azure portal
1619

1720
If you deleted your app in Azure App Service, you can restore it from the portal by following these steps:

articles/azure-functions/functions-reference-python.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ The *host.json* file must also be updated to include an HTTP `routePrefix`, as s
842842
"extensionBundle":
843843
{
844844
"id": "Microsoft.Azure.Functions.ExtensionBundle",
845-
"version": "[3.*, 4.0.0)"
845+
"version": "[4.*, 5.0.0)"
846846
},
847847
"extensions":
848848
{
@@ -910,7 +910,7 @@ You can use Asynchronous Server Gateway Interface (ASGI)-compatible and Web Serv
910910
"extensionBundle":
911911
{
912912
"id": "Microsoft.Azure.Functions.ExtensionBundle",
913-
"version": "[2.*, 3.0.0)"
913+
"version": "[4.*, 5.0.0)"
914914
},
915915
"extensions":
916916
{

articles/backup/backup-azure-backup-faq.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
description: 'Answers to common questions about'
55
ms.topic: faq
66
ms.service: azure-backup
7-
ms.date: 08/09/2024
7+
ms.date: 06/23/2025
88
author: jyothisuri
99
ms.author: jsuri
1010
ms.custom: engagement-fy24
@@ -109,6 +109,11 @@ sections:
109109
answer: |
110110
No. Currently, Azure Backup supports only copying restore points from one vault to another. You can [move snapshots to a different region using the VM restore point APIs](/azure/virtual-machines/manage-restore-points#copy-a-vm-restore-point-between-regions), but this isn't supported for Vault-tier recovery points.
111111
112+
- question: |
113+
Why is Cross Region Restore not supported when Public Network access is set to Deny?
114+
answer: |
115+
Cross Region Restore (CRR) replicates data from the primary to the secondary region using Geo-redundant storage (GRS) with CRR enabled. When you deny public access and use a private endpoint, the system expects data sync to occur over a private network. However, the secondary region currently doesn’t support private endpoint configuration, which is essential for replication. Without a private connection in the secondary region, CRR can't perform the required replication.
116+
112117
- name: Azure Backup agent
113118
questions:
114119
- question: |

articles/container-apps/networking.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,13 @@ Different environment types have different subnet requirements:
147147

148148
| Subnet Size | Available IP Addresses<sup>1</sup> | Max nodes (Dedicated workload profile)<sup>2</sup>| Max replicas (Consumption workload profile)<sup>2</sup> |
149149
|--|--|--|--|
150-
| /23 | 495 | 247 | 2,470 |
151-
| /24 | 239 | 119 | 1,190 |
152-
| /25 | 111 | 55 | 550 |
153-
| /26 | 47 | 23 | 230 |
154-
| /27 | 15 | 7 | 70 |
150+
| /23 | 498 | 249 | 2,490 |
151+
| /24 | 242 | 121 | 1,210 |
152+
| /25 | 114 | 57 | 570 |
153+
| /26 | 50 | 25 | 250 |
154+
| /27 | 18 | 9 | 90 |
155155

156-
<sup>1</sup> The available IP addresses is the size of the subnet minus the 12 IP addresses required for Azure Container Apps infrastructure and 5 IP addresses reserved by the subnet.
156+
<sup>1</sup> The available IP addresses is the size of the subnet minus the 14 IP addresses required for Azure Container Apps infrastructure which includes 5 IP addresses reserved by the subnet.
157157
<sup>2</sup> This is accounting for apps in single revision mode.
158158

159159
# [Consumption only environment](#tab/consumption-only-env)

articles/frontdoor/end-to-end-tls.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ For Azure Front Door classic and Microsoft CDN classic, you can configure the mi
4545
4646
## Supported certificates
4747

48-
When you create your TLS/SSL certificate, you must create a complete certificate chain with an allowed Certificate Authority (CA) that is part of the [Microsoft Trusted CA List](https://ccadb-public.secure.force.com/microsoft/IncludedCACertificateReportForMSFT). If you use a non-allowed CA, your request will be rejected.
48+
When you create your TLS/SSL certificate, you must create a complete certificate chain with an allowed Certificate Authority (CA) that is part of the [Microsoft Trusted CA List](https://ccadb.my.salesforce-sites.com/microsoft/IncludedCACertificateReportForMSFT). If you use a non-allowed CA, your request will be rejected.
4949

5050
Certificates from internal CAs or self-signed certificates aren't allowed.
5151

articles/iot-operations/deploy-iot-ops/overview-deploy.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ To install Azure IoT Operations, have the following hardware requirements availa
2929
| Available memory for Azure IoT Operations (RAM) | 10-GB | Depends on usage |
3030
| CPU | 4 vCPUs | 8 vCPUs |
3131

32+
>[!NOTE]
33+
>The minimum configuration is appropriate when running AIO only.
34+
3235
## Choose your features
3336

3437
Azure IoT Operations offers two deployment modes. You can choose to deploy with *test settings*, a basic subset of features that are simpler to get started with for evaluation scenarios. Or, you can choose to deploy with *secure settings*, the full feature set.

articles/role-based-access-control/permissions/hybrid-multicloud.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ Azure service: [Azure Arc](/azure/azure-arc/)
228228
> | Microsoft.HybridCompute/machines/UpgradeExtensions/action | Upgrades Extensions on Azure Arc machines |
229229
> | Microsoft.HybridCompute/machines/assessPatches/action | Assesses any Azure Arc machines to get missing software patches |
230230
> | Microsoft.HybridCompute/machines/installPatches/action | Installs patches on any Azure Arc machines |
231-
> | Microsoft.HybridCompute/machines/listAccessDetails/action | Retreives the access details for a machines resource |
231+
> | Microsoft.HybridCompute/machines/listAccessDetails/action | Retrieves the access details for a machines resource |
232232
> | Microsoft.HybridCompute/machines/addExtensions/action | Setup Extensions on Azure Arc machines |
233233
> | Microsoft.HybridCompute/machines/extensions/read | Reads any Azure Arc extensions |
234234
> | Microsoft.HybridCompute/machines/extensions/write | Installs or Updates an Azure Arc extensions |

articles/sentinel/sap/deploy-data-connector-agent-container.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ At this stage, the system's **Health** status is **Pending**. If the agent is up
348348
- If you have the **Entra ID Application Developer** role or higher, continue to the next step.
349349
- If you don't have the **Entra ID Application Developer** role or higher:
350350
- Share the DCR ID with your Entra ID administrator or colleague with the required permissions.
351-
- Ensure that the **Monitoring Metrics Publishing** role is assigned on the DCR, with the service principal assignment, using the client ID from the Entra ID app registration.
351+
- Ensure that the **Monitoring Metrics Publisher** role is assigned on the DCR, with the service principal assignment, using the client ID from the Entra ID app registration.
352352
- Retrieve the client ID and client secret from the Entra ID app registration to use for authorization on the DCR.
353353
354354
The SAP admin uses the client ID and client secret information to post to the DCR.

articles/service-bus-messaging/includes/get-namespace-connection-string.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,20 @@
44
author: spelluru
55
ms.service: azure-service-bus
66
ms.topic: include
7-
ms.date: 02/02/2022
7+
ms.date: 06/18/2025
88
ms.author: spelluru
99
ms.custom: include file
1010
---
1111

1212
## Get connection string to the namespace (Azure portal)
13-
Creating a new namespace automatically generates an initial Shared Access Signature (SAS) policy with primary and secondary keys, and primary and secondary connection strings that each grant full control over all aspects of the namespace. See [Service Bus authentication and authorization](../service-bus-authentication-and-authorization.md) for information about how to create rules with more constrained rights for regular senders and receivers.
13+
14+
Creating a new namespace automatically generates an initial Shared Access Signature (SAS) policy. The policy includes primary and secondary keys, and primary and secondary connection strings that each grant full control over all aspects of the namespace. For more information about how to create rules with more constrained rights for regular senders and receivers, see [Service Bus authentication and authorization](../service-bus-authentication-and-authorization.md).
1415

1516
A client can use the connection string to connect to the Service Bus namespace. To copy the primary connection string for your namespace, follow these steps:
1617

17-
1. On the **Service Bus Namespace** page, select **Shared access policies** on the left menu.
18-
3. On the **Shared access policies** page, select **RootManageSharedAccessKey**.
19-
4. In the **Policy: RootManageSharedAccessKey** window, select the copy button next to **Primary Connection String**, to copy the connection string to your clipboard for later use. Paste this value into Notepad or some other temporary location.
18+
1. On the **Service Bus Namespace** page, expand **Settings**, then select **Shared access policies**.
19+
1. On the **Shared access policies** page, select **RootManageSharedAccessKey**.
20+
1. In the **SAS Policy: RootManageSharedAccessKey** window, select the copy button next to **Primary Connection String**. This action copies the connection string to your clipboard for later use. Paste this value into Notepad or some other temporary location.
2021

2122
:::image type="content" source="./media/service-bus-create-namespace-portal/connection-string.png" lightbox="./media/service-bus-create-namespace-portal/connection-string.png" alt-text="Screenshot shows an S A S policy called RootManageSharedAccessKey, which includes keys and connection strings.":::
2223

20.1 KB
Loading

0 commit comments

Comments
 (0)