Skip to content

Commit 98f16a3

Browse files
authored
Merge pull request #297906 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents bf12b42 + 6e78e2f commit 98f16a3

14 files changed

+38
-38
lines changed

articles/azure-functions/durable/durable-functions-troubleshooting-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ traces
129129
| extend status = customDimensions["prop__status"]
130130
| extend details = customDimensions["prop__Details"]
131131
| extend reason = customDimensions["prop__reason"]
132-
| where severityLevel > 1 // to see all logs of severity level "Information" or greater.
132+
| where severityLevel >= 1 // to see all logs of severity level "Information" or greater.
133133
| where instanceId == orchestrationInstanceID
134134
| sort by timestamp asc
135135
```

articles/azure-maps/migrate-get-traffic-incidents.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -69,22 +69,22 @@ The following table lists the fields that can appear in the HTTP response when r
6969

7070
| Bing Maps response field | Azure Maps response field | Description |
7171
|--------------------------|---------------------------|-------------|
72-
| Description (Json)<br>Description (XML)  | `d`  | This output is in the [tm] response element of Azure Maps.  |
73-
| End (Json)<br>EndTimeUTC (XML)  | `ed`  | This output is in the [tm] response element of Azure Maps. The date is described in the ISO8601 format and includes time in UTC.  |
74-
| eventList (Json)<br>EventList (XML)  | Not supported | |
75-
| icon (Json)<br>Icon (XML)  | `ic`  | This output is in the [tm] response element of Azure Maps. See [IconCategory] (`ic`) for more info.  |
76-
| incidentId (Json)<br>IncidentId (XML)  | `id` | This output is in the [tm] response element of Azure Maps.  |
77-
| isEndTimeBackfilled (Json)<br>IsEndTimeBackfilled (XML)  | Not supported | |
78-
| isJamcident (Json)<br>IsJamcident (XML)  | Not supported |
79-
| lastModified (Json)<br>LastModifiedUTC (XML)  | Not supported | |
80-
| point (Json)<br>Point (XML)  | `p`  | This output is in the [tm] response element of Azure Maps. See [point] (`p`) for more info.  |
81-
| roadClosed (Json)<br>RoadClosed (XML)  | See description | The [IconCategory] output of the [tm] response element of Azure Maps can be used to indicate a road closure.   |
82-
| severity (Json)<br>Severity (XML)  | `ty`  | This output is in the [tm] response element. See [DelayMagnitude]:  (`ty`) for more info.  |
83-
| severityScore (Json)<br>SeverityScore (XML)              | Not supported | |
84-
| Start (Json)<br>StartTimeUTC (XML)  | `sd`  | This output is in the [tm] response element of Azure Maps. The date is described in the ISO8601 format and includes time in UTC.  |
85-
| title (Json)<br>Title (XML)  | See description | The `f` output in the [tm] response element of Azure Maps provides the name of the intersection or location where the traffic caused by the the incident starts and can serve as an alternative to the Bing Maps `title` output.  |
86-
| toPoint (Json)<br>ToPoint (XML)  | See description | The `t` output in the [tm] response element of Azure Maps provides the name of the intersection or location where the traffic due to the incident ends and can serve as an alternative to the Bing Maps `toPoint` output.  |
87-
| type (Json)<br>Type (XML)  | `c`  | The `c` output in the [tm] response element of Azure Maps provides the cause of the incident, if available.  |
72+
| Description (JSON)<br>Description (XML)  | `d`  | This output is in the [tm] response element of Azure Maps.  |
73+
| End (JSON)<br>EndTimeUTC (XML)  | `ed`  | This output is in the [tm] response element of Azure Maps. The date is described in the ISO8601 format and includes time in UTC.  |
74+
| eventList (JSON)<br>EventList (XML)  | Not supported | |
75+
| icon (JSON)<br>Icon (XML)  | `ic`  | This output is in the [tm] response element of Azure Maps. See [IconCategory] (`ic`) for more info.  |
76+
| incidentId (JSON)<br>IncidentId (XML)  | `id` | This output is in the [tm] response element of Azure Maps.  |
77+
| isEndTimeBackfilled (JSON)<br>IsEndTimeBackfilled (XML)  | Not supported | |
78+
| isJamcident (JSON)<br>IsJamcident (XML)  | Not supported |
79+
| lastModified (JSON)<br>LastModifiedUTC (XML)  | Not supported | |
80+
| point (JSON)<br>Point (XML)  | `p`  | This output is in the [tm] response element of Azure Maps. See [point] (`p`) for more info.  |
81+
| roadClosed (JSON)<br>RoadClosed (XML)  | See description | The [IconCategory] output of the [tm] response element of Azure Maps can be used to indicate a road closure.   |
82+
| severity (JSON)<br>Severity (XML)  | `ty`  | This output is in the [tm] response element. See [DelayMagnitude]:  (`ty`) for more info.  |
83+
| severityScore (JSON)<br>SeverityScore (XML)              | Not supported | |
84+
| Start (JSON)<br>StartTimeUTC (XML)  | `sd`  | This output is in the [tm] response element of Azure Maps. The date is described in the ISO8601 format and includes time in UTC.  |
85+
| title (JSON)<br>Title (XML)  | See description | The `f` output in the [tm] response element of Azure Maps provides the name of the intersection or location where the traffic caused by the the incident starts and can serve as an alternative to the Bing Maps `title` output.  |
86+
| toPoint (JSON)<br>ToPoint (XML)  | See description | The `t` output in the [tm] response element of Azure Maps provides the name of the intersection or location where the traffic due to the incident ends and can serve as an alternative to the Bing Maps `toPoint` output.  |
87+
| type (JSON)<br>Type (XML)  | `c`  | The `c` output in the [tm] response element of Azure Maps provides the cause of the incident, if available.  |
8888

8989
For more information about the Azure Maps Get Traffic Incident Detail API response fields, see [Responses].
9090

articles/backup/backup-azure-backup-server-vmware.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ You can modify the number of jobs by using the registry key as shown below (not
435435
The value should be the number (decimal) of virtual machines that you select for parallel backup.
436436
437437
> [!NOTE]
438-
> You can modify the number of jobs to a higher value. If you set the jobs number to 1, replication jobs run serially. To increase the number to a higher value, you must consider the VMware performance. Consider the number of resources in use and additional usage required on VMWare vSphere Server, and determine the number of delta replication jobs to run in parallel. Also, this change will affect only the newly created protection groups. For existing protection groups you must temporarily add another VM to the protection group. This should update the protection group configuration accordingly. You can remove this VM from the protection group after the procedure is completed.
438+
> You can modify the number of jobs to a higher value. If you set the jobs number to 1, replication jobs run serially. To increase the number to a higher value, you must consider the VMware performance. Consider the number of resources in use and additional usage required on VMware vSphere Server, and determine the number of delta replication jobs to run in parallel. Also, this change will affect only the newly created protection groups. For existing protection groups you must temporarily add another VM to the protection group. This should update the protection group configuration accordingly. You can remove this VM from the protection group after the procedure is completed.
439439
440440
## VMware vSphere 6.7, 7.0, and 8.0
441441

articles/backup/backup-azure-data-protection-use-rest-api-backup-postgresql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ GET "https://management.azure.com/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx
510510

511511
## Next steps
512512

513-
[Restore data from an Azure PostGreSQL database backup](restore-postgresql-database-use-rest-api.md)
513+
[Restore data from an Azure PostgreSQL database backup](restore-postgresql-database-use-rest-api.md)
514514

515515
For more information on the Azure Backup REST APIs, see the following articles:
516516

articles/backup/backup-azure-data-protection-use-rest-api-create-update-postgresql-policy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ The `{policyName}` and `{vaultName}` are provided in the URI. Additional, inform
6565

6666
## Create the request body
6767

68-
For example, to create a policy for POstgreSQL backup, the request body needs the following components:
68+
For example, to create a policy for PostgreSQL backup, the request body needs the following components:
6969

7070
|Name |Required |Type |Description |
7171
|---------|---------|---------|---------|
@@ -368,7 +368,7 @@ After including all changes, the policy JSON will appear as follows:
368368

369369
```
370370

