Skip to content

Commit d32be5a

Browse files
authored
Merge pull request #194631 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents bc41f94 + 0f0945d commit d32be5a

23 files changed

+233
-90
lines changed

articles/azure-app-configuration/howto-integrate-azure-managed-service-identity.md

Lines changed: 54 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,26 @@ ms.service: azure-app-configuration
88
ms.custom: devx-track-csharp, fasttrack-edit, subject-rbac-steps
99
ms.topic: conceptual
1010
ms.date: 04/08/2021
11+
zone_pivot_groups: appconfig-provider
1112
---
1213
# Use managed identities to access App Configuration
1314

1415
Azure Active Directory [managed identities](../active-directory/managed-identities-azure-resources/overview.md) simplify secrets management for your cloud application. With a managed identity, your code can use the service principal created for the Azure service it runs on. You use a managed identity instead of a separate credential stored in Azure Key Vault or a local connection string.
1516

1617
Azure App Configuration and its .NET Core, .NET Framework, and Java Spring client libraries have managed identity support built into them. Although you aren't required to use it, the managed identity eliminates the need for an access token that contains secrets. Your code can access the App Configuration store using only the service endpoint. You can embed this URL in your code directly without exposing any secret.
1718

19+
:::zone target="docs" pivot="framework-dotnet"
20+
1821
This article shows how you can take advantage of the managed identity to access App Configuration. It builds on the web app introduced in the quickstarts. Before you continue, [Create an ASP.NET Core app with App Configuration](./quickstart-aspnet-core-app.md) first.
1922

23+
:::zone-end
24+
25+
:::zone target="docs" pivot="framework-spring"
26+
27+
This article shows how you can take advantage of the managed identity to access App Configuration. It builds on the web app introduced in the quickstarts. Before you continue, [Create a Java Spring app with Azure App Configuration](./quickstart-java-spring-app.md) first.
28+
29+
:::zone-end
30+
2031
> [!IMPORTANT]
2132
> Managed Identity cannot be used to authenticate locally-running applications. Your application must be deployed to an Azure service that supports Managed Identity. This article uses Azure App Service as an example, but the same concept applies to any other Azure service that supports managed identity, for example, [Azure Kubernetes Service](../aks/use-azure-ad-pod-identity.md), [Azure Virtual Machine](../active-directory/managed-identities-azure-resources/qs-configure-portal-windows-vm.md), and [Azure Container Instances](../container-instances/container-instances-managed-identity.md). If your workload is hosted in one of those services, you can leverage the service's managed identity support, too.
2233
@@ -28,14 +39,25 @@ In this article, you learn how to:
2839
> * Grant a managed identity access to App Configuration.
2940
> * Configure your app to use a managed identity when you connect to App Configuration.
3041
31-
3242
## Prerequisites
3343

3444
To complete this tutorial, you must have:
3545

