Skip to content

Commit 997c66d

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into ts_hbase12
2 parents 75c753e + c91c62d commit 997c66d

File tree

10 files changed

+29
-14
lines changed

10 files changed

+29
-14
lines changed

articles/active-directory/develop/scenario-spa-sign-in.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ You cannot use a combination of both the pop-up and redirect methods in your app
4949

5050
```javascript
5151
const loginRequest = {
52-
scopes: ["user.read", "user.write"]
52+
scopes: ["https://graph.microsoft.com/User.ReadWrite"]
5353
}
5454

5555
userAgentApplication.loginPopup(loginRequest).then(function (loginResponse) {
@@ -83,7 +83,7 @@ For a pop-up window experience, enable the `popUp` config option. You can also p
8383
imports: [ MsalModule.forRoot({
8484
clientID: 'your_app_id',
8585
popUp: true,
86-
consentScopes: ["user.read", "user.write"]
86+
consentScopes: ["https://graph.microsoft.com/User.ReadWrite"]
8787
})]
8888
})
8989
```
@@ -102,7 +102,7 @@ function authCallback(error, response) {
102102
userAgentApplication.handleRedirectCallback(authCallback);
103103

104104
const loginRequest = {
105-
scopes: ["user.read", "user.write"]
105+
scopes: ["https://graph.microsoft.com/User.ReadWrite"]
106106
}
107107

108108
userAgentApplication.loginRedirect(loginRequest);

articles/active-directory/saas-apps/braze-tutorial.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ To configure Azure AD single sign-on with Braze, perform the following steps:
113113
`https://<SUBDOMAIN>.braze.com/sign_in`
114114

115115
> [!NOTE]
116-
> These values are not real. Update these values with the actual Reply URL and Sign-On URL. Contact [Braze Client support team](mailto:support@braze.com) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
116+
> For the subdomain, use the coordinating subdomain listed in your Braze instance URL. For example, if your instance is US-01, your URL is https://dashboard-01.braze.com. This means that your subdomain will be dashboard-01.
117117

118118
6. Braze application expects the SAML assertions in a specific format. Configure the following claims for this application. You can manage the values of these attributes from the **User Attributes** section on application integration page. On the **Set up Single Sign-On with SAML** page, click **Edit** button to open **User Attributes** dialog.
119119

@@ -162,7 +162,7 @@ To configure Azure AD single sign-on with Braze, perform the following steps:
162162

163163
### Configure Braze Single Sign-On
164164

165-
To configure single sign-on on **Braze** side, you need to send the downloaded **Certificate (Base64)** and appropriate copied URLs from Azure portal to [Braze support team](mailto:[email protected]). They set this setting to have the SAML SSO connection set properly on both sides.
165+
To configure single sign-on on **Braze** side, you will need to ensure that a Braze Account Manager has enabled SAML SSO for your account. Once enabled, you can then go to Company Settings > Security Settings and toggle the SAML SSO section to ON. Within this section, you will need to copy and paste the downloaded **Certificate (Base64)**, along with adding a SAML Name .
166166

167167
### Create an Azure AD test user
168168

@@ -216,7 +216,7 @@ In this section, you enable Britta Simon to use Azure single sign-on by granting
216216

217217
### Create Braze test user
218218

219-
In this section, you create a user called Britta Simon in Braze. Work with [Braze support team](mailto:[email protected]) to add the users in the Braze platform. Users must be created and activated before you use single sign-on.
219+
In this section, you create a user called Britta Simon in Braze. You can add the users in the Braze platform. Users must be created and activated before you use single sign-on.
220220

221221
### Test single sign-on
222222

articles/azure-monitor/insights/container-insights-live-logs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ If you have enabled Kubernetes RBAC authorization, you will need to apply cluste
6767
6868
AKS can be configured to use Azure Active Directory (AD) for user authentication. If you are configuring it for the first time, see [Integrate Azure Active Directory with Azure Kubernetes Service](../../aks/azure-ad-integration.md). During the steps to create the [client application](../../aks/azure-ad-integration.md#create-the-client-application), specify the following:
6969
70-
- **Redirect URI (optional)**: This is a **Web** application type and the base URL value should be `https://afd.hosting.portal.azure.net/monitoring/Content/iframe/infrainsights.app/web/base-libs/auth/auth.html`.
70+
- **Redirect URI**: Two **Web** application types need to be created. The first base URL value should be `https://afd.hosting.portal.azure.net/monitoring/Content/iframe/infrainsights.app/web/base-libs/auth/auth.html` and the second base URL value should be `https://monitoring.hosting.portal.azure.net/monitoring/Content/iframe/infrainsights.app/web/base-libs/auth/auth.html`.
7171
- After registering the application, from the **Overview** page select **Authentication** from the left-hand pane. On the **Authentication** page, under **Advanced settings** implicitly grant **Access tokens** and **ID tokens** and then save your changes.
7272
7373
>[!NOTE]

articles/cosmos-db/sql-query-linq-to-sql.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ The syntax is `input(.|.SelectMany())(.Select()|.Where())*`. A concatenated quer
194194
- **LINQ lambda expression**
195195

196196
```csharp
197-
input.Select(family=>family.parents[0])
198-
.Where(familyName == "Wakefield");
197+
input.Select(family => family.parents[0])
198+
.Where(parent => parent.familyName == "Wakefield");
199199
```
200200

201201
- **SQL**

articles/dms/known-issues-troubleshooting-dms.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ When you try to connect to source in the Azure Database Migration service projec
9393
| ------------- | ------------- |
9494
| When using [ExpressRoute](https://azure.microsoft.com/services/expressroute/), Azure Database Migration Service [requires](https://docs.microsoft.com/azure/dms/tutorial-sql-server-azure-sql-online) provisioning three service endpoints on the Virtual Network subnet associated with the service:<br> -- Service Bus endpoint<br> -- Storage endpoint<br> -- Target database endpoint (e.g. SQL endpoint, Cosmos DB endpoint)<br><br><br><br><br> | [Enable](https://docs.microsoft.com/azure/dms/tutorial-sql-server-azure-sql-online) the required service endpoints for ExpressRoute connectivity between source and Azure Database Migration Service. <br><br><br><br><br><br><br><br> |
9595

96-
## Timeout error when migrating a MySQL database to Azure DB for MySQL
96+
## Lock wait timeout error when migrating a MySQL database to Azure DB for MySQL
9797

98-
When you migrate a MySQL database to an Azure Database for MySQL instance via Azure Database Migration Service, the migration fails with following timeout error:
98+
When you migrate a MySQL database to an Azure Database for MySQL instance via Azure Database Migration Service, the migration fails with following lock wait timeout error:
9999

100100
* **Error**: Database migration error - Failed to load file - Failed to start load process for file 'n' RetCode: SQL_ERROR SqlState: HY000 NativeError: 1205 Message: [MySQL][ODBC Driver][mysqld] Lock wait timeout exceeded; try restarting transaction
101101

articles/logic-apps/logic-apps-handle-large-messages.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,13 @@ includes this information about the content that your logic app wants to upload
210210
|||||
211211

212212
4. After each PATCH request, the endpoint confirms the receipt
213-
for each chunk by responding with the "200" status code.
213+
for each chunk by responding with the "200" status code and the following response headers:
214+
215+
| Endpoint response header field | Type | Required | Description |
216+
|--------------------------------|------|----------|-------------|
217+
| **Range** | String | Yes | The byte range for content that has been received by the endpoint, for example: "bytes=0-1023" |
218+
| **x-ms-chunk-size** | Integer | No | The suggested chunk size in bytes |
219+
||||
214220

215221
For example, this action definition shows an HTTP POST
216222
request for uploading chunked content to an endpoint.
@@ -234,4 +240,4 @@ the `contentTransfer` property sets `transferMode` to `chunked`:
234240
},
235241
"type": "Http"
236242
}
237-
```
243+
```

articles/security/fundamentals/encryption-atrest.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ Client-side encryption of Azure SQL Database data is supported through the [Alwa
294294
| Event Grid | Yes | - | - |
295295
| API Management | Yes | - | - |
296296
| **IoT Services** | | | |
297-
| IoT Hub | - | - | Yes |
297+
| IoT Hub | Yes | - | Yes |
298298
| **Management and Governance** | | | |
299299
| Azure Site Recovery | Yes | Yes, RSA 2048-bit | Yes |
300300
| **Media** | | | |

articles/storage/common/storage-encryption-keys-cli.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ ms.subservice: common
1818

1919
This article shows how to configure a key vault with customer-managed keys using Azure CLI.
2020

21+
> [!IMPORTANT]
22+
> Using customer-managed keys with Azure Storage encryption requires that the key vault have two required properties configured, **Soft Delete** and **Do Not Purge**. These properties are enabled by default when you create a new key vault in the Azure portal. However, if you need to enable these properties on an existing key vault, you must use either PowerShell or Azure CLI.
23+
> Only RSA keys and key size 2048 are supported.
24+
2125
## Assign an identity to the storage account
2226

2327
To enable customer-managed keys for your storage account, first assign a system-assigned managed identity to the storage account. You'll use this managed identity to grant the storage account permissions to access the key vault.

articles/storage/common/storage-encryption-keys-portal.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ This article shows how to configure a key vault with customer-managed keys using
2121

2222
> [!IMPORTANT]
2323
> Using customer-managed keys with Azure Storage encryption requires that the key vault have two required properties configured, **Soft Delete** and **Do Not Purge**. These properties are enabled by default when you create a new key vault in the Azure portal. However, if you need to enable these properties on an existing key vault, you must use either PowerShell or Azure CLI.
24+
> Only RSA keys and key size 2048 are supported.
2425
2526
## Enable customer-managed keys
2627

articles/storage/common/storage-encryption-keys-powershell.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ ms.subservice: common
1818

1919
This article shows how to configure a key vault with customer-managed keys using PowerShell.
2020

21+
> [!IMPORTANT]
22+
> Using customer-managed keys with Azure Storage encryption requires that the key vault have two required properties configured, **Soft Delete** and **Do Not Purge**. These properties are enabled by default when you create a new key vault in the Azure portal. However, if you need to enable these properties on an existing key vault, you must use either PowerShell or Azure CLI.
23+
> Only RSA keys and key size 2048 are supported.
24+
2125
## Assign an identity to the storage account
2226

2327
To enable customer-managed keys for your storage account, first assign a system-assigned managed identity to the storage account. You'll use this managed identity to grant the storage account permissions to access the key vault.

0 commit comments

Comments
 (0)