Skip to content

Commit 77cf9b7

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into patricka-troubleshoot
2 parents ba89434 + 3df02b7 commit 77cf9b7

File tree

16 files changed

+249
-118
lines changed

16 files changed

+249
-118
lines changed

articles/active-directory/enterprise-users/groups-dynamic-membership.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,10 @@ You can also create a rule that selects device objects for membership in a group
379379
> [!NOTE]
380380
> systemlabels is a read-only attribute that cannot be set with Intune.
381381
>
382-
> For Windows 10, the correct format of the deviceOSVersion attribute is as follows: (device.deviceOSVersion -startsWith "10.0.1"). The formatting can be validated with the Get-MsolDevice PowerShell cmdlet.
382+
> For Windows 10, the correct format of the deviceOSVersion attribute is as follows: (device.deviceOSVersion -startsWith "10.0.1"). The formatting can be validated with the Get-MgDevice PowerShell cmdlet:
383+
> ```
384+
> Get-MgDevice -Search "displayName:YourMachineNameHere" -ConsistencyLevel eventual | Select-Object -ExpandProperty 'OperatingSystemVersion'
385+
> ```
383386
384387
The following device attributes can be used.
385388

articles/bastion/connect-native-client-windows.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: bastion
66
author: cherylmc
77
ms.service: bastion
88
ms.topic: how-to
9-
ms.date: 09/09/2022
9+
ms.date: 11/17/2022
1010
ms.author: cherylmc
1111
---
1212

