Skip to content

Commit 9991039

Browse files
authored
Merge pull request #77581 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 ea37903 + d3bae92 commit 9991039

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

articles/azure-monitor/app/monitor-performance-live-website-now.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ We are tracking this issue [here](https://github.com/Microsoft/ApplicationInsigh
143143
* To output verbose logs, modify the config file: `C:\Program Files\Microsoft Application Insights\Status Monitor\Microsoft.Diagnostics.Agent.StatusMonitor.exe.config` and add `<add key="TraceLevel" value="All" />` to the `appsettings`.
144144
Then restart status monitor.
145145

146+
* As Status Monitor is a .NET application you can also enable [.net tracing by adding the appropriate diagnostics to the config file](https://docs.microsoft.com/dotnet/framework/configure-apps/file-schema/trace-debug/system-diagnostics-element). For example, in some scenarios it can be useful to see what's happening at the network level by [configuring network tracing](https://docs.microsoft.com/dotnet/framework/network-programming/how-to-configure-network-tracing)
147+
146148
### Insufficient permissions
147149

148150
* On the server, if you see a message about "insufficient permissions", try the following:
@@ -178,7 +180,7 @@ OS support for Application Insights Status Monitor on Server:
178180
* Windows server 2012 R2
179181
* Windows Server 2016
180182

181-
with latest SP and .NET Framework 4.5
183+
with latest SP and .NET Framework 4.5 (Status Monitor is built on this version of the framework)
182184

183185
On the client side: Windows 7, 8, 8.1 and 10, again with .NET Framework 4.5
184186

@@ -271,7 +273,9 @@ When you select a web app for Status Monitor to instrument:
271273

272274
### What version of Application Insights SDK does Status Monitor install?
273275

274-
As of now, Status Monitor can only install Application Insights SDK versions 2.3 or 2.4.
276+
As of now, Status Monitor can only install Application Insights SDK versions 2.3 or 2.4.
277+
278+
The Application Insights SDK Version 2.4 is the [last version to support .NET 4.0](https://github.com/microsoft/ApplicationInsights-dotnet/releases/tag/v2.5.0-beta1) which was [EOL January 2016](https://devblogs.microsoft.com/dotnet/support-ending-for-the-net-framework-4-4-5-and-4-5-1/). Therefore, as of now Status Monitor can be used to instrument a .NET 4.0 application.
275279

276280
### Do I need to run Status Monitor whenever I update the app?
277281

articles/cognitive-services/cognitive-services-apis-create-account.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ Within your Cognitive Services resource, You can use the Endpoint URL and keys i
8989

9090
![Resources screen](media/cognitive-services-apis-create-account/resourceScreen.png)
9191

92+
Make a note of the location and the keys. You can get the keys by selecting **Keys** under **Resource Management**.
93+
9294
## Next steps
9395

9496
> [!div class="nextstepaction"]

articles/sql-data-warehouse/create-data-warehouse-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ Follow these steps to clean up resources as you desire.
188188
189189
![Clean up resources](media/load-data-from-azure-blob-storage-using-polybase/clean-up-resources.png)
190190
191-
2. To pause compute, click the **Pause** button. When the data warehouse is paused, you see a **Start** button. To resume compute, click **Start**.
191+
2. To pause compute, click the **Pause** button. When the data warehouse is paused, you see a **Resume** button. To resume compute, click **Resume**.
192192
193193
3. To remove the data warehouse so you are not charged for compute or storage, click **Delete**.
194194

0 commit comments

Comments
 (0)