Skip to content

Commit a531e06

Browse files
committed
Merge branch 'main' into fundamentals-overview
2 parents bfda196 + 067026f commit a531e06

20 files changed

+81
-34
lines changed

articles/active-directory/saas-apps/alinto-protect-provisioning-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ This section guides you through the steps to configure the Azure AD provisioning
7878

7979
![Provisioning tab automatic](common/provisioning-automatic.png)
8080

81-
1. In the **Admin Credentials** section, input your Alinto Protect Tenant URL and Secret Token. Click **Test Connection** to ensure Azure AD can connect to Alinto Protect. If the connection fails, ensure your Alinto Protect account has Admin permissions and try again.
81+
1. In the **Admin Credentials** section, input your Alinto Protect Tenant URL as `https://cloud.cleanmail.eu/api/v3/scim2 ` and corresponding Secret Token obtained from Step 2. Click **Test Connection** to ensure Azure AD can connect to Alinto Protect. If the connection fails, ensure your Alinto Protect account has Admin permissions and try again.
8282

8383
![Token](common/provisioning-testconnection-tenanturltoken.png)
8484

articles/advisor/advisor-get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Learn how to access Advisor through the Azure portal, get recommendations, and i
2323

2424
1. The Advisor dashboard will display a summary of your recommendations for all selected subscriptions. You can choose the subscriptions that you want recommendations to be displayed for using the subscription filter dropdown.
2525

26-
1. To get recommendations for a specific category, click one of the tabs: **Reliability**, **Security**, **Performance**, or **Cost**.
26+
1. To get recommendations for a specific category, click one of the tabs: **Reliability**, **Security**, **Performance**, **Operational Excellence**, or **Cost**.
2727

2828
![Azure Advisor dashboard](./media/advisor-overview/advisor-dashboard.png)
2929

articles/application-gateway/configuration-http-settings.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: application-gateway
55
author: greg-lindsay
66
ms.service: application-gateway
77
ms.topic: conceptual
8-
ms.date: 09/13/2022
8+
ms.date: 03/17/2023
99
ms.author: greglin
1010
---
1111

@@ -34,7 +34,12 @@ Please refer to TLS offload and End-to-End TLS documentation for Application Gat
3434

3535
## Connection draining
3636

37-
Connection draining helps you gracefully remove backend pool members during planned service updates. It applies to backend instances that are explicitly removed from the backend pool or during scale-in of backend instances. You can apply this setting to all members of a backend pool by enabling connection draining on the Backend Setting. It ensures that all deregistering instances of a backend pool continue to maintain existing connections and serve on-going requests for a configurable timeout and don't receive any new requests or connections.
37+
Connection draining helps you gracefully remove backend pool members during planned service updates. It applies to backend instances that are
38+
- explicitly removed from the backend pool,
39+
- removed during scale-in operations, or
40+
- reported as unhealthy by the health probes.
41+
42+
You can apply this setting to all backend pool members by enabling Connection Draining in the Backend Setting. It ensures that all deregistering instances in a backend pool don't receive any new requests/connections while maintaining the existing connections until the configured timeout value. This is also true for WebSocket connections.
3843

3944
| Configuration Type | Value |
4045
| ---------- | ---------- |

articles/application-gateway/features.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: application-gateway
55
author: greg-lindsay
66
ms.service: application-gateway
77
ms.topic: conceptual
8-
ms.date: 09/13/2022
8+
ms.date: 03/17/2023
99
ms.author: greglin
1010
---
1111

@@ -102,9 +102,14 @@ For more information, see [WebSocket support](application-gateway-websocket.md)
102102

103103
## Connection draining
104104

