Skip to content

Commit 5918217

Browse files
authored
Merge pull request #223584 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 e436c24 + ac9f36a commit 5918217

File tree

7 files changed

+65
-19
lines changed

7 files changed

+65
-19
lines changed

articles/active-directory/managed-identities-azure-resources/overview.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ There are two types of managed identities:
4646
- A service principal of a special type is created in Azure AD for the identity. The service principal is tied to the lifecycle of that Azure resource. When the Azure resource is deleted, Azure automatically deletes the service principal for you.
4747
- By design, only that Azure resource can use this identity to request tokens from Azure AD.
4848
- You authorize the managed identity to have access to one or more services.
49+
- The name of the system-assigned service principal is always the same as the name of the Azure resource it is created for. For a deployment slot, the name of its system-assigned identity is <app-name>/slots/<slot-name>.
4950

5051
- **User-assigned**. You may also create a managed identity as a standalone Azure resource. You can [create a user-assigned managed identity](how-to-manage-ua-identity-portal.md) and assign it to one or more Azure Resources. When you enable a user-assigned managed identity:
5152
- A service principal of a special type is created in Azure AD for the identity. The service principal is managed separately from the resources that use it.

articles/azure-monitor/agents/azure-monitor-agent-windows-client.md

Lines changed: 55 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,11 @@ Now we associate the Data Collection Rules (DCR) to the Monitored Object by crea
180180

181181
**Request URI**
182182
```HTTP
183-
PUT https://management.azure.com/{MOResourceId}/providers/microsoft.insights/datacollectionruleassociations/assoc?api-version=2021-04-01
183+
PUT https://management.azure.com/{MOResourceId}/providers/microsoft.insights/datacollectionruleassociations/{associationName}?api-version=2021-09-01-preview
184184
```
185185
**Sample Request URI**
186186
```HTTP
187-
PUT https://management.azure.com/providers/Microsoft.Insights/monitoredObjects/{AADTenantId}/providers/microsoft.insights/datacollectionruleassociations/assoc?api-version=2021-04-01
187+
PUT https://management.azure.com/providers/Microsoft.Insights/monitoredObjects/{AADTenantId}/providers/microsoft.insights/datacollectionruleassociations/{associationName}?api-version=2021-09-01-preview
188188
```
189189

190190
**URI Parameters**
@@ -213,12 +213,11 @@ PUT https://management.azure.com/providers/Microsoft.Insights/monitoredObjects/{
213213
| `dataCollectionRuleID` | The resource ID of an existing Data Collection Rule that you created in the **same region** as the Monitored Object. |
214214

215215

