Skip to content

Commit 560c648

Browse files
authored
Merge pull request #111810 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 85d5237 + 02fe9ca commit 560c648

File tree

6 files changed

+13
-14
lines changed

6 files changed

+13
-14
lines changed

articles/active-directory/reports-monitoring/howto-integrate-activity-logs-with-log-analytics.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ To use this feature, you need:
5757
* A user who's a *global administrator* or *security administrator* for the Azure AD tenant.
5858
* A Log Analytics workspace in your Azure subscription. Learn how to [create a Log Analytics workspace](https://docs.microsoft.com/azure/log-analytics/log-analytics-quick-create-workspace).
5959

60+
## Licensing requirements
61+
62+
Using this feature requires an Azure AD Premium P1 or P2 license. To find the right license for your requirements, see [Comparing generally available features of the Free, Basic, and Premium editions](https://azure.microsoft.com/pricing/details/active-directory/).
63+
6064
## Send logs to Azure Monitor
6165

6266
1. Sign in to the [Azure portal](https://portal.azure.com).
@@ -80,4 +84,4 @@ To use this feature, you need:
8084
## Next steps
8185

8286
* [Analyze Azure AD activity logs with Azure Monitor logs](howto-analyze-activity-logs-log-analytics.md)
83-
* [Install and use the log analytics views for Azure Active Directory](howto-install-use-log-analytics-views.md)
87+
* [Install and use the log analytics views for Azure Active Directory](howto-install-use-log-analytics-views.md)

articles/azure-monitor/app/profiler-aspnetcore-linux.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,6 @@ You should see output similar to the following example:
164164
165165
![View Profiler traces](./media/profiler-aspnetcore-linux/view-traces.png)
166166
167-
## Known issues
168-
169-
### Profile Now button doesn't work for Linux Profiler
170-
The Linux version of the App Insights profiler does not yet support on demand profiling using the profile now button.
171167
172168
173169
## Next steps

articles/azure-monitor/app/profiler-troubleshooting.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ ms.reviewer: mbullwin
1313

1414
## Active issues
1515

16-
* Profiling for ASP.NET Core 3.x applications isn't supported yet.
17-
* If you must have Profiler on, a workaround is to use [Application Insights Profiler for ASP.NET Core](https://github.com/microsoft/ApplicationInsights-Profiler-AspNetCore). The profiler is labeled for Linux, but it also works with .NET Core 3.0+ applications on Windows. For details, see [Supported versions](https://github.com/microsoft/ApplicationInsights-Profiler-AspNetCore#supported-versions).
16+
* Profiling for ASP.NET Core 3.x applications is supported now on Azure App Services.
1817

1918
## <a id="troubleshooting"></a>General troubleshooting
2019

articles/migrate/tutorial-prepare-hyper-v.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.custom: mvc
88

99
# Prepare for assessment and migration of Hyper-V VMs to Azure
1010

11-
This article describes how to prepare for assessment of on-premises Hyper-V VMs with Azure Migrate:Server Assessment(migrate-services-overview.md#azure-migrate-server-assessment-tool), and migration of Hyper-V VMs with [Azure Migrate:Server Migration](migrate-services-overview.md#azure-migrate-server-migration-tool).
11+
This article describes how to prepare for assessment of on-premises Hyper-V VMs with [Azure Migrate:Server Assessment](migrate-services-overview.md#azure-migrate-server-assessment-tool), and migration of Hyper-V VMs with [Azure Migrate:Server Migration](migrate-services-overview.md#azure-migrate-server-migration-tool).
1212

1313

1414
This tutorial is the first in a series that shows you how to assess and migrate Hyper-V VMs to Azure. In this tutorial, you learn how to:

articles/virtual-machines/linux/azure-dns.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ To check the current settings on a Linux virtual machine, 'cat /etc/resolv.conf'
9292
The resolv.conf file is auto-generated and should not be edited. The specific steps that add the 'options' line vary by distribution:
9393

9494
**Ubuntu** (uses resolvconf)
95-
1. Add the options line to '/etc/resolveconf/resolv.conf.d/head'.
95+
1. Add the options line to '/etc/resolvconf/resolv.conf.d/head'.
9696
2. Run 'resolvconf -u' to update.
9797

9898
**SUSE** (uses netconf)

articles/virtual-network/index.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,11 @@ landingContent:
7070
links:
7171
- text: Secure and isolate access to Azure resources
7272
url: https://docs.microsoft.com/learn/modules/secure-and-isolate-with-nsg-and-service-endpoints
73-
74-
73+
- linkListType: video
74+
links:
75+
- text: Azure Virtual Network Service Endpoint
76+
url: https://www.youtube.com/watch?v=gxsitRRgylI
77+
7578
# Card
7679
- title: Connect virtual networks
7780
linkLists:
@@ -189,9 +192,6 @@ landingContent:
189192
url: /powershell/module/az.network
190193
- text: REST
191194
url: /rest/api/virtual-network
192-
193-
194-
195195

196196

197197

0 commit comments

Comments
 (0)