Skip to content

Commit 3c0b573

Browse files
authored
Merge pull request #300739 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 52adbd0 + 6448bf9 commit 3c0b573

File tree

6 files changed

+10
-11
lines changed

6 files changed

+10
-11
lines changed

articles/api-management/how-to-configure-local-metrics-logs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ The self-hosted gateway supports [StatsD](https://github.com/statsd/statsd), whi
2525
The following sample YAML configuration deploys StatsD and Prometheus to the Kubernetes cluster where a self-hosted gateway is deployed. It also creates a [Service](https://kubernetes.io/docs/concepts/services-networking/service/) for each. The self-hosted gateway then publishes metrics to the StatsD Service. We'll access the Prometheus dashboard via its Service.
2626

2727
> [!NOTE]
28-
> The following example pulls public container images from Docker Hub. We recommend that you set up a pull secret to authenticate using a Docker Hub account instead of making an anonymous pull request. To improve reliability when working with public content, import and manage the images in a private Azure container registry. [Learn more about working with public images.](/azure/container-registry/buffer-gate-public-content)
28+
> The following example pulls public container images from Docker Hub. We recommend that you set up a pull secret to authenticate using a Docker Hub account instead of making an anonymous pull request. To improve reliability when working with public content, import and manage the images in a private Azure Container Registry. [Learn more about working with public images.](/azure/container-registry/buffer-gate-public-content)
2929
3030
```yaml
3131
apiVersion: v1

articles/api-management/mitigate-owasp-api-threats.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ More information about this threat: [API1:2023 Broken Object Level Authorization
3838

3939
### Recommendations
4040

41-
* The best place to implement object level authorization is within the backend API itself. At the backend, the correct authorization decisions can be made at the request (or object) level, where applicable, using logic applicable to the domain and API. Consider scenarios where a given request may yield differing levels of detail in the response, depending on the requestor's permissions and authorization.
41+
* The best place to implement object level authorization is within the backend API itself. At the backend, the correct authorization decisions can be made at the request (or object) level, where applicable, using logic applicable to the domain and API. Consider scenarios where a given request may yield differing levels of detail in the response, depending on the requester's permissions and authorization.
4242

4343
* If a current vulnerable API can't be changed at the backend, then API Management could be used as a fallback. For example:
4444

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: MCP tool bindings for Azure Functions
3-
description: Learn how you can expose your functions as model content protocol (MCP) tools using bindings in Azure Functions.
3+
description: Learn how you can expose your functions as model context protocol (MCP) tools using bindings in Azure Functions.
44
ms.topic: reference
55
ms.date: 05/03/2025
66
ms.custom:
@@ -14,7 +14,7 @@ zone_pivot_groups: programming-languages-set-functions
1414

1515
# MCP tool bindings for Azure Functions overview
1616

17-
The [Model Content Protocol (MCP)](https://github.com/modelcontextprotocol) is a client-server protocol intended to enable language models and agents to more efficiently discover and use external data sources and tools.
17+
The [Model Context Protocol (MCP)](https://github.com/modelcontextprotocol) is a client-server protocol intended to enable language models and agents to more efficiently discover and use external data sources and tools.
1818

1919
[!INCLUDE [functions-mcp-extension-preview-note](../../includes/functions-mcp-extension-preview-note.md)]
2020

articles/oracle/oracle-db/oracle-database-network-plan.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ There are two types of network features: default and advance.
1818

1919
### Default network features
2020
Default network features enable basic network connectivity for both new and existing Oracle Database@Azure deployments. These features are available across all supported Oracle Database@Azure regions and provide the foundational networking required for your deployment
21-
### Advanced network features (preview)
22-
Advanced network features enhance the virtual networking experience, offering improved security, performance, and control—similar to standard Azure VMs. These features are currently in public preview and available in the following regions:
21+
### Advanced network features
22+
Advanced network features enhance the virtual networking experience, offering improved security, performance, and control—similar to standard Azure VMs. These features are generally available for new deployments in the following regions:
23+
2324
* Australia East
2425
* Australia Southeast
2526
* Central US
@@ -79,8 +80,8 @@ The following table describes required configurations of supported network featu
7980
|Connectivity from an Oracle database cluster to a [private endpoint](../../private-link/private-endpoint-overview.md) in a different spoke virtual network connected to a virtual WAN|Yes| Yes|
8081
|NSG support on the Private link | No| Yes|
8182
| Connectivity to serverless Apps like Azure functions via private endpoints | No| Yes|
82-
|Load balancers for Oracle database cluster traffic|No| Yes|
8383
|Dual stack (IPv4 and IPv6) virtual network|Only IPv4 is supported| Only IPv4 is supported|
84+
| Service tags support| No | Yes |
8485

8586
> [!NOTE]
8687
> When using NSGs (Network Security Groups) on the Azure side, ensure that any security rules configured on the Oracle (OCI) side are reviewed to avoid conflicts. While applying security policies on both Azure and OCI can enhance the overall security posture, it also introduces additional complexity in terms of management and requires careful manual synchronization between the two environments. Misalignment between these policies could lead to unintended access issues or operational disruptions.

articles/synapse-analytics/sql-data-warehouse/sql-data-warehouse-workload-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ For example, granting an ad-hoc user role membership to smallrc allowed that use
3636

3737
Dedicated SQL pool workload management in Azure Synapse consists of three high-level concepts: [Workload Classification](sql-data-warehouse-workload-classification.md), [Workload Importance](sql-data-warehouse-workload-importance.md), and [Workload Isolation](sql-data-warehouse-workload-isolation.md). These capabilities give you more control over how your workload utilizes system resources.
3838

39-
Workload classification is the concept of assigning a request to a workload group and setting importance levels. Historically, this assignment was done via role membership using [sp_addrolemember](resource-classes-for-workload-management.md#change-a-users-resource-class). This action can now be done via the [CREATE WORKLOAD CLASSIFER](/sql/t-sql/statements/create-workload-classifier-transact-sql?toc=/azure/synapse-analytics/sql-data-warehouse/toc.json&bc=/azure/synapse-analytics/sql-data-warehouse/breadcrumb/toc.json&view=azure-sqldw-latest&preserve-view=true). The classification capability provides a richer set of options such as label, session, and time to classify requests.
39+
Workload classification is the concept of assigning a request to a workload group and setting importance levels. Historically, this assignment was done via role membership using [sp_addrolemember](resource-classes-for-workload-management.md#change-a-users-resource-class). This action can now be done via the [CREATE WORKLOAD CLASSIFIER](/sql/t-sql/statements/create-workload-classifier-transact-sql?toc=/azure/synapse-analytics/sql-data-warehouse/toc.json&bc=/azure/synapse-analytics/sql-data-warehouse/breadcrumb/toc.json&view=azure-sqldw-latest&preserve-view=true). The classification capability provides a richer set of options such as label, session, and time to classify requests.
4040

4141
Workload importance influences the order in which a request gets access to resources. On a busy system, a request with higher importance has first access to resources. Importance can also ensure ordered access to locks.
4242

articles/virtual-desktop/session-host-update.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@ There can only be one session host update operation running or scheduled in a si
5555
The existing power state and drain mode of session hosts is honored. You can perform an update on a host pool where all the session hosts are deallocated to save costs.
5656

5757
> [!IMPORTANT]
58-
> - If you use Azure Virtual Desktop Insights, the Azure Monitor agent or Log Analytics agent isn't automatically installed on the updated session hosts. To install the agent automatically, here are some options:
59-
> - For the Azure Monitor agent, you can [use Azure Policy](/azure/azure-monitor/agents/azure-monitor-agent-policy).
60-
> - For the Log Analytics agent, you can [use Azure Automation](/azure/azure-monitor/agents/agent-windows?tabs=azure-automation#install-the-agent).
58+
> - If you use Azure Virtual Desktop Insights, the Azure Monitor agent isn't automatically installed on the updated session hosts. To install the agent automatically, you can [use Azure Policy](/azure/azure-monitor/agents/azure-monitor-agent-policy).
6159
>
6260
> - Keep in mind [quota limits](/azure/quotas/view-quotas) on your Azure subscription and consider [submitting a request to increase a quota](/azure/quotas/quickstart-increase-quota-portal) if an update would go over the limit.
6361
>

0 commit comments

Comments
 (0)