Skip to content

Commit c048212

Browse files
authored
Merge branch 'MicrosoftDocs:main' into patch-2
2 parents 529b1fb + 4f5649f commit c048212

File tree

60 files changed

+515
-212
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+515
-212
lines changed

articles/automation/change-tracking/manage-change-tracking-monitoring-agent.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: This article tells how to use change tracking and inventory to trac
44
services: automation
55
ms.subservice: change-inventory-management
66
ms.custom: linux-related-content
7-
ms.date: 09/19/2024
7+
ms.date: 11/19/2024
88
ms.topic: how-to
99
ms.service: azure-automation
1010
---
@@ -25,7 +25,10 @@ To manage tracking and inventory, ensure that you enable Change tracking with AM
2525

2626
1. In the [Azure portal](https://portal.azure.com), select the virtual machine.
2727
1. Select a specific VM for which you would like to configure the Change tracking settings.
28-
1. Under **Operations**, select **Change tracking**
28+
1. Under **Operations**, select **Change tracking**.
29+
30+
:::image type="content" source="media/manage-change-tracking-monitoring-agent/configure-file-settings.png" alt-text="Screenshot of selecting the change tracking to configure file settings." lightbox="media/manage-change-tracking-monitoring-agent/configure-file-settings.png":::
31+
2932
1. Select **Settings** to view the **Data Collection Rule Configuration** (DCR) page. Here, you can do the following actions:
3033
1. Configure changes on a VM at a granular level.
3134
1. Select the filter to configure the workspace.
248 KB
Loading

articles/azure-cache-for-redis/TOC.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,6 @@
159159
href: managed-redis/managed-redis-how-to-import-export-data.md
160160
- name: Configure disk encryption
161161
href: managed-redis/managed-redis-how-to-encryption.md
162-
- name: Reboot
163-
href: managed-redis/managed-redis-administration.md#reboot
164-
- name: Update channel and schedule updates
165-
href: managed-redis/managed-redis-administration.md#update-channel-and-schedule-updates
166162
- name: Configure redis-cli access
167163
href: managed-redis/managed-redis-how-to-redis-cli-tool.md
168164
- name: Management FAQs
@@ -488,4 +484,4 @@
488484
- name: Build your skills with Microsoft Learn training
489485
href: /training/browse/?products=azure-redis-cache
490486
- name: Azure Roadmap
491-
href: https://azure.microsoft.com/roadmap/?category=databases
487+
href: https://azure.microsoft.com/roadmap/?category=databases

articles/azure-maps/power-bi-visual-add-reference-layer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ Optionally, select the **Use custom colors** toggle switch to toggle On/Off cust
177177
178178
#### Semantic model
179179
180-
| Datapoint | Country | City | Office name |
180+
| Datapoint | Country/region | City | Office name |
181181
|-------------|---------|----------|-------------|
182182
| Datapoint_1 | US | New York | Office C |
183183
| Datapoint_1 | US | Seattle | Office A |

articles/azure-netapp-files/azure-netapp-files-service-levels.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ The following diagram shows throughput limit examples of volumes in an auto QoS
4646

4747
### Throughput limit examples of volumes in a manual QoS capacity pool
4848

49-
If you use a manual QoS capacity pool, you can assign the capacity and throughput for a volume independently. When you create a volume in a manual QoS capacity pool, you can specify the throughput (MiB/S) value. The total throughput assigned to volumes in a manual QoS capacity pool depends on the size of the pool and the service level. Throughput limits are capped by a formula: cCapacity pool size in TiB x service level throughput/TiB. For instance, a 10-TiB capacity pool with the Ultra service level has a total throughput capacity of 1280 MiB/s (10 TiB x 128 MiB/s/TiB) available for the volumes.
49+
If you use a manual QoS capacity pool, you can assign the capacity and throughput for a volume independently. When you create a volume in a manual QoS capacity pool, you can specify the throughput (MiB/S) value. The total throughput assigned to volumes in a manual QoS capacity pool depends on the size of the pool and the service level. Throughput limits are capped by a formula: capacity pool size in TiB x service level throughput/TiB. For instance, a 10-TiB capacity pool with the Ultra service level has a total throughput capacity of 1280 MiB/s (10 TiB x 128 MiB/s/TiB) available for the volumes.
5050

5151
For example, for an SAP HANA system, this capacity pool can be used to create the following volumes. Each volume provides the individual size and throughput to meet your application requirements:
5252

articles/azure-web-pubsub/howto-develop-event-listener.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: Y-Sindo
55
ms.author: zityang
66
ms.service: azure-web-pubsub
77
ms.topic: how-to
8-
ms.date: 09/30/2022
8+
ms.date: 11/20/2024
99
---
1010

1111
# Send client events to Event Hubs
@@ -67,9 +67,9 @@ Find your Azure Web PubSub service from **Azure portal**. Navigate to **Identity
6767

6868
## Test your configuration with live demo
6969

70-
1. Open this [Event Hubs Consumer Client](https://awpseventlistenerdemo.blob.core.windows.net/eventhub-consumer/index.html) web app, input the Event Hubs connection string to connect to an event hub as a consumer. If you get the Event Hubs connection string from an Event Hubs namespace resource instead of an event hub instance, then you need to specify the event hub name. This event hub consumer client is connected with the mode that only reads new events; the events published before aren't seen here. You can change the consumer client connection mode to read all the available events in the production environment.
70+
1. Open this [Event Hubs Consumer Client](https://awpseventlistenerdemo.z13.web.core.windows.net/eventhub-consumer/index.html) web app, input the Event Hubs connection string to connect to an event hub as a consumer. If you get the Event Hubs connection string from an Event Hubs namespace resource instead of an event hub instance, then you need to specify the event hub name. This event hub consumer client is connected with the mode that only reads new events; the events published before aren't seen here. You can change the consumer client connection mode to read all the available events in the production environment.
7171

72-
1. Use this [WebSocket Client](https://awpseventlistenerdemo.blob.core.windows.net/webpubsub-client/websocket-client.html) web app to generate client events. If you've configured to send system event `connected` to that event hub, you should be able to see a printed `connected` event in the Event Hubs consumer client after connecting to Web PubSub service successfully. You can also generate a user event with the app.
72+
1. Use this [WebSocket Client](https://awpseventlistenerdemo.z13.web.core.windows.net/webpubsub-client/websocket-client.html) web app to generate client events. If you've configured to send system event `connected` to that event hub, you should be able to see a printed `connected` event in the Event Hubs consumer client after connecting to Web PubSub service successfully. You can also generate a user event with the app.
7373
:::image type="content" source="media/howto-develop-event-listener/eventhub-consumer-connected-event.png" alt-text="Screenshot of a printed connected event in the Event Hubs consumer client app.":::
7474
:::image type="content" source="media/howto-develop-event-listener/web-pubsub-client-specify-event-name.png" alt-text="Screenshot showing the area of the WebSocket client app to generate a user event.":::
7575

articles/backup/azure-file-share-backup-overview.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: About Azure File share backup
33
description: Learn how to back up Azure file shares in the Recovery Services vault
44
ms.topic: overview
5-
ms.date: 09/09/2024
5+
ms.date: 11/20/2024
66
ms.service: azure-backup
77
ms.custom:
88
- engagement-fy23
@@ -103,6 +103,12 @@ The following diagram explains the lifecycle of the lease acquired by Azure Back
103103

104104
:::image type="content" source="./media/azure-file-share-backup-overview/backup-lease-lifecycle-diagram.png" alt-text="Diagram explaining the lifecycle of the lease acquired by Azure Backup." border="false":::
105105

106+
## How Cross Subscription Backup for Azure File share (preview) works?
107+
108+
Cross Subscription Backup (CSB) for Azure File share (preview) enables you to back up file shares across subscriptions. This feature is useful when you want to centralize backup management for file shares across different subscriptions. You can back up file shares from a source subscription to a Recovery Services vault in a target subscription.
109+
110+
Learn about the [additional prerequisites](backup-azure-files.md#prerequisites) and [steps to configure Cross Subscription Backup for Azure File share (preview)](backup-azure-files.md#configure-the-backup). For information on the supported regions for Cross Subscription Backup, see the [Azure File share backup support matrix](azure-file-share-support-matrix.md#supported-regions-for-cross-subscription-backup-preview).
111+
106112
## Next steps
107113

108114
* [Back up Azure File shares](backup-afs.md).

articles/backup/azure-file-share-support-matrix.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Support Matrix for Azure file share backup by using Azure Backup
33
description: Provides a summary of support settings and limitations when backing up Azure file shares.
44
ms.topic: reference
5-
ms.date: 09/09/2024
5+
ms.date: 11/20/2024
66
ms.custom: references_regions, engagement-fy24
77
ms.service: azure-backup
88
author: AbhishekMallick-MS
@@ -32,6 +32,10 @@ Vaulted backup for Azure Files (preview) is available in West Central US, Southe
3232

3333
---
3434

35+
### Supported regions for Cross Subscription Backup (preview)
36+
37+
Cross Subscription Backup (CSB) for Azure File share (preview) is currently available in the following regions: East Asia, Southeast Asia, UK South, UK West, Central India.
38+
3539
## Supported storage accounts
3640

3741
**Choose a backup tier**:

articles/backup/backup-azure-files.md

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Back up Azure File shares in the Azure portal
33
description: Learn how to use the Azure portal to back up Azure File shares in the Recovery Services vault
44
ms.topic: how-to
5-
ms.date: 07/29/2024
5+
ms.date: 11/20/2024
66
ms.service: azure-backup
77
ms.custom: engagement-fy23
88
author: AbhishekMallick-MS
@@ -22,37 +22,42 @@ Azure File share backup is a native, cloud based backup solution that protects y
2222
2323
## Prerequisites
2424

25-
* Ensure that the file share is present in one of the supported storage account types. Review the [support matrix](azure-file-share-support-matrix.md).
25+
* Ensure the file share is present in one of the supported storage account types. Review the [support matrix](azure-file-share-support-matrix.md).
2626
* Identify or create a [Recovery Services vault](#create-a-recovery-services-vault) in the same region and subscription as the storage account that hosts the file share.
2727
* In case you have restricted access to your storage account, check the firewall settings of the account to ensure that the exception "Allow Azure services on the trusted services list to access this storage account" is granted. You can refer to [this](../storage/common/storage-network-security.md?tabs=azure-portal#manage-exceptions) link for the steps to grant an exception.
28+
>[!Important]
29+
>To perform [Cross Subscription Backup (CSB) for protecting Azure File share (preview)](azure-file-share-backup-overview.md#how-cross-subscription-backup-for-azure-file-share-preview-works) in another subscription, ensure you register `Microsoft.RecoveryServices` in the **subscription of the file share** in addition to the above prerequisites. Learn about the [supported regions for Cross Subscription Backup (preview)](azure-file-share-support-matrix.md#supported-regions-for-cross-subscription-backup-preview).
30+
2831

2932
[!INCLUDE [How to create a Recovery Services vault](../../includes/backup-create-rs-vault.md)]
3033

3134
## Configure the backup
3235

33-
You can configure *snapshot backup* and *vaulted backup (preview)* for Azure File share from *Backup center* or *File share blade*.
36+
You can configure *snapshot backup* and *vaulted backup (preview)* for Azure File share from the *Recovery Services vault* or *File share blade*.
3437

3538
**Choose an entry point**
3639

37-
# [Backup center](#tab/backup-center)
40+
# [Recovery Services vault](#tab/recovery-services-vault)
3841

39-
To configure backup for multiple file shares from the Backup center, follow these steps:
42+
To configure backup for multiple file shares from the Recovery Services vault, follow these steps:
4043

41-
1. In the [Azure portal](https://portal.azure.com/), go to **Backup center** and select **+Backup**.
44+
1. In the [Azure portal](https://portal.azure.com/), go to the **Recovery Services vault** and select **+Backup**.
4245

43-
:::image type="content" source="./media/backup-afs/backup-center-configure-inline.png" alt-text="Screenshot showing to configure Backup for Azure File." lightbox="./media/backup-afs/backup-center-configure-expanded.png":::
46+
:::image type="content" source="./media/backup-afs/azure-file-configure-backup.png" alt-text="Screenshot showing to configure Backup for Azure File." lightbox="./media/backup-afs/azure-file-configure-backup.png":::
4447

4548
1. On the **Start: Configure Backup** blade, select **Azure Files (Azure Storage)** as the datasource type, select the vault that you want to protect the file shares with, and then select **Continue**.
4649

4750
:::image type="content" source="./media/backup-afs/azure-file-share-select-vault.png" alt-text="Screenshot showing to select Azure Files.":::
4851

49-
1. Click **Select** to select the storage account that contains the file shares to be backed-up.
52+
1. Click **Select** to select the storage account that contains the file shares to be backed up.
5053

51-
The **Select storage account** blade opens on the right, which lists a set of discovered supported storage accounts. They're either associated with this vault or present in the same region as the vault, but not yet associated to any Recovery Services vault.
54+
The **Select storage account** blade opens on the right, which lists a set of discovered supported storage accounts. They're either associated with this vault or present in the same region as the vault, but not yet associated with any Recovery Services vault.
5255

5356
:::image type="content" source="./media/backup-azure-files/azure-file-share-select-storage-account.png" alt-text="Screenshot showing to select a storage account." lightbox="./media/backup-azure-files/azure-file-share-select-storage-account.png":::
5457

55-
1. On the **Select storage account** blade, from the list of discovered storage accounts, select an account, and select **OK**.
58+
1. On the **Select storage account** blade, by default it list the storage accounts from the current subscription. Select an account, and select **OK**.
59+
60+
If you want to configure the backup operation with a storage account in a different subscription ([Cross Subscription Backup - preview](azure-file-share-backup-overview.md#how-cross-subscription-backup-for-azure-file-share-preview-works)), choose the other subscription from the **Subscription** filter. The storage accounts from the selected subscription appear.
5661

5762
:::image type="content" source="./media/backup-azure-files/azure-file-share-confirm-storage-account.png" alt-text="Screenshot showing to select one of the discovered storage accounts." lightbox="./media/backup-azure-files/azure-file-share-confirm-storage-account.png":::
5863

@@ -80,7 +85,7 @@ To configure backup for multiple file shares from the Backup center, follow thes
8085
- **Snapshot**: Enables only snapshot-based backups that are stored locally and can only provide protection in case of accidental deletions.
8186
- **Vault-Standard (Preview)**: Provides comprehensive data protection.
8287

83-
1. Configure the *backup schedule* as per the requirement. You can configure up to *six backups* a day. The snapshots are taken as per the schedule defined in the policy. In case of vaulted backup, the data from the last snapshot of the day is transferred to the vault.
88+
1. Configure the *backup schedule* as per the requirement. You can configure up to *six backups* per day. The snapshots are taken as per the schedule defined in the policy. In case of vaulted backup, the data from the last snapshot of the day is transferred to the vault.
8489

8590
1. Configure the *Snapshot retention* and *Vault retention (preview)* duration to determine the expiry date of the recovery points.
8691

@@ -144,7 +149,7 @@ The following steps explain how you can configure backup for individual file sha
144149
- **Snapshot**: Enables only snapshot-based backups that are stored locally and can only provide protection in case of accidental deletions.
145150
- **Vault-Standard (Preview)**: Provides comprehensive data protection.
146151

147-
1. Configure the *backup schedule* as per the requirement. You can configure up to *six backups* a day. The snapshots are taken as per the schedule defined in the policy. In case of vaulted backup, the data from the last snapshot of the day is transferred to the vault.
152+
1. Configure the *backup schedule* as per the requirement. You can configure up to *six backups* per day. The snapshots are taken as per the schedule defined in the policy. In case of vaulted backup, the data from the last snapshot of the day is transferred to the vault.
148153

149154
1. Configure the *Snapshot retention* and *Vault retention (preview)* duration to determine the expiry date of the recovery points.
150155

@@ -176,15 +181,13 @@ Occasionally, you might want to generate a backup snapshot, or recovery point, o
176181

177182
**Choose an entry point**
178183

179-
# [Backup center](#tab/backup-center)
184+
# [Recovery Services vault](#tab/recovery-services-vault)
180185

181186
To run an on-demand backup, follow these steps:
182187

183-
1. Go to **Backup center** and select **Backup Instances** from the menu.
184-
185-
Filter for **Azure Files (Azure Storage)** as the datasource type.
188+
1. Go to the **Recovery Services vault** and select **Backup items** from the menu.
186189

187-
:::image type="content" source="./media/backup-afs/azure-file-share-backup-instances-inline.png" alt-text="Screenshot showing to select Backup instances." lightbox="./media/backup-afs/azure-file-share-backup-instances-expanded.png":::
190+
1. On the **Backup items** blade, select the **Backup Management Type** as **Azure Storage (Azure Files)**.
188191

189192
1. Select the item for which you want to run an on-demand backup job.
190193

@@ -198,9 +201,9 @@ To run an on-demand backup, follow these steps:
198201

199202
1. Select **OK** to confirm the on-demand backup job that runs.
200203

201-
1. Monitor the portal notifications to keep a track of backup job run completion.
204+
1. Monitor the portal notifications to keep track of backup job run completion.
202205

203-
To monitor the job progress in the **Backup center** dashboard, select **Backup center** -> **Backup Jobs** -> **In progress**.
206+
To monitor the job progress in the **Recovery Services vault** dashboard, go to **Recovery Services vault** > **Backup Jobs** > **In progress**.
204207

205208
# [File share blade](#tab/file-share-pane)
206209

articles/backup/backup-azure-immutable-vault-concept.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: This article explains about the concept of Immutable vault for Azur
44
ms.topic: overview
55
ms.service: azure-backup
66
ms.custom: references_regions, engagement-fy24
7-
ms.date: 11/11/2024
7+
ms.date: 11/20/2024
88
author: AbhishekMallick-MS
99
ms.author: v-abhmallick
1010
---
@@ -15,7 +15,7 @@ Immutable vault can help you protect your backup data by blocking any operations
1515

1616
## Before you start
1717

18-
- Use of WORM storage for immutable vaults in locked state is currently in GA for Recovery Services Vaults in the following regions: West Central US, West Europe, East US, North Europe, Australia East.
18+
- Use of WORM storage for immutable vaults in locked state is currently in GA for Recovery Services Vaults in the following regions: Australia Central 2, Switzerland West, South Africa West, Korea Central, Germany North, Korea South, Spain Central.
1919
- Use of WORM storage for immutable vaults in locked state is applicable for the following workloads: Azure Virtual machines, SQL in Azure VM, SAP HANA in Azure VM, Azure Backup Server, Azure Backup Agent, DPM.
2020
- Immutable vault is available in all Azure public and US Government regions.
2121
- Immutable vault is supported for Recovery Services vaults and Backup vaults.

0 commit comments

Comments
 (0)