Skip to content

Commit cde4e9d

Browse files
authored
Merge pull request #307163 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 33e1a5c + cb8bce0 commit cde4e9d

6 files changed

Lines changed: 7 additions & 9 deletions

articles/azure-functions/functions-bindings-mcp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ To connect to the MCP server exposed by your function app, you need to provide a
9393

9494
<sup>1</sup> Newer protocol versions deprecated the Server-Sent Events transport. Unless your client specifically requires it, you should use the Streamable HTTP transport instead.
9595

96-
When hosted in Azure, the endpoints exposed by the extension also require the [system key](./function-keys-how-to.md) named `mcp_extension`. If it isn't provided in the `x-functions-key` HTTP header, your client receives a `401 Unauthorized` response. You can retrieve the key using any of the methods described in [Get your function access keys](./function-keys-how-to.md#get-your-function-access-keys). The following example shows how to get the key with the Azure CLI:
96+
When hosted in Azure, the endpoints exposed by the extension also require the [system key](./function-keys-how-to.md) named `mcp_extension`. If it isn't provided in the `x-functions-key` HTTP header or in the `code` query string parameter, your client receives a `401 Unauthorized` response. You can retrieve the key using any of the methods described in [Get your function access keys](./function-keys-how-to.md#get-your-function-access-keys). The following example shows how to get the key with the Azure CLI:
9797

9898
```azurecli
9999
az functionapp keys list --resource-group <RESOURCE_GROUP> --name <APP_NAME> --query systemKeys.mcp_extension --output tsv

articles/expressroute/expressroute-about-virtual-network-gateways.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ When Auto-Assigned Public IP is enabled, the ExpressRoute gateway's Overview pag
9292

9393
**How it works:**
9494

95-
When you create an ExpressRoute gateway, Microsoft automatically provisions and manages the public IP address in a secure, backend subscription. This IP is encapsulated within the gateway resource, enabling Microsoft to enforce policies such as data rate limits and enhance auditability.
95+
When you create an ExpressRoute gateway, Microsoft automatically provisions and manages the public IP address in a secure, backend subscription. This IP is encapsulated within the gateway resource, enabling Microsoft to enforce policies such as data rate limits and enhance auditability. Previously it was possible to create the public IP resource as a zonal resource which ensured that all instances of the gateway in that zone shared the same public IP address. New behavior is that the gateway is always zone redundant.
9696

9797
**Availability:**
9898

articles/expressroute/expressroute-howto-add-gateway-portal-resource-manager.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ The steps for this tutorial use the values in the following configuration refere
8080
| Minimum Scale Units | This option is only available when you select the **ErGwScale (Preview)** SKU. Enter the minimum number of scale units you want to use. For more information, see [ExpressRoute Gateway Scale Units](scalable-gateway.md). |
8181
| Maximum Scale Units | This option is only available when you select the **ErGwScale (Preview)** SKU. Enter the maximum number of scale units you want to use. For more information, see [ExpressRoute Gateway Scale Units](scalable-gateway.md). |
8282
| Virtual network | Select *vnet-1*. |
83-
| **Public IP address** | |
84-
| Assignment | By default, all ExpressRoute Gateways will have an [Auto-Assigned Public IP](expressroute-about-virtual-network-gateways.md#auto-assigned-public-ip). |
83+
| **Public IP address** | ExpressRoute Gateways now have an [Auto-Assigned Public IP](expressroute-about-virtual-network-gateways.md#auto-assigned-public-ip). This Public IP address is automatically assigned to the gateway during its creation, which means zonal gateways can no longer be created. |
8584

8685
> [!IMPORTANT]
8786
> If you plan to use IPv6-based private peering over ExpressRoute, please make sure to create your gateway with a Public IP address of type Standard, Static using the [PowerShell instructions](./expressroute-howto-add-gateway-resource-manager.md#add-a-gateway).

articles/expressroute/expressroute-howto-add-gateway-resource-manager.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ The steps for this task use a VNet based on the values in the following configur
4141
| Gateway IP Name | *GWIP* |
4242
| Gateway IP configuration Name | *gwipconf* |
4343
| Type | *ExpressRoute* |
44-
| Gateway Public IP Name | *gwpip* |
45-
4644
## Add a gateway
4745

4846
> [!IMPORTANT]
@@ -106,7 +104,8 @@ The steps for this task use a VNet based on the values in the following configur
106104

107105
> [!NOTE]
108106
> Basic SKU public IP isn't supported with new ExpressRoute virtual network gateway.
109-
> Creating a public IP is no longer required, Microsoft will create and manage your public IP.
107+
> Creating a public IP is no longer required, [Microsoft will create and manage your public IP](expressroute-about-virtual-network-gateways.md#auto-assigned-public-ip). This means all ExpressRoute virtual network gateways are created as zone-redundant.
108+
110109

111110
1. Create the configuration for your gateway. The gateway configuration defines the subnet to use. In this step, you're specifying the configuration that will be used when you create the gateway. Use the following sample to create your gateway configuration.
112111

articles/sentinel/work-with-threat-indicators.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ Threat indicators are stored in the Microsoft Sentinel `ThreatIntelligenceIndica
172172