216-
### Using PowerShell
216+
### Using PowerShell for onboarding
217217
```PowerShell
218218
$TenantID = "xxxxxxxxx-xxxx-xxx" #Your Tenant ID
219219
$SubscriptionID = "xxxxxx-xxxx-xxxxx" #Your Subscription ID
220220
$ResourceGroup = "rg-yourResourseGroup" #Your resroucegroup
221-
$DCRName = "CollectWindowsOSlogs" #Your Data collection rule name
222221
223222
Connect-AzAccount -Tenant $TenantID
224223
@@ -252,35 +251,55 @@ $body = @"
252251
}
253252
"@
254253
255-
$request = "https://management.azure.com/providers/microsoft.insights/providers/microsoft.authorization/roleassignments/$newguid`?api-version=2021-04-01-preview"
254+
$requestURL = "https://management.azure.com/providers/microsoft.insights/providers/microsoft.authorization/roleassignments/$newguid`?api-version=2021-04-01-preview"
256255
257256
258-
Invoke-RestMethod -Uri $request -Headers $AuthenticationHeader -Method PUT -Body $body
257+
Invoke-RestMethod -Uri $requestURL -Headers $AuthenticationHeader -Method PUT -Body $body
259258
260259
261260
##########################
262261
263262
#2. Create Monitored Object
264263
265264
# "location" property value under the "body" section should be the Azure region where the MO object would be stored. It should be the "same region" where you created the Data Collection Rule. This is the location of the region from where agent communications would happen.
266-
267-
$request = "https://management.azure.com/providers/Microsoft.Insights/monitoredObjects/$TenantID`?api-version=2021-09-01-preview"
268-
$body = @'
265+
$Location = "eastus" #Use your own loacation
266+
$requestURL = "https://management.azure.com/providers/Microsoft.Insights/monitoredObjects/$TenantID`?api-version=2021-09-01-preview"
267+
$body = @"
269268
{
270269
"properties":{
271-
"location":"eastus"
270+
"location":`"$Location`"
272271
}
273272
}
274-
'@
273+
"@
275274
276-
$Respond = Invoke-RestMethod -Uri $request -Headers $AuthenticationHeader -Method PUT -Body $body -Verbose
275+
$Respond = Invoke-RestMethod -Uri $requestURL -Headers $AuthenticationHeader -Method PUT -Body $body -Verbose
277276
$RespondID = $Respond.id
278277
279278
##########################
280279
281280
#3. Associate DCR to Monitored Object
281+
#See reference documentation https://learn.microsoft.com/en-us/rest/api/monitor/data-collection-rule-associations/create?tabs=HTTP
282+
$associationName = "assoc01" #You can define your custom associationname, must change the association name to a unique name, if you want to associate multiple DCR to monitored object
283+
$DCRName = "dcr-WindowsClientOS" #Your Data collection rule name
284+
285+
$requestURL = "https://management.azure.com$RespondId/providers/microsoft.insights/datacollectionruleassociations/$associationName`?api-version=2021-09-01-preview"
286+
$body = @"
287+
{
288+
"properties": {
289+
"dataCollectionRuleId": "/subscriptions/$SubscriptionID/resourceGroups/$ResourceGroup/providers/Microsoft.Insights/dataCollectionRules/$DCRName"
290+
}
291+
}
292+
293+
"@
294+
295+
Invoke-RestMethod -Uri $requestURL -Headers $AuthenticationHeader -Method PUT -Body $body
296+
297+
#(Optional example). Associate another DCR to Monitored Object
298+
#See reference documentation https://learn.microsoft.com/en-us/rest/api/monitor/data-collection-rule-associations/create?tabs=HTTP
299+
$associationName = "assoc02" #You must change the association name to a unique name, if you want to associate multiple DCR to monitored object
300+
$DCRName = "dcr-PAW-WindowsClientOS" #Your Data collection rule name
282301
283-
$request = "https://management.azure.com$RespondId/providers/microsoft.insights/datacollectionruleassociations/assoc?api-version=2021-04-01"
302+
$requestURL = "https://management.azure.com$RespondId/providers/microsoft.insights/datacollectionruleassociations/$associationName`?api-version=2021-09-01-preview"
284303
$body = @"
285304
{
286305
"properties": {
@@ -290,10 +309,32 @@ $body = @"
290309
291310
"@
292311
293-
Invoke-RestMethod -Uri $request -Headers $AuthenticationHeader -Method PUT -Body $body
312+
Invoke-RestMethod -Uri $requestURL -Headers $AuthenticationHeader -Method PUT -Body $body
313+
314+
#4. (Optional) Get all the associatation.
315+
$requestURL = "https://management.azure.com$RespondId/providers/microsoft.insights/datacollectionruleassociations?api-version=2021-09-01-preview"
316+
(Invoke-RestMethod -Uri $requestURL -Headers $AuthenticationHeader -Method get).value
317+
318+
294319
```
295320

321+
### Using PowerShell for offboarding
322+
```PowerShell
323+
#This will remove the monitor object
324+
$TenantID = "xxxxxxxxx-xxxx-xxx" #Your Tenant ID
325+
$SubscriptionID = "xxxxxx-xxxx-xxxxx" #Your Subscription ID
326+
$ResourceGroup = "rg-yourResourseGroup" #Your resroucegroup
327+
328+
Connect-AzAccount -Tenant $TenantID
296329
330+
#Select the subscription
331+
Select-AzSubscription -SubscriptionId $SubscriptionID
332+
333+
#Delete monitored object
334+
$requestURL = "https://management.azure.com/providers/Microsoft.Insights/monitoredObjects/$TenantID`?api-version=2021-09-01-preview"
335+
#Invoke-RestMethod -Uri $requestURL -Headers $AuthenticationHeader -Method Delete
336+
337+
```
297338

298339
## Verify successful setup
299340
Check the ‘Heartbeat’ table (and other tables you configured in the rules) in the Log Analytics workspace that you specified as a destination in the data collection rule(s).

articles/container-instances/tutorial-docker-compose.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ It can take a few minutes to push to the registry.
167167
To verify the image is stored in your registry, run the [az acr repository show](/cli/azure/acr/repository#az-acr-repository-show) command:
168168

169169
```azurecli
170-
az acr repository show --name <acrName> --repository azure-vote-front
170+
az acr repository show --name <acrName> --repository azuredocs/azure-vote-front
171171
```
172172

173173
[!INCLUDE [container-instances-create-docker-context](../../includes/container-instances-create-docker-context.md)]

articles/cosmos-db/configure-synapse-link.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ container = database.createContainerIfNotExists(containerProperties, 400).block(
193193

194194
#### Python V4 SDK
195195

196-
The following Java code creates a Synapse Link enabled container by setting the `analytical_storage_ttl` property. To update an existing container, use the `replace_container` method.
196+
The following Python code creates a Synapse Link enabled container by setting the `analytical_storage_ttl` property. To update an existing container, use the `replace_container` method.
197197

198198
```python
199199
# Client

articles/dns/private-dns-virtual-network-links.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ From the virtual network perspective, private DNS zone becomes the registration
2121

2222
## Resolution virtual network
2323

24-
If you choose to link your virtual network with the private DNS zone without autoregistration. The virtual network is treated as a resolution virtual network only. DNS records for virtual machines deployed this virtual network won't be created automatically in the private zone. However, virtual machines deployed in the virtual network can successfully query for DNS records in the private zone. These records include manually created and auto registered records from other virtual networks linked to the private DNS zone.
24+
If you choose to link your virtual network with the private DNS zone without autoregistration, the virtual network is treated as a resolution virtual network only. DNS records for virtual machines deployed this virtual network won't be created automatically in the private zone. However, virtual machines deployed in the virtual network can successfully query for DNS records in the private zone. These records include manually created and auto registered records from other virtual networks linked to the private DNS zone.
2525

2626
One private DNS zone can have multiple resolution virtual networks and a virtual network can have multiple resolution zones associated to it.
2727

articles/iot-hub/iot-hub-devguide-identity-registry.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Device identities are represented as JSON documents with the following propertie
8686

8787
| Property | Options | Description |
8888
| --- | --- | --- |
89-
| deviceId |required, read-only on updates |A case-sensitive string (up to 128 characters long) of ASCII 7-bit alphanumeric characters plus certain special characters: `- . + % _ # * ? ! ( ) , : = @ $ '`. |
89+
| deviceId |required, read-only on updates |A case-sensitive string (up to 128 characters long) of ASCII 7-bit alphanumeric characters plus certain special characters: `- . % _ * ? ! ( ) , : = @ $ '`. The special characters: `+ #` are not supported. |
9090
| generationId |required, read-only |An IoT hub-generated, case-sensitive string up to 128 characters long. This value is used to distinguish devices with the same **deviceId**, when they have been deleted and re-created. |
9191
| etag |required, read-only |A string representing a weak ETag for the device identity, as per [RFC7232](https://tools.ietf.org/html/rfc7232). |
9292
| authentication |optional |A composite object containing authentication information and security materials. For more information, see [Authentication Mechanism](/rest/api/iothub/service/devices/get-identity#authenticationmechanism) in the REST API documentation. |
@@ -158,4 +158,4 @@ To try out some of the concepts described in this article, see the following IoT
158158

159159
To explore using the IoT Hub Device Provisioning Service to enable zero-touch, just-in-time provisioning, see:
160160

161-
* [Azure IoT Hub Device Provisioning Service](../iot-dps/index.yml)
161+
* [Azure IoT Hub Device Provisioning Service](../iot-dps/index.yml)

articles/virtual-machines/hbv2-series.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ HBv2-series VMs feature 200 Gb/sec Mellanox HDR InfiniBand. These VMs are connec
2929
| Size | vCPU | Processor | Memory (GiB) | Memory bandwidth GB/s | Base CPU frequency (GHz) | All-cores frequency (GHz, peak) | Single-core frequency (GHz, peak) | RDMA performance (Gb/s) | MPI support | Temp storage (GiB) | Max data disks | Max Ethernet vNICs |
3030
| --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- |
3131
| Standard_HB120rs_v2 | 120 | AMD EPYC 7V12 | 456 | 350 | 2.45 | 3.1 | 3.3 | 200 | All | 480 + 960 | 8 | 8 |
32+
| Standard_HB120-96rs_v2 | 96 | AMD EPYC 7V12 | 456 | 350 | 2.45 | 3.1 | 3.3 | 200 | All | 480 + 960 | 8 | 8 |
33+
| Standard_HB120-64rs_v2 | 64 | AMD EPYC 7V12 | 456 | 350 | 2.45 | 3.1 | 3.3 | 200 | All | 480 + 960 | 8 | 8 |
34+
| Standard_HB120-32rs_v2 | 32 | AMD EPYC 7V12 | 456 | 350 | 2.45 | 3.1 | 3.3 | 200 | All | 480 + 960 | 8 | 8 |
35+
| Standard_HB120-16rs_v2 | 16 | AMD EPYC 7V12 | 456 | 350 | 2.45 | 3.1 | 3.3 | 200 | All | 480 + 960 | 8 | 8 |
3236

3337
Learn more about the:
3438
- [Architecture and VM topology](./workloads/hpc/hbv2-series-overview.md)

0 commit comments

Comments
 (0)