Skip to content

Commit d3fa873

Browse files
authored
Merge pull request #296421 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 89b4193 + ec03948 commit d3fa873

15 files changed

+35
-33
lines changed

articles/azure-maps/rest-api-azure-maps.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ There are previous stable releases of an Azure Maps service that are still in us
4040
|-----|-------------|-------------|
4141
| [Render][Render v1] | 1.0 | Get road, satellite/aerial, weather, traffic map tiles, and static map images.<BR>The Azure Maps [Render v1] service is now deprecated and will be retired on 9/17/26. To avoid service disruptions, all calls to Render v1 API need to be updated to use the latest version of the [Render] API. |
4242
| [Render][render-2022-08-01] | 2022-08-01 | Get road, satellite/aerial, weather, traffic map tiles, and static map images. |
43-
| [Route] | 1.0 | Calculate optimized travel times and distances between locations for multiple modes of transportation and get localized travel instructions. |
43+
| [Route][Route v1] | 1.0 | Calculate optimized travel times and distances between locations for multiple modes of transportation and get localized travel instructions. |
4444
| [Search][Search v1] | 1.0 | Geocode addresses and coordinates, search for business listings and places by name or category and get administrative boundary polygons. This is version 1.0 of the Search service. For the latest version, see [Search]. |
4545
| [Search] | 2023-06-01 | Geocode addresses and coordinates, search for business listings and places by name or category and get administrative boundary polygons. |
4646

@@ -68,6 +68,7 @@ Prerelease version of an Azure Maps service. Preview releases contain new functi
6868
[render-2022-08-01]: /rest/api/maps/render?view=rest-maps-2022-08-01
6969

7070
[Render v1]: /rest/api/maps/render?view=rest-maps-1.0
71+
[Route v1]: /rest/api/maps/route?view=rest-maps-1.0
7172
[Search v1]: /rest/api/maps/search?view=rest-maps-1.0
7273

7374
<!--- 2024-07-01-preview is the latest preview release of the Route service,

articles/azure-signalr/signalr-howto-work-with-app-gateway.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Create from the portal an Application Gateway instance **_AG1_**:
7676
- **Listener name**: Enter _myListener_ for the name of the listener.
7777
- **Frontend IP**: Select **Public** to choose the public IP you created for the frontend.
7878
- **Protocol**: HTTP
79-
- We use the HTTP frontend protocol on Application Gateway in this article to simplify the demo and help you get started easier. But in reality, you may need to enable HTTPs and Customer Domain on it with production scenario.
79+
- We use the HTTP frontend protocol on Application Gateway in this article to simplify the demo and help you get started easier. But in reality, you may need to enable HTTPS and Customer Domain on it with production scenario.
8080
- Accept the default values for the other settings on the **Listener** tab
8181
:::image type="content" source="./media/signalr-howto-work-with-app-gateway/application-gateway-create-rule-listener.png" alt-text="Screenshot of setting up the application gateway routing rule listener tab for the SignalR Service.":::
8282
- On the **Backend targets** tab, use the following values:
@@ -297,7 +297,7 @@ Now the web app is deployed, let's go to the portal for **_WA1_** and make the f
297297

298298
- On the **TLS/SSL settings** tab:
299299

300-
- **HTTPS Only**: **Off**. To Simplify the demo, we used the HTTP frontend protocol on Application Gateway. Therefore, we need to turn off this option to avoid changing the HTTP URL to HTTPs automatically.
300+
- **HTTPS Only**: **Off**. To Simplify the demo, we used the HTTP frontend protocol on Application Gateway. Therefore, we need to turn off this option to avoid changing the HTTP URL to HTTPS automatically.
301301