173173
>[!IMPORTANT]
174174
> On April 3, 2025, we publicly previewed two new tables to support STIX indicator and object schemas: `ThreatIntelIndicators` and `ThreatIntelObjects`. Microsoft Sentinel will ingest all threat intelligence into these new tables, while continuing to ingest the same data into the legacy `ThreatIntelligenceIndicator` table until July 31, 2025.
175-
>**Be sure to update your custom queries, analytics and detection rules, workbooks, and automation to use the new tables by July 31, 2025.** After this date, Microsoft Sentinel will stop ingesting data to the legacy `ThreatIntelligenceIndicator` table. We're updating all out-of-the-box threat intelligence solutions in Content hub to leverage the new tables. For more information about the new table schemas, see [ThreatIntelIndicators](/azure/azure-monitor/reference/tables/threatintelligenceindicator) and [ThreatIntelObjects](/azure/azure-monitor/reference/tables/threatintelobjects).
175+
>**Be sure to update your custom queries, analytics and detection rules, workbooks, and automation to use the new tables by July 31, 2025.** After this date, Microsoft Sentinel will stop ingesting data to the legacy `ThreatIntelligenceIndicator` table. We're updating all out-of-the-box threat intelligence solutions in Content hub to leverage the new tables. For more information about the new table schemas, see [ThreatIntelIndicators](/azure/azure-monitor/reference/tables/threatintelindicators) and [ThreatIntelObjects](/azure/azure-monitor/reference/tables/threatintelobjects).
176176
> For information on using and migrating to the new tables, see (Work with STIX objects to enhance threat intelligence and threat hunting in Microsoft Sentinel (Preview))[work-with-stix-objects-indicators.md].
177177
178178

includes/storage-file-sync-cost-categories.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
ms.custom: include file
1111
---
1212

13-
- **Capital and operational costs of Windows File Servers with one or more server endpoints.** Azure File Sync as a replication solution is agnostic of where the Windows File Servers that are synchronized with Azure Files are; they could be hosted on-premises, in an Azure virtual machine, or even in another cloud. The costs for sync servers hosted on-premises or in other cloud providers include both capital and operating costs that aren't tracked as part of your Azure bill, but are still part of the total cost of ownership of the solution. Captial expenses are the upfront hardware costs of your solution. Operating expenses are the ongoing costs of labor, electricity, etc. You should consider the amount of data you need to cache on-premises, the number of CPUs and amount of memory your Windows File Servers need to host Azure File Sync workloads, and other organization-specific costs you might have. For more information, see [recommended system resources](../articles/storage/file-sync/file-sync-planning.md#recommended-system-resources).
13+
- **Capital and operational costs of Windows File Servers with one or more server endpoints.** Azure File Sync as a replication solution is agnostic of where the Windows File Servers that are synchronized with Azure Files are; they could be hosted on-premises, in an Azure virtual machine, or even in another cloud. The costs for sync servers hosted on-premises or in other cloud providers include both capital and operating costs that aren't tracked as part of your Azure bill, but are still part of the total cost of ownership of the solution. Capital expenses are the upfront hardware costs of your solution. Operating expenses are the ongoing costs of labor, electricity, etc. You should consider the amount of data you need to cache on-premises, the number of CPUs and amount of memory your Windows File Servers need to host Azure File Sync workloads, and other organization-specific costs you might have. For more information, see [recommended system resources](../articles/storage/file-sync/file-sync-planning.md#recommended-system-resources).
1414

1515
- **Per server licensing cost for servers registered with Azure File Sync.** To use Azure File Sync with a specific Windows File Server, you must first register it with Azure File Sync's Azure resource, the Storage Sync Service. Each server that you register after the first server has a flat monthly fee. Although this fee is small, it is one component of your bill to consider. To see the current price of the server registration fee for your desired region, see [the File Sync section on Azure Files pricing page](https://azure.microsoft.com/pricing/details/storage/files/).
1616

0 commit comments

Comments
 (0)