Skip to content

Commit f49fb32

Browse files
authored
Merge pull request #284503 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 b84ad3f + a882511 commit f49fb32

File tree

6 files changed

+37
-11
lines changed

6 files changed

+37
-11
lines changed

articles/azure-cache-for-redis/cache-high-availability.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Various high availability options are available in the Standard, Premium, and En
2020
| Option | Description | Availability | Standard | Premium | Enterprise |
2121
| ------------------- | ------- | ------- | :------: | :---: | :---: |
2222
| [Standard replication](#standard-replication-for-high-availability)| Dual-node replicated configuration in a single data center with automatic failover | 99.9% (see [details](https://azure.microsoft.com/support/legal/sla/cache/v1_1/)) |Yes|Yes|Yes|
23-
| [Zone redundancy](#zone-redundancy) | Multi-node replicated configuration across Availability Zones, with automatic failover | 99.9% in Premium; 99.99% in Enterprise (see [details](https://azure.microsoft.com/support/legal/sla/cache/v1_1/)) |No|Yes|Yes|
23+
| [Zone redundancy](#zone-redundancy) | Multi-node replicated configuration across Availability Zones, with automatic failover | 99.9% in Premium; 99.99% in Enterprise (see [details](https://azure.microsoft.com/support/legal/sla/cache/v1_1/)) |Yes (Preview)|Yes|Yes|
2424
| Geo-replication | Linked cache instances in two regions, with user-controlled failover | Premium; Enterprise (see [details](https://azure.microsoft.com/support/legal/sla/cache/v1_1/)) |No| [Passive](#passive-geo-replication) | [Active](#active-geo-replication) |
2525
| [Import/Export](#importexport) | Point-in-time snapshot of data in cache. | 99.9% (see [details](https://azure.microsoft.com/support/legal/sla/cache/v1_1/)) |No|Yes|Yes|
2626
| [Persistence](#persistence) | Periodic data saving to storage account. | 99.9% (see [details](https://azure.microsoft.com/support/legal/sla/cache/v1_1/)) |No|Yes|Preview|

articles/azure-monitor/logs/search-jobs.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ This video explains when and how to use search jobs:
2424
|:-------|:---------------------|
2525
| Run a search job | `Microsoft.OperationalInsights/workspaces/tables/write` and `Microsoft.OperationalInsights/workspaces/searchJobs/write` permissions to the Log Analytics workspace, for example, as provided by the [Log Analytics Contributor built-in role](../logs/manage-access.md#built-in-roles). |
2626

27+
> [!NOTE]
28+
> Cross-tenant search jobs are not currently supported, even when Entra ID tenants are managed through Azure Lighthouse.
29+
2730
## When to use search jobs
2831

2932
Use a search job when the log query timeout of 10 minutes isn't sufficient to search through large volumes of data or if you're running a slow query.

articles/connectors/built-in.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ Azure Logic Apps supports business-to-business (B2B) communication scenarios thr
640640

641641
* For operations that require maps or schemas, you can either:
642642

643-
* Upload these artifacts to your logic app resource using the Azure portal or Visual Studio Code. You can then use these artifacts across all child workflows in the *same* logic app resource. For more information, review [Add schemas to use with workflows in Azure Logic Apps](../logic-apps/logic-apps-enterprise-integration-maps.md?tabs=standard) and [Add schemas to use with workflows in Azure Logic Apps](../logic-apps/logic-apps-enterprise-integration-schemas.md?tabs=standard).
643+
* Upload these artifacts to your logic app resource using the Azure portal or Visual Studio Code. You can then use these artifacts across all child workflows in the *same* logic app resource. For more information, review [Add maps to use with workflows in Azure Logic Apps](../logic-apps/logic-apps-enterprise-integration-maps.md?tabs=standard) and [Add schemas to use with workflows in Azure Logic Apps](../logic-apps/logic-apps-enterprise-integration-schemas.md?tabs=standard).
644644

645645
* [Link your logic app resource to your integration account](../logic-apps/logic-apps-enterprise-integration-create-integration-account.md).
646646

articles/container-registry/tasks-agent-pools.md

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,19 +93,41 @@ az acr agentpool update \
9393

9494
Task agent pools require access to the following Azure services. The following firewall rules must be added to any existing network security groups or user-defined routes.
9595

96-
| Direction | Protocol | Source | Source Port | Destination | Dest Port | Used |
97-
| --------- | -------- | -------------- | ----------- | -------------------- | --------- | ------- |
98-
| Outbound | TCP | VirtualNetwork | Any | AzureKeyVault | 443 | Default |
99-
| Outbound | TCP | VirtualNetwork | Any | Storage | 443 | Default |
100-
| Outbound | TCP | VirtualNetwork | Any | EventHub | 443 | Default |
101-
| Outbound | TCP | VirtualNetwork | Any | AzureActiveDirectory | 443 | Default |
102-
| Outbound | TCP | VirtualNetwork | Any | AzureMonitor | 443,12000 | Default |
96+
| Direction | Protocol | Source | Source Port | Destination | Dest Port | Used | Remarks |
97+
| --------- | -------- | -------------- | ----------- | -------------------- | --------- | ------- | ------------------------------------------------- |
98+
| Outbound | TCP | VirtualNetwork | Any | AzureKeyVault | 443 | Default | |
99+
| Outbound | TCP | VirtualNetwork | Any | Storage | 443 | Default | |
100+
| Outbound | TCP | VirtualNetwork | Any | EventHub | 443 | Default | |
101+
| Outbound | TCP | VirtualNetwork | Any | AzureActiveDirectory | 443 | Default | |
102+
| Outbound | TCP | VirtualNetwork | Any | AzureMonitor | 443,12000 | Default | Port 12000 is a unique port used for diagnostics |
103103

104104
> [!NOTE]
105105
> If your tasks require additional resources from the public internet, add the corresponding rules. For example, additional rules are needed to run a docker build task that pulls the base images from Docker Hub, or restores a NuGet package.
106106
107107
Customers basing their deployments with MCR can refer to [MCR/MAR firewall rules.](https://github.com/microsoft/containerregistry/blob/main/docs/client-firewall-rules.md)
108108

109+
#### Advanced network configuration
110+
111+
If the standard Firewall/NSG (Network Security Group) rules are deemed too permissive, and more fine-grained control is required for outbound connections, consider the following approach:
112+
113+
- Enable service endpoints on the agent pool subnet. This grants the agent pool access to its service dependencies while maintaining a secure network posture.
114+
- It's important to note that outbound Firewall/NSG rules are still necessary. These rules facilitate the Virtual Network's ability to switch the source IP from public to private, which is an additional step beyond enabling service endpoints.
115+
116+
More information on service endpoints is documented [here][az-vnet-svc-ep].
117+
118+
At minimum, the following service endpoints will be required
119+
120+
- Microsoft.AzureActiveDirectory
121+
- Microsoft.ContainerRegistry
122+
- Microsoft.EventHub
123+
- Microsoft.KeyVault
124+
- Microsoft.Storage (or the corresponding storage regions taking geo-replication into account)
125+
126+
> [!NOTE]
127+
> Currently a service endpoint for Azure Monitor does not exist. If outbound traffic for Azure Monitor is not configured, the agent pool will be unable to emit diagnostic logs but may appear to still operate normally. In this case ACR will be unable to help fully troubleshoot any issues encountered so it is important that the network administrator take this into account when planning the network configuration.
128+
129+
Also, it is important to note that all of ACR Tasks have pre-cached images for some of the more common use cases. Tasks will only cache a single version at a time, meaning that if the full tagged image reference is used, then the build agent will attempt to pull the image. For example, a common use case is `cmd: mcr.microsoft.com/acr/acr-cli:<tag>`. However, the pre-cached version is frequently updated, which means the actual version on the machine will likely be higher. In this case, the network configuration must configure a route for outbound traffic to the target registry host which in the example above would be mcr.microsoft.com. The same rules would apply to any other external public registry (docker.io, quay.io, ghcr.io, etc.).
130+
109131
### Create pool in VNet
110132

111133
The following example creates an agent pool in the *mysubnet* subnet of network *myvnet*:
@@ -200,3 +222,4 @@ For more examples of container image builds and maintenance in the cloud, check
200222
[az-acr-task-create]: /cli/azure/acr/task#az_acr_task_create
201223
[az-acr-task-run]: /cli/azure/acr/task#az_acr_task_run
202224
[create-reg-cli]: container-registry-get-started-azure-cli.md
225+
[az-vnet-svc-ep]: ../virtual-network/virtual-network-service-endpoints-overview.md#secure-azure-services-to-virtual-networks

articles/operator-service-manager/best-practices-onboard-deploy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ We recommend that you first onboard and deploy your simplest NFs (one or two cha
2828
- After the desired set of Azure Operator Service Manager publisher resources and artifacts is tested and approved for production use, we recommend marking the entire set as immutable to prevent accidental changes and ensure a consistent deployment experience. Consider relying on immutability capabilities to distinguish between resources and artifacts used in production versus the ones used for testing and development purposes. You can query the state of the publisher resources and the artifact manifests to determine which ones are marked as immutable. For more information, see [Publisher tenants, subscriptions, regions, and preview management](publisher-resource-preview-management.md).
2929

3030
Keep in mind the following logic:
31-
- If Network Service Design Function (NSDV) is marked as immutable, CGS has to be marked as immutable too. Otherwise, the deployment call fails.
31+
- If Network Service Design Version (NSDV) is marked as immutable, CGS has to be marked as immutable too. Otherwise, the deployment call fails.
3232
- If Network Function Design Version (NFDV) is marked as immutable, the artifact manifest must be marked as immutable too. Otherwise, the deployment call fails.
3333
- If only artifact manifest or CGS is marked immutable, the deployment call succeeds regardless of whether NFDV and NSDV are marked as immutable.
3434
- Marking an artifact manifest as immutable ensures that all artifacts listed in that manifest (typically, charts, images, and Azure Resource Manager templates [ARM templates]) are marked immutable too by enforcing necessary permissions on the artifact store.

articles/reliability/availability-zones-service-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ Azure offerings are grouped into three categories that reflect their _regional_
197197
| [Azure SignalR](../azure-signalr/availability-zones.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
198198
| [Azure Spring Apps](reliability-spring-apps.md#availability-zone-support) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
199199
| Azure Storage: Ultra Disk | ![An icon that signifies this service is zonal.](media/icon-zonal.svg) |
200-
| [Azure VMware Services](../azure-vmware/architecture-private-clouds.md) | | ![An icon that signifies this service is zonal.](media/icon-zonal.svg) |
200+
| [Azure VMware Services](../azure-vmware/architecture-private-clouds.md) | ![An icon that signifies this service is zonal.](media/icon-zonal.svg) |
201201
| [Azure Web PubSub](../azure-web-pubsub/concept-availability-zones.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
202202
| [Microsoft Fabric](reliability-fabric.md#availability-zone-support) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
203203

0 commit comments

Comments
 (0)