Skip to content

Commit aaf0076

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-master
2 parents 9a00c89 + 905667d commit aaf0076

File tree

100 files changed

+1449
-628
lines changed

Some content is hidden

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

100 files changed

+1449
-628
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26039,11 +26039,21 @@
2603926039
"redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-autoscale-powershell",
2604026040
"redirect_document_id": false
2604126041
},
26042+
{
26043+
"source_path": "articles/sentinel/tutorial-detect-threats.md",
26044+
"redirect_url": "/azure/sentinel/tutorial-detect-threats-built-in",
26045+
"redirect_document_id": false
26046+
},
2604226047
{
2604326048
"source_path": "articles/sentinel/user-analytics.md",
2604426049
"redirect_url": "/azure/sentinel/overview",
2604526050
"redirect_document_id": false
2604626051
},
26052+
{
26053+
"source_path": "articles/sentinel/connect-fusion.md",
26054+
"redirect_url": "/azure/sentinel/fusion",
26055+
"redirect_document_id": false
26056+
},
2604726057
{
2604826058
"source_path": "articles/security-center/security-center-ata-integration.md",
2604926059
"redirect_url": "/azure/security-center/security-center-partner-integration",

articles/active-directory-domain-services/tutorial-create-instance.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,15 @@ When you create an Azure AD DS instance, you specify a DNS name. There are some
6363
* **Custom domain names:** The most common approach is to specify a custom domain name, typically one that you already own and is routable. When you use a routable, custom domain, traffic can correctly flow as needed to support your applications.
6464
* **Non-routable domain suffixes:** We generally recommend that you avoid a non-routable domain name suffix, such as *contoso.local*. The *.local* suffix isn't routable and can cause issues with DNS resolution.
6565

66+
> [!TIP]
67+
> If you create a custom domain name, take care with existing DNS namespaces. It's recommended to include a unique prefix for the domain name. For example, if your DNS root name is *contoso.com*, create an Azure AD DS managed domain with the custom domain name of *corp.contoso.com* or *ds.contoso.com*. In a hybrid environment with an on-premises AD DS environment, these prefixes may already be in use. Use a unique prefix for Azure AD DS.
68+
>
69+
> You can use the root DNS name for your Azure AD DS managed domain, but you may need to create some additional DNS records for other services in your environment. For example, if you run a webserver that hosts a site using the root DNS name, there can be naming conflicts that require additional DNS entries.
70+
>
71+
> In these tutorials and how-to articles, the custom domain of *contoso.com* is used as a short example. In all commands, specify your own domain name, which may include a unique prefix.
72+
>
73+
> For more information, see [Select a naming prefix for the domain][naming-prefix].
74+
6675
The following DNS name restrictions also apply:
6776

6877
* **Domain prefix restrictions:** You can't create a managed domain with a prefix longer than 15 characters. The prefix of your specified domain name (such as *contoso* in the *contoso.com* domain name) must contain 15 or fewer characters.
@@ -226,3 +235,6 @@ To see this managed domain in action, create and join a virtual machine to the d
226235
[on-prem-sync]: tutorial-configure-password-hash-sync.md
227236
[configure-sspr]: ../active-directory/authentication/quickstart-sspr.md
228237
[password-hash-sync-process]: ../active-directory/hybrid/how-to-connect-password-hash-synchronization.md#password-hash-sync-process-for-azure-ad-domain-services
238+
239+
<!-- EXTERNAL LINKS -->
240+
[naming-prefix]: /windows-server/identity/ad-ds/plan/selecting-the-forest-root-domain#selecting-a-prefix

articles/aks/support-policies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Microsoft and customers share responsibility for Kubernetes worker nodes where:
9393
* Docker or Moby daemon
9494

9595
> [!NOTE]
96-
> On a worker node, if a control plane component is not operational, the AKS team might need to reboot the entire worker node. Because of their restricted access to the customer's active workload and data, the AKS team reboots a worker node only if the customer escalates the issue. Wherever possible, the AKS team works to prevent a required reboot from affecting the application.
96+
> On a worker node, if a control plane component is not operational, the AKS team might need to reboot individual components or the entire worker node. These reboot operations are automated and provide auto-remediation for common issues. These reboots occur only on the _node_ level and not the cluster unless these is an emergency maintenance or outage.
9797
9898
### Customer responsibilities for AKS worker nodes
9999

articles/backup/backup-azure-microsoft-azure-backup.md

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,15 @@ ms.author: dacurwin
1111
---
1212

1313
# Install and upgrade Azure Backup Server
14+
1415
> [!div class="op_single_selector"]
1516
> * [Azure Backup Server](backup-azure-microsoft-azure-backup.md)
1617
> * [SCDPM](backup-azure-dpm-introduction.md)
1718
>
1819
>
1920
21+
> Applies To: MABS v3. (MABS v2 is no longer supported. If you are using a version earlier than MABS v3, please upgrade to the latest version.)
22+
2023
This article explains how to prepare your environment to back up workloads using Microsoft Azure Backup Server (MABS). With Azure Backup Server, you can protect application workloads such as Hyper-V VMs, Microsoft SQL Server, SharePoint Server, Microsoft Exchange, and Windows clients from a single console.
2124

2225
> [!NOTE]
@@ -34,23 +37,24 @@ MABS deployed in an Azure VM can back up VMs in Azure but they should be in same
3437
Azure Backup Server inherits much of the workload backup functionality from Data Protection Manager (DPM). This article links to DPM documentation to explain some of the shared functionality. Though Azure Backup Server shares much of the same functionality as DPM, Azure Backup Server does not back up to tape, nor does it integrate with System Center.
3538

3639
## Choose an installation platform
40+
3741
The first step towards getting the Azure Backup Server up and running is to set up a Windows Server. Your server can be in Azure or on-premises.
3842

3943
### Using a server in Azure
40-
When choosing a server for running Azure Backup Server, it is recommended you start with a gallery image of Windows Server 2012 R2 Datacenter, Windows Server 2016 Datacenter, or Windows Server 2019 Datacenter. The article, [Create your first Windows virtual machine in the Azure portal](../virtual-machines/virtual-machines-windows-hero-tutorial.md?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json), provides a tutorial for getting started with the recommended virtual machine in Azure, even if you've never used Azure before. The recommended minimum requirements for the server virtual machine (VM) should be: Standard_A4_v2 with four cores and 8-GB RAM.
44+
45+
When choosing a server for running Azure Backup Server, it is recommended you start with a gallery image of Windows Server 2016 Datacenter or Windows Server 2019 Datacenter. The article, [Create your first Windows virtual machine in the Azure portal](../virtual-machines/virtual-machines-windows-hero-tutorial.md?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json), provides a tutorial for getting started with the recommended virtual machine in Azure, even if you've never used Azure before. The recommended minimum requirements for the server virtual machine (VM) should be: Standard_A4_v2 with four cores and 8-GB RAM.
4146

4247
Protecting workloads with Azure Backup Server has many nuances. The article, [Install DPM as an Azure virtual machine](https://technet.microsoft.com/library/jj852163.aspx), helps explain these nuances. Before deploying the machine, read this article completely.
4348

4449
### Using an on-premises server
50+
4551
If you do not want to run the base server in Azure, you can run the server on a Hyper-V VM, a VMware VM, or a physical host. The recommended minimum requirements for the server hardware are two cores and 8-GB RAM. The supported operating systems are listed in the following table:
4652

4753
| Operating System | Platform | SKU |
4854
|:--- | --- |:--- |
49-
| Windows Server 2019 |64 bit |Standard, Datacenter, Essentials (MABS V3 and later) |
50-
| Windows Server 2016 and latest SPs |64 bit |Standard, Datacenter, Essentials (MABS V2 and later) |
51-
| Windows Server 2012 R2 and latest SPs |64 bit |Standard, Datacenter, Foundation |
52-
| Windows Storage Server 2012 R2 and latest SPs |64 bit |Standard, Workgroup |
53-
| Windows Storage Server 2012 and latest SPs |64 bit |Standard, Workgroup |
55+
| Windows Server 2019 |64 bit |Standard, Datacenter, Essentials |
56+
| Windows Server 2016 and latest SPs |64 bit |Standard, Datacenter, Essentials |
57+
5458

5559
You can deduplicate the DPM storage using Windows Server Deduplication. Learn more about how [DPM and deduplication](https://technet.microsoft.com/library/dn891438.aspx) work together when deployed in Hyper-V VMs.
5660

@@ -69,6 +73,7 @@ Whether you send backup data to Azure, or keep it locally, Azure Backup Server m
6973
[!INCLUDE [backup-create-rs-vault.md](../../includes/backup-create-rs-vault.md)]
7074

7175
### Set Storage Replication
76+
7277
The storage replication option allows you to choose between geo-redundant storage and locally redundant storage. By default, Recovery Services vaults use geo-redundant storage. If this vault is your primary vault, leave the storage option set to geo-redundant storage. Choose locally redundant storage if you want a cheaper option that isn't quite as durable. Read more about [geo-redundant](../storage/common/storage-redundancy-grs.md) and [locally redundant](../storage/common/storage-redundancy-lrs.md) storage options in the [Azure Storage replication overview](../storage/common/storage-redundancy.md).
7378

7479
To edit the storage replication setting:
@@ -80,10 +85,10 @@ To edit the storage replication setting:
8085

8186
![Set the storage configuration for new vault](./media/backup-try-azure-backup-in-10-mins/recovery-services-vault-backup-configuration.png)
8287

83-
84-
8588
## Software package
89+
8690
### Downloading the software package
91+
8792
1. Sign in to the [Azure portal](https://portal.azure.com/).
8893
2. If you already have a Recovery Services vault open, proceed to step 3. If you do not have a Recovery Services vault open, but are in the Azure portal, on the main menu, click **Browse**.
8994

@@ -135,6 +140,7 @@ To edit the storage replication setting:
135140
Since the download size of all the files together is > 3G, on a 10-Mbps download link it may take up to 60 minutes for the download to complete.
136141

137142
### Extracting the software package
143+
138144
After you've downloaded all the files, click **MicrosoftAzureBackupInstaller.exe**. This will start the **Microsoft Azure Backup Setup Wizard** to extract the setup files to a location specified by you. Continue through the wizard and click on the **Extract** button to begin the extraction process.
139145

140146
> [!WARNING]
@@ -147,6 +153,7 @@ After you've downloaded all the files, click **MicrosoftAzureBackupInstaller.exe
147153
Once the extraction process complete, check the box to launch the freshly extracted *setup.exe* to begin installing Microsoft Azure Backup Server and click on the **Finish** button.
148154

149155
### Installing the software package
156+
150157
1. Click **Microsoft Azure Backup** to launch the setup wizard.
151158

152159
![Microsoft Azure Backup Setup Wizard](./media/backup-azure-microsoft-azure-backup/launch-screen2.png)
@@ -209,6 +216,7 @@ Once the extraction process complete, check the box to launch the freshly extrac
209216
When the installation step has completed, the product's desktop icons will have been created as well. Just double-click the icon to launch the product.
210217

211218
### Add backup storage
219+
212220
The first backup copy is kept on storage attached to the Azure Backup Server machine. For more information about adding disks, see [Configure storage pools and disk storage](https://docs.microsoft.com/azure/backup/backup-mabs-add-storage).
213221

214222
> [!NOTE]
@@ -251,7 +259,7 @@ Here are the steps if you need to move MABS to a new server, while retaining the
251259
3. Reset the machine account in active directory.
252260
4. Install Server 2016 on new machine and name it the same machine name as the original Azure Backup server.
253261
5. Join the Domain
254-
6. Install Azure Backup server V2 or later (Move MABS Storage pool disks from old server and import)
262+
6. Install Azure Backup server V3 or later (move MABS Storage pool disks from old server and import)
255263
7. Restore the DPMDB taken in step 1.
256264
8. Attach the storage from the original backup server to the new server.
257265
9. From SQL Restore the DPMDB
@@ -265,6 +273,7 @@ Here are the steps if you need to move MABS to a new server, while retaining the
265273
If you have added NEW disks to the DPM Storage pool instead of moving the old ones, then run DPMSYNC -Reallocatereplica
266274

267275
## Network connectivity
276+
268277
Azure Backup Server requires connectivity to the Azure Backup service for the product to work successfully. To validate whether the machine has the connectivity to Azure, use the ```Get-DPMCloudConnection``` cmdlet in the Azure Backup Server PowerShell console. If the output of the cmdlet is TRUE, then connectivity exists, else there is no connectivity.
269278

270279
At the same time, the Azure subscription needs to be in a healthy state. To find out the state of your subscription and to manage it, sign in to the [subscription portal](https://account.windowsazure.com/Subscriptions).
@@ -281,6 +290,7 @@ Once you know the state of the Azure connectivity and of the Azure subscription,
281290
| Lost connectivity > 15 days |Deprovisioned |Stopped |Stopped |Stopped and Azure recovery points deleted |Stopped |
282291

283292
### Recovering from loss of connectivity
293+
284294
If you have a firewall or a proxy that is preventing access to Azure, you need to allow the following domain addresses in the firewall/proxy profile:
285295

286296
* `http://www.msftncsi.com/ncsi.txt`
@@ -292,12 +302,14 @@ If you have a firewall or a proxy that is preventing access to Azure, you need t
292302
Once connectivity to Azure has been restored to the Azure Backup Server machine, the operations that can be performed are determined by the Azure subscription state. The table above has details about the operations allowed once the machine is "Connected".
293303

294304
### Handling subscription states
305+
295306
It is possible to take an Azure subscription from an *Expired* or *Deprovisioned* state to the *Active* state. However, this has some implications on the product behavior while the state is not *Active*:
296307

297308
* A *Deprovisioned* subscription loses functionality for the period that it is deprovisioned. On turning *Active*, the product functionality of backup/restore is revived. The backup data on the local disk also can be retrieved if it was kept with a sufficiently large retention period. However, the backup data in Azure is irretrievably lost once the subscription enters the *Deprovisioned* state.
298309
* An *Expired* subscription only loses functionality for until it has been made *Active* again. Any backups scheduled for the period that the subscription was *Expired* will not run.
299310

300311
## Upgrade MABS
312+
301313
Use the following procedures to upgrade MABS.
302314

303315
### Upgrade from MABS V2 to V3
@@ -328,15 +340,13 @@ Use the following steps to upgrade MABS:
328340
4. Backups should continue without the need to restart your production servers.
329341
5. You can begin protecting your data now. If you are upgrading to Modern Backup Storage, while protecting, you can also choose the volumes you wish to store the backups in, and check for under provisioned space. [Learn more](backup-mabs-add-storage.md).
330342

331-
> [!NOTE]
332-
>
333-
> If you are upgrading from MABS V1 to V2, make sure your OS is Windows Server 2016 or Windows Server 2012 R2. To take advantage of new features like System Center 2016 Data Protection Manager Modern Backup Storage, you must install Backup Server V2 on Windows Server 2016. Before you upgrade to or install Backup Server V2, read about the [installation prerequisites](https://docs.microsoft.com/system-center/dpm/install-dpm?view=sc-dpm-1807#setup-prerequisites) applicable for MABS.
334-
335343
## Troubleshooting
344+
336345
If Microsoft Azure Backup server fails with errors during the setup phase (or backup or restore), refer to this [error codes document](https://support.microsoft.com/kb/3041338) for more information.
337346
You can also refer to [Azure Backup related FAQs](backup-azure-backup-faq.md)
338347

339348
## Next steps
349+
340350
You can get detailed information about [preparing your environment for DPM](https://technet.microsoft.com/library/hh758176.aspx) on the Microsoft TechNet site. It also contains information about supported configurations on which Azure Backup Server can be deployed and used. You can use a series of [PowerShell cmdlet](https://docs.microsoft.com/powershell/module/dataprotectionmanager/?view=systemcenter-ps-2016) for performing various operations.
341351

342352
You can use these articles to gain a deeper understanding of workload protection using Microsoft Azure Backup server.
7.38 KB
Loading
4.85 KB
Loading

0 commit comments

Comments
 (0)