371-
For more details about policy creation, see the [PostGreSQL database Backup policy](backup-azure-database-postgresql.md#create-backup-policy) document.
371+
For more details about policy creation, see the [PostgreSQL database Backup policy](backup-azure-database-postgresql.md#create-backup-policy) document.
372372

373373
## Responses
374374

articles/backup/backup-azure-database-postgresql-flex-use-rest-api-create-update-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ After including all changes, the policy JSON will appear as follows:
322322

323323
```
324324

325-
For more details about policy creation, see the [PostGreSQL database Backup policy document](backup-azure-database-postgresql.md#create-backup-policy).
325+
For more details about policy creation, see the [PostgreSQL database Backup policy document](backup-azure-database-postgresql.md#create-backup-policy).
326326

327327
### Responses
328328

articles/backup/backup-postgresql-cli.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ After the vault is created, let's create a Backup policy to protect Azure Postgr
5656

5757
## Create a Backup policy
5858

59-
### Understanding PostGreSQL backup policy
59+
### Understanding PostgreSQL backup policy
6060

6161
While disk backup offers multiple backups per day and blob backup is a _continuous_ backup with no trigger, PostgreSQL backup offers Archive protection. The backup data that's first sent to the vault can be then moved to the _archive_ tier as per a defined rule or a _lifecycle_. In this context, let's understand the backup policy object for PostgreSQL.
6262

@@ -268,7 +268,7 @@ Once the vault and policy are created, there are three critical points that you
268268

269269
### Key entities involved
270270

271-
#### PostGreSQL database to be protected
271+
#### PostgreSQL database to be protected
272272

273273
Fetch the Azure Resource Manager ID (ARM ID) of PostgreSQL to be protected. This serves as the identifier of the database. We'll use an example of a database named **empdb11** under a PostgreSQL server **testposgresql**, which is present in the resource group **ossrg** under a different subscription.
274274

articles/backup/backup-rbac-rs-vault.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,19 +134,19 @@ The following table captures the Backup management actions and corresponding Azu
134134
| Restoring a blob | Backup Operator | Backup vault | |
135135
| | Storage account backup contributor | Storage account containing the blob | In addition, the backup vault MSI should be given [these permissions](./blob-backup-configure-manage.md#grant-permissions-to-the-backup-vault-on-storage-accounts) |
136136

137-
### Minimum role requirements for Azure database for PostGreSQL server backup
137+
### Minimum role requirements for Azure database for PostgreSQL server backup
138138

139139
| Management Operation | Minimum Azure role required | Scope Required | Alternative |
140140
| --- | --- | --- | --- |
141141
| Validate before configuring backup | Backup Operator | Backup vault | |
142-
| | Reader | Azure PostGreSQL server | |
142+
| | Reader | Azure PostgreSQL server | |
143143
| Enable backup from backup vault | Backup Operator | Backup vault | |
144-
| | Contributor | Azure PostGreSQL server | Alternatively, instead of a built-in-role, you can consider a custom role which has the following permissions: Microsoft.DBforPostgreSQL/servers/write Microsoft.DBforPostgreSQL/servers/read In addition, the backup vault MSI should be given [these permissions](./backup-azure-database-postgresql-overview.md#set-of-permissions-needed-for-azure-postgresql-database-backup) |
145-
| On demand backup of PostGreSQL server | Backup Operator | Backup vault | |
144+
| | Contributor | Azure PostgreSQL server | Alternatively, instead of a built-in-role, you can consider a custom role which has the following permissions: Microsoft.DBforPostgreSQL/servers/write Microsoft.DBforPostgreSQL/servers/read In addition, the backup vault MSI should be given [these permissions](./backup-azure-database-postgresql-overview.md#set-of-permissions-needed-for-azure-postgresql-database-backup) |
145+
| On demand backup of PostgreSQL server | Backup Operator | Backup vault | |
146146
| Validate before restoring a server | Backup Operator | Backup vault | |
147-
| | Contributor | Target Azure PostGreSQL server | Alternatively, instead of a built-in-role, you can consider a custom role which has the following permissions: Microsoft.DBforPostgreSQL/servers/write Microsoft.DBforPostgreSQL/servers/read
147+
| | Contributor | Target Azure PostgreSQL server | Alternatively, instead of a built-in-role, you can consider a custom role which has the following permissions: Microsoft.DBforPostgreSQL/servers/write Microsoft.DBforPostgreSQL/servers/read
148148
| Restoring a server | Backup Operator | Backup vault | |
149-
| | Contributor | Target Azure PostGreSQL server | Alternatively, instead of a built-in-role, you can consider a custom role which has the following permissions: Microsoft.DBforPostgreSQL/servers/write Microsoft.DBforPostgreSQL/servers/read In addition, the backup vault MSI should be given [these permissions](./backup-azure-database-postgresql-overview.md#set-of-permissions-needed-for-azure-postgresql-database-restore) |
149+
| | Contributor | Target Azure PostgreSQL server | Alternatively, instead of a built-in-role, you can consider a custom role which has the following permissions: Microsoft.DBforPostgreSQL/servers/write Microsoft.DBforPostgreSQL/servers/read In addition, the backup vault MSI should be given [these permissions](./backup-azure-database-postgresql-overview.md#set-of-permissions-needed-for-azure-postgresql-database-restore) |
150150

151151
## Next steps
152152

articles/backup/manage-backup-vault.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ The Cross Region Restore option allows you to restore data in a secondary Azur
154154
:::image type="content" source="./media/backup-vault-overview/monitor-postgresql-restore-to-secondary-region.png" alt-text="Screenshot shows how to monitor the postgresql restore to the secondary region." lightbox="./media/backup-vault-overview/monitor-postgresql-restore-to-secondary-region.png":::
155155

156156
> [!NOTE]
157-
> Cross Region Restore is currently only available for PostGreSQL servers.
157+
> Cross Region Restore is currently only available for PostgreSQL servers.
158158
159159
## Cross Subscription Restore using Azure portal
160160

articles/backup/restore-azure-database-postgresql-flex.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Before you restore from Azure Database for PostgreSQL Flexible server backups, r
2828

2929
Follow these steps:
3030

31-
1. Go to **Backup vault** > **Backup Instances**. Select the PostgreSQL-Flex server to be restored and select **Restore**.
31+
1. Go to **Backup vault** > **Backup Instances**. Select the PostgreSQL - Flexible server to be restored and select **Restore**.
3232

3333
:::image type="content" source="./media/restore-azure-database-postgresql-flex/restore.png" alt-text="Screenshot showing how to restore a database.":::
3434

@@ -43,7 +43,7 @@ Follow these steps:
4343
1. Once the validation is successful, select **Review + restore**.
4444
:::image type="content" source="./media/restore-azure-database-postgresql-flex/review-restore.png" alt-text="Screenshot showing the restore parameter process.":::
4545

46-
1. After final review of the parameters, select **Restore** to restore the selected PostgreSQL-Flex server backup in target storage account.
46+
1. After final review of the parameters, select **Restore** to restore the selected PostgreSQL - Flexible server backup in target storage account.
4747
:::image type="content" source="./media/restore-azure-database-postgresql-flex/review.png" alt-text="Screenshot showing the review process page.":::
4848

4949
1. Submit the Restore operation and track the triggered job under **Backup jobs**.

0 commit comments

Comments
 (0)