Skip to content

Commit 1e2a703

Browse files
authored
Merge pull request #228405 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 8b520bc + 14fe29a commit 1e2a703

File tree

7 files changed

+9
-8
lines changed

7 files changed

+9
-8
lines changed

articles/aks/faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ Starting with version 1.2.0, Azure CNI sets Transparent mode as default for sing
233233

234234
### Bridge mode
235235

236-
As the name suggests, bridge mode Azure CNI, in a "just in time" fashion, will create a L2 bridge named "azure0". All the host side pod `veth` pair interfaces will be connected to this bridge. So Pod-Pod intra VM communication and the remaining traffic goes through this bridge. The bridge in question is a layer 2 virtual device that on its own cannot receive or transmit anything unless you bind one or more real devices to it. For this reason, eth0 of the Linux VM has to be converted into a subordinate to "azure0" bridge. This creates a complex network topology within the Linux VM and as a symptom CNI had to take care of other networking functions like DNS server update and so on.
236+
As the name suggests, bridge mode Azure CNI, in a "just in time" fashion, will create an L2 bridge named "azure0". All the host side pod `veth` pair interfaces will be connected to this bridge. So Pod-Pod intra VM communication and the remaining traffic goes through this bridge. The bridge in question is a layer 2 virtual device that on its own cannot receive or transmit anything unless you bind one or more real devices to it. For this reason, eth0 of the Linux VM has to be converted into a subordinate to "azure0" bridge. This creates a complex network topology within the Linux VM and as a symptom CNI had to take care of other networking functions like DNS server update and so on.
237237

238238
:::image type="content" source="media/faq/bridge-mode.png" alt-text="Bridge mode topology":::
239239

articles/azure-resource-manager/templates/template-functions-resource.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ The identifier is returned in the following format:
780780

781781
You use this function to get the resource ID for resources that are [deployed to the management group](deploy-to-management-group.md) rather than a resource group. The returned ID differs from the value returned by the [resourceId](#resourceid) function by not including a subscription ID and a resource group value.
782782

783-
### managementGrouopResourceID example
783+
### managementGroupResourceID example
784784

785785
The following template creates and assigns a policy definition. It uses the `managementGroupResourceId` function to get the resource ID for policy definition.
786786

articles/cost-management-billing/costs/understand-cost-mgt-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ Cost Management receives tags as part of each usage record submitted by the indi
114114
- Resource tags are only included in usage data while the tag is applied – tags aren't applied to historical data.
115115
- Resource tags are only available in Cost Management after the data is refreshed.
116116
- Resource tags are only available in Cost Management when the resource is active/running and producing usage records. For example, when a VM is deallocated.
117-
- Managing tags requires contributor access to each resource.
117+
- Managing tags requires contributor access to each resource or the [tag contributor](../../role-based-access-control/built-in-roles.md#tag-contributor) RBAC role.
118118
- Managing tag policies requires either owner or policy contributor access to a management group, subscription, or resource group.
119119

120120
If you don't see a specific tag in Cost Management, consider the following questions:

articles/iot-hub-device-update/device-update-howto-proxy-updates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ This tutorial uses an Ubuntu Server 18.04 LTS virtual machine (VM) as an example
8787
5. Restart the Device Update agent:
8888

8989
```sh
90-
sudo systemctl restart adu-agent
90+
sudo systemctl restart deviceupdate-agent
9191
```
9292

9393
### Set up mock components

articles/openshift/howto-service-principal-credential-rotation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ To check the expiration date of service principal credentials run the following:
8888
# Service principal expiry in ISO 8601 UTC format
8989
SP_ID=$(az aro show --name MyManagedCluster --resource-group MyResourceGroup \
9090
--query servicePrincipalProfile.clientId -o tsv)
91-
az ad app credential list --id $SP_ID --query "[].endDate" -o tsv
91+
az ad app credential list --id $SP_ID --query "[].endDateTime" -o tsv
9292
```
9393
If the service principal credentials are expired please update using one of the two credential rotation methods.
9494

includes/azure-storage-account-limits-standard.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Microsoft recommends that you use a GPv2 storage account for most scenarios. You
2525
| Maximum number of blob containers, blobs, file shares, tables, queues, entities, or messages per storage account. | No limit |
2626
| Default maximum request rate per storage account | 20,000 requests per second<sup>1</sup> |
2727
| Default maximum ingress per general-purpose v2 and Blob storage account in the following regions (LRS/GRS):<br /><ul><li>Australia East</li><li>Central US</li><li>East Asia</li><li>East US 2</li><li>Japan East</li><li>Korea Central</li><li>North Europe</li><li>South Central US</li><li>Southeast Asia</li><li>UK South</li><li>West Europe</li><li>West US</li></ul> | 60 Gbps<sup>1</sup> |
28-
| Default maximum ingress per general-purpose v2 and Blob storage account in the following regions (ZRS):<br /><ul><li>Australia East</li><li>Central US</li><li>East US</li><li>East US 2</li><li>Japan East</li><li>North Europe</li><li>South Central US</li><li>Southeast Asia</li><li>UK South</li><li>West Europe</li><li>West US 2</li></ul> | 60 Gb ps<sup>1</sup> |
28+
| Default maximum ingress per general-purpose v2 and Blob storage account in the following regions (ZRS):<br /><ul><li>Australia East</li><li>Central US</li><li>East US</li><li>East US 2</li><li>Japan East</li><li>North Europe</li><li>South Central US</li><li>Southeast Asia</li><li>UK South</li><li>West Europe</li><li>West US 2</li></ul> | 60 Gbps<sup>1</sup> |
2929
| Default maximum ingress per general-purpose v2 and Blob storage account in regions that aren't listed in the previous row. | 25 Gbps<sup>1</sup> |
3030
| Default maximum ingress for general-purpose v1 storage accounts (all regions) | 10 Gbps<sup>1</sup> |
3131
| Default maximum egress for general-purpose v2 and Blob storage accounts in the following regions (LRS/GRS):<br /><ul><li>Australia East</li><li>Central US</li><li>East Asia</li><li>East US 2</li><li>Japan East</li><li>Korea Central</li><li>North Europe</li><li>South Central US</li><li>Southeast Asia</li><li>UK South</li><li>West Europe</li><li>West US</li></ul> | 120 Gbps<sup>1</sup> |

includes/machine-learning-mlflow-configure-tracking.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ ms.author: fasantia
5959
6060
ml_client = MLClient(credential=DefaultAzureCredential(),
6161
subscription_id=subscription_id,
62-
resource_group_name=resource_group)
62+
resource_group_name=resource_group,
63+
workspace_name=workspace_name)
6364
```
6465

6566
> [!IMPORTANT]
@@ -123,4 +124,4 @@ ms.author: fasantia
123124
---
124125

125126
> [!TIP]
126-
> When working on shared environments, like an Azure Databricks cluster, Azure Synapse Analytics cluster, or similar, it is useful to set the environment variable `MLFLOW_TRACKING_URI` at the cluster level to automatically configure the MLflow tracking URI to point to Azure Machine Learning for all the sessions running in the cluster rather than to do it on a per-session basis.
127+
> When working on shared environments, like an Azure Databricks cluster, Azure Synapse Analytics cluster, or similar, it is useful to set the environment variable `MLFLOW_TRACKING_URI` at the cluster level to automatically configure the MLflow tracking URI to point to Azure Machine Learning for all the sessions running in the cluster rather than to do it on a per-session basis.

0 commit comments

Comments
 (0)