46+
:::zone target="docs" pivot="framework-dotnet"
47+
3648
* [.NET Core SDK](https://dotnet.microsoft.com/download).
3749
* [Azure Cloud Shell configured](../cloud-shell/quickstart.md).
3850

51+
:::zone-end
52+
53+
:::zone target="docs" pivot="framework-spring"
54+
55+
- Azure subscription - [create one for free](https://azure.microsoft.com/free/)
56+
- A supported [Java Development Kit (JDK)](/java/azure/jdk) with version 11.
57+
- [Apache Maven](https://maven.apache.org/download.cgi) version 3.0 or above.
58+
59+
:::zone-end
60+
3961
[!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]
4062

4163
## Add a managed identity
@@ -66,16 +88,18 @@ The following steps describe how to assign the App Configuration Data Reader rol
6688

6789
1. On the **Role** tab, select the **App Configuration Data Reader** role.
6890

69-
![Add role assignment page with Role tab selected.](../../includes/role-based-access-control/media/add-role-assignment-role-generic.png)
91+
![Add role assignment page with Role tab selected.](./media/add-role-assignment-role.png)
7092

7193
1. On the **Members** tab, select **Managed identity**, and then select **Select members**.
7294

73-
1. Select your Azure subscription, select **System-assigned managed identity**, and then select **App Service**.
95+
1. Select your Azure subscription, for Managed Identity select **App Service**, then select your App Service name.
7496

7597
1. On the **Review + assign** tab, select **Review + assign** to assign the role.
7698

7799
## Use a managed identity
78100

101+
:::zone target="docs" pivot="framework-dotnet"
102+
79103
1. Add a reference to the *Azure.Identity* package:
80104

81105
```bash
@@ -158,13 +182,38 @@ The following steps describe how to assign the App Configuration Data Reader rol
158182
> });
159183
>```
160184
>As explained in the [Managed Identities for Azure resources FAQs](../active-directory/managed-identities-azure-resources/known-issues.md), there is a default way to resolve which managed identity is used. In this case, the Azure Identity library enforces you to specify the desired identity to avoid posible runtime issues in the future (for instance, if a new user-assigned managed identity is added or if the system-assigned managed identity is enabled). So, you will need to specify the clientId even if only one user-assigned managed identity is defined, and there is no system-assigned managed identity.
161-
162-
185+
186+
:::zone-end
187+
188+
:::zone target="docs" pivot="framework-spring"
189+
190+
1. Find the endpoint to your App Configuration store. This URL is listed on the **Overview** tab for the store in the Azure portal.
191+
192+
1. Open `bootstrap.properties`, remove the connection-string property and replace it with endpoint:
193+
194+
```properties
195+
spring.cloud.azure.appconfiguration.stores[0].endpoint=<service_endpoint>
196+
```
197+
198+
> [!NOTE]
199+
> If you want to use **user-assigned managed identity** the property `spring.cloud.azure.appconfiguration.stores[0].managed-identity.client-id`, be sure to specify the clientId when creating the [ManagedIdentityCredential](/java/api/com.azure.identity.managedidentitycredential).
200+
201+
:::zone-end
163202
164203
## Deploy your application
165204
205+
:::zone target="docs" pivot="framework-dotnet"
206+
166207
Using managed identities requires you to deploy your app to an Azure service. Managed identities can't be used for authentication of locally-running apps. To deploy the .NET Core app that you created in the [Create an ASP.NET Core app with App Configuration](./quickstart-aspnet-core-app.md) quickstart and modified to use managed identities, follow the guidance in [Publish your web app](../app-service/quickstart-dotnetcore.md?pivots=development-environment-vs&tabs=netcore31#publish-your-web-app).
167208
209+
:::zone-end
210+
211+
:::zone target="docs" pivot="framework-spring"
212+
213+
Using managed identities requires you to deploy your app to an Azure service. Managed identities can't be used for authentication of locally-running apps. To deploy the Spring app that you created in the [Create a Java Spring app with Azure App Configuration](./quickstart-java-spring-app.md) quickstart and modified to use managed identities, follow the guidance in [Publish your web app](../app-service/quickstart-java.md?tabs=javase&pivots=platform-linux).
214+
215+
:::zone-end
216+
168217
In addition to App Service, many other Azure services support managed identities. For more information, see [Services that support managed identities for Azure resources](../active-directory/managed-identities-azure-resources/services-support-managed-identities.md).
169218
170219
## Clean up resources
444 KB
Loading

articles/azure-arc/overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Currently, Azure Arc allows you to manage the following resource types hosted ou
2828
* [Azure data services](data/overview.md): Run Azure data services on-premises, at the edge, and in public clouds using Kubernetes and the infrastructure of your choice. SQL Managed Instance
2929
and PostgreSQL Hyperscale (preview) services are currently available.
3030
* [SQL Server](/sql/sql-server/azure-arc/overview): Extend Azure services to SQL Server instances hosted outside of Azure.
31-
* Virtual machines (preview): Provision, resize, delete and manage virtual machines based on [VMware vSphere](/vmware-vsphere/overview.md) or [Azure Stack HCI](/azure-stack/hci/manage/azure-arc-enabled-virtual-machines) and enable VM self-service through role-based access.
31+
* Virtual machines (preview): Provision, resize, delete and manage virtual machines based on [VMware vSphere](/azure/azure-arc/vmware-vsphere/overview) or [Azure Stack HCI](/azure-stack/hci/manage/azure-arc-enabled-virtual-machines) and enable VM self-service through role-based access.
3232

3333
## Key features and benefits
3434

@@ -48,7 +48,7 @@ Some of the key scenarios that Azure Arc supports are:
4848

4949
* Create [custom locations](./kubernetes/custom-locations.md) on top of your [Azure Arc-enabled Kubernetes](./kubernetes/overview.md) clusters, using them as target locations for deploying Azure services instances. Deploy your Azure service cluster extensions for [Azure Arc-enabled Data Services](./data/create-data-controller-direct-azure-portal.md), [App Services on Azure Arc](../app-service/overview-arc-integration.md) (including web, function, and logic apps) and [Event Grid on Kubernetes](../event-grid/kubernetes/overview.md).
5050

51-
* Perform virtual machine lifecycle and management operations for [VMware vSphere](/vmware-vsphere/overview.md) and [Azure Stack HCI](/azure-stack/hci/manage/azure-arc-enabled-virtual-machines) environments.
51+
* Perform virtual machine lifecycle and management operations for [VMware vSphere](/azure/azure-arc/vmware-vsphere/overview) and [Azure Stack HCI](/azure-stack/hci/manage/azure-arc-enabled-virtual-machines) environments.
5252

5353
* A unified experience viewing your Azure Arc-enabled resources, whether you are using the Azure portal, the Azure CLI, Azure PowerShell, or Azure REST API.
5454

@@ -84,5 +84,5 @@ For information, see the [Azure pricing page](https://azure.microsoft.com/pricin
8484
* Learn about [Azure Arc-enabled Kubernetes](./kubernetes/overview.md).
8585
* Learn about [Azure Arc-enabled data services](https://azure.microsoft.com/services/azure-arc/hybrid-data-services/).
8686
* Learn about [SQL Server on Azure Arc-enabled servers](/sql/sql-server/azure-arc/overview).
87-
* Learn about [Azure Arc-enabled VMware vSphere](vmware-vsphere/overview.md) and [Azure Arc-enabled Azure Stack HCI](https://docs.microsoft.com/azure-stack/hci/manage/azure-arc-enabled-virtual-machines)
87+
* Learn about [Azure Arc-enabled VMware vSphere](vmware-vsphere/overview.md) and [Azure Arc-enabled Azure Stack HCI](/azure-stack/hci/manage/azure-arc-enabled-virtual-machines)
8888
* Experience Azure Arc-enabled services by exploring the [Jumpstart proof of concept](https://azurearcjumpstart.io/azure_arc_jumpstart/).

articles/azure-monitor/essentials/activity-logs-insights.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ Before using Activity log insights, you'll have to [enable sending logs to your
1818

1919
## How does Activity logs insights work?
2020

21-
Activity logs you send to a [Log Analytics workspace](/articles/azure-monitor/logs/log-analytics-workspace-overview.md) are stored in a table called AzureActivity.
21+
Activity logs you send to a [Log Analytics workspace](/azure/azure-monitor/logs/log-analytics-workspace-overview) are stored in a table called AzureActivity.
2222

23-
Activity logs insights are a curated [Log Analytics workbook](/articles/azure-monitor/visualize/workbooks-overview.md) with dashboards that visualize the data in the AzureActivity table. For example, which administrators deleted, updated or created resources, and whether the activities failed or succeeded.
23+
Activity logs insights are a curated [Log Analytics workbook](/azure/azure-monitor/visualize/workbooks-overview) with dashboards that visualize the data in the AzureActivity table. For example, which administrators deleted, updated or created resources, and whether the activities failed or succeeded.
2424

2525
:::image type="content" source="media/activity-log/activity-logs-insights-main.png" lightbox="media/activity-log/activity-logs-insights-main.png" alt-text="A screenshot showing Azure Activity logs insights dashboards":::
2626

@@ -52,7 +52,7 @@ To view Activity logs insights on a resource level:
5252
1. At the top of the **Activity Logs Insights** page, select:
5353

5454
1. A time range for which to view data from the **TimeRange** dropdown.
55-
* **Azure Activity Logs Entries** shows the count of Activity log records in each [activity log category](/articles/azure-monitor/essentials/activity-log-schema#categories).
55+
* **Azure Activity Logs Entries** shows the count of Activity log records in each [activity log category](/azure/azure-monitor/essentials/activity-log-schema#categories).
5656

5757
:::image type="content" source="media/activity-log/activity-logs-insights-category-value.png" lightbox= "media/activity-log/activity-logs-insights-category-value.png" alt-text="Azure Activity Logs by Category Value":::
5858

@@ -68,4 +68,4 @@ To view Activity logs insights on a resource level:
6868
Learn more about:
6969
* [Platform logs](./platform-logs-overview.md)
7070
* [Activity log event schema](activity-log-schema.md)
71-
* [Creating a diagnostic setting to send Activity logs to other destinations](./diagnostic-settings.md)
71+
* [Creating a diagnostic setting to send Activity logs to other destinations](./diagnostic-settings.md)

articles/communication-services/samples/chat-hero-sample.md

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,10 @@ Below you'll find more information on prerequisites and steps to set up the samp
5050

5151
## Prerequisites
5252

53+
- [Visual Studio Code (Stable Build)](https://code.visualstudio.com/download)
54+
- [Node.js (16.14.2 and above)](https://nodejs.org/en/download/)
5355
- Create an Azure account with an active subscription. For details, see [Create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
54-
- [Node.js (8.11.2 and above)](https://nodejs.org/en/download/)
55-
- [Visual Studio (2017 and above)](https://visualstudio.microsoft.com/vs/)
56-
- [.NET Core 3.1](https://dotnet.microsoft.com/download/dotnet-core/3.1) (Make sure to install version that corresponds with your visual studio instance, 32 vs 64 bit)
57-
- Create an Azure Communication Services resource. For details, see [Create an Azure Communication Services resource](../quickstarts/create-communication-resource.md). You'll need to record your resource **connection string** for this quickstart.
58-
59-
## Locally deploying the service & client app
60-
61-
The single threaded chat sample is essentially two "applications" a client and server application.
62-
63-
Open up Visual Studio on the chat.csproj and run in Debug mode, this will start up the chat front end service. When the server app is visited
64-
from the browser, it will redirect traffic towards the locally deployed chat front end service.
65-
66-
You can test the sample locally by opening multiple browser sessions with the URL of your chat to simulate a multi-user chat.
56+
- Create an Azure Communication Services resource. For details, see [Create an Azure Communication Resource](../quickstarts/create-communication-resource.md). You'll need to record your resource **connection string** for this quickstart.
6757

6858
## Before running the sample for the first time
6959

@@ -72,22 +62,24 @@ You can test the sample locally by opening multiple browser sessions with the UR
7262
3. Get the `Connection String` and `Endpoint URL` from the Azure portal. For more information on connection strings, see [Create an Azure Communication Services resources](../quickstarts/create-communication-resource.md)
7363
4. Once you get the `Connection String` and `Endpoint URL`, Add both values to the **Server/appsettings.json** file found under the Chat Hero Sample folder. Input your connection string in the variable: `ResourceConnectionString` and endpoint URL in the variable: `EndpointUrl`.
7464

75-
### Local run
76-
77-
1. Go to the Chat folder and open the `Chat.csproj` solution in Visual Studio
78-
2. Run the project. The browser will open at localhost:5000.
65+
## Local run
7966

80-
#### Troubleshooting
67+
1. Set your connection string in `Server/appsettings.json`
68+
2. Set your endpoint URL string in `Server/appsettings.json`
69+
3. `npm run setup` from the root directory
70+
4. `npm run start` from the root directory
8171

82-
- Solution doesn't build, it throws errors during NPM installation/build
83-
84-
Clean/rebuild the C# solution
72+
You can test the sample locally by opening multiple browser sessions with the URL of your chat to simulate a multi-user chat.
8573

8674
## Publish the sample to Azure
8775

88-
1. Right click on the `Chat` project and select Publish.
89-
2. Create a new publish profile and select your Azure subscription.
90-
3. Before publishing, add your connection string with `Edit App Service Settings`, and fill in `ResourceConnectionString` as the key and provide your connection string (copied from appsettings.json) as the value.
76+
1. Under the root director, run these commands:
77+
```
78+
npm run setup
79+
npm run build
80+
npm run package
81+
```
82+
2. Use the Azure extension and deploy the Chat/dist directory to your app service
9183

9284
## Clean up resources
9385

@@ -110,4 +102,3 @@ For more information, see the following articles:
110102
- [Redux](https://redux.js.org/) - Client-side state management
111103
- [FluentUI](https://aka.ms/fluent-ui) - Microsoft powered UI library
112104
- [React](https://reactjs.org/) - Library for building user interfaces
113-
- [ASP.NET Core](/aspnet/core/introduction-to-aspnet-core?preserve-view=true&view=aspnetcore-3.1) - Framework for building web applications

articles/cosmos-db/concepts-limits.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: markjbrown
55
ms.author: mjbrown
66
ms.service: cosmos-db
77
ms.topic: conceptual
8-
ms.date: 02/16/2022
8+
ms.date: 04/08/2022
99
---
1010

1111
# Azure Cosmos DB service quotas
@@ -216,7 +216,7 @@ Cosmos DB supports querying items using [SQL](./sql-query-getting-started.md). T
216216
| Resource | Default limit |
217217
| --- | --- |
218218
| Maximum length of SQL query| 256 KB |
219-
| Maximum JOINs per query| 5 <sup>*</sup>|
219+
| Maximum JOINs per query| 10 <sup>*</sup>|
220220
| Maximum UDFs per query| 10 <sup>*</sup>|
221221
| Maximum points per polygon| 4096 |
222222
| Maximum included paths per container| 500 |

0 commit comments

Comments
 (0)