@@ -35,9 +35,10 @@ After you deploy this feature, there are two different sets of connection instru
3535
* Set up concurrent VM sessions with Bastion.
3636
* [Upload files](vm-upload-download-native.md#tunnel-command) to your target VM from your local computer. File download from the target VM to the local client is currently not supported for this command.
3737

38-
Currently, this feature has the following limitation:
38+
**Limitations**
3939

4040
* Signing in using an SSH private key stored in Azure Key Vault isn’t supported with this feature. Before signing in to your Linux VM using an SSH key pair, download your private key to a file on your local machine.
41+
* This feature is not supported on Cloud Shell.
4142

4243
## <a name="prereq"></a>Prerequisites
4344

articles/confidential-computing/virtual-machine-solutions-amd.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Azure Confidential virtual machine options on AMD processors (preview)
2+
title: Azure Confidential virtual machine options on AMD processors
33
description: Azure Confidential Computing offers multiple options for confidential virtual machines that run on AMD processors backed by SEV-SNP technology.
44
author: mamccrea
55
ms.author: mamccrea

articles/databox/data-box-troubleshoot-data-upload.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ When the following errors occur, you can resolve the errors and include the file
106106
|Storage account deleted or moved |One or more storage accounts were moved or deleted. Resolve the error and resume data copy, or skip to data erasure and complete the order. |**Storage accounts deleted or moved**<br>Storage accounts: &lt;*storage accounts list*&gt; were either deleted, or moved to a different subscription or resource group. Recover or re-create the storage accounts with the original set of properties, and then confirm to resume data copy.<br>[Learn more on how to recover a storage account](../storage/common/storage-account-recover.md). |
107107
|Storage account location changed |One or more storage accounts were moved to a different region. Resolve the error and resume data copy, or skip to data erasure and complete the order. |**Storage accounts location changed**<br>Storage accounts: &lt;*storage accounts list*&gt; were moved to a different region. Restore the account to the original destination region and then confirm to resume data copy.<br>[Learn more on how to move storage accounts](../storage/common/storage-account-move.md). |
108108
|Virtual network restriction on storage account |One or more storage accounts are behind a virtual network and have restricted access. Resolve the error and resume data copy, or skip to data erasure and complete the order. |**Storage accounts behind virtual network**<br>Storage accounts: &lt;*storage accounts list*&gt; were moved behind a virtual network. Add Data Box to the list of trusted services to allow access and then confirm to resume data copy.<br>[Learn more about trusted first party access](../storage/common/storage-network-security.md#exceptions). |
109-
|Storage account owned by a different tenant |One or more storage accounts were moved under a different tenant. Resolve the error and resume data copy, or skip to data erasure and complete the order.|**Storage accounts moved to a different tenant**<br>Storage accounts: &lt;*storage accounts list*&gt; were moved to a different tenant. Restore the account to the original tenant and then confirm to resume data copy.<br>[Learn more on how to move storage accounts](../storage/common/storage-account-recover.md#recover-a-deleted-account-via-a-support-ticket). |
109+
|Storage account owned by a different tenant |One or more storage accounts were moved under a different tenant. Resolve the error and resume data copy, or skip to data erasure and complete the order.|**Storage accounts moved to a different tenant**<br>Storage accounts: &lt;*storage accounts list*&gt; were moved to a different tenant. Restore the account to the original tenant and then confirm to resume data copy.<br>[Learn more on how to move storage accounts](../storage/common/storage-account-move.md). |
110110
|Kek user identity not found |The user identity that has access to the customer-managed key wasn’t found in the active directory. Resolve the error and resume data copy, or skip to data erasure and complete the order. |**User identity not found**<br>Applied a customer-managed key but the user assigned identity that has access to the key was not found in the active directory.<br>This error may occur if a user identity is deleted from Azure.<br>Try adding another user-assigned identity to your key vault to enable access to the customer-managed key. For more information, see how to [Enable the key](data-box-customer-managed-encryption-key-portal.md#enable-key).<br>Confirm to resume data copy after the error is resolved. |
111111
|Cross tenant identity access not allowed |Managed identity couldn’t access the customer-managed key. Resolve the error and resume data copy, or skip to data erasure and complete the order. |**Cross tenant identity access not allowed**<br>Managed identity couldn’t access the customer-managed key.<br>This error may occur if a subscription is moved to a different tenant. To resolve this error, manually move the identity to the new tenant.<br>Try adding another user-assigned identity to your key vault to enable access to the customer-managed key. For more information, see how to [Enable the key](data-box-customer-managed-encryption-key-portal.md#enable-key).<br>Confirm to resume data copy after the error is resolved. |
112112
|Key details not found |Couldn’t fetch the passkey as the customer-managed key wasn’t found. Resolve the error and resume data copy, or skip to data erasure and complete the order. |**Key details not found**<br>If you deleted the key vault, you can't recover the customer-managed key. If you migrated the key vault to a different tenant, see [Change a key vault tenant ID after a subscription move](../key-vault/general/move-subscription.md). If you deleted the key vault and it is still in the purge-protection duration, use the steps at [Recover a key vault](../key-vault/general/key-vault-recovery.md?tabs=azure-powershell#key-vault-powershell).<br>If the key vault was migrated to a different tenant, use one of the following steps to recover the vault:<ol><li>Revert the key vault back to the old tenant.</li><li>Set `Identity` = `None` and then set the value back to `Identity` = `SystemAssigned`. This deletes and recreates the identity after the new identity is created. Enable `Get`, `WrapKey`, and `UnwrapKey` permissions for the new identity in the key vault's access policy.</li></ol> |

articles/healthcare-apis/iot/how-to-use-monitoring-tab.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ In this article, you'll learn how to use the [MedTech service](iot-connector-ove
4242
:::image type="content" source="media\iot-monitoring-tab\pin-metrics-to-dashboard.png" alt-text="Screenshot the MedTech service monitoring tile with red box around the pin icon." lightbox="media\iot-monitoring-tab\pin-metrics-to-dashboard.png":::
4343

4444
> [!TIP]
45-
> To learn more about advanced metrics display and sharing options, see [Getting started with Azure Metrics Explorer](/azure/azure/azure/azure-monitor/essentials/metrics-getting-started)
45+
> To learn more about advanced metrics display and sharing options, see [Getting started with Azure Metrics Explorer](/azure/azure-monitor/essentials/metrics-getting-started)
4646
4747
## Available metrics for the MedTech service
4848

articles/partner-solutions/nginx/nginx-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.date: 05/12/2022
1313

1414
In this article you learn how to enable deeper integration of the **NGINX** SaaS service with Azure.
1515

16-
The Cloud-Native Observability Platform of NGINX centralizes log, metric, and tracing analytics in one place. You can more easily monitor the health and performance of your Azure environment, and troubleshoot your services faster.
16+
NGINX for Azure (preview) delivers secure and high performance applications using familiar and trusted load balancing solutions. Use NGINX for Azure (preview) as a reverse proxy within your Azure environment.
1717

1818
The NGINX for Azure (preview) offering in the Azure Marketplace allows you to manage NGINX in the Azure portal as an integrated service. You can implement NGINX as a monitoring solution for your cloud workloads through a streamlined workflow.
1919

Binary file not shown.

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

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: jimmart-dev
77

88
ms.service: storage
99
ms.topic: conceptual
10-
ms.date: 06/23/2022
10+
ms.date: 11/17/2022
1111
ms.author: jammart
1212
ms.subservice: common
1313
---
@@ -32,7 +32,7 @@ If the deleted storage account used customer-managed keys with Azure Key Vault a
3232
3333
## Recover a deleted account from the Azure portal
3434

35-
To restore a deleted storage account from within another storage account, follow these steps:
35+
To recover a deleted storage account from the Azure portal, follow these steps:
3636

3737
1. Navigate to the list of your storage accounts in the Azure portal.
3838
1. Select the **Restore** button to open the **Restore deleted account** pane.
@@ -43,30 +43,6 @@ To restore a deleted storage account from within another storage account, follow
4343

4444
1. Select the **Restore** button to recover the account. The portal displays a notification that the recovery is in progress.
4545

46-
## Recover a deleted account via a support ticket
47-
48-
1. In the Azure portal, navigate to **Help + support**.
49-
1. Select **New support request**.
50-
1. On the **Basics** tab, in the **Issue type** field, select **Technical**.
51-
1. In the **Subscription** field, select the subscription that contained the deleted storage account.
52-
1. In the **Service** field, select **Storage Account Management**.
53-
1. In the **Resource** field, select any storage account resource. The deleted storage account will not appear in the list.
54-
1. Add a brief summary of the issue.
55-
1. In the **Problem type** field, select **Deletion and Recovery**.
56-
1. In the **Problem subtype** field, select **Recover deleted storage account**. The following image shows an example of the **Basics** tab being filled out:
57-
58-
:::image type="content" source="media/storage-account-recover/recover-account-support-basics.png" alt-text="Screenshot showing how to recover a storage account through support ticket - Basics tab":::
59-
60-
1. Next, navigate to the **Solutions** tab, and select **Customer-Controlled Storage Account Recovery**, as shown in the following image:
61-
62-
:::image type="content" source="media/storage-account-recover/recover-account-support-solutions.png" alt-text="Screenshot showing how to recover a storage account through support ticket - Solutions tab":::
63-
64-
1. From the dropdown, select the account to recover, as shown in the following image. If the storage account that you want to recover is not in the dropdown, then it cannot be recovered.
65-
66-
:::image type="content" source="media/storage-account-recover/recover-account-support.png" alt-text="Screenshot showing how to recover a storage account through support ticket":::
67-
68-
1. Select the **Recover** button to restore the account. The portal displays a notification that the recovery is in progress.
69-
7046
## Next steps
7147

7248
- [Storage account overview](storage-account-overview.md)

0 commit comments

Comments
 (0)