Skip to content

Commit 9059413

Browse files
authored
Merge pull request #207732 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 7d93c25 + 0bc4ffc commit 9059413

File tree

5 files changed

+49
-16
lines changed

5 files changed

+49
-16
lines changed

articles/active-directory/cloud-infrastructure-entitlement-management/onboard-gcp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ This article describes how to onboard a Google Cloud Platform (GCP) project on P
3636

3737
> [!NOTE]
3838
> 1. To confirm that the app was created, open **App registrations** in Azure and, on the **All applications** tab, locate your app.
39-
> 1. Select the app name to open the **Expose an API** page. The **Application ID URI** displayed in the **Overview** page is the *audience value* used while making an OIDC connection with your AWS account.
39+
> 1. Select the app name to open the **Expose an API** page. The **Application ID URI** displayed in the **Overview** page is the *audience value* used while making an OIDC connection with your GCP account.
4040
4141
1. Return to Permissions Management, and in the **Permissions Management Onboarding - Azure AD OIDC App Creation**, select **Next**.
4242

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

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,8 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
128128

129129
## Configure Zendesk SSO
130130

131+
You can set up one SAML configuration for team members and a second SAML configuration for end users.
132+
131133
1. To automate the configuration within **Zendesk**, you need to install **My Apps Secure Sign-in browser extension** by clicking **Install the extension**.
132134

133135
![Screenshot shows the Install the extension button.](./media/target-process-tutorial/install_extension.png)
@@ -136,18 +138,18 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
136138

137139
![Setup configuration](common/setup-sso.png)
138140

139-
1. If you want to setup Zendesk manually, open a new web browser window and sign into your Zendesk company site as an administrator and perform the following steps:
141+
1. If you want to set up Zendesk manually, open a new web browser window and sign into your Zendesk company site as an administrator and perform the following steps:
140142

141-
1. In the **Zendesk Admin Center**, Go to the **Account -> Security -> Single sign-on** page and click **Configure** in the **SAML**.
143+
1. In the **Zendesk Admin Center**, go to **Account -> Security -> Single sign-on**, then click **Create SSO configuration** and select **SAML**.
142144

