Skip to content

Commit 7705988

Browse files
authored
Merge pull request #296708 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 481ea1f + 4833c16 commit 7705988

File tree

4 files changed

+19
-17
lines changed

4 files changed

+19
-17
lines changed

articles/container-apps/aspire-dashboard.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Read real time app data with .NET Aspire Dashboard in Azure Container Apps
3-
description: Use real time log data with .NET Aspire Dashboard in Azure Container Apps.
2+
title: Read real time app data with Aspire Dashboard in Azure Container Apps
3+
description: Use real time log data with Aspire Dashboard in Azure Container Apps.
44
services: container-apps
55
author: craigshoemaker
66
ms.service: azure-container-apps
@@ -11,13 +11,13 @@ ms.author: cshoe
1111
zone_pivot_groups: azure-azd-cli-portal
1212
---
1313

14-
# Read real time app data with .NET Aspire Dashboard in Azure Container Apps (preview)
14+
# Read real time app data with Aspire Dashboard in Azure Container Apps (preview)
1515

16-
The [.NET Aspire Dashboard](/dotnet/aspire/fundamentals/dashboard/overview) displays live data about how applications and other resources are running within an environment.
16+
The [Aspire Dashboard](/dotnet/aspire/fundamentals/dashboard/overview) displays live data about how applications and other resources are running within an environment.
1717

18-
The following image is a screenshot of a trace visualization generated by the .NET Aspire Dashboard.
18+
The following image is a screenshot of a trace visualization generated by the Aspire Dashboard.
1919

20-
:::image type="content" source="media/aspire-dashboard/aspire-dashboard-trace.png" alt-text="Screenshot of a .NET Aspire Dashboard trace window.":::
20+
:::image type="content" source="media/aspire-dashboard/aspire-dashboard-trace.png" alt-text="Screenshot of an Aspire Dashboard trace window.":::
2121

2222
The information displayed on the dashboard comes from two sources:
2323