302302
- Go to the **Overview** tab and get the URL of **_WA1_**.
303303
- Get the URL, and replace scheme https with http, for example, `http://wa1.azurewebsites.net`, open the URL in the browser, now you can start chatting! Use F12 to open network traces, and you can see the SignalR connection is established through **_AG1_**.

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
@@ -35,7 +35,7 @@ Fetch the Azure Resource Manager ID (ARM ID) of the PostgreSQL database to be pr
3535
"/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx/resourcegroups/ossdemoRG/providers/Microsoft.DBforPostgreSQL/servers/testpostgresql/databases/empdb11"
3636
```
3737

38-
#### Azure key vault
38+
#### Azure Key Vault
3939

4040
The Azure Backup service doesn't store the username and password to connect to the PostgreSQL database. Instead, the backup admin needs to seed the *keys* into the key vault. Then the Azure Backup service will access the key vault, read the keys, and access the database. Note the secret identifier of the relevant key. The following example uses bash.
4141

articles/backup/backup-azure-database-postgresql-overview.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ You can restore PostgreSQL single server databases as **Restore as Files**. Then
5050
5151
## Backup process
5252

53-
1. As a backup admin, you can specify the Azure PostgreSQL databases that you intend to back up. Additionally, you can also specify the details of the Azure key vault that stores the credentials needed to connect to the specified database(s). These credentials are securely seeded by the database admin in the Azure key vault.
53+
1. As a backup admin, you can specify the Azure PostgreSQL databases that you intend to back up. Additionally, you can also specify the details of Azure Key Vault, which stores the credentials needed to connect to the specified database(s). These credentials are securely seeded by the database admin in Key Vault.
5454
1. The backup service then validates if it has [appropriate permissions to authenticate](#azure-backup-authentication-with-the-postgresql-server) with the specified PostgreSQL server and to back up its databases.
5555
1. Azure Backup spins up a worker role (VM) with a backup extension installed in it to communicate with the protected PostgreSQL server. This extension consists of a coordinator and a PostgreSQL plugin. The coordinator triggers workflows for various operations, such as backup and restore, and the plugin manages the actual data flow.
5656
1. At the scheduled time, the coordinator communicates with the plugin, for it to start streaming the backup data from the PostgreSQL server using **pg_dump (custom)**.
@@ -64,7 +64,7 @@ Azure Backup follows strict security guidelines laid down by Azure; permissions
6464

6565
### Key-vault based authentication model
6666

67-
The Azure Backup service needs to connect to the Azure PostgreSQL while taking each backup. While ‘username + password’ (or connection string), corresponding to the database, are used to make this connection, these credentials aren’t stored with Azure Backup. Instead, these credentials need to be securely seeded by the database admin in the [Azure key vault as a secret](/azure/key-vault/secrets/about-secrets). The workload admin is responsible to manage and rotate credentials; Azure Backup calls for the most recent secret details from the key vault to take the backup.
67+
The Azure Backup service needs to connect to the Azure PostgreSQL while taking each backup. While ‘username + password’ (or connection string), corresponding to the database, are used to make this connection, these credentials aren’t stored with Azure Backup. Instead, these credentials need to be securely seeded by the database admin in [Azure Key Vault as a secret](/azure/key-vault/secrets/about-secrets). The workload admin is responsible to manage and rotate credentials; Azure Backup calls for the most recent secret details from the key vault to take the backup.
6868

6969
:::image type="content" source="./media/backup-azure-database-postgresql-overview/key-vault-based-authentication-model.png" alt-text="Diagram showing the workload or database flow.":::
7070

@@ -73,7 +73,7 @@ The Azure Backup service needs to connect to the Azure PostgreSQL while taking e
7373
1. Grant the following access permissions to the Backup vault’s MSI:
7474

7575
- _Reader_ access on the Azure PostgreSQL server.
76-
- _Key Vault Secrets User_ (or get, list secrets) access on the Azure key vault.
76+
- _Key Vault Secrets User_ (or get, list secrets) access on Key Vault.
7777

7878
1. Network line of sight access on:
7979

@@ -121,12 +121,12 @@ To grant all the access permissions needed by Azure Backup, refer to the followi
121121

122122
### Access permissions on the Azure Key vault (associated with the PostgreSQL server)
123123

124-
1. Set Backup vault’s MSI **Key Vault Secrets User** (or **get**, **list** secrets) access on the Azure key vault. To assign permissions, you can use role assignments or access policies. It’s not required to add the permission using both the options as it doesn’t help.
124+
1. Set Backup vault’s MSI **Key Vault Secrets User** (or **get**, **list** secrets) access on Key Vault. To assign permissions, you can use role assignments or access policies. It’s not required to add the permission using both the options as it doesn’t help.
125125

126126
- Using Azure role-based access control (Azure RBAC) authorization (that is, Permission model is set to Azure role-based access control):
127127

128128
- Under Access control, grant the backup vault’s MSI _Key Vault Secrets User_ access on the key vault. Bearers of that role will be able to read secrets.
129-
- [Grant permission to applications to access an Azure key vault using Azure RBAC](/azure/key-vault/general/rbac-guide?tabs=azure-cli).
129+
- [Grant permission to applications to access Key Vault using Azure RBAC](/azure/key-vault/general/rbac-guide?tabs=azure-cli).
130130

131131
:::image type="content" source="./media/backup-azure-database-postgresql-overview/key-vault-secrets-user-access-inline.png" alt-text="Screenshot showing the option to provide secret user access." lightbox="./media/backup-azure-database-postgresql-overview/key-vault-secrets-user-access-expanded.png":::
132132

articles/backup/backup-azure-immutable-vault-how-to-manage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ This article describes how to manage Azure Backup Immutable vault operations for
1515

1616
[Immutable vault](backup-azure-immutable-vault-concept.md) can help you protect your backup data by blocking any operations that could lead to loss of recovery points. Further, you can lock the Immutable vault setting to enable WORM storage immutability and make it irreversible to prevent any malicious actors from disabling immutability and deleting backups.
1717

18-
>[!NOTE]
19-
> Immutable WORM storage is currently in GA for Recovery Services Vaults in the following regions: West Central US, West Europe, East US, North Europe, Australia East
18+
> [!NOTE]
19+
> Immutable WORM storage 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.
2020
2121
## Enable Immutable vault
2222

articles/backup/backup-postgresql-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ The following example uses bash.
285285
ossId="/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx/resourcegroups/ossrg/providers/Microsoft.DBforPostgreSQL/servers/archive-postgresql-ccy/databases/empdb11"
286286
```
287287

