Skip to content

Commit e6069bc

Browse files
authored
Merge pull request #178182 from msangapu-msft/monitor-preview
remove preview
2 parents aef89cc + 6c01362 commit e6069bc

8 files changed

+39
-55
lines changed

articles/app-service/configure-custom-container.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ There are several ways to access Docker logs:
257257
- [In Azure portal](#in-azure-portal)
258258
- [From the Kudu console](#from-the-kudu-console)
259259
- [With the Kudu API](#with-the-kudu-api)
260-
- [Send logs to Azure monitor](troubleshoot-diagnostic-logs.md#send-logs-to-azure-monitor-preview)
260+
- [Send logs to Azure monitor](troubleshoot-diagnostic-logs.md#send-logs-to-azure-monitor)
261261

262262
### In Azure portal
263263

articles/app-service/configure-language-java.md

Lines changed: 18 additions & 18 deletions
Large diffs are not rendered by default.

articles/app-service/get-resource-events.md

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,17 @@ ms.author: msangapu
88
---
99
# Get resource events in Azure App Service
1010

11-
Azure App Service provides built-in tools to monitor the status and health of your resources. Resource events help you understand any changes that were made to your underlying web app resources and take action as necessary. Event examples include: scaling of instances, updates to application settings, restarting of the web app, and many more. In this article, you'll learn how to view [Azure Activity Logs](../azure-monitor/essentials/activity-log.md#view-the-activity-log) and enable [Event Grid](../event-grid/index.yml) to monitor resource events related to your App Service web app.
12-
13-
> [!NOTE]
14-
> App Service integration with Event Grid is in **preview**. [View the announcement for more details.](https://aka.ms/app-service-event-grid-announcement)
15-
>
11+
Azure App Service provides built-in tools to monitor the status and health of your resources. Resource events help you understand any changes that were made to your underlying web app resources and take action as necessary. Event examples include: scaling of instances, updates to application settings, restarting of the web app, and many more. In this article, you'll learn how to view [Azure Activity Logs](../azure-monitor/essentials/activity-log.md#view-the-activity-log) and enable [Event Grid](../event-grid/index.yml) to monitor App Service resource events.
1612

1713
## View Azure Activity Logs
1814
Azure Activity Logs contain resource events emitted by operations taken on the resources in your subscription. Both the user actions in the Azure portal and Azure Resource Manager templates contribute to the events captured by the Activity log.
1915

2016
Azure Activity Logs for App Service details such as:
21-
- what operations were taken on the resources (ex: App Service Plans)
22-
- who started the operation
23-
- when the operation occurred
24-
- the status of the operation
25-
- property values to help you research the operation
17+
- What operations were taken on the resources (ex: App Service Plans)
18+
- Who started the operation
19+
- When the operation occurred
20+
- Status of the operation
21+
- Property values to help you research the operation
2622

2723
### What can you do with Azure Activity Logs?
2824

@@ -34,7 +30,7 @@ Azure Activity Logs can be queried using the Azure portal, PowerShell, REST API,
3430

3531
While Activity logs are user-based, there's a new [Event Grid](../event-grid/index.yml) integration with App Service (preview) that logs both user actions and automated events. With Event Grid, you can configure a handler to react to the said events. For example, use Event Grid to instantly trigger a serverless function to run image analysis each time a new photo is added to a blob storage container.
3632

37-
Alternatively, you can use Event Grid with Logic Apps to process data anywhere, without writing code. Event Grid connects data sources and event handlers. For example, use Event Grid to instantly trigger a serverless function to run image analysis each time a new photo is added to a blob storage container.
33+
Alternatively, you can use Event Grid with Logic Apps to process data anywhere, without writing code. Event Grid connects data sources and event handlers.
3834

3935
[View the properties and schema for Azure App Service Events.](../event-grid/event-schema-app-service.md)
4036

articles/app-service/index.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,13 +164,13 @@ landingContent:
164164
linkLists:
165165
- linkListType: whats-new
166166
links:
167-
- text: App Service Integration with Azure Monitor (preview)
167+
- text: App Service Integration with Azure Monitor
168168
url: https://azure.github.io/AppService/2019/11/01/App-Service-Integration-with-Azure-Monitor.html
169-
- text: Log Types for Azure Monitor Integration (preview)
169+
- text: Log Types for Azure Monitor Integration
170170
url: https://azure.github.io/AppService/2020/06/25/New-Logs-Available-for-Azure-Monitor-Integration.html
171171
- linkListType: tutorial
172172
links:
173-
- text: Troubleshoot errors with Azure Monitor (preview)
173+
- text: Troubleshoot errors with Azure Monitor
174174
url: tutorial-troubleshoot-monitor.md
175175
- linkListType: how-to-guide
176176
links:

articles/app-service/monitor-app-service-reference.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ App Service doesn't have any metrics that contain dimensions.
3737

3838
## Resource logs
3939

40-
> [!NOTE]
41-
> Azure Monitor integration with App Service is in [preview](https://aka.ms/appsvcblog-azmon).
42-
>
43-
4440
This section lists the types of resource logs you can collect for App Service.
4541

4642
| Log type | Windows | Windows Container | Linux | Linux Container | Description |

articles/app-service/monitor-app-service.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,13 @@ ms.date: 04/16/2021
1111

1212
# Monitoring App Service
1313

14-
When you have critical applications and business processes relying on Azure resources, you want to monitor those resources for their availability, performance, and operation. This article describes the monitoring data generated by App Service and shipped to [Azure Monitor](../azure-monitor/overview.md). You can also use [built-in diagnostics to monitor resources](troubleshoot-diagnostic-logs.md) to assist with debugging an App Service app. If you're unfamiliar with the features of Azure Monitor common to all Azure services that use it, read [Monitoring Azure resources with Azure Monitor](../azure-monitor/essentials/monitor-azure-resource.md).
15-
16-
> [!NOTE]
17-
> Diagnostic settings integration with App Service is in [preview](https://aka.ms/appsvcblog-azmon).
18-
>
14+
When you have critical applications and business processes relying on Azure resources, you want to monitor those resources for their availability, performance, and operation. This article describes the monitoring data generated by App Service and shipped to [Azure Monitor](../azure-monitor/overview.md). You can also use [built-in diagnostics to monitor resources](troubleshoot-diagnostic-logs.md) to assist with debugging an App Service app. If you're unfamiliar with the features of Azure Monitor common to all Azure services, read [Monitoring Azure resources with Azure Monitor](../azure-monitor/essentials/monitor-azure-resource.md).
1915

2016
## Monitoring data
2117

2218
App Service collects the same kinds of monitoring data as other Azure resources that are described in [Monitoring data from Azure resources](../azure-monitor/essentials/monitor-azure-resource.md#monitoring-data).
2319

24-
See [Monitoring *App Service* data reference](monitor-app-service-reference.md) for detailed information on the metrics and logs metrics created by App Service.
20+
See [Monitoring *App Service* data reference](monitor-app-service-reference.md) for detailed information on App Service metrics and logs.
2521

2622
App Service also provides built-in diagnostics to assist with debugging apps. See [Enable diagnostics logging](troubleshoot-diagnostic-logs.md) for more information on enabling the built-in logs. To monitor App Service instances, see [Monitor App Service instances using Health check](monitor-instances-health-check.md).
2723

@@ -47,7 +43,7 @@ For reference, you can see a list of [all resource metrics supported in Azure Mo
4743

4844
Data in Azure Monitor Logs is stored in tables where each table has its own set of unique properties.
4945

50-
All resource logs in Azure Monitor have the same fields followed by service-specific fields. The common schema is outlined in [Azure Monitor resource log schema](troubleshoot-diagnostic-logs.md#send-logs-to-azure-monitor-preview).
46+
All resource logs in Azure Monitor have the same fields followed by service-specific fields. The common schema is outlined in [Azure Monitor resource log schema](troubleshoot-diagnostic-logs.md#send-logs-to-azure-monitor).
5147

5248
The [Activity log](../azure-monitor/essentials/activity-log.md) is a type of platform log that provides insight into subscription-level events. You can view it independently or route to Azure Monitor Logs. Routing to Azure Monitor Logs gives the benefit of using Log Analytics to run complex queries.
5349

@@ -93,7 +89,7 @@ See [Azure Monitor queries for App Service](https://github.com/microsoft/AzureMo
9389

9490
Azure Monitor alerts proactively notify you when important conditions are found in your monitoring data. They allow you to identify and address issues in your system before your customers notice them. You can set alerts on [metrics](../azure-monitor/alerts/alerts-metric-overview.md), [logs](../azure-monitor/alerts/alerts-unified-log.md), and the [activity log](../azure-monitor/alerts/activity-log-alerts.md).
9591

96-
If you're running an application on App Service [Azure Monitor Application Insights](../azure-monitor/overview.md#application-insights) may offer additional types of alerts.
92+
If you're running an application on App Service [Azure Monitor Application Insights](../azure-monitor/overview.md#application-insights) offers more types of alerts.
9793

9894
The following table lists common and recommended alert rules for App Service.
9995

articles/app-service/troubleshoot-diagnostic-logs.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Azure provides built-in diagnostics to assist with debugging an [App Service app
1414
This article uses the [Azure portal](https://portal.azure.com) and Azure CLI to work with diagnostic logs. For information on working with diagnostic logs using Visual Studio, see [Troubleshooting Azure in Visual Studio](troubleshoot-dotnet-visual-studio.md).
1515

1616
> [!NOTE]
17-
> In addition to the logging instructions in this article, there's new, integrated logging capability with Azure Monitoring. You'll find more on this capability in the [Send logs to Azure Monitor (preview)](#send-logs-to-azure-monitor-preview) section.
17+
> In addition to the logging instructions in this article, there's new, integrated logging capability with Azure Monitoring. You'll find more on this capability in the [Send logs to Azure Monitor](#send-logs-to-azure-monitor) section.
1818
>
1919
>
2020
@@ -177,12 +177,12 @@ For Windows apps, the ZIP file contains the contents of the *D:\Home\LogFiles* d
177177
| **Web Server Logs** | */LogFiles/http/RawLogs/* | Contains text files formatted using the [W3C extended log file format](/windows/desktop/Http/w3c-logging). This information can be read using a text editor or a utility like [Log Parser](https://www.iis.net/downloads/community/2010/04/log-parser-22).<br/>App Service doesn't support the `s-computername`, `s-ip`, or `cs-version` fields. |
178178
| **Deployment logs** | */LogFiles/Git/* and */deployments/* | Contain logs generated by the internal deployment processes, as well as logs for Git deployments. |
179179
180-
## Send logs to Azure Monitor (preview)
180+
## Send logs to Azure Monitor
181181
182-
With the new [Azure Monitor integration](https://aka.ms/appsvcblog-azmon), you can [create Diagnostic Settings (preview)](https://azure.github.io/AppService/2019/11/01/App-Service-Integration-with-Azure-Monitor.html#create-a-diagnostic-setting) to send logs to Storage Accounts, Event Hubs and Log Analytics.
182+
With the new [Azure Monitor integration](https://aka.ms/appsvcblog-azmon), you can [create Diagnostic Settings](https://azure.github.io/AppService/2019/11/01/App-Service-Integration-with-Azure-Monitor.html#create-a-diagnostic-setting) to send logs to Storage Accounts, Event Hubs and Log Analytics.
183183
184184
> [!div class="mx-imgBorder"]
185-
> ![Diagnostic Settings (preview)](media/troubleshoot-diagnostic-logs/diagnostic-settings-page.png)
185+
> ![Diagnostic Settings](media/troubleshoot-diagnostic-logs/diagnostic-settings-page.png)
186186
187187
### Supported log types
188188

articles/app-service/tutorial-troubleshoot-monitor.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ ms.date: 06/20/2020
99
---
1010
# Tutorial: Troubleshoot an App Service app with Azure Monitor
1111

12-
> [!NOTE]
13-
> Azure Monitor integration with App Service is in [preview](https://aka.ms/appsvcblog-azmon).
14-
>
15-
1612
This tutorial shows how to troubleshoot an [App Service](overview.md) app using [Azure Monitor](../azure-monitor/overview.md). The sample app includes code meant to exhaust memory and cause HTTP 500 errors, so you can diagnose and fix the problem using Azure Monitor. When you're finished, you'll have a sample app running on App Service on Linux integrated with [Azure Monitor](../azure-monitor/overview.md).
1713

1814
[Azure Monitor](../azure-monitor/overview.md) maximizes the availability and performance of your applications and services by delivering a comprehensive solution for collecting, analyzing, and acting on telemetry from your cloud and on-premises environments.
@@ -53,7 +49,7 @@ git remote add azure <url-from-app-webapp-create>
5349
git push azure main
5450
```
5551

56-
## Configure Azure Monitor (preview)
52+
## Configure Azure Monitor
5753

5854
### Create a Log Analytics Workspace
5955

@@ -127,7 +123,7 @@ In the Azure portal, select your Log Analytics workspace.
127123

128124
### Log queries
129125

130-
Log queries help you to fully leverage the value of the data collected in Azure Monitor Logs. You use log queries to identify the logs in both AppServiceHTTPLogs and AppServiceConsoleLogs. See the [log query overview](../azure-monitor/logs/log-query-overview.md) for more information on log queries.
126+
Log queries help you to fully apply the value of the data collected in Azure Monitor Logs. You use log queries to identify the logs in both AppServiceHTTPLogs and AppServiceConsoleLogs. See the [log query overview](../azure-monitor/logs/log-query-overview.md) for more information on log queries.
131127

132128
### View AppServiceHTTPLogs with log query
133129

0 commit comments

Comments
 (0)