Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ernetperf

Author: duongau

articles/azure-monitor/app/azure-web-apps-net.md

@@ -1,70 +1,73 @@
 ---
-title: Downtime, SLA, and outage workbook - Application Insights
-description: Calculate and report SLA for Web Test through a single pane of glass across your Application Insights resources and Azure subscriptions.
+title: Downtime, SLA, and outages workbook - Application Insights
+description: Calculate and report SLA for web test through a single pane of glass across your Application Insights resources and Azure subscriptions.
 ms.topic: conceptual
 ms.date: 05/4/2021
 ms.reviwer: casocha
 ---
 
 # Downtime, SLA, and outages workbook
 
-Introducing a simple way to calculate and report SLA (service-level agreement) for Web Tests through a single pane of glass across your Application Insights resources and Azure subscriptions. The Downtime and Outage report provides powerful pre-built queries and data visualizations to enhance your understanding of your customer's connectivity, typical application response time, and experienced down time.
+This article introduces a simple way to calculate and report service-level agreement (SLA) for web tests through a single pane of glass across your Application Insights resources and Azure subscriptions. The downtime and outage report provides powerful prebuilt queries and data visualizations to enhance your understanding of your customer's connectivity, typical application response time, and experienced downtime.
 
-The SLA workbook template is accessible through the workbook gallery in your Application Insights resource or through the availability tab by selecting **SLA Reports** at the top.
-:::image type="content" source="./media/sla-report/availability.png" alt-text="Screenshot of availability tab with SLA Reports highlighted." lightbox="./media/sla-report/availability.png":::
+The SLA workbook template is accessible through the workbook gallery in your Application Insights resource. Or, in the left pane, select **Availability** and then select **SLA Report** at the top of the screen.
+:::image type="content" source="./media/sla-report/availability.png" alt-text="Screenshot that shows the Availability tab with SLA Report highlighted." lightbox="./media/sla-report/availability.png":::
 
-:::image type="content" source="./media/sla-report/workbook-gallery.png" alt-text="Screenshot of the workbook gallery with downtime and outages workbook highlighted." lightbox ="./media/sla-report/workbook-gallery.png":::
+:::image type="content" source="./media/sla-report/workbook-gallery.png" alt-text="Screenshot of the workbook gallery with the Downtime & Outages workbook highlighted." lightbox ="./media/sla-report/workbook-gallery.png":::
 
 ## Parameter flexibility
 
 The parameters set in the workbook influence the rest of your report.
 
-:::image type="content" source="./media/sla-report/parameters.png" alt-text=" Screenshot of parameters." lightbox= "./media/sla-report/parameters.png":::
+:::image type="content" source="./media/sla-report/parameters.png" alt-text=" Screenshot that shows parameters." lightbox= "./media/sla-report/parameters.png":::
 
-`Subscriptions`, `App Insights Resources`, and `Web Test` parameters determine your high-level resource options. These parameters are based on Log Analytics queries and used in every report query.
+* `Subscriptions`, `App Insights Resources`, and `Web Test`: These parameters determine your high-level resource options. They're based on Log Analytics queries and are used in every report query.
+* `Failure Threshold` and `Outage Window`: You can use these parameters to determine your own criteria for a service outage. An example is the criteria for an App Insights Availability alert based on a failed location counter over a chosen period. The typical threshold is three locations over a five-minute window.
+* `Maintenance Period`: You can use this parameter to select your typical maintenance frequency. `Maintenance Window` is a datetime selector for an example maintenance period. All data that occurs during the identified period will be ignored in your results.
+* `Availability Target %`: This parameter specifies your target objective and takes custom values.
 
-`Failure Threshold` and `Outage Window` allow you to determine your own criteria for a service outage, for example, the criteria for App Insights Availability alert based upon failed location counter over a chosen period. The typical threshold is three locations over a five-minute window.
-
-`Maintenance Period` enables you to select your typical maintenance frequency and `Maintenance Window` is a datetime selector for an example maintenance period. All data that occurs during the identified period will be ignored in your results.
+## Overview page
 
-`Availability Target %` specifies your target objective & takes custom values.
+The overview page contains high-level information about your:
 