288-
#### Azure key vault
288+
#### Azure Key Vault
289289

290290
The Azure Backup service doesn't store the username and password to connect to the PostgreSQL database. Instead, the backup admin needs to seed the *keys* into the key vault. Then the Backup service will access the key vault, read the keys, and then access the database. Note the secret identifier of the relevant key.
291291

articles/backup/backup-postgresql-ps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ Fetch the Azure Resource Manager ID (ARM ID) of PostgreSQL to be protected. This
231231
$ossId = "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx/resourcegroups/ossrg/providers/Microsoft.DBforPostgreSQL/servers/archive-postgresql-ccy/databases/empdb11"
232232
```
233233

234-
#### Azure key vault
234+
#### Azure Key Vault
235235

236236
Azure Backup service doesn't store the username and password to connect to the PostgreSQL database. Instead, the backup admin seeds the *keys* into the key vault, and then the backup service will access the key vault, read the keys, and access the database. Note the secret identifier of the relevant key.
237237

@@ -243,7 +243,7 @@ $keyURI = "https://testkeyvaulteus.vault.azure.net/secrets/ossdbkey"
243243

244244
You need to connect the Backup vault to the PostgreSQL server, and then access the database via the keys present in the key vault. So, it requires access to the PostgreSQL server and the key vault. Access is granted to the Backup vault's MSI.
245245

246-
[Read about the appropriate permissions](./backup-azure-database-postgresql-overview.md#set-of-permissions-needed-for-azure-postgresql-database-backup) that you should grant to the Backup vault's MSI on the PostgreSQL server and the Azure key vault, where the keys to the database are stored.
246+
[Read about the appropriate permissions](./backup-azure-database-postgresql-overview.md#set-of-permissions-needed-for-azure-postgresql-database-backup) that you should grant to the Backup vault's MSI on the PostgreSQL server and Azure Key Vault, where the keys to the database are stored.
247247

248248
### Prepare the request
249249

articles/backup/install-mars-agent.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ To install and register the MARRS agent, follow these steps:
148148
If you are running into issues during vault registration, see the [troubleshooting guide](backup-azure-mars-troubleshoot.md#invalid-vault-credentials-provided).
149149

150150
>[!Note]
151-
>We recommend to save your passphrase in an alternate secure location, such as the Azure key vault. Microsoft can't recover the data without the passphrase. [Learn](save-backup-passphrase-securely-in-azure-key-vault.md) how to store a secret in a Key Vault.
151+
>We recommend to save your passphrase in an alternate secure location, such as Azure Key Vault. Microsoft can't recover the data without the passphrase. [Learn](save-backup-passphrase-securely-in-azure-key-vault.md) how to store a secret in Key Vault.
152152
153153
## Next step
154154

articles/backup/tutorial-postgresql-backup.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@ You can configure backup on multiple databases across multiple Azure PostgreSQL
118118
:::image type="content" source="./media/backup-azure-database-postgresql/choose-an-azure-postgresql-server-inline.png" alt-text="Screenshot showing how to choose an Azure PostgreSQL server." lightbox="./media/backup-azure-database-postgresql/choose-an-azure-postgresql-server-expanded.png":::
119119

120120

121-
1. **Assign Azure key vault** that stores the credentials to connect to the selected database. To assign the key vault at the individual row level, click **Select a key vault and secret**. You can also assign the key vault by multi-selecting the rows and click **Assign key vault** in the top menu of the grid.
121+
1. **Assign Azure Key Vault** that stores the credentials to connect to the selected database. To assign the key vault at the individual row level, click **Select a key vault and secret**. You can also assign the key vault by multi-selecting the rows and click **Assign key vault** in the top menu of the grid.
122122

123-
:::image type="content" source="./media/backup-azure-database-postgresql/assign-azure-key-vault-inline.png" alt-text="Screenshot showing how to assign Azure key vault." lightbox="./media/backup-azure-database-postgresql/assign-azure-key-vault-expanded.png":::
123+
:::image type="content" source="./media/backup-azure-database-postgresql/assign-azure-key-vault-inline.png" alt-text="Screenshot showing how to assign Azure Key Vault." lightbox="./media/backup-azure-database-postgresql/assign-azure-key-vault-expanded.png":::
124124

125125
1. To specify the secret information, use one of the following options:
126126

articles/event-grid/authenticate-with-namespaces-using-json-web-tokens.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ In this step, you configure custom authentication settings on your Event Grid na
9090
1. On the **Event Grid Namespace** page, select **Configuration** on the left menu.
9191
1. In the **Custom JWT authentication** section, specify values for the following properties:
9292
1. Select **Enable custom JWT authentication**.
93-
1. **Token Issuer**: Enter the value of the issuer claims of the JWT tokens, presented by the MQTT clients.
93+
1. **Token Issuer**: Enter the value of the issuer claims of the JWTs, presented by the MQTT clients.
9494
1. Select **Add issuer certificate**
9595
9696
:::image type="content" source="./media/authenticate-with-namespaces-using-json-web-tokens/configuration-custom-authentication.png" alt-text="Screenshot that shows the Custom JWT authentication section of the Configuration page for an Event Grid namespace." lightbox="./media/authenticate-with-namespaces-using-json-web-tokens/configuration-custom-authentication.png":::

0 commit comments

Comments
 (0)