@@ -38,25 +38,25 @@ The dashboard is secured against unauthorized access and modification. To use th
3838
> [!TIP]
3939
> While you have the portal as an option, the recommended approach to enabling your dashboard is with [azd](aspire-dashboard.md?pivots=azd). If you run into an problems using the portal, [create an issue in the Container Apps GitHub repo](https://github.com/microsoft/azure-container-apps/issues).
4040
41-
You can enable the .NET Aspire Dashboard on any existing container app using the following steps.
41+
You can enable the Aspire Dashboard on any existing container app using the following steps.
4242

4343
1. Go to the [Azure portal](https://portal.azure.com).
4444

4545
1. Browse to your container app.
4646

47-
1. In the *Overview* page, find the *.NET Aspire Dashboard* label, and select **enable**. This action opens the .NET Aspire Dashboard settings page.
47+
1. In the *Overview* page, find the *Aspire Dashboard* label, and select **enable**. This action opens the Aspire Dashboard settings page.
4848

49-
1. In the settings page, next to the *.NET Aspire Dashboard* label, select the **Enabled** checkbox. You can ignore the other settings on this page, as they pertain to logging rather than to the .NET Aspire Dashboard.
49+
1. In the settings page, next to the *Aspire Dashboard* label, select the **Enabled** checkbox. You can ignore the other settings on this page, as they pertain to logging rather than to the Aspire Dashboard.
5050

51-
1. In the *Overview* page for your container app, find the *.NET Aspire Dashboard* label. The **enable** link has been replaced by an **Open dashboard** link. Select this link. You might need to reload the *Overview* page for the link to appear.
51+
1. In the *Overview* page for your container app, find the *Aspire Dashboard* label. The **enable** link has been replaced by an **Open dashboard** link. Select this link. You might need to reload the *Overview* page for the link to appear.
5252

53-
You can also find the .NET Aspire Dashboard settings by browsing to your Container Apps environment and selecting *Monitoring* > *Logging options*.
53+
You can also find the Aspire Dashboard settings by browsing to your Container Apps environment and selecting *Monitoring* > *Logging options*.
5454

5555
::: zone-end
5656

5757
::: zone pivot="azurecli"
5858

59-
You can enable the .NET Aspire Dashboard on any existing container app environment by using the following commands. Replace the `<PLACEHOLDERS>` with your values.
59+
You can enable the Aspire Dashboard on any existing container app environment by using the following commands. Replace the `<PLACEHOLDERS>` with your values.
6060

6161
```azurecli
6262
az containerapp env dotnet-component create \
@@ -71,7 +71,7 @@ The `create` command returns the dashboard URL that you can open in a browser.
7171

7272
::: zone pivot="azd"
7373

74-
You can enable the .NET Aspire Dashboard on any existing container app using the following steps.
74+
You can enable the Aspire Dashboard on any existing container app using the following steps.
7575

7676
```azurecli
7777
dotnet new aspire-starter
@@ -116,4 +116,4 @@ Refer to the following items if you have issues enabling your dashboard:
116116
## Related content
117117

118118
> [!div class="nextstepaction"]
119-
[.NET Aspire dashboard overview](/dotnet/aspire/fundamentals/dashboard/overview)
119+
[Aspire dashboard overview](/dotnet/aspire/fundamentals/dashboard/overview)

articles/container-apps/dotnet-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ Features such as anti-forgery, authentication, SignalR, Blazor Server, and Razor
122122

123123
ASP.NET Core has special features protect and unprotect data, such as session data and anti-forgery tokens. By default, data protection keys are stored on the file system, which isn't suitable for a cloud-native environment.
124124

125-
If you're deploying a .NET Aspire application, data protection is automatically configured for you. In all other situations, you need to [configure data protection manually](/aspnet/core/host-and-deploy/scaling-aspnet-apps/scaling-aspnet-apps?view=aspnetcore-8.0&tabs=login-azure-cli&preserve-view=true#connect-the-azure-services).
125+
If you're deploying an Aspire application, data protection is automatically configured for you. In all other situations, you need to [configure data protection manually](/aspnet/core/host-and-deploy/scaling-aspnet-apps/scaling-aspnet-apps?view=aspnetcore-8.0&tabs=login-azure-cli&preserve-view=true#connect-the-azure-services).
126126

127127
#### Configure ASP.NET Core SignalR
128128

@@ -134,5 +134,5 @@ ASP.NET Core Blazor Server apps store state on the server, which means that each
134134

135135
## Related information
136136

137-
* [Deploy a .NET Aspire app](/dotnet/aspire/deployment/azure/aca-deployment)
137+
* [Deploy an Aspire app](/dotnet/aspire/deployment/azure/aca-deployment)
138138
* [Deploy and scale an ASP.NET Core app](/aspnet/core/host-and-deploy/scaling-aspnet-apps/scaling-aspnet-apps)

articles/network-watcher/packet-capture-overview.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ Use filters to capture only the traffic that you want to monitor. Filters are ba
5151

5252
There's a limit of 10,000 parallel packet capture sessions per region per subscription. This limit applies only to the sessions and doesn't apply to the saved packet capture files either locally on the VM or in a storage account. See the [Network Watcher service limits page](../azure-resource-manager/management/azure-subscription-service-limits.md#azure-network-watcher-limits) for a full list of limits.
5353

54+
Packet capture currently supports SAS authentication when saving completed packet captures to a storage account. SAS authentication is required if choosing to save to a storage account. If SAS authentication isn't an option, then saving to the local disk on the virtual machine where the packet capture is taken is the alternative.
55+
5456
## Related content
5557

5658
- To learn how to manage packet captures, see [Manage packet captures with Azure Network Watcher](packet-capture-manage.md).

articles/web-application-firewall/waf-copilot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ To enable the integration, follow these steps:
6464
3. Open the Copilot for Security menu.
6565
4. Open **Sources** in the prompt bar.
6666
5. On the Plugins page, set the Azure Web Application Firewall toggle to **On**.
67-
6. Select the Settings on the Azure Web Application Firewall plugin to configure the Log Analytics workspace, Log Analytics subscription ID, and the Log Analytics resource group name for Azure Front Door WAF and/or the Azure Application Gateway WAF. You can also configure the Application Gateway WAF policy URI and/or Azure Front Door WAF policy URI.
67+
6. Select the Settings on the Azure Web Application Firewall plugin to configure the Log Analytics workspace for Azure Front Door WAF and/or the Azure Application Gateway WAF.
6868
7. To start using the skills, use the prompt bar.
6969
:::image type="content" source="media/waf-copilot/prompt-bar.png" alt-text="Screenshot showing the Microsoft Copilot for Security prompt bar.":::
7070

0 commit comments

Comments
 (0)