Skip to content

Commit 508dd14

Browse files
Learn Build Service GitHub AppLearn Build Service GitHub App
authored andcommitted
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 1b6c01f + f9f17c3 commit 508dd14

16 files changed

+253
-87
lines changed

articles/backup/offline-backup-azure-data-box.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Offline backup by using Azure Data Box
33
description: Learn how you can use Azure Data Box to seed large initial backup data offline from the MARS Agent to a Recovery Services vault.
44
ms.topic: how-to
5-
ms.date: 05/24/2024
5+
ms.date: 04/18/2025
66
author: jyothisuri
77
ms.author: jsuri
88
ms.service: azure-backup
@@ -136,18 +136,18 @@ The offline backup process using MARS and Azure Data Box requires the Data Box d
136136
137137
## Set up Azure Data Box devices
138138
139-
Depending on the Azure Data Box SKU you ordered, do the steps covered in the appropriate sections that follow. The steps show you how to set up and prepare the Data Box devices for the MARS Agent to identify and transfer the initial backup data.
139+
Depending on the Azure Data Box SKU you ordered, perform the steps covered in the appropriate sections that follow. The steps illustrate how to set up and prepare the Data Box devices for the MARS Agent to identify and transfer the initial backup data.
140140
141141
### Set up Azure Data Box disks
142142
143-
If you ordered one or more Azure Data Box disks (up to 8 TB each), follow the steps mentioned here to [unpack, connect, and unlock your Data Box disk](../databox/data-box-disk-deploy-set-up.md).
143+
If you ordered one or more Azure Data Box disks (up to 100 TB), follow the steps mentioned within the [unpack, connect, and unlock your Data Box disk](../databox/data-box-disk-deploy-set-up.md) article.
144144
145145
>[!NOTE]
146146
>It's possible that the server with the MARS Agent doesn't have a USB port. In that situation, you can connect your Azure Data Box disk to another server or client and expose the root of the device as a network share.
147147
148148
### Set up Azure Data Box
149149
150-
If you ordered an Azure Data Box instance (up to 100 TB), follow the steps here [to set up your Data Box instance](../databox/data-box-deploy-set-up.md).
150+
If you ordered an Azure Data Box instance (up to 100 TB), follow the steps here [to set up your Data Box instance](../databox/data-box-deploy-set-up.md?pivots=dbx-ng).
151151
152152
#### Mount your Azure Data Box instance as a Local System
153153
@@ -241,9 +241,9 @@ After the backup of the data is finished, you'll see a page on the MARS Agent th
241241
242242
This section explains the steps to take after the backup of the data to the Azure Data Box Disk is successful.
243243
244-
- Follow the steps in this article to [ship the Azure Data Box disk to Azure](../databox/data-box-disk-deploy-picked-up.md). If you used an Azure Data Box 100-TB device, follow these steps to [ship the Azure Data Box device to Azure](../databox/data-box-deploy-picked-up.md).
244+
- Follow the steps in this article to [ship the Azure Data Box disk to Azure](../databox/data-box-disk-deploy-picked-up.md). If you used an Azure Data Box 100-TB device, follow these steps to [ship the Azure Data Box device to Azure](../databox/data-box-deploy-picked-up.md?pivots=dbx-ng).
245245
246-
- [Monitor the Data Box job](../databox/data-box-disk-deploy-upload-verify.md) in the Azure portal. After the Azure Data Box job is finished, the MARS Agent automatically moves the data from the storage account to the Recovery Services vault at the time of the next scheduled backup. It then marks the backup job as *Job Completed* if a recovery point is successfully created.
246+
- [Monitor the Data Box job](../databox/data-box-disk-deploy-upload-verify.md?pivots=dbx-ng) in the Azure portal. After the Azure Data Box job is finished, the MARS Agent automatically moves the data from the storage account to the Recovery Services vault at the time of the next scheduled backup. It then marks the backup job as *Job Completed* if a recovery point is successfully created.
247247
248248
>[!NOTE]
249249
>The MARS Agent triggers backups at the times scheduled during policy creation. These jobs flag "Waiting for Azure Data Box job to be completed" until the time the job is finished.