143-
![Screenshot shows the Zendesk Admin Center with Security settings selected.](./media/zendesk-tutorial/settings.png "Security")
145+
![Screenshot shows the Zendesk Admin Center with Security settings selected.](https://zen-marketing-documentation.s3.amazonaws.com/docs/en/zendesk_create_sso_configuration.png "Security")
144146

145147
1. Perform the following steps in the **Single sign-on** page.
146148

147-
![Single sign-on](./media/zendesk-tutorial/saml-configuration.png "Single sign-on")
149+
![Single sign-on](https://zen-marketing-documentation.s3.amazonaws.com/docs/en/zendesk_saml_configuration_settings.png "Single sign-on")
150+
151+
a. In **Configuration name**, enter a name for your configuration. Up to two SAML and two JWT configurations are possible.
148152

149-
a. Check the **Enabled**.
150-
151153
b. In **SAML SSO URL** textbox, paste the value of **Login URL** which you have copied from Azure portal.
152154

153155
c. In **Certificate fingerprint** textbox, paste the **Thumbprint** value of certificate which you have copied from Azure portal.
@@ -156,6 +158,18 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
156158

157159
e. Click **Save**.
158160

161+
After creating your SAML configuration, you must activate it by assigning it to end users or team members.
162+
163+
1. In the **Zendesk Admin Center**, go to **Account -> Security** and select either **Team member authentication** or **End user authentication**.
164+
165+
1. If you're assigning the configuration to team members, select **External authentication** to show the authentication options. These options are already displayed for end users.
166+
167+
1. Click the **Single sign-on (SSO)** option in the **External authentication** section, then select the name of the SSO configuration you want to use.
168+
169+
1. Select the primary SSO method for this group of users if you have more than one authentication method assigned to the group. This option sets the default method used when users go to a page that requires authentication.
170+
171+
1. Click **Save**.
172+
159173
### Create Zendesk test user
160174

161175
The objective of this section is to create a user called Britta Simon in Zendesk. Zendesk supports automatic user provisioning, which is by default enabled. You can find more details [here](Zendesk-provisioning-tutorial.md) on how to configure automatic user provisioning.

articles/azure-resource-manager/bicep/linter-rule-outputs-should-not-contain-secrets.md

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,22 @@ This rule finds possible exposure of secrets in a template's outputs.
1212
## Linter rule code
1313

1414
Use the following value in the [Bicep configuration file](bicep-config-linter.md) to customize rule settings:
15-
15+
1616
`outputs-should-not-contain-secrets`
1717

1818
## Solution
1919

2020
Don't include any values in an output that could potentially expose secrets. For example, secure parameters of type secureString or secureObject, or [`list*`](./bicep-functions-resource.md#list) functions such as listKeys.
21-
22-
The output from a template is stored in the deployment history, so a malicious user could find that information.
23-
21+
22+
The output from a template is stored in the deployment history, so a user with read-only permissions could gain access to information otherwise not available with read-only permission.
23+
2424
The following example fails because it includes a secure parameter in an output value.
2525

2626
```bicep
27+
2728
@secure()
2829
param secureParam string
29-
30+
3031
output badResult string = 'this is the value ${secureParam}'
3132
```
3233

@@ -37,7 +38,7 @@ param storageName string
3738
resource stg 'Microsoft.Storage/storageAccounts@2021-04-01' existing = {
3839
name: storageName
3940
}
40-
41+
4142
output badResult object = {
4243
value: stg.listKeys().keys[0].value
4344
}
@@ -49,7 +50,19 @@ The following example fails because the output name contains 'password', indicat
4950
output accountPassword string = '...'
5051
```
5152

52-
To fix it, you will need to remove the secret data from the output.
53+
To fix it, you will need to remove the secret data from the output. The recommended practice is to output the resourceId of the resource containing the secret and retrieve the secret when the resource needing the information is created or updated. Secrets may also be stored in KeyVault for more complex deployment scenarios.
54+
55+
The following example shows a secure pattern for retrieving a storageAccount key from a module.
56+
57+
```bicep
58+
output storageId string = stg.id
59+
```
60+
61+
Which can be used in a subsequent deployment as sown in the following example
62+
63+
```bicep
64+
someProperty: listKeys(myStorageModule.outputs.storageId.value, '2021-09-01').keys[0].value
65+
```
5366

5467
## Silencing false positives
5568

@@ -64,4 +77,4 @@ It is good practice to add a comment explaining why the rule does not apply to t
6477

6578
## Next steps
6679

67-
For more information about the linter, see [Use Bicep linter](./linter.md).
80+
For more information about the linter, see [Use Bicep linter](./linter.md).

articles/virtual-machines/linux/create-upload-centos.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,12 @@ Preparing a CentOS 7 virtual machine for Azure is very similar to CentOS 6, howe
227227
* The NetworkManager package no longer conflicts with the Azure Linux agent. This package is installed by default and we recommend that it is not removed.
228228
* GRUB2 is now used as the default bootloader, so the procedure for editing kernel parameters has changed (see below).
229229
* XFS is now the default file system. The ext4 file system can still be used if desired.
230+
* Since CentOS 8 Stream and newer no longer include `network.service` by default, you will need to install it manually:
231+
232+
```console
233+
sudo yum install network-scripts
234+
sudo systemctl enable network.service
235+
```
230236

231237
**Configuration Steps**
232238

articles/virtual-machines/workloads/sap/hana-vm-operations-storage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ Check whether the storage throughput for the different suggested volumes meets t
223223

224224
Azure Write Accelerator only works with [Azure managed disks](https://azure.microsoft.com/services/managed-disks/). So at least the Azure premium storage disks forming the **/hana/log** volume need to be deployed as managed disks. More detailed instructions and restrictions of Azure Write Accelerator can be found in the article [Write Accelerator](../../how-to-enable-write-accelerator.md).
225225

226-
For the HANA certified VMs of the Azure [Esv3](../../ev3-esv3-series.md?toc=/azure/virtual-machines/linux/toc.json&bc=/azure/virtual-machines/linux/breadcrumb/toc.json#esv3-series) family and the [Edsv4](../../edv4-edsv4-series.md?toc=/azure/virtual-machines/linux/toc.json&bc=/azure/virtual-machines/linux/breadcrumb/toc.json#edsv4-series), [Edsv5](../../edv5-edsv5-series.md?toc=/azure/virtual-machines/linux/toc.json&bc=/azure/virtual-machines/linux/breadcrumb/toc.json#edsv5-series), and [Esv5](../../ev5-esv5-series.md?toc=/azure/virtual-machines/linux/toc.json&bc=/azure/virtual-machines/linux/breadcrumb/toc.json#esv5-series) you need to use ANF for the **/hana/data** and **/hana/log** volume. Or you need to leverage Azure Ultra disk storage instead of Azure premium storage only for the **/hana/log** volume to be compliant with the SAP HANA certification KPIs. Though, many custmers are using premium storage SSD disks for the **/hana/log** volume for non-production purposes or even for smaller production workloads since the write latency experienced with premium storage for the critical redo log writes are meeting the workload requirements. The configurations for the **/hana/data** volume on Azure premium storage could look like:
226+
For the HANA certified VMs of the Azure [Esv3](../../ev3-esv3-series.md?toc=/azure/virtual-machines/linux/toc.json&bc=/azure/virtual-machines/linux/breadcrumb/toc.json#esv3-series) family and the [Edsv4](../../edv4-edsv4-series.md?toc=/azure/virtual-machines/linux/toc.json&bc=/azure/virtual-machines/linux/breadcrumb/toc.json#edsv4-series), [Edsv5](../../edv5-edsv5-series.md?toc=/azure/virtual-machines/linux/toc.json&bc=/azure/virtual-machines/linux/breadcrumb/toc.json#edsv5-series), and [Esv5](../../ev5-esv5-series.md?toc=/azure/virtual-machines/linux/toc.json&bc=/azure/virtual-machines/linux/breadcrumb/toc.json#esv5-series) you need to use ANF for the **/hana/data** and **/hana/log** volume. Or you need to leverage Azure Ultra disk storage instead of Azure premium storage only for the **/hana/log** volume to be compliant with the SAP HANA certification KPIs. Though, many customers are using premium storage SSD disks for the **/hana/log** volume for non-production purposes or even for smaller production workloads since the write latency experienced with premium storage for the critical redo log writes are meeting the workload requirements. The configurations for the **/hana/data** volume on Azure premium storage could look like:
227227

228228
| VM SKU | RAM | Max. VM I/O<br /> Throughput | /hana/data | Provisioned Throughput | Maximum burst throughput | IOPS | Burst IOPS |
229229
| --- | --- | --- | --- | --- | --- | --- |

0 commit comments

Comments
 (0)