105-
Connection draining helps you achieve graceful removal of backend pool members during planned service updates. This setting is enabled via the backend http setting and can be applied to all members of a backend pool during rule creation. Once enabled, Application Gateway ensures all deregistering instances of a backend pool don't receive any new request while allowing existing requests to complete within a configured time limit. This applies to both backend instances that are explicitly removed from the backend pool by a user configuration change, and backend instances that are reported as unhealthy as determined by the health probes. The only exception to this are requests bound for deregistering instances, which have been deregistered explicitly, because of gateway-managed session affinity and continues to be proxied to the deregistering instances.
105+
Connection draining helps you achieve graceful removal of backend pool members during planned service updates or problems with backend health. This setting is enabled via the [Backend Setting](configuration-http-settings.md) and is applied to all backend pool members during rule creation. Once enabled, the aplication gateway ensures all deregistering instances of a backend pool don't receive any new requests while allowing existing requests to complete within a configured time limit. It applies to cases where backend instances are
106+
- explicitly removed from the backend pool after a configuration change by a user,
107+
- reported as unhealthy by the health probes, or
108+
- removed during a scale-in operation.
106109

107-
For more information, see [Application Gateway Configuration Overview](configuration-http-settings.md#connection-draining).
110+
The only exception is when requests continue to be proxied to the deregistering instances because of gateway-managed session affinity.
111+
112+
The connection draining is honored for WebSocket connections as well. For information on time limits, see [Backend Settings configuration](configuration-http-settings.md#connection-draining).
108113

109114
## Custom error pages
110115

articles/automation/troubleshoot/update-agent-issues-linux.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ As they are the directories of workspaces, the number of directories equals the
103103
To fix the issue, run the following command:
104104

105105
```
106-
sudo su omsagent -c python /opt/microsoft/omsconfig/Scripts/PerformRequiredConfigurationChecks.py
106+
sudo su omsagent -c 'python /opt/microsoft/omsconfig/Scripts/PerformRequiredConfigurationChecks.py'
107107
```
108108

109109
This command forces the omsconfig agent to talk to Azure Monitor and retrieve the latest configuration.
@@ -132,7 +132,7 @@ Update Management downloads Hybrid Runbook Worker packages from the operations e
132132
To fix this issue, run the following command:
133133

134134
```
135-
sudo su omsagent -c python /opt/microsoft/omsconfig/Scripts/PerformRequiredConfigurationChecks.py
135+
sudo su omsagent -c 'python /opt/microsoft/omsconfig/Scripts/PerformRequiredConfigurationChecks.py'
136136
```
137137

138138
This command forces the omsconfig agent to talk to Azure Monitor and retrieve the latest configuration.

articles/azure-monitor/app/opencensus-python.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ OpenCensus maps the following exporters to the types of telemetry that you see i
9696
logger.addHandler(AzureLogHandler())
9797

9898
# Alternatively manually pass in the connection_string
99-
# logger.addHandler(AzureLogHandler(connection_string=<appinsights-connection-string>)
99+
# logger.addHandler(AzureLogHandler(connection_string=<appinsights-connection-string>))
100100

101101
"""Generate random log data."""
102102
for num in range(5):
@@ -122,7 +122,7 @@ OpenCensus maps the following exporters to the types of telemetry that you see i
122122
logger = logging.getLogger(__name__)
123123
logger.addHandler(AzureLogHandler())
124124
# Alternatively manually pass in the connection_string
125-
# logger.addHandler(AzureLogHandler(connection_string=<appinsights-connection-string>)
125+
# logger.addHandler(AzureLogHandler(connection_string=<appinsights-connection-string>))
126126

127127
properties = {'custom_dimensions': {'key_1': 'value_1', 'key_2': 'value_2'}}
128128

@@ -184,7 +184,7 @@ from opencensus.ext.azure.log_exporter import AzureLogHandler
184184
logger = logging.getLogger(__name__)
185185
logger.addHandler(AzureLogHandler())
186186
# Alternatively, manually pass in the connection_string
187-
# logger.addHandler(AzureLogHandler(connection_string=<appinsights-connection-string>)
187+
# logger.addHandler(AzureLogHandler(connection_string=<appinsights-connection-string>))
188188

189189
properties = {'custom_dimensions': {'key_1': 'value_1', 'key_2': 'value_2'}}
190190

@@ -208,7 +208,7 @@ from opencensus.ext.azure.log_exporter import AzureEventHandler
208208
logger = logging.getLogger(__name__)
209209
logger.addHandler(AzureLogHandler())
210210
# Alternatively manually pass in the connection_string
211-
# logger.addHandler(AzureLogHandler(connection_string=<appinsights-connection-string>)
211+
# logger.addHandler(AzureLogHandler(connection_string=<appinsights-connection-string>))
212212

213213
logger.setLevel(logging.INFO)
214214
logger.info('Hello, World!')

articles/azure-resource-manager/bicep/bicep-functions-lambda.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ This article describes the lambda functions to use in Bicep. [Lambda expressions
2222

2323
Bicep lambda function has these limitations:
2424

25-
- Lambda expression can only be specified directly as function arguments in these functions: [`filter()`](#filter), [`map()`](#map), [`reduce()`](#reduce), [`sort()`](#sort), and [`toOrder()`](#toobject).
25+
- Lambda expression can only be specified directly as function arguments in these functions: [`filter()`](#filter), [`map()`](#map), [`reduce()`](#reduce), [`sort()`](#sort), and [`toObject()`](#toobject).
2626
- Using lambda variables (the temporary variables used in the lambda expressions) inside resource or module array access isn't currently supported.
2727
- Using lambda variables inside the [`listKeys`](./bicep-functions-resource.md#list) function isn't currently supported.
2828
- Using lambda variables inside the [reference](./bicep-functions-resource.md#reference) function isn't currently supported.

articles/backup/backup-azure-vms-enhanced-policy.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Azure Backup now supports _Enhanced policy_ that's needed to support new Azure o
2121
2222
You must enable backup of Trusted Launch VM through enhanced policy only. Enhanced policy provides the following features:
2323

24-
- Supports *Multiple Backups Per Day* (in preview).
24+
- Supports *Multiple Backups Per Day*.
2525
- Instant Restore tier is zonally redundant using Zone-redundant storage (ZRS) resiliency. See the [pricing details for Managed Disk Snapshots](https://azure.microsoft.com/pricing/details/managed-disks/).
2626

2727
:::image type="content" source="./media/backup-azure-vms-enhanced-policy/enhanced-backup-policy-settings.png" alt-text="Screenshot showing the enhanced backup policy options.":::
@@ -43,7 +43,7 @@ Follow these steps:
4343

4444
:::image type="content" source="./media/backup-azure-vms-enhanced-policy/choose-backup-policies-option.png" alt-text="Screenshot showing to choose the backup policies option.":::
4545

46-
3. Click **+Add**.
46+
3. Select **+Add**.
4747

4848
:::image type="content" source="./media/backup-azure-vms-enhanced-policy/add-backup-policy.png" alt-text="Screenshot showing to add a backup policy.":::
4949

@@ -65,8 +65,13 @@ Follow these steps:
6565
- **Retention range**: Options for retention range are auto-selected based on backup frequency you choose. The default retention for daily, weekly, monthly, and yearly backup points are set to 180 days, 12 weeks, 60 months, and 10 years respectively. You can customize these values as required.
6666

6767
:::image type="content" source="./media/backup-azure-vms-enhanced-policy/enhanced-backup-policy-settings.png" alt-text="Screenshot showing to configure the enhanced backup policy.":::
68-
69-
6. Click **Create**.
68+
69+
>[!Note]
70+
>The maximum limit of instant recovery point retention range depends on the number of snapshots you take per day. If the snapshot count is more (for example, every *4 hours* frequency in *24 hours* duration - *6* scheduled snapshots), then the maximum allowed days for retention reduces.
71+
>
72+
>However, if you choose lower RPO of *12 hours*, the snapshot retention is increased to *30 days*.
73+
74+
6. Select **Create**.
7075

7176
>[!Note]
7277
>- The support for Enhanced policy is available in all Azure Public and US Government regions.

articles/backup/backup-azure-vms-introduction.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: About Azure VM backup
33
description: In this article, learn how the Azure Backup service backs up Azure Virtual machines, and how to follow best practices.
44
ms.topic: conceptual
5-
ms.date: 09/13/2019
5+
ms.date: 02/27/2023
66
author: jyothisuri
77
ms.author: jsuri
88
---
@@ -75,6 +75,9 @@ The following table explains the different types of snapshot consistency:
7575
**Restore queue** | Azure Backup processes restore jobs from multiple storage accounts at the same time, and it puts restore requests in a queue.
7676
**Restore copy** | During the restore process, data is copied from the vault to the storage account.<br/><br/> The total restore time depends on the I/O operations per second (IOPS) and the throughput of the storage account.<br/><br/> To reduce the copy time, select a storage account that isn't loaded with other application writes and reads.
7777

78+
> [!Note]
79+
> Azure Backup now enables you to back up your Azure VMs multiple times a day using the Enhanced policy. With this capability, you can also define the duration in which your backup jobs would trigger and align your backup schedule with the working hours when there are frequent updates to Azure Virtual Machines. [Learn more](backup-azure-vms-enhanced-policy.md).
80+
7881
### Backup performance
7982

8083
These common scenarios can affect the total backup time:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Support matrix for Azure VM backups
33
description: Get a summary of support settings and limitations for backing up Azure VMs by using the Azure Backup service.
44
ms.topic: conceptual
5-
ms.date: 12/06/2022
5+
ms.date: 02/27/2023
66
ms.custom: references_regions
77
ms.reviewer: geg
88
ms.service: backup
@@ -49,7 +49,7 @@ Back up monthly or yearly| Not supported when you're backing up with the Azure V
4949
Automatically adjust the clock | Not supported.<br/><br/> Azure Backup doesn't automatically adjust for daylight saving time when you're backing up a VM.<br/><br/> Modify the policy manually as needed.
5050
[Disable security features for hybrid backup](./backup-azure-security-feature.md) |Not supported.
5151
Back up a VM whose machine time is changed | Not supported.<br/><br/> If you change the machine time to a future date/time after enabling backup for that VM, even if the time change is reverted, successful backup isn't guaranteed.
52-
Do multiple backups per day | Supported through **Enhanced policy** (in preview). <br><br> For hourly backup, the minimum recovery point objective (RPO) is 4 hours and the maximum is 24 hours. You can set the backup schedule to 4, 6, 8, 12, and 24 hours, respectively. [Learn how to back up an Azure VM by using Enhanced policy](backup-azure-vms-enhanced-policy.md).
52+
Do multiple backups per day | Supported through **Enhanced policy**. <br><br> For hourly backup, the minimum recovery point objective (RPO) is 4 hours and the maximum is 24 hours. You can set the backup schedule to 4, 6, 8, 12, and 24 hours, respectively. <br><br> Note that the maximum limit of instant recovery point retention range depends on the number of snapshots you take per day. If the snapshot count is more (for example, every *4 hours* frequency in *24 hours* duration - *6* scheduled snapshots), then the maximum allowed days for retention reduces. However, if you choose lower RPO of *12* hours, the snapshot retention is increased to *30 days*. <br><br> Learn about how to [back up an Azure VM using Enhanced policy](backup-azure-vms-enhanced-policy.md).
5353
Back up a VM with a deprecated plan when the publisher has removed it from Azure Marketplace | Not supported. <br><br> Backup is possible. However, restore will fail. <br><br> If you've already configured backup for a VM with a deprecated virtual machine offer and encounter a restore error, see [Troubleshoot backup errors with Azure VMs](backup-azure-vms-troubleshoot.md#usererrormarketplacevmnotsupported---vm-creation-failed-due-to-market-place-purchase-request-being-not-present).
5454

5555
## Operating system support (Windows)
@@ -167,7 +167,7 @@ Back up Azure VMs with locks | Supported for managed VMs. <br><br> Not supported
167167
[Restore spot VMs](../virtual-machines/spot-vms.md) | Not supported. <br><br/> Azure Backup restores spot VMs as regular Azure VMs.
168168
[Restore VMs in an Azure dedicated host](../virtual-machines/dedicated-hosts.md) | Supported.<br></br>When you're restoring an Azure VM through the [Create new](backup-azure-arm-restore-vms.md#create-a-vm) option, the VM can't be restored in the dedicated host, even when the restore is successful. To achieve this, we recommend that you [restore as disks](backup-azure-arm-restore-vms.md#restore-disks). While you're restoring as disks by using the template, create a VM in a dedicated host, and then attach the disks.<br></br>This is not applicable in a secondary region while you're performing [cross-region restore](backup-azure-arm-restore-vms.md#cross-region-restore).
169169
Configure standalone Azure VMs in Windows Storage Spaces | Supported.
170-
[Restore virtual machine scale sets](../virtual-machine-scale-sets/virtual-machine-scale-sets-orchestration-modes.md#scale-sets-with-flexible-orchestration) | Supported for the flexible orchestration model to back up and restore a single Azure VM.
170+
[Restore Virtual Machine Scale Sets](../virtual-machine-scale-sets/virtual-machine-scale-sets-orchestration-modes.md#scale-sets-with-flexible-orchestration) | Supported for the flexible orchestration model to back up and restore a single Azure VM.
171171
Restore with managed identities | Supported for managed Azure VMs. <br><br> Not supported for classic and unmanaged Azure VMs. <br><br> Cross-region restore isn't supported with managed identities. <br><br> Currently, this is available in all Azure public and national cloud regions. <br><br> [Learn more](backup-azure-arm-restore-vms.md#restore-vms-with-managed-identities).
172172
<a name="tvm-backup">Back up trusted launch VMs</a> | Backup is supported. <br><br> Backup of trusted launch VMs is supported through [Enhanced policy](backup-azure-vms-enhanced-policy.md). You can enable backup through a [Recovery Services vault](./backup-azure-arm-vms-prepare.md), the [pane for managing a VM](./backup-during-vm-creation.md#start-a-backup-after-creating-the-vm), and the [pane for creating a VM](backup-during-vm-creation.md#create-a-vm-with-backup-configured). <br><br> **Feature details** <br><br> - Backup is supported in all regions where trusted launch VMs are available. <br><br> - Configuration of backups, alerts, and monitoring for trusted launch VMs is currently not supported through the backup center. <br><br> - Migration of an existing [Gen2 VM](../virtual-machines/generation-2.md) (protected with Azure Backup) to a trusted launch VM is currently not supported. [Learn how to create a trusted launch VM](../virtual-machines/trusted-launch-portal.md?tabs=portal#deploy-a-trusted-launch-vm). <br><br> - Item-level restore is not supported.
173173
[Back up confidential VMs](../confidential-computing/confidential-vm-overview.md) | The backup support is in limited preview. <br><br> Backup is supported only for confidential VMs that have no confidential disk encryption and for confidential VMs that have confidential OS disk encryption through a platform-managed key (PMK). <br><br> Backup is currently not supported for confidential VMs that have confidential OS disk encryption through a customer-managed key (CMK). <br><br> **Feature details** <br><br> - Backup is supported in [all regions where confidential VMs are available](../confidential-computing/confidential-vm-overview.md#regions). <br><br> - Backup is supported only if you're using [Enhanced policy](backup-azure-vms-enhanced-policy.md). You can configure backup through the [pane for creating a VM](backup-azure-arm-vms-prepare.md), the [pane for managing a VM](backup-during-vm-creation.md#start-a-backup-after-creating-the-vm), and the [Recovery Services vault](backup-azure-arm-vms-prepare.md). <br><br> - [Cross-region restore](backup-azure-arm-restore-vms.md#cross-region-restore) and file recovery (item-level restore) for confidential VMs are currently not supported.
@@ -218,7 +218,7 @@ Azure Backup supports encryption for in-transit and at-rest data.
218218

219219
For network traffic to Azure:
220220

221-
- Backup traffic from servers to the Recovery Services vault is encrypted via Advanced Encryption Standard 256.
221+
- The Backup traffic from servers to the Recovery Services vault is encrypted via Advanced Encryption Standard 256.
222222
- Backup data is sent over a secure HTTPS link.
223223
- Backup data is stored in the Recovery Services vault in encrypted form.
224224
- Only you have the encryption key to unlock this data. Microsoft can't decrypt the backup data at any point.

0 commit comments

Comments
 (0)