Skip to content

Commit f3808d5

Browse files
authored
Merge pull request #193289 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 284c1fe + e6139ae commit f3808d5

File tree

5 files changed

+36
-16
lines changed

5 files changed

+36
-16
lines changed

articles/active-directory/develop/howto-create-self-signed-certificate.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,16 @@ Use the certificate you create using this method to authenticate from an applica
5151
In an elevated PowerShell prompt, run the following command and leave the PowerShell console session open. Replace `{certificateName}` with the name that you wish to give to your certificate.
5252

5353
```powershell
54-
55-
$cert = New-SelfSignedCertificate -Subject "CN={certificateName}" -CertStoreLocation "Cert:\CurrentUser\My" -KeyExportPolicy Exportable -KeySpec Signature -KeyLength 2048 -KeyAlgorithm RSA -HashAlgorithm SHA256 ## Replace {certificateName}
54+
$certname = "{certificateName}" ## Replace {certificateName}
55+
$cert = New-SelfSignedCertificate -Subject "CN=$certname" -CertStoreLocation "Cert:\CurrentUser\My" -KeyExportPolicy Exportable -KeySpec Signature -KeyLength 2048 -KeyAlgorithm RSA -HashAlgorithm SHA256
5656
5757
```
5858

5959
The **$cert** variable in the previous command stores your certificate in the current session and allows you to export it. The command below exports the certificate in `.cer` format. You can also export it in other formats supported on the Azure portal including `.pem` and `.crt`.
6060

6161
```powershell
6262
63-
Export-Certificate -Cert $cert -FilePath "C:\Users\admin\Desktop\{certificateName}.cer" ## Specify your preferred location and replace {certificateName}
63+
Export-Certificate -Cert $cert -FilePath "C:\Users\admin\Desktop\$certname.cer" ## Specify your preferred location
6464
6565
```
6666

@@ -74,8 +74,8 @@ Use this option to create a certificate and its private key if your application
7474
In an elevated PowerShell prompt, run the following command and leave the PowerShell console session open. Replace `{certificateName}` with name that you wish to give your certificate.
7575

7676
```powershell
77-
78-
$cert = New-SelfSignedCertificate -Subject "CN={certificateName}" -CertStoreLocation "Cert:\CurrentUser\My" -KeyExportPolicy Exportable -KeySpec Signature -KeyLength 2048 -KeyAlgorithm RSA -HashAlgorithm SHA256 ## Replace {certificateName}
77+
$certname = "{certificateName}" ## Replace {certificateName}
78+
$cert = New-SelfSignedCertificate -Subject "CN=$certname" -CertStoreLocation "Cert:\CurrentUser\My" -KeyExportPolicy Exportable -KeySpec Signature -KeyLength 2048 -KeyAlgorithm RSA -HashAlgorithm SHA256
7979
8080
```
8181

@@ -84,7 +84,7 @@ The **$cert** variable in the previous command stores your certificate in the cu
8484

8585
```powershell
8686
87-
Export-Certificate -Cert $cert -FilePath "C:\Users\admin\Desktop\{certificateName}.cer" ## Specify your preferred location and replace {certificateName}
87+
Export-Certificate -Cert $cert -FilePath "C:\Users\admin\Desktop\$certname.cer" ## Specify your preferred location
8888
8989
```
9090

@@ -100,7 +100,7 @@ Now, using the password you stored in the `$mypwd` variable, secure, and export
100100

101101
```powershell
102102
103-
Export-PfxCertificate -Cert $cert -FilePath "C:\Users\admin\Desktop\{privateKeyName}.pfx" -Password $mypwd ## Specify your preferred location and replace {privateKeyName}
103+
Export-PfxCertificate -Cert $cert -FilePath "C:\Users\admin\Desktop\$certname.pfx" -Password $mypwd ## Specify your preferred location
104104
105105
```
106106

@@ -113,7 +113,7 @@ If you created the certificate using Option 2, you can delete the key pair from
113113

114114
```powershell
115115
116-
Get-ChildItem -Path "Cert:\CurrentUser\My" | Where-Object {$_.Subject -Match "{certificateName}"} | Select-Object Thumbprint, FriendlyName ## Replace {privateKeyName} with the name you gave your certificate
116+
Get-ChildItem -Path "Cert:\CurrentUser\My" | Where-Object {$_.Subject -Match "$certname"} | Select-Object Thumbprint, FriendlyName
117117
118118
```
119119

articles/active-directory/managed-identities-azure-resources/how-to-assign-app-role-managed-identity-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ In this article, you learn how to assign a managed identity to an application ro
103103
104104
```azurecli
105105
roleguid="0566419e-bb95-4d9d-a4f8-ed9a0f147fa6"
106-
az rest -m POST -u https://graph.microsoft.com/beta/servicePrincipals/$oidForMI/appRoleAssignments -b "{\"principalId\": \"$oidForMI\", \"resourceId\": \"$serverSPOID\",\"appRoleId\": \"$roleguid\"}"
106+
az rest -m POST -u https://graph.microsoft.com/v1.0/servicePrincipals/$oidForMI/appRoleAssignments -b "{\"principalId\": \"$oidForMI\", \"resourceId\": \"$serverSPOID\",\"appRoleId\": \"$roleguid\"}"
107107
```
108108
109109
## Next steps