articles/databox/data-box-deploy-export-ordered.md

Lines changed: 225 additions & 45 deletions
Large diffs are not rendered by default.
87.3 KB
Loading
171 KB
Loading
62.4 KB
Loading
174 KB
Loading
56.2 KB
Loading

articles/operator-nexus/concepts-security.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,3 +131,9 @@ As a secure service, Azure Kubernetes Service (AKS) complies with SOC, ISO, PCI
131131
The Operator Nexus Cluster Manager is an AKS implementation. The following image shows the Kube-Bench exceptions for the Cluster Manager. A full report of CIS Benchmark control evaluation for Azure Kubernetes Service (AKS) can be found [here](/azure/aks/cis-kubernetes)
132132

133133
:::image type="content" source="media/security/nexus-cluster-manager-kubebench.png" alt-text="Screenshot of Cluster Manager Kube-Bench exceptions." lightbox="media/security/nexus-cluster-manager-kubebench.png":::
134+
135+
## Encryption at rest
136+
137+
Azure Operator Nexus provides persistent storage for virtualized and containerized workloads. Data is stored and encrypted at rest on the storage appliances in the Azure Operator Nexus aggregator rack. For more information, please see [the storage appliance reference documentation](/reference-near-edge-storage.md).
138+
139+
Nexus Kubernetes clusters and Nexus virtual machines consume storage from a local disk. Data stored on local disks is encrypted using LUKS2 with the AES256 bit algorithm in XTS mode. All encryption keys are platform managed.

articles/operator-nexus/reference-near-edge-storage.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ An Azure Operator Nexus instance can have up to two storage appliances. The stor
3535

3636
The Pure FlashArray contains a variety of data reduction features. The effective capacity of the storage appliance, which gives the amount of data that can be stored from the workload's perspective, is typically larger than the raw capacity. The effective capacity depends strongly on the data being stored. For example, pre-compressed or application-encrypted data achieves lower data reduction ratios on the storage appliance than data with high levels of duplication. Pure storage can model likely achievable data reduction ratios and effective capacity for a wide variety of workloads to help you choose a SKU with a suitable amount of storage capacity.
3737

38+
### Encryption at rest
39+
40+
All data stored on the Pure FlashArray is encrypted at rest using platform-managed storage server-side encryption. For more information, see [Pure's FlashArray Data Security Overview](https://support.purestorage.com/bundle/m_security_resources/page/repositories/production-branch/content/documents/Production/FlashArray/FlashArray_Security/FlashArray_Security_Guides_and_Manuals/topics/task/t_an_overview_of_flasharray_data_security.html) (sign in required).
41+
3842
## Storage connectivity
3943

4044
This diagram shows the connectivity model followed by storage appliance in the near-edge offering.

articles/sentinel/business-applications/deploy-power-platform-solution.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ ms.date: 11/14/2024
1515

1616
This article describes how to deploy the [Microsoft Sentinel solution for Microsoft Business Apps](../business-applications/solution-overview.md) to connect your Microsoft Power Platform and Microsoft Dynamics 365 Customer Engagement system to Microsoft Sentinel. The solution collects audit and activity logs to detect threats, suspicious activities, illegitimate activities, and more.
1717

18-
> [!IMPORTANT]
19-
>
20-
> - The Microsoft Sentinel solution for Microsoft Business Apps is currently in PREVIEW. The [Azure Preview Supplemental Terms](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) include additional legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
21-
> - The solution is a premium offering. Pricing information will be available before the solution becomes generally available.
22-
2318
## Prerequisites
2419

2520
Before deploying the Microsoft Sentinel solution for Microsoft Business Apps, ensure that you meet the following prerequisites:

0 commit comments

Comments
 (0)