Skip to content

Commit 97852c1

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-aadroles-roles-security-operator-mde
2 parents b75b39e + ba97747 commit 97852c1

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

articles/azure-monitor/essentials/diagnostic-settings.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ Each Azure resource requires its own diagnostic setting, which defines the follo
2828
A single diagnostic setting can define no more than one of each of the destinations. If you want to send data to more than one of a particular destination type (for example, two different Log Analytics workspaces), create multiple settings. Each resource can have up to five diagnostic settings.
2929

3030
> [!WARNING]
31-
> If you need to delete a resource, you should first delete its diagnostic settings. Otherwise, if you recreate this resource using the same name, the previous diagnostic settings will be included with the new resource. This will resume the collection of resource logs for the new resource as defined in a diagnostic setting and send the applicable metric and log data to the previously configured destination.
31+
> If you need to delete a resource, you should first delete its diagnostic settings. Otherwise, if you recreate this resource, the diagnostic settings for the deleted resource could be included with the new resource, depending on the resource configuration for each resource. If the diagnostics settings are included with the new resource, this resumes the collection of resource logs as defined in the diagnostic setting and sends the applicable metric and log data to the previously configured destination.
32+
>
33+
>Also, it’s a good practice to delete the diagnostic settings for a resource you're going to delete and don't plan on using again to keep your environment clean.
3234
3335
The following video walks you through routing resource platform logs with diagnostic settings. The video was done at an earlier time. Be aware of the following changes:
3436

articles/backup/backup-support-matrix-iaas.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Support matrix for Azure VM backup
33
description: Provides a summary of support settings and limitations when backing up Azure VMs with the Azure Backup service.
44
ms.topic: conceptual
5-
ms.date: 09/07/2022
5+
ms.date: 10/31/2022
66
ms.custom: references_regions
77
ms.reviewer: geg
88
author: v-amallick
@@ -178,7 +178,7 @@ Azure VM data disks | Support for backup of Azure VMs with up to 32 disks.<br><b
178178
Data disk size | Individual disk size can be up to 32 TB and a maximum of 256 TB combined for all disks in a VM.
179179
Storage type | Standard HDD, Standard SSD, Premium SSD. <br><br> Backup and restore of [ZRS disks](../virtual-machines/disks-redundancy.md#zone-redundant-storage-for-managed-disks) is supported.
180180
Managed disks | Supported.
181-
Encrypted disks | Supported.<br/><br/> Azure VMs enabled with Azure Disk Encryption can be backed up (with or without the Azure AD app).<br/><br/> Encrypted VMs can't be recovered at the file/folder level. You must recover the entire VM.<br/><br/> You can enable encryption on VMs that are already protected by Azure Backup.
181+
Encrypted disks | Supported.<br/><br/> Azure VMs enabled with Azure Disk Encryption can be backed up (with or without the Azure AD app).<br/><br/> Encrypted VMs can't be recovered at the file/folder level. You must recover the entire VM.<br/><br/> You can enable encryption on VMs that are already protected by Azure Backup. <br><br> You can back up and restore disks encrypted using platform-managed keys (PMKs) or customer-managed keys (CMKs). You can also assign a disk-encryption set while restoring in the same region (that is providing disk-encryption set while performing cross-region restore is currently not supported, however, you can assign the DES to the restored disk after the restore is complete).
182182
Disks with Write Accelerator enabled | Azure VM with WA disk backup is available in all Azure public regions starting from May 18, 2020. If WA disk backup is not required as part of VM backup, you can choose to remove with [**Selective disk** feature](selective-disk-backup-restore.md). <br><br>**Important** <br> Virtual machines with WA disks need internet connectivity for a successful backup (even though those disks are excluded from the backup).
183183
Disks enabled for access with private EndPoint | Unsupported.
184184
Back up & Restore deduplicated VMs/disks | Azure Backup doesn't support deduplication. For more information, see this [article](./backup-support-matrix.md#disk-deduplication-support) <br/> <br/> - Azure Backup doesn't deduplicate across VMs in the Recovery Services vault <br/> <br/> - If there are VMs in deduplication state during restore, the files can't be restored because the vault doesn't understand the format. However, you can successfully perform the full VM restore.

articles/hdinsight/hdinsight-40-component-versioning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ The Open-source component versions associated with HDInsight 4.0 are listed in t
2626
| Apache Oozie | 4.3.1 |
2727
| Apache Zookeeper | 3.4.6 |
2828
| Apache Phoenix | 5 |
29-
| Apache Spark | 2.4.4, 3.1 |
29+
| Apache Spark | 2.4.4 |
3030
| Apache Livy | 0.5 |
3131
| Apache Kafka | 2.1.1, 2.4.1 |
3232
| Apache Ambari | 2.7.0 |

articles/network-watcher/network-watcher-alert-triggered-packet-capture.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@ titleSuffix: Azure Network Watcher
44
description: This article describes how to create an alert triggered packet capture with Azure Network Watcher
55
services: network-watcher
66
documentationcenter: na
7-
author: damendo
8-
9-
7+
author: shijaiswal
108
ms.assetid: 75e6e7c4-b3ba-4173-8815-b00d7d824e11
119
ms.service: network-watcher
1210
ms.topic: how-to
1311
ms.tgt_pltfrm: na
1412
ms.workload: infrastructure-services
1513
ms.date: 02/22/2017
16-
ms.author: damendo
14+
ms.author: shijaiswal
1715
ms.custom: devx-track-azurepowershell
1816

1917
---

articles/storage/elastic-san/elastic-san-create.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This article explains how to deploy and configure an elastic storage area networ
1616

1717
## Prerequisites
1818

19-
- If you're using Azure PowerShell, use `Install-Module -Name Az.Elastic-SAN -Scope CurrentUser -Repository PSGallery -Force -RequiredVersion .10-preview` to install the preview module.
19+
- If you're using Azure PowerShell, use `Install-Module -Name Az.ElasticSan -Scope CurrentUser -Repository PSGallery -Force -RequiredVersion 0.1.0` to install the preview module.
2020
- If you're using Azure CLI, install the latest version. For installation instructions, see [How to install the Azure CLI](/cli/azure/install-azure-cli).
2121
- Once you've installed the latest version, run `az extension add -n elastic-san` to install the extension for Elastic SAN.
2222

0 commit comments

Comments
 (0)