articles/azure-monitor/vm/vminsights-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ The steps to configure VM insights are as follows. Follow each link for detailed
4444
- [Add VMInsights solution to workspace.](./vminsights-configure-workspace.md#add-vminsights-solution-to-workspace)
4545
- [Install agents on virtual machine and virtual machine scale set to be monitored.](./vminsights-enable-overview.md)
4646

47-
47+
Currently, VM insights does not support multi-homing.
4848

4949
## Next steps
5050

articles/iot-dps/how-to-troubleshoot-dps.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,24 +46,24 @@ To learn more, see [alerts in Azure Monitor](../azure-monitor/alerts/alerts-over
4646

4747
1. Sign in to the [Azure portal](https://portal.azure.com).
4848

49-
2. Browse to your IoT hub.
49+
2. Browse to your Device Provisioning Service.
5050

5151
3. Select **Diagnostics settings**.
5252

53-
4. Select **Turn on diagnostics**.
53+
4. Select **Add diagnostic setting**.
5454

55-
5. Enable the desired logs to be collected.
55+
5. Configure the desired logs to be collected.
5656

5757
| Log Name | Description |
5858
|-------|------------|
5959
| DeviceOperations | Logs related to device connection events |
6060
| ServiceOperations | Event logs related to using service SDK (e.g. Creating or updating enrollment groups)|
6161

62-
6. Turn on **Send to Log Analytics** ([see pricing](https://azure.microsoft.com/pricing/details/log-analytics/)).
62+
6. Tick the box **Send to Log Analytics** ([see pricing](https://azure.microsoft.com/pricing/details/log-analytics/)) and save.
6363

6464
7. Go to **Logs** tab in the Azure portal under Device Provisioning Service resource.
6565

66-
8. Click **Run** to view recent events.
66+
8. Write **AzureDiagnostics** as a query and click **Run** to view recent events.
6767

6868
9. If there are results, look for `OperationName`, `ResultType`, `ResultSignature`, and `ResultDescription` (error message) to get more detail on the error.
6969

@@ -78,4 +78,4 @@ Use this table to understand and resolve common errors.
7878
| 404 | The Device Provisioning Service instance, or a resource (e.g. an enrollment) does not exist. |404 Not Found |
7979
| 412 | The ETag in the request does not match the ETag of the existing resource, as per RFC7232. | 412 Precondition failed |
8080
| 429 | Operations are being throttled by the service. For specific service limits, see [IoT Hub Device Provisioning Service limits](../azure-resource-manager/management/azure-subscription-service-limits.md#iot-hub-device-provisioning-service-limits). | 429 Too many requests |
81-
| 500 | An internal error occurred. | 500 Internal Server Error|
81+
| 500 | An internal error occurred. | 500 Internal Server Error|

includes/resource-graph/samples/bycat/azure-virtual-machines.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,26 @@ Search-AzGraph -Query "PatchAssessmentResources | where type has 'softwarepatche
355355

356356
---
357357

358+
### List of unattached disks with details
359+
360+
Returns the list of disks that have a status of unattached with details. The query also includes the disk name, resource group, and location to enable triaging and mitigation as part of auditing or cost optimization efforts.
361+
362+
```kusto
363+
Resources
364+
| where type == "microsoft.compute/disks"
365+
| where properties['diskState'] == "Unattached"
366+
| project name,resourceGroup,id,type,kind,location,subscriptionId,tags,properties['diskState']
367+
```
368+
369+
# [Portal](#tab/azure-portal)
370+
371+
:::image type="icon" source="../../../../articles/governance/resource-graph/media/resource-graph-small.png"::: Try this query in Azure Resource Graph Explorer:
372+
373+
- Azure portal: <a href="https://portal.azure.com/?feature.customportal=false#blade/HubsExtension/ArgQueryBlade/query/HealthResources%0a%7c%20where%20type%20%3d%7e%20%27microsoft.resourcehealth%2favailabilitystatuses%27%0a%7c%20summarize%20by%20ResourceId%20%3d%20tolower(tostring(properties.targetResourceId))%2c%20AvailabilityState%20%3d%20tostring(properties.availabilityState)" target="_blank">portal.azure.com</a>
374+
- Azure Government portal: <a href="https://portal.azure.us/?feature.customportal=false#blade/HubsExtension/ArgQueryBlade/query/HealthResources%0a%7c%20where%20type%20%3d%7e%20%27microsoft.resourcehealth%2favailabilitystatuses%27%0a%7c%20summarize%20by%20ResourceId%20%3d%20tolower(tostring(properties.targetResourceId))%2c%20AvailabilityState%20%3d%20tostring(properties.availabilityState)" target="_blank">portal.azure.us</a>
375+
- Azure China 21Vianet portal: <a href="https://portal.azure.cn/?feature.customportal=false#blade/HubsExtension/ArgQueryBlade/query/HealthResources%0a%7c%20where%20type%20%3d%7e%20%27microsoft.resourcehealth%2favailabilitystatuses%27%0a%7c%20summarize%20by%20ResourceId%20%3d%20tolower(tostring(properties.targetResourceId))%2c%20AvailabilityState%20%3d%20tostring(properties.availabilityState)" target="_blank">portal.azure.cn</a>
376+
```
377+
358378
### List of virtual machines and associated availability states by Resource Ids
359379
360380
Returns the latest list of virtual machines (type `Microsoft.Compute/virtualMachines`) aggregated by availability state. The query also provides the associated Resource Id based on `properties.targetResourceId`, for easy debugging and mitigation. Availability states can be one of four values: Available, Unavailable, Degraded and Unknown. For more details on what each of the availability states mean, please see [Azure Resource Health overview](../../../../articles/service-health/resource-health-overview.md#health-status).

0 commit comments

Comments
 (0)