Merge pull request #284378 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)

Author: rmca14

CODEOWNERS

@@ -15,13 +15,3 @@
 /articles/mariadb @tynevi @thomps23
 /articles/mysql @tynevi @thomps23
 /articles/managed-instance-apache-cassandra @tynevi @thomps23
-
-
-
-
-
-
-
-
-
-

articles/app-service/includes/deploy-intelligent-apps/deploy-intelligent-apps-linux-java-pivot.md

@@ -8,7 +8,7 @@ ms.date: 04/10/2024
 ms.author: jefmarti
 ---
 
-You can use Azure App Service to create applications using Azure OpenAI and OpenAI. In the following tutorial, we're adding an Azure OpenAI service to a Java 17 Spring Boot application using the Azure SDK.
+You can use Azure App Service to create applications using Azure OpenAI and OpenAI. In the following tutorial, we're adding Azure OpenAI Service to a Java 17 Spring Boot application using the Azure SDK.
 
 #### Prerequisites
 

articles/app-service/overview-inbound-outbound-ips.md

@@ -80,6 +80,8 @@ az webapp show --resource-group <group_name> --name <app_name> --query possibleO
 (Get-AzWebApp -ResourceGroup <group_name> -name <app_name>).PossibleOutboundIpAddresses
 ```
 
+For function apps, see [Function app outbound IP addresses](/azure/azure-functions/ip-addresses?tabs=azure-powershell#find-outbound-ip-addresses).
+
 ## Get a static outbound IP
 
 You can control the IP address of outbound traffic from your app by using virtual network integration together with a virtual network NAT gateway to direct traffic through a static public IP address. [Virtual network integration](./overview-vnet-integration.md) is available on **Basic**, **Standard**, **Premium**, **PremiumV2**, and **PremiumV3** App Service plans. To learn more about this setup, see [NAT gateway integration](./networking/nat-gateway-integration.md).

articles/azure-monitor/alerts/alerts-create-metric-alert-rule.yml

@@ -4,6 +4,8 @@ metadata:
   title: Create Azure Monitor metric alert rules
   description: This article shows you how to create a new metric alert rule.
   author: AbbyMSFT
+  ms.service: azure-monitor
+  ms.subservice: alerts
   ms.author: abbyweisberg
   ms.reviewer: harelbr
   ms.date: 03/07/2024

articles/azure-monitor/alerts/alerts-overview.md

@@ -71,7 +71,7 @@ Stateless alerts fire each time the condition is met. The alert condition for al
 - All activity log alerts are stateless.
 - The frequency of notifications for stateless metric alerts differs based on the alert rule's configured frequency:
     - **Alert frequency of less than 5 minutes**: While the condition continues to be met, a notification is sent sometime between one and six minutes.
-    - **Alert frequency of more than 5 minutes**: While the condition continues to be met, a notification is sent between the configured frequency and double the frequency. For example, for an alert rule with a frequency of 15 minutes, a notification is sent sometime between 15 to 30 minutes.
+    - **Alert frequency of equal to or more than 5 minutes**: While the condition continues to be met, a notification is sent between the configured frequency and double the frequency. For example, for an alert rule with a frequency of 15 minutes, a notification is sent sometime between 15 to 30 minutes.
 
 ### Stateful alerts
 Stateful alerts fire when the rule conditions are met, and will not fire again or trigger any more actions until the conditions are resolved. 

articles/azure-monitor/logs/functions.md

@@ -16,7 +16,7 @@ A function is a log query in Azure Monitor that can be used in other log queries
 
 - To view or use functions, you need `Microsoft.OperationalInsights/workspaces/query/*/read` permissions to the Log Analytics workspace, as provided by the [Log Analytics Reader built-in role](./manage-access.md#log-analytics-reader), for example.
 
-- To create or edit functions, you need `microsoft.operationalinsights/workspaces/savedSearches/write` permissions to the Log Analytics workspace, as provided by the [Log Analytics Reader built-in role](./manage-access.md#log-analytics-reader), for example.
+- To create or edit functions, you need `microsoft.operationalinsights/workspaces/savedSearches/write` permissions to the Log Analytics workspace, as provided by the [Log Analytics Contributor built-in role](./manage-access.md#log-analytics-contributor), for example.
 
 ## Types of functions
 There are two types of functions in Azure Monitor:

articles/azure-resource-manager/bicep/user-defined-data-types.md

@@ -254,9 +254,7 @@ For more information, see [Custom tagged union data type](./data-types.md#custom
 
 ## Import types between Bicep files
 
-[Bicep CLI version 0.21.X or higher](./install.md) is required to use this compile-time import feature. The experimental flag `compileTimeImports` must be enabled from the [Bicep config file](./bicep-config.md#enable-experimental-features).
-
-Only user-defined data types that bear the `@export()` decorator can be imported to other templates. Currently, this decorator can only be used on `type` statements.
+Only user-defined data types that bear the `@export()` decorator can be imported to other templates.
 
 The following example enables you to import the two user-defined data types from other templates:
 

articles/expressroute/expressroute-about-encryption.md

@@ -36,7 +36,7 @@ Yes. For the MACsec configuration, we support the preshared key mode only. It me
 
 ### Does traffic continue to flow if there's a mismatch in MACsec key between my devices and Microsoft's?
 
-No. If MACsec is configured and a key mismatch occurs, you lose connectivity to Microsoft. In other traffic doesn't fall back to an unencrypted connection, exposing your data. 
+No. If MACsec is configured and a key mismatch occurs, you lose connectivity to Microsoft. In other words, traffic doesn't fall back to an unencrypted connection, exposing your data. 
 
 ### Does enabling MACsec on ExpressRoute Direct degrade network performance?
 

articles/update-manager/guidance-migration-azure.md

@@ -12,14 +12,15 @@ ms.author: sudhirsneha
 
 **Applies to:** :heavy_check_mark: Windows VMs :heavy_check_mark: Linux VMs :heavy_check_mark: On-premises environment :heavy_check_mark: Azure Arc-enabled servers.
 
-This article provides a guide to start using Azure Update Manager (for update management) for virtual machines that are currently using Microsoft Configuration Manager (MCM). 
+This article provides a guide to modernize management of servers for which you are currently using Microsoft Configuration Manager (MCM). We shall focus on Azure Update Manager that provides Azure based experiences for patch management, the major capability of MCM. 
 
-Before initiating migration, you need to understand mapping between System Center components and equivalent services in Azure.
+To start with, let us list the Azure Services that provide equivalent capabilities for the different System Center components.
 
 | **System Center Component** | **Azure equivalent service** |
 | --- | --- |
 | System Center Operations Manager (SCOM) | Azure Monitor SCOM Managed Instance |
-| System Center Configuration Manager (SCCM), now called Microsoft Configuration Manager (MCM) | Azure Update Manager, </br> Change Tracking and Inventory, </br> Guest Config, </br> Azure Automation, </br> Desired State Configuration (DSC), </br> Defender for Cloud | 
+| System Center Configuration Manager (SCCM), now called Microsoft Configuration Manager (MCM) | Azure Update Manager, </br> Change Tracking and Inventory, </br> Azure 
+ Machine Configuration (formerly called Azure Policy Guest Configuration), </br> Azure Automation, </br> Microsoft Defender for Cloud | 
 | System Center Virtual Machine Manager (SCVMM) | Arc enabled System Center VMM | 
 | System Center Data Protection Manager (SCDPM) | Azure Backup | 
 | System Center Orchestrator (SCORCH) | Azure Automation |