Merge pull request #201951 from MicrosoftDocs/main

Publish to Live, Friday 4AM PST, 6/17

Author: PMEds28

.openpublishing.redirection.json

@@ -40271,6 +40271,26 @@
       "source_path_from_root": "/articles/private-link/private-endpoint-static-ip-powershell.md",
       "redirect_url": "/azure/private-link/create-private-endpoint-powershell",
       "redirect_document_id": true
-    }
+    },
+    {
+      "source_path_from_root": "/articles/azure-monitor/insights/sql-insights-alerts.md",
+      "redirect_url": "/azure/azure-sql/database/sql-insights-alerts",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/azure-monitor/insights/sql-insights-enable.md",
+      "redirect_url": "/azure/azure-sql/database/sql-insights-enable",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/azure-monitor/insights/sql-insights-overview.md",
+      "redirect_url": "/azure/azure-sql/database/sql-insights-overview",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path_from_root": "/articles/azure-monitor/insights/sql-insights-troubleshoot.md",
+      "redirect_url": "/azure/azure-sql/database/sql-insights-troubleshoot",
+      "redirect_document_id": false
+    }    
   ]
 }

articles/aks/configure-azure-cni.md

@@ -308,7 +308,8 @@ Learn more about networking in AKS in the following articles:
 [services]: https://kubernetes.io/docs/concepts/services-networking/service/
 [portal]: https://portal.azure.com
 [cni-networking]: https://github.com/Azure/azure-container-networking/blob/master/docs/cni.md
-[kubenet]: https://kubernetes.io/docs/concepts/cluster-administration/network-plugins/#kubenet
+[kubenet]: concepts-network.md#kubenet-basic-networking
+
 
 <!-- LINKS - Internal -->
 [az-aks-create]: /cli/azure/aks#az_aks_create

articles/api-management/api-management-features.md

@@ -39,7 +39,8 @@ Each API Management [pricing tier](https://aka.ms/apimpricing) offers a distinct
 | Azure Monitor logs and metrics                                                               | No          | Yes       | Yes   | Yes      | Yes     |
 | Static IP                                                                                    | No          | Yes       | Yes   | Yes      | Yes     |
 | [WebSocket APIs](websocket-api.md)                                                                                    | No          | Yes       | Yes   | Yes      | Yes     |
-| [GraphQL APIs (preview)](graphql-api.md)                                                                               | Yes          | Yes       | Yes   | Yes      | Yes     |
+| [GraphQL APIs](graphql-api.md)                                                                               | Yes          | Yes       | Yes   | Yes      | Yes     |
+| [GraphQL resolvers (preview)](graphql-schema-resolve-api.md)                                                            | Yes          | Yes       | Yes   | Yes      | Yes     |
 
 <sup>1</sup> Enables the use of Azure AD (and Azure AD B2C) as an identity provider for user sign in on the developer portal.<br/>
 <sup>2</sup> Including related functionality e.g. users, groups, issues, applications and email templates and notifications.<br/>

articles/azure-monitor/agents/agent-linux-troubleshoot.md

@@ -74,7 +74,7 @@ We've seen that a clean re-install of the Agent will fix most issues. In fact th
  Additional configurations | `/etc/opt/microsoft/omsagent/<workspace id>/conf/omsagent.d/*.conf`
 
  > [!NOTE]
- > Editing configuration files for performance counters and Syslog is overwritten if the collection is configured from the [data menu Log Analytics Advanced Settings](../agents/agent-data-sources.md#configuring-data-sources) in the Azure portal for your workspace. To disable configuration for all agents, disable collection from Log Analytics **Advanced Settings** or for a single agent run the following:
+ > Editing configuration files for performance counters and Syslog is overwritten if the collection is configured from the [Agents configuration](../agents/agent-data-sources.md#configuring-data-sources) in the Azure portal for your workspace. To disable configuration for all agents, disable collection from **Agents configuration** or for a single agent run the following:
 > `sudo /opt/microsoft/omsconfig/Scripts/OMS_MetaConfigHelper.py --disable && sudo rm /etc/opt/omi/conf/omsconfig/configuration/Current.mof* /etc/opt/omi/conf/omsconfig/configuration/Pending.mof*`
 
 ## Installation error codes

articles/azure-monitor/essentials/collect-custom-metrics-linux-telegraf.md

@@ -5,7 +5,7 @@ author: anirudhcavale
 services: azure-monitor
 
 ms.topic: conceptual
-ms.date: 09/24/2018
+ms.date: 06/16/2022
 ms.author: ancav
 ---
 # Collect custom metrics for a Linux VM with the InfluxData Telegraf agent
@@ -77,7 +77,6 @@ Now the agent will collect metrics from each of the input plug-ins specified and
 
 1. Navigate to the new **Monitor** tab. Then select **Metrics**.  
 
-     ![Monitor - Metrics (preview)](./media/collect-custom-metrics-linux-telegraf/metrics.png)
 
 1. Select your VM in the resource selector.