Skip to content

Commit 6d3c560

Browse files
authored
Merge pull request #206817 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 b28038c + 193fdca commit 6d3c560

File tree

7 files changed

+41
-34
lines changed

7 files changed

+41
-34
lines changed

articles/active-directory/managed-identities-azure-resources/tutorial-linux-vm-access-nonaad.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ To complete these steps, you need an SSH client.  If you are using Windows, you
103103
2. **Connect** to the VM with the SSH client of your choice. 
104104
3. In the terminal window, use CURL to make a request to the local managed identities for Azure resources endpoint to get an access token for Azure Key Vault.  
105105

106+
106107
The CURL request for the access token is below.  
107108

108109
```bash
@@ -147,4 +148,4 @@ Alternatively you may also do this via [PowerShell or the CLI](../../azure-resou
147148
In this tutorial, you learned how to use a Linux VM system-assigned managed identity to access Azure Key Vault. To learn more about Azure Key Vault see:
148149

149150
> [!div class="nextstepaction"]
150-
>[Azure Key Vault](../../key-vault/general/overview.md)
151+
>[Azure Key Vault](../../key-vault/general/overview.md)

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

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: 'Tutorial: Azure AD SSO integration with Sonarqube'
3-
description: Learn how to configure single sign-on between Azure Active Directory and Sonarqube.
2+
title: 'Tutorial: Azure AD SSO integration with SonarQube'
3+
description: Learn how to configure single sign-on between Azure Active Directory and SonarQube.
44
services: active-directory
55
author: jeevansd
66
manager: CelesteDG
@@ -13,59 +13,62 @@ ms.date: 06/25/2021
1313
ms.author: jeedes
1414
---
1515

16-
# Tutorial: Azure AD SSO integration with Sonarqube
16+
# Tutorial: Azure AD SSO integration with SonarQube
1717

18-
In this tutorial, you'll learn how to integrate Sonarqube with Azure Active Directory (Azure AD). When you integrate Sonarqube with Azure AD, you can:
18+
In this tutorial, you'll learn how to integrate SonarQube with Azure Active Directory (Azure AD). When you integrate SonarQube with Azure AD, you can:
1919

20-
* Control in Azure AD who has access to Sonarqube.
21-
* Enable your users to be automatically signed-in to Sonarqube with their Azure AD accounts.
20+
* Control in Azure AD who has access to SonarQube.
21+
* Enable your users to be automatically signed-in to SonarQube with their Azure AD accounts.
2222
* Manage your accounts in one central location - the Azure portal.
2323

2424
## Prerequisites
2525

2626
To get started, you need the following items:
2727

2828
* An Azure AD subscription. If you don't have a subscription, you can get a [free account](https://azure.microsoft.com/free/).
29-
* Sonarqube single sign-on (SSO) enabled subscription.
29+
* SonarQube single sign-on (SSO) enabled subscription.
30+
31+
> [!NOTE]
32+
> Help on installing SonarQube can be found in the [online documentation](https://docs.sonarqube.org/latest/setup/install-server/).
3033
3134
## Scenario description
3235

3336
In this tutorial, you configure and test Azure AD SSO in a test environment.
3437

35-
* Sonarqube supports **SP** initiated SSO.
38+
* SonarQube supports **SP** initiated SSO.
3639

3740
> [!NOTE]
3841
> Identifier of this application is a fixed string value so only one instance can be configured in one tenant.
3942
40-
## Add Sonarqube from the gallery
43+
## Add SonarQube from the gallery
4144

42-
To configure the integration of Sonarqube into Azure AD, you need to add Sonarqube from the gallery to your list of managed SaaS apps.
45+
To configure the integration of SonarQube into Azure AD, you need to add SonarQube from the gallery to your list of managed SaaS apps.
4346

4447
1. Sign in to the Azure portal using either a work or school account, or a personal Microsoft account.
4548
1. On the left navigation pane, select the **Azure Active Directory** service.
4649
1. Navigate to **Enterprise Applications** and then select **All Applications**.
4750
1. To add new application, select **New application**.
48-
1. In the **Add from the gallery** section, type **Sonarqube** in the search box.
49-
1. Select **Sonarqube** from results panel and then add the app. Wait a few seconds while the app is added to your tenant.
51+
1. In the **Add from the gallery** section, type **SonarQube** in the search box.
52+
1. Select **SonarQube** from results panel and then add the app. Wait a few seconds while the app is added to your tenant.
5053

51-
## Configure and test Azure AD SSO for Sonarqube
54+
## Configure and test Azure AD SSO for SonarQube
5255

53-
Configure and test Azure AD SSO with Sonarqube using a test user called **B.Simon**. For SSO to work, you need to establish a link relationship between an Azure AD user and the related user in Sonarqube.
56+
Configure and test Azure AD SSO with SonarQube using a test user called **B.Simon**. For SSO to work, you need to establish a link relationship between an Azure AD user and the related user in SonarQube.
5457

55-
To configure and test Azure AD SSO with Sonarqube, perform the following steps:
58+
To configure and test Azure AD SSO with SonarQube, perform the following steps:
5659

5760
1. **[Configure Azure AD SSO](#configure-azure-ad-sso)** - to enable your users to use this feature.
5861
1. **[Create an Azure AD test user](#create-an-azure-ad-test-user)** - to test Azure AD single sign-on with B.Simon.
5962
1. **[Assign the Azure AD test user](#assign-the-azure-ad-test-user)** - to enable B.Simon to use Azure AD single sign-on.
60-
1. **[Configure Sonarqube SSO](#configure-sonarqube-sso)** - to configure the single sign-on settings on application side.
61-
1. **[Create Sonarqube test user](#create-sonarqube-test-user)** - to have a counterpart of B.Simon in Sonarqube that is linked to the Azure AD representation of user.
63+
1. **[Configure SonarQube SSO](#configure-sonarqube-sso)** - to configure the single sign-on settings on application side.
64+
1. **[Create SonarQube test user](#create-sonarqube-test-user)** - to have a counterpart of B.Simon in SonarQube that is linked to the Azure AD representation of user.
6265
1. **[Test SSO](#test-sso)** - to verify whether the configuration works.
6366

6467
## Configure Azure AD SSO
6568

6669
Follow these steps to enable Azure AD SSO in the Azure portal.
6770

68-
1. In the Azure portal, on the **Sonarqube** application integration page, find the **Manage** section and select **single sign-on**.
71+
1. In the Azure portal, on the **SonarQube** application integration page, find the **Manage** section and select **single sign-on**.
6972
1. On the **Select a single sign-on method** page, select **SAML**.
7073
1. On the **Set up single sign-on with SAML** page, click the pencil icon for **Basic SAML Configuration** to edit the settings.
7174

@@ -93,7 +96,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
9396

9497
![The Certificate download link](common/certificatebase64.png)
9598

96-
1. On the **Set up Sonarqube** section, copy the appropriate URL(s) based on your requirement.
99+
1. On the **Set up SonarQube** section, copy the appropriate URL(s) based on your requirement.
97100

98101
![Copy configuration URLs](common/copy-configuration-urls.png)
99102

@@ -111,19 +114,19 @@ In this section, you'll create a test user in the Azure portal called B.Simon.
111114

112115
### Assign the Azure AD test user
113116

114-
In this section, you'll enable B.Simon to use Azure single sign-on by granting access to Sonarqube.
117+
In this section, you'll enable B.Simon to use Azure single sign-on by granting access to SonarQube.
115118

116119
1. In the Azure portal, select **Enterprise Applications**, and then select **All applications**.
117-
1. In the applications list, select **Sonarqube**.
120+
1. In the applications list, select **SonarQube**.
118121
1. In the app's overview page, find the **Manage** section and select **Users and groups**.
119122
1. Select **Add user**, then select **Users and groups** in the **Add Assignment** dialog.
120123
1. In the **Users and groups** dialog, select **B.Simon** from the Users list, then click the **Select** button at the bottom of the screen.
121124
1. If you are expecting a role to be assigned to the users, you can select it from the **Select a role** dropdown. If no role has been set up for this app, you see "Default Access" role selected.
122125
1. In the **Add Assignment** dialog, click the **Assign** button.
123126

124-
## Configure Sonarqube SSO
127+
## Configure SonarQube SSO
125128

126-
1. Open a new web browser window and sign into your Sonarqube company site as an administrator.
129+
1. Open a new web browser window and sign into your SonarQube company site as an administrator.
127130

128131
1. Click on **Administration > Configuration > Security** and go to the **SAML Plugin** perform the following steps.
129132

@@ -160,20 +163,20 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
160163

161164
j. Click **Save**.
162165

163-
### Create Sonarqube test user
166+
### Create SonarQube test user
164167

165-
In this section, you create a user called B.Simon in Sonarqube. Work with [Sonarqube Client support team](https://sonarsource.com/company/contact/) to add the users in the Sonarqube platform. Users must be created and activated before you use single sign-on.
168+
In this section, you create a user called B.Simon in SonarQube. Work with [SonarQube Client support team](https://sonarsource.com/company/contact/) to add the users in the SonarQube platform. Users must be created and activated before you use single sign-on.
166169

167170
## Test SSO
168171

169172
In this section, you test your Azure AD single sign-on configuration with following options.
170173

171-
* Click on **Test this application** in Azure portal. This will redirect to Sonarqube Sign-on URL where you can initiate the login flow.
174+
* Click on **Test this application** in Azure portal. This will redirect to SonarQube Sign-on URL where you can initiate the login flow.
172175

173-
* Go to Sonarqube Sign-on URL directly and initiate the login flow from there.
176+
* Go to SonarQube Sign-on URL directly and initiate the login flow from there.
174177

175-
* You can use Microsoft My Apps. When you click the Sonarqube tile in the My Apps, this will redirect to Sonarqube Sign-on URL. For more information about the My Apps, see [Introduction to the My Apps](https://support.microsoft.com/account-billing/sign-in-and-start-apps-from-the-my-apps-portal-2f3b1bae-0e5a-4a86-a33e-876fbd2a4510).
178+
* You can use Microsoft My Apps. When you click the SonarQube tile in the My Apps, this will redirect to SonarQube Sign-on URL. For more information about the My Apps, see [Introduction to the My Apps](https://support.microsoft.com/account-billing/sign-in-and-start-apps-from-the-my-apps-portal-2f3b1bae-0e5a-4a86-a33e-876fbd2a4510).
176179

177180
## Next steps
178181

179-
* Once you configure the Sonarqube you can enforce session controls, which protects exfiltration and infiltration of your organization’s sensitive data in real time. Session controls extends from Conditional Access. [Learn how to enforce session control with Microsoft Defender for Cloud Apps](/cloud-app-security/proxy-deployment-any-app).
182+
* Once you configure SonarQube, you can enforce session controls, which protects exfiltration and infiltration of your organization’s sensitive data in real time. Session controls extends from Conditional Access. [Learn how to enforce session control with Microsoft Defender for Cloud Apps](/cloud-app-security/proxy-deployment-any-app).

articles/azure-arc/kubernetes/tutorial-akv-secrets-provider.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,9 @@ You should see output similar to the example below. Note that it may take severa
163163
"type": "Microsoft.KubernetesConfiguration/extensions",
164164
"apiVersion": "2021-09-01",
165165
"name": "[parameters('ExtensionInstanceName')]",
166+
"identity": {
167+
"type": "SystemAssigned"
168+
},
166169
"properties": {
167170
"extensionType": "[parameters('ExtensionType')]",
168171
"releaseTrain": "[parameters('ReleaseTrain')]",

articles/azure-functions/security-concepts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ For more information, see [How to use managed identities for App Service and Azu
131131

132132
[Cross-origin resource sharing (CORS)](https://en.wikipedia.org/wiki/Cross-origin_resource_sharing) is a way to allow web apps running in another domain to make requests to your HTTP trigger endpoints. App Service provides built-in support for handing the required CORS headers in HTTP requests. CORS rules are defined on a function app level.
133133

134-
While it's tempting to use a wildcard that allows all sites to access your endpoint. But, this defeats the purpose of CORS, which is to help prevent cross-site scripting attacks. Instead, add a separate CORS entry for the domain of each web app that must access your endpoint.
134+
While it's tempting to use a wildcard that allows all sites to access your endpoint, this defeats the purpose of CORS, which is to help prevent cross-site scripting attacks. Instead, add a separate CORS entry for the domain of each web app that must access your endpoint.
135135

136136
### Managing secrets
137137

articles/azure-monitor/logs/data-collector-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ To use the HTTP Data Collector API, you create a POST request that includes the
4848
| Log-Type |Specify the record type of the data that's being submitted. It can contain only letters, numbers, and the underscore (_) character, and it can't exceed 100 characters. |
4949
| x-ms-date |The date that the request was processed, in RFC 7234 format. |
5050
| x-ms-AzureResourceId | The resource ID of the Azure resource that the data should be associated with. It populates the [_ResourceId](./log-standard-columns.md#_resourceid) property and allows the data to be included in [resource-context](manage-access.md#access-mode) queries. If this field isn't specified, the data won't be included in resource-context queries. |
51-
| time-generated-field | The name of a field in the data that contains the timestamp of the data item. If you specify a field, its contents are used for **TimeGenerated**. If you don't specify this field, the default for **TimeGenerated** is the time that the message is ingested. The contents of the message field should follow the ISO 8601 format YYYY-MM-DDThh:mm:ssZ. Note: the Time Generated value cannot be older than 3 days before received time or the row will be dropped.|
51+
| time-generated-field | The name of a field in the data that contains the timestamp of the data item. If you specify a field, its contents are used for **TimeGenerated**. If you don't specify this field, the default for **TimeGenerated** is the time that the message is ingested. The contents of the message field should follow the ISO 8601 format YYYY-MM-DDThh:mm:ssZ. Note: the Time Generated value cannot be older than 2 days before received time or the row will be dropped.|
5252
| | |
5353

5454
## Authorization

articles/cognitive-services/cognitive-services-virtual-networks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Network rules are enforced on all network protocols to Azure Cognitive Services,
3535

3636
## Supported regions and service offerings
3737

38-
Virtual networks (VNETs) are supported in [regions where Cognitive Services are available](https://azure.microsoft.com/global-infrastructure/services/). Currently multi-service resource does not support VNET. Cognitive Services supports service tags for network rules configuration. The services listed below are included in the **CognitiveServicesManagement** service tag.
38+
Virtual networks (VNETs) are supported in [regions where Cognitive Services are available](https://azure.microsoft.com/global-infrastructure/services/). Cognitive Services supports service tags for network rules configuration. The services listed below are included in the **CognitiveServicesManagement** service tag.
3939

4040
> [!div class="checklist"]
4141
> * Anomaly Detector

articles/vpn-gateway/vpn-gateway-howto-point-to-site-resource-manager-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.author: cherylmc
1111
---
1212
# Configure a point-to-site VPN connection using Azure certificate authentication: Azure portal
1313

14-
This article helps you securely connect individual clients running Windows, Linux, or macOS to an Azure VNet. point-to-site VPN connections are useful when you want to connect to your VNet from a remote location, such when you're telecommuting from home or a conference. You can also use P2S instead of a Site-to-Site VPN when you have only a few clients that need to connect to a VNet. point-to-site connections don't require a VPN device or a public-facing IP address. P2S creates the VPN connection over either SSTP (Secure Socket Tunneling Protocol), or IKEv2. For more information about point-to-site VPN, see [About point-to-site VPN](point-to-site-about.md).
14+
This article helps you securely connect individual clients running Windows, Linux, or macOS to an Azure VNet. point-to-site VPN connections are useful when you want to connect to your VNet from a remote location, such as when you're telecommuting from home or a conference. You can also use P2S instead of a Site-to-Site VPN when you have only a few clients that need to connect to a VNet. point-to-site connections don't require a VPN device or a public-facing IP address. P2S creates the VPN connection over either SSTP (Secure Socket Tunneling Protocol), or IKEv2. For more information about point-to-site VPN, see [About point-to-site VPN](point-to-site-about.md).
1515

1616
:::image type="content" source="./media/vpn-gateway-howto-point-to-site-resource-manager-portal/point-to-site-diagram.png" alt-text="Connect from a computer to an Azure VNet - point-to-site connection diagram.":::
1717

0 commit comments

Comments
 (0)