Merge pull request #289705 from MicrosoftDocs/main

11/01/2024 PM Publish

Author: Daidihuang

.openpublishing.redirection.json

@@ -3599,6 +3599,16 @@
       "source_path_from_root": "/articles/third-party-notices.md",
       "redirect_url": "https://github.com/MicrosoftDocs/azure-docs/blob/main/ThirdPartyNotices.md",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/reliability/glossary.md",
+      "redirect_url": "/azure/reliability/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/reliability/resiliency-recommendations/recommend-cosmos-db-nosql.md",
+      "redirect_url": "/azure/reliability/reliability-cosmos-db-nosql",
+      "redirect_document_id": false
     }
   ]
 }

articles/api-management/api-management-howto-use-azure-monitor.md

@@ -7,7 +7,7 @@ author: dlepow
 ms.service: azure-api-management
 ms.custom: engagement-fy23, devdivchpfy22
 ms.topic: tutorial
-ms.date: 08/26/2024
+ms.date: 11/01/2024
 ms.author: danlep
 ---
 # Tutorial: Monitor published APIs
@@ -37,24 +37,24 @@ In this tutorial, you learn how to:
 
 ## View metrics of your APIs
 
-API Management emits [metrics](/azure/azure-monitor/essentials/data-platform-metrics) every minute, giving you near real-time visibility into the state and health of your APIs. The following are the most frequently used metrics. For a list of all available metrics, see [supported metrics](/azure/azure-monitor/essentials/metrics-supported#microsoftapimanagementservice).
+API Management emits [metrics](/azure/azure-monitor/essentials/data-platform-metrics) every minute, giving you near real-time visibility into the state and health of your APIs. The following are the most frequently used metrics. For a list of all available metrics, see [supported metrics](/azure/azure-monitor/reference/supported-metrics/microsoft-apimanagement-service-metrics).
 
 * **Capacity** - helps you make decisions about upgrading/downgrading your API Management services. The metric is emitted per minute and reflects the estimated gateway capacity at the time of reporting. The metric ranges from 0-100 calculated based on gateway resources such as CPU and memory utilization and other factors.
 
     > [!TIP]
-    > In the [v2 service tiers](v2-service-tiers-overview.md), API Management replaced the capacity metric with separate CPU and memory utilization metrics. These metrics can also be used for scaling decisions and troubleshooting. [Learn more](api-management-capacity.md)
+    > In the [v2 service tiers](v2-service-tiers-overview.md), API Management has replaced the capacity metric with separate CPU and memory utilization metrics. These metrics can also be used for scaling decisions and troubleshooting. [Learn more](api-management-capacity.md)
 
 * **Requests** - helps you analyze API traffic going through your API Management services. The metric is emitted per minute and reports the number of gateway requests with dimensions. Filter requests by response codes, location, hostname, and errors.
 
 > [!IMPORTANT]
-> The following metrics have been retired: Total Gateway Requests, Successful Gateway Requests, Unauthorized Gateway Requests, Failed Gateway Requests, Other Gateway Requests. Please migrate to the Requests metric which provides equivalent functionality.
+> The following metrics have been retired: Total Gateway Requests, Successful Gateway Requests, Unauthorized Gateway Requests, Failed Gateway Requests, Other Gateway Requests. Please migrate to the Requests metric which provides closely similar functionality.
 
 :::image type="content" source="media/api-management-howto-use-azure-monitor/apim-monitor-metrics-1.png" alt-text="Screenshot of Metrics in API Management Overview":::
 
 To access metrics:
 
 1. In the [Azure portal](https://portal.azure.com), navigate to your API Management instance. On the **Overview** page, on the **Monitor** tab, review key metrics for your APIs.
-1. To investigate metrics in detail, select **Metrics** from the left menu.
+1. To investigate metrics in detail, select **Monitoring** > **Metrics** from the left menu.
 
     :::image type="content" source="media/api-management-howto-use-azure-monitor/api-management-metrics-blade.png" alt-text="Screenshot of Metrics item in Monitoring menu in the portal.":::
 
@@ -73,15 +73,14 @@ You can receive [alerts](/azure/azure-monitor/alerts/alerts-metric-overview) bas
 To configure an example alert rule based on a request metric:
 
 1. In the [Azure portal](https://portal.azure.com), navigate to your API Management instance.
-1. Select **Alerts** from the left menu.
+1. Select **Monitoring** > **Alerts** from the left menu.
 
     :::image type="content" source="media/api-management-howto-use-azure-monitor/alert-menu-item.png" alt-text="Screenshot of Alerts option in Monitoring menu in the portal.":::
 
 1. Select **+ Create** > **Alert rule**.
-1. In the **Select a signal** window on the **Condition** tab:
-    1. In **Signal type**, select **Metrics**.
+1. On the **Condition** tab:
     1. In **Signal name**, select **Requests**.
-    1. In **Alert logic**, specify a **Threshold value**, which is the number of occurrences after which the alert should be triggered.
+    1. In **Alert logic**, review or modify the default values for the alert. For example, update the static **Threshold**, which is the number of occurrences after which the alert should be triggered.
     1. In **Split by dimensions**, in **Dimension name**, select **Gateway Response Code Category**.
     1. In **Dimension values**, select **4xx**, for client errors such as unauthorized or invalid requests. If the dimension value doesn't appear, select **Add custom value** and enter **4xx**.
     1. In **When to evaluate**, accept the default settings, or select other settings to configure how often the rule runs. Select **Next**.
@@ -94,13 +93,13 @@ To configure an example alert rule based on a request metric:
 
 1. On the **Details** tab of **Create an alert rule**, enter a name and description of the alert rule and select the severity level.
 1. Optionally configure the remaining settings. Then, on the **Review + create** tab, select **Create**.
-1. Now, test the alert rule by calling the Conference API without an API key. For example:
+1. Optionally test the alert rule by using an HTTP client to simulate a request that triggers the alert. For example, run the following command in a terminal, substituting the API Management hostname with the hostname of your API Management instance:
 
     ```bash
-    curl GET https://apim-hello-world.azure-api.net/conference/speakers HTTP/1.1 
+    curl GET https://contoso.azure-api.net/non-existent-endpoint HTTP/1.1 
     ```
 
-    An alert triggers based on the evaluation period, and it will send email to [email protected].
+    An alert triggers based on the evaluation period, and it will send email to [email protected]. 
 
     Alerts also appear on the **Alerts** page for the API Management instance.
 
@@ -111,7 +110,7 @@ To configure an example alert rule based on a request metric:
 Activity logs provide insight into the operations on your API Management services. Using activity logs, you can determine the "what, who, and when" for any write operations (PUT, POST, DELETE) taken on your API Management services.
 
 > [!NOTE]
-> Activity logs do not include read (GET) operations or operations performed in the Azure portal or using the original Management APIs.
+> Activity logs do not include read (GET) operations or operations performed in the Azure portal.
 
 You can access activity logs in your API Management service, or access logs of all your Azure resources in Azure Monitor. 
 
@@ -136,7 +135,7 @@ Resource logs (Azure Monitor logs) provide rich information about API Management
 To configure resource logs:
 
 1. In the [Azure portal](https://portal.azure.com), navigate to your API Management instance.
-2. Select **Diagnostic settings**.
+2. Select **Monitoring** > **Diagnostic settings**.
 
     :::image type="content" source="media/api-management-howto-use-azure-monitor/api-management-diagnostic-logs-blade.png" alt-text="Screenshot of Diagnostic settings item in Monitoring menu in the portal.":::
 
@@ -155,7 +154,7 @@ To configure resource logs:
 
 For more information, see [Create diagnostic settings to send platform logs and metrics to different destinations](/azure/azure-monitor/essentials/diagnostic-settings).
  
-## View diagnostic data in Azure Monitor
+## View logs and metrics in Azure Monitor
 
 If you enable collection of logs or metrics in a Log Analytics workspace, it can take a few minutes for data to appear in Azure Monitor. 
 
@@ -177,7 +176,7 @@ To view the data:
 
 For more information about using resource logs for API Management, see:
 
-* [Log Analytics tutorial](/azure/azure-monitor/logs/log-analytics-tutorial), or try the [Log Analytics demo environment](https://ms.portal.azure.com/#view/Microsoft_OperationsManagementSuite_Workspace/LogsDemo.ReactView).
+* [Log Analytics tutorial](/azure/azure-monitor/logs/log-analytics-tutorial).
 
 * [Overview of log queries in Azure Monitor](/azure/azure-monitor/logs/log-query-overview).
 
@@ -191,14 +190,14 @@ For details about the logging settings, see [Diagnostic logging settings referen
 
 To configure logging settings for all APIs:
 
-1. In the left menu of your API Management instance, select **APIs** > **All APIs**.
+1. In the left menu of your API Management instance, select **APIs** > **APIs** > **All APIs**.
 1. Select the **Settings** tab from the top bar.
 1. Scroll down to the **Diagnostic Logs** section, and select the **Azure Monitor** tab.
 1. Review the settings and make changes if needed. Select **Save**. 
 
 To configure logging settings for a specific API:
 
-1. In the left menu of your API Management instance, select **APIs** and then the name of the API.
+1. In the left menu of your API Management instance, select **APIs** > **APIs** and then the name of the API.
 1. Select the **Settings** tab from the top bar.
 1. Scroll down to the **Diagnostic Logs** section, and select the **Azure Monitor** tab.
 1. Review the settings and make changes if needed. Select **Save**. 

articles/api-management/media/api-management-howto-use-azure-monitor/alert-menu-item.png

@@ -15,8 +15,9 @@ ms.custom: devx-track-csharp, devx-track-extended-java, devx-track-js, devx-trac
 You can restrict access to your Azure App Service app by enabling different types of authentication for it. One way to do it is to request a client certificate when the client request is over TLS/SSL and validate the certificate. This mechanism is called TLS mutual authentication or client certificate authentication. This article shows how to set up your app to use client certificate authentication.
 
 > [!NOTE]
+> Your app code is responsible for validating the client certificate. App Service doesn't do anything with this client certificate other than forwarding it to your app.
+> 
 > If you access your site over HTTP and not HTTPS, you will not receive any client certificate. So if your application requires client certificates, you should not allow requests to your application over HTTP.
->
 
 [!INCLUDE [Prepare your web app](../../includes/app-service-ssl-prepare-app.md)]
 
@@ -26,7 +27,13 @@ To set up your app to require client certificates:
 
 1. From the left navigation of your app's management page, select **Configuration** > **General Settings**.
 
-1. Set **Client certificate mode** to **Require**. Select **Save** at the top of the page.
+1. Select **Client certificate mode** of choice. Select **Save** at the top of the page.
+
+|Client certificate modes|Description|
+|-|-|
+|Required|All requests require a client certificate.|
+|Optional|Requests may or may not use a client certificate. Clients will be prompted for a certificate by default. For example, browser clients will show a prompt to select a certificate for authentication.|
+|Optional Interactive User|Requests may or may not use a client certificate. Clients will not be prompted for a certificate by default. For example, browser clients will not show a prompt to select a certificate for authentication.|
 
 ### [Azure CLI](#tab/azurecli)
 To do the same with Azure CLI, run the following command in the [Cloud Shell](https://shell.azure.com):