-## Overview page
+- Total SLA (excluding maintenance periods, if defined).
+- End-to-end outage instances.
+- Application downtime.
 
-The overview page contains high-level information about your total SLA (excluding maintenance periods if defined), end to end outage instances, and application downtime. Outage instances are defined by when a test starts to fail until it is successful based on your outage parameters. If a test starts failing at 8:00 am and succeeds again at 10:00 am, then that entire period of data is considered the same outage.
+Outage instances are defined by when a test starts to fail until it's successful, based on your outage parameters. If a test starts failing at 8:00 AM and succeeds again at 10:00 AM, that entire period of data is considered the same outage.
 
-:::image type="content" source="./media/sla-report/overview.gif" alt-text=" GIF of overview page showing the overview table by test." lightbox="./media/sla-report/overview.gif":::
+:::image type="content" source="./media/sla-report/overview.gif" alt-text=" Screenshot that shows an overview page showing the Overview Table by Test." lightbox="./media/sla-report/overview.gif":::
 
-You can also investigate your longest outage that occurred over your reporting period.
+You can also investigate the longest outage that occurred over your reporting period.
 
-Some tests are linkable back to their Application Insights resource for further investigation but that is only possible in the [Workspace-based Application Insights resource](create-workspace-resource.md).
+Some tests are linkable back to their Application Insights resource for further investigation. But that's only possible in the [workspace-based Application Insights resource](create-workspace-resource.md).
 
 ## Downtime, outages, and failures
 
-The **Outages and Downtime** tab has information on total outage instances and total down time broken down by test. The **Failures by Location** tab have a geo-map of failed testing locations to help identify potential problem connection areas.
+The **Outages & Downtime** tab has information on total outage instances and total downtime broken down by test. The **Failures by Location** tab has a geo-map of failed testing locations to help identify potential problem connection areas.
 
-:::image type="content" source="./media/sla-report/outages-failures.gif" alt-text=" GIF of Outages and Downtime tab and Failure by Location tab in the downtime and outages workbook." lightbox="./media/sla-report/outages-failures.gif":::
+:::image type="content" source="./media/sla-report/outages-failures.gif" alt-text=" Screenshot that shows the Outages & Downtime tab and the Failure by Location tab in the downtime and outages workbook." lightbox="./media/sla-report/outages-failures.gif":::
 
 ## Edit the report
 
-You can edit the report like any other [Azure Monitor Workbook](../visualize/workbooks-overview.md). You can customize the queries or visualizations based on your team's needs.
+You can edit the report like any other [Azure Monitor workbook](../visualize/workbooks-overview.md). You can customize the queries or visualizations based on your team's needs.
 
-:::image type="content" source="./media/sla-report/edit.gif" alt-text=" GIF of selecting the edit button to change the visualization to a pie chart." lightbox="./media/sla-report/edit.gif":::
+:::image type="content" source="./media/sla-report/edit.gif" alt-text=" Screenshot that shows selecting the Edit button to change the visualization to a pie chart." lightbox="./media/sla-report/edit.gif":::
 
 ### Log Analytics
 
 The queries can all be run in [Log Analytics](../logs/log-analytics-overview.md) and used in other reports or dashboards. Remove the parameter restriction and reuse the core query.
 
-:::image type="content" source="./media/sla-report/logs.gif" alt-text=" GIF of log query." lightbox="./media/sla-report/logs.gif":::
+:::image type="content" source="./media/sla-report/logs.gif" alt-text=" Screenshot that shows a log query." lightbox="./media/sla-report/logs.gif":::
 
 ## Access and sharing
 
-The report can be shared with your teams, leadership, or pinned to a dashboard for further use. The user needs to have read permission/access to the Applications Insights resource where the actual workbook is stored.
+The report can be shared with your teams and leadership or pinned to a dashboard for further use. The user needs to have read permission/access to the Application Insights resource where the actual workbook is stored.
 
-:::image type="content" source="./media/sla-report/share.png" alt-text=" Screenshot of share this template." lightbox= "./media/sla-report/share.png":::
+:::image type="content" source="./media/sla-report/share.png" alt-text=" Screenshot that shows the Share Template pane." lightbox= "./media/sla-report/share.png":::
 
 ## Next steps
 
-- [Log Analytics query optimization tips](../logs/query-optimization.md).
+- Learn some [Log Analytics query optimization tips](../logs/query-optimization.md).
 - Learn how to [create a chart in workbooks](../visualize/workbooks-chart-visualizations.md).
 - Learn how to monitor your website with [availability tests](monitor-web-app-availability.md).

articles/azure-monitor/app/pre-aggregated-metrics-log-metrics.md

@@ -1,46 +1,46 @@
 ---
 title: Analyze web app user retention with Application Insights
-description: How many users return to your app?
+description: This article shows you how to determine how many users return to your app.
 ms.topic: conceptual
 ms.date: 07/30/2021
 ms.reviewer: mmcc
 ---
 
 # User retention analysis for web applications with Application Insights
 
-The retention feature in [Application Insights](./app-insights-overview.md) helps you analyze how many users return to your app, and how often they perform particular tasks or achieve goals. For example, if you run a game site, you could compare the numbers of users who return to the site after losing a game with the number who return after winning. This knowledge can help you improve both your user experience and your business strategy.
+The retention feature in [Application Insights](./app-insights-overview.md) helps you analyze how many users return to your app, and how often they perform particular tasks or achieve goals. For example, if you run a game site, you could compare the numbers of users who return to the site after losing a game with the number who return after winning. This knowledge can help you improve your user experience and your business strategy.
 
 ## Get started
 
 If you don't yet see data in the retention tool in the Application Insights portal, [learn how to get started with the usage tools](usage-overview.md).
 
 ## The Retention workbook
 
-To use the Retention Workbook, in your Application Insights resources navigate to **Usage** > **Retention** and select **Retention Analysis Workbook**. Or in the  **Workbooks** tab select **Public Templates** then select **User Retention Analysis** under *Usage*.
+To use the Retention workbook, in your Application Insights resources go to **Usage** > **Retention** > **Retention Analysis Workbook**. Or on the **Workbooks** tab, select **Public Templates**. Then under **Usage**, select **User Retention Analysis**.
 
-:::image type="content" source="./media/usage-retention/workbooks-gallery.png" alt-text="Screenshot of the workbooks gallery on public templates." lightbox="./media/usage-retention/workbooks-gallery.png":::
+:::image type="content" source="./media/usage-retention/workbooks-gallery.png" alt-text="Screenshot that shows the Workbooks Gallery on the Public Templates tab." lightbox="./media/usage-retention/workbooks-gallery.png":::
 
+### Use the workbook
 
+:::image type="content" source="./media/usage-retention/retention.png" alt-text="Screenshot that shows the Retention workbook showing a line chart." lightbox="./media/usage-retention/retention.png":::
 
-### Using the workbook
+Workbook capabilities:
 
-:::image type="content" source="./media/usage-retention/retention.png" alt-text="Screenshot of the retention workbook showing a line chart." lightbox="./media/usage-retention/retention.png":::
+- By default, retention shows all users who did anything and then came back and did anything else over a defined period. You can select different combinations of events to narrow the focus on specific user activities.
+- To add one or more filters on properties, select **Add Filters**. For example, you can focus on users in a particular country or region.
+- The **Overall Retention** chart shows a summary of user retention across the selected time period.
+- The grid shows the number of users retained. Each row represents a cohort of users who performed any event in the time period shown. Each cell in the row shows how many of that cohort returned at least once in a later period. Some users might return in more than one period.
+- The insights cards show the top five initiating events and the top five returned events. This information gives users a better understanding of their retention report.
 
-- By default, retention shows all users who did anything then came back and did anything else over a period. You can select different combination of events to narrow the focus on specific user activities.
-- Add one or more filters on properties by selecting **Add Filters**. For example, you can focus on users in a particular country or region. 
-- The overall retention chart shows a summary of user retention across the selected time period. 
-- The grid shows the number of users retained. Each row represents a cohort of users who performed any event in the time period shown. Each cell in the row shows how many of that cohort returned at least once in a later period. Some users may return in more than one period. 
-- The insights cards show top five initiating events, and top five returned events to give users a better understanding of their retention report. 
-
-    :::image type="content" source="./media/usage-retention/retention-2.png" alt-text="Screenshot of the retention workbook, showing user return after # of weeks chart." lightbox="./media/usage-retention/retention-2.png":::
+    :::image type="content" source="./media/usage-retention/retention-2.png" alt-text="Screenshot that shows the Retention workbook showing the User returned after # of weeks chart." lightbox="./media/usage-retention/retention-2.png":::
 
 ## Use business events to track retention
 
-To get the most useful retention analysis, measure events that represent significant business activities. 
+To get the most useful retention analysis, measure events that represent significant business activities.
 
-For example, many users might open a page in your app without playing the game that it displays. Tracking just the page views would therefore provide an inaccurate estimate of how many people return to play the game after enjoying it previously. To get a clear picture of returning players, your app should send a custom event when a user actually plays.  
+For example, many users might open a page in your app without playing the game that it displays. Tracking only the page views would provide an inaccurate estimate of how many people returned to play the game after enjoying it previously. To get a clear picture of returning players, your app should send a custom event when a user actually plays.
 
-It's good practice to code custom events that represent key business actions, and use these for your retention analysis. To capture the game outcome, you need to write a line of code to send a custom event to Application Insights. If you write it in the web page code or in Node.JS, it looks like this:
+It's good practice to code custom events that represent key business actions. Then you can use these events for your retention analysis. To capture the game outcome, you need to write a line of code to send a custom event to Application Insights. If you write it in the webpage code or in Node.JS, it looks like this example:
 
 ```JavaScript
     appinsights.trackEvent("won game");
@@ -52,15 +52,15 @@ Or in ASP.NET server code:
    telemetry.TrackEvent("won game");
 ```
 
-[Learn more about writing custom events](./api-custom-events-metrics.md#trackevent).
-
+Learn more about [writing custom events](./api-custom-events-metrics.md#trackevent).
 
 ## Next steps
-- - To learn more about workbooks, visit [the workbooks overview](../visualize/workbooks-overview.md).
+
+- To learn more about workbooks, see the [workbooks overview](../visualize/workbooks-overview.md).
 - To enable usage experiences, start sending [custom events](./api-custom-events-metrics.md#trackevent) or [page views](./api-custom-events-metrics.md#page-views).
-- If you already send custom events or page views, explore the Usage tools to learn how users use your service.
-    - [Users, Sessions, Events](usage-segmentation.md)
+- If you already send custom events or page views, explore the Usage tools to learn how users use your service:
+    - [Users, sessions, events](usage-segmentation.md)
     - [Funnels](usage-funnels.md)
-    - [User Flows](usage-flows.md)
+    - [User flows](usage-flows.md)
     - [Workbooks](../visualize/workbooks-overview.md)
     - [Add user context](./usage-overview.md)

articles/azure-monitor/app/sla-report.md

@@ -253,7 +253,7 @@ ama-metrics-ksm-5fcf8dffcd      1         1         1       11h
 ## Limitations
 
 - Ensure that you update the `kube-state metrics` Annotations and Labels list with proper formatting. There's a limitation in the Resource Manager template deployments that require exact values in the `kube-state` metrics pods. If the kuberenetes pod has any issues with malformed parameters and isn't running, then the feature won't work as expected.
-- A data collection rule and data collection endpoint is created with the name `MSPROM-\<cluster-name\>-\<cluster-region\>`. These names can't currently be modified.
+- A data collection rule and data collection endpoint is created with the name `MSProm-\<short-cluster-region\>-\<cluster-name\>`. These names can't currently be modified.
 - You must get the existing Azure Monitor workspace integrations for a Grafana workspace and update the Resource Manager template with it, otherwise it will overwrite and remove the existing integrations from the grafana workspace.
 - CPU and Memory requests and limits can't be changed for Container insights metrics addon. If changed, they'll be reconciled and replaced by original values in a few seconds.
 - Metrics addon doesn't work on AKS clusters configured with HTTP proxy.