Skip to content

Commit c86bfc1

Browse files
authored
Merge pull request #275903 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 67742fb + bf3c28d commit c86bfc1

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

articles/azure-monitor/visualize/workbooks-data-sources.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,14 @@ To make a query control that uses this data source, use the **Query type** dropd
6767

6868
Azure Workbooks supports Azure Resource Manager REST operations so that you can query the management.azure.com endpoint without providing your own authorization header token.
6969

70-
To make a query control that uses this data source, use the **Data source** dropdown and select **Azure Resource Manager**. Provide the appropriate parameters, such as **Http method**, **url path**, **headers**, **url parameters**, and **body**.
70+
To make a query control that uses this data source, use the **Data source** dropdown and select **Azure Resource Manager**. Provide the appropriate parameters, such as **Http method**, **url path**, **headers**, **url parameters**, and **body**. Azure Resource Manager data source is intended to be used as a data source to power data *visualizations*; as such, it does not support `PUT` or `PATCH` operations. The data source supports the following HTTP methods, with these expecations and limitations:
7171

72+
* `GET` - the most common operation for visualization, execute a query and parse the `JSON` result using settings in the "Result Settings" tab.
73+
* `GETARRAY` - for ARM APIs that may return multiple "pages" of results using the ARM standard `nextLink` or `@odata.nextLink` style response (See [Async operations, throttling, and paging](/rest/api/azure/#async-operations-throttling-and-paging), this method will make followup calls to the API for each `nextLink`, and merge those results into an array of results.
74+
* `POST` - This method is used for APIs that pass information in a POST body.
75+
7276
> [!NOTE]
73-
> Only GET, POST, and HEAD operations are currently supported.
77+
> The Azure Resource Manager data source only supports results that return a 200 `OK` response, indicating the result is synchronous. APIs returning asynchronous results with 202 `ACCEPTED` asynchronous result and a header with a result URL are not supported.
7478
7579
## Azure Data Explorer
7680

articles/azure-resource-manager/management/manage-resource-groups-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Learn how to use the [Azure portal](https://portal.azure.com) with [Azure Resour
1616

1717
A resource group is a container that holds related resources for an Azure solution. The resource group can include all the resources for the solution, or only those resources that you want to manage as a group. You decide how you want to allocate resources to resource groups based on what makes the most sense for your organization. Generally, add resources that share the same lifecycle to the same resource group so you can easily deploy, update, and delete them as a group.
1818

19-
The resource group stores metadata about the resources. Therefore, when you specify a location for the resource group, you are specifying where that metadata is stored. For compliance reasons, you may need to ensure that your data is stored in a particular region.
19+
The resource group stores metadata about the resources. Therefore, when you specify a location for the resource group, you are specifying where that metadata is stored. For compliance reasons, you may need to ensure that your data is stored in a particular region. Note that resources inside a resource group can be of different regions.
2020

2121

2222
## Create resource groups

articles/azure-resource-manager/management/move-limitations/app-service-move-limitations.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ When you move a Web App across subscriptions, the following guidance applies:
3030
- App Service apps with private endpoints cannot be moved. Delete the private endpoint(s) and recreate it after the move.
3131
- App Service apps with virtual network integration cannot be moved. Remove the virtual network integration and reconnect it after the move.
3232
- App Service resources can only be moved from the resource group in which they were originally created. If an App Service resource is no longer in its original resource group, move it back to its original resource group. Then, move the resource across subscriptions. For help with finding the original resource group, see the next section.
33+
- When you move a Web App to a different subscription, the location of the Web App remains the same, but its policy is changed. For example, if your Web App is in Subscription1 located in Central US and has Policy1, and Subscription2 is in the UK South and has Policy2. If you move the Web App to Subscription2, the location of the Web App remains the same (Central US); however, it will be under the new policy which is policy2.
3334

3435
## Find original resource group
3536

articles/storage/common/storage-account-upgrade.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ To monitor your existing storage accounts and gather this data, you can make use
122122

123123
In order to estimate the data access costs for Blob storage accounts, you need to break down the transactions into two groups.
124124

125-
- The amount of data retrieved from the storage account can be estimated by looking at the sum of the *'Ingress'* metric for primarily the *'GetBlob'* and *'CopyBlob'* operations.
125+
- The amount of data retrieved from the storage account can be estimated by looking at the sum of the *'Egress'* metric for primarily the *'GetBlob'* and *'CopyBlob'* operations.
126126

127-
- The amount of data written to the storage account can be estimated by looking at the sum of *'Egress'* metrics for primarily the *'PutBlob'*, *'PutBlock'*, *'CopyBlob'* and *'AppendBlock'* operations.
127+
- The amount of data written to the storage account can be estimated by looking at the sum of *'Ingress'* metrics for primarily the *'PutBlob'*, *'PutBlock'*, *'CopyBlob'* and *'AppendBlock'* operations.
128128

129129
To determine the price of each operation against the blob storage service, see [Map each REST operation to a price](../blobs/map-rest-apis-transaction-categories.md).
130130

articles/virtual-machines/vm-generalized-image-version.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ You also need the `imageID` of the image you want to use and you need to make su
474474

475475
In this example, we're showing how to create a VM from a generalized image. If you're using a specialized image, see [Create a VM using a specialized image version](vm-specialized-image-version.md).
476476

477-
You need to sign in to the tenant where the image is stored, get an access token, then sign into the tenant where you want to create the VM. This is how Azure authenticates that you have access to the image.
477+
You need to sign in to the tenant where the image is stored, get an access token, then sign into the tenant where you want to create the VM. In this case, tenant1 is where the image is stored, and tenant2 is where you want to create the VM. This is how Azure authenticates that you have access to the image.
478478

479479
```azurecli-interactive
480480
@@ -486,8 +486,6 @@ az login --tenant $tenant1
486486
az account get-access-token
487487
az login --tenant $tenant2
488488
az account get-access-token
489-
az login --tenant $tenant1
490-
az account get-access-token
491489
```
492490

493491

@@ -514,15 +512,14 @@ az vm create \
514512

515513
In this example, we're showing how to create a VM from a generalized image. If you're using a specialized image, see [Create a VM using a specialized image version](vm-specialized-image-version.md).
516514

517-
You need to sign in to the tenant where the image is stored, get an access token, then sign into the tenant where you want to create the VM. This is how Azure authenticates that you have access to the image.
515+
You need to sign in to the tenant where the image is stored, get an access token, then sign into the tenant where you want to create the VM. In this case, tenant1 is where the image is stored, and tenant2 is where you want to create the VM. This is how Azure authenticates that you have access to the image.
518516

519517
```azurepowershell-interactive
520518
521519
$tenant1 = "<Tenant 1 ID>"
522520
$tenant2 = "<Tenant 2 ID>"
523521
Connect-AzAccount -Tenant "<Tenant 1 ID>" -UseDeviceAuthentication
524522
Connect-AzAccount -Tenant "<Tenant 2 ID>" -UseDeviceAuthentication
525-
Connect-AzAccount -Tenant "<Tenant 1 ID>" -UseDeviceAuthentication
526523
```
527524

528525

0 commit comments

Comments
 (0)