Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)

Author: Learn Build Service GitHub App

articles/automation/python-packages.md

@@ -42,7 +42,7 @@ On a Windows 64-bit machine with [Python2.7](https://www.python.org/downloads/re
 C:\Python27\Scripts\pip2.7.exe download -d <output dir> <package name>
 ```
 
-Once the packages are downloaded, you can import them into your automation account.
+Once the packages are downloaded, you can import them into your Automation account.
 
 ### Runbook
 

articles/azure-monitor/alerts/alert-options.md

@@ -0,0 +1,46 @@
+---
+title: Create alert rules for an Azure resource
+description: Describes the different options for creating alert rules in Azure Monitor and where you can find more information about each option.
+ms.topic: conceptual
+author: bwren
+ms.author: bwren
+ms.date: 02/16/2024
+ms.reviewer: robb
+
+---
+
+# Create alert rules for Azure resources
+Alerts in Azure Monitor proactively notify you of critical conditions based on collected telemetry and potentially attempt to take corrective action. Alerts are generated from alert rules which define the criteria for the alert and what action to take when the alert triggers. There are no alert rules created by default in Azure Monitor. In addition to creating your own, there are multiple options for getting started quickly with alert rules based on pre-defined conditions, and different options are available for different Azure services. This article describes the different options for creating alert rules in Azure Monitor and where you can find more information about each option.
+
+
+## Recommended alerts
+Recommended alerts is a feature in Azure Monitor for some services that allows you to quickly create a set of alert rules for a particular resource. Simply select **Set up recommendations** from the **Alerts** tab for the resource in the Azure portal, and select the rules you want to enable. This feature isn't available for all services, and you need to select the option for each resource you want to monitor. One strategy is to use the recommended alerts as guidance for the alert rules that should be created for a particular type of resource. You can use [Azure Policy](#azure-policy) to automatically create these same alert rules for all resources of a particular type.
+
+
+## Azure Monitor Baseline Alerts (AMBA)
+AMBA is a central repository that combines product group and field experience driven alert definitions that allow customers and partners to improve their observability experience through the adoption of Azure Monitor. It's organized by resource type so you can quickly identify alert definitions that fit your requirements. AMBA leverages Azure Monitor alerts and helps you detect and address issues consistently and at scale indicating problems with monitored resource in your infrastructure. AMBA includes definitions for both metric and log alerts for resources including:
+
+- Service Health
+- Compute resources
+- Networking resources
+- Many more
+
+AMBA also includes example snippets of alert definitions to be directly used in an ARM or BICEP deployments in addition to policy definitions. Read more about on Azure Landing Zone monitoring at [Monitor Azure platform landing zone components](/azure/cloud-adoption-framework/ready/landing-zone/design-area/management-monitor#azure-landing-zone-monitoring-guidance) .
+
+AMBA has patterns that group alerts from different resource types to address specific scenarios. Azure landing zone (ALZ), which is also suitable for non-ALZ aligned customers, is a pattern of AMBA that collates platform alerts into a deployable at-scale solution. Other patterns are under development including SAP and Azure Virtual Desktop, which are intended to minimize friction in adopting observability into your environment. 
+
+See [Azure Monitor Baseline Alerts](https://aka.ms/amba) for details.
+
+## Manual alert rules
+You can manually create alert rules for any of your Azure resources using the appropriate metric values or log queries as a signal. You must create and maintain each alert rule for each resource individually, so you will probably want to use one of the other options when they're applicable and only manually create alert rules for special cases. Multiple services in Azure have documentation articles that describe recommended telemetry to collect and alert rules that are recommended for that service. These articles are typically found in the **Monitor** section of the service's documentation. For example, [Monitor Azure virtual machines](../../virtual-machines/monitor-vm.md) and [Monitor Azure Kubernetes Service (AKS)](../../aks/monitor-aks.md).
+
+See [Choosing the right type of alert rule](./alerts-types.md) for more information about the different types of alert rules and articles such as [Create or edit a metric alert rule](./alerts-create-metric-alert-rule.md) and [Create or edit a log alert rule](./alerts-create-log-alert-rule.md) for detailed guidance on manually creating alert rules.
+
+## Azure Policy
+Using [Azure Policy](../../governance/policy/overview.md), you can automatically create alert rules for all resources of a particular type instead of manually creating rules for each individual resource. You still must define the alerting condition, but the alert rules for each resource will automatically be created for you, for both existing resources and any new ones that you create.
+
+See [Resource Manager template samples for metric alert rules in Azure Monitor](./resource-manager-alerts-metric.md) and [Resource Manager template samples for log alert rules in Azure Monitor](./resource-manager-alerts-log.md) for ARM templates that can be used in policy definitions.
+
+## Next steps
+
+- [Read more about alerts in Azure Monitor](./alerts-overview.md)

articles/azure-monitor/essentials/tutorial-resource-logs.md

@@ -67,7 +67,7 @@ Browse through the available queries. Identify one to run and select **Run**. Th
 :::image type="content" source="media/tutorial-resource-logs/query-results.png" lightbox="media/tutorial-resource-logs/query-results.png"alt-text="Screenshot that shows the results of a sample log query.":::
 
 ## Next steps
-Now that you're collecting resource logs, create a log search alert to be proactively notified when interesting data is identified in your log data.
+Once you're collecting monitoring data for your Azure resources, see your different options for creating alert rules to be proactively notified when Azure Monitor identifies interesting information.
 
 > [!div class="nextstepaction"]
-> [Create a log search alert for an Azure resource](../alerts/tutorial-log-alert.md)
+> [Create alert rules for an Azure resource](../alerts/alert-options.md)

articles/azure-monitor/toc.yml

@@ -35,6 +35,8 @@ items:
       href: essentials/tutorial-metrics.md
     - name: Collect and view resource logs
       href: essentials/tutorial-resource-logs.md
+    - name: Create alerts
+      href: alerts/alert-options.md
   - name: Monitor applications with Application Insights
     items:
     - name: Application Insights overview

articles/backup/backup-azure-vms-enhanced-policy.md

@@ -2,7 +2,7 @@
 title: Back up Azure VMs with Enhanced policy
 description: Learn how to configure Enhanced policy to back up VMs.
 ms.topic: how-to
-ms.date: 02/07/2024
+ms.date: 02/19/2024
 ms.reviewer: sharrai
 ms.service: backup
 ms.custom: devx-track-azurecli, devx-track-azurepowershell

articles/backup/backup-support-matrix-iaas.md

@@ -2,7 +2,7 @@
 title: Support matrix for Azure VM backups
 description: Get a summary of support settings and limitations for backing up Azure VMs by using the Azure Backup service.
 ms.topic: conceptual
-ms.date: 02/07/2024
+ms.date: 02/19/2024
 ms.custom: references_regions 
 ms.reviewer: sharrai
 ms.service: backup

articles/defender-for-cloud/release-notes.md

@@ -24,9 +24,17 @@ If you're looking for items older than six months, you can find them in the [Arc
 
 |Date | Update |
 |----------|----------|
+| February 18| [Open Container Initiative (OCI) image format specification support](#open-container-initiative-oci-image-format-specification-support) |
 | February 13 | [AWS container vulnerability assessment powered by Trivy retired](#aws-container-vulnerability-assessment-powered-by-trivy-retired) |
 | February 8 | [Recommendations released for preview: four recommendations for Azure Stack HCI resource type](#recommendations-released-for-preview-four-recommendations-for-azure-stack-hci-resource-type) |
 
+### Open Container Initiative (OCI) image format specification support 
+
+February 18, 2024
+
+The [Open Container Initiative (OCI)](https://github.com/opencontainers/image-spec/blob/main/spec.md) image format specification is now supported by vulnerability assessment, powered by Microsoft Defender Vulnerability Management for AWS, Azure & GCP clouds.
+
+
 ### AWS container vulnerability assessment powered by Trivy retired
 
 February 13, 2024

articles/defender-for-iot/organizations/TOC.yml

@@ -399,7 +399,7 @@
           href: appliance-catalog/hpe-edgeline-el300.md
         - name: HPE ProLiant DL20 Gen10 (L500 Rugged)
           href: appliance-catalog/hpe-proliant-dl20-smb-legacy.md
-        - name: Neousys Nuvo-500LP (L100 Rugged)
+        - name: Neousys Nuvo-5006LP (L100 Rugged)
           href: appliance-catalog/neousys-nuvo-5006lp.md
   - name: System maintenance references
     items:

articles/hdinsight-aks/secure-traffic-by-firewall.md

@@ -4,7 +4,7 @@ description: Learn how to secure traffic using firewall on HDInsight on AKS usin
 ms.service: hdinsight-aks
 ms.custom: devx-track-azurecli
 ms.topic: how-to
-ms.date: 08/3/2023
+ms.date: 02/19/2024
 ---
 
 # Use firewall to restrict outbound traffic using Azure CLI
@@ -73,7 +73,7 @@ FWROUTE_NAME_INTERNET="${PREFIX}-fwinternet"
       ```
       > [!Important]
       > 1. If you add NSG in subnet `HDIAKS_SUBNET_NAME`, you need to add certain outbound and inbound rules manually. Follow [use NSG to restrict the traffic](./secure-traffic-by-nsg.md).
-      > 1. Don't associate subnet `HDIAKS_SUBNET_NAME` with a route table because HDInsight on AKS creates cluster pool with default outbound type and can't create the cluster pool in a subnet already associated with a route table.
+      > 1. By default, route table will not be associated with subnet. If required, user has to create a route table and associate it with the cluster pool.
 
 ## Create HDInsight on AKS cluster pool using Azure portal
 
@@ -83,9 +83,9 @@ FWROUTE_NAME_INTERNET="${PREFIX}-fwinternet"
     
      :::image type="content" source="./media/secure-traffic-by-firewall/security-tab.png" alt-text="Diagram showing the security tab." border="true" lightbox="./media/secure-traffic-by-firewall/security-tab.png":::
     
-  1. When HDInsight on AKS cluster pool is created, you can find a route table in subnet `HDIAKS_SUBNET_NAME`.
+  1. Create a route table.
     
-     :::image type="content" source="./media/secure-traffic-by-firewall/route-table.png" alt-text="Diagram showing the route table." border="true" lightbox="./media/secure-traffic-by-firewall/route-table.png":::
+     Create a route table and associate it with the cluster pool. For more information, see [create a route table](../virtual-network/manage-route-table.md#create-a-route-table).
 
 ### Get AKS cluster details created behind the cluster pool
 
@@ -168,22 +168,11 @@ FWROUTE_NAME_INTERNET="${PREFIX}-fwinternet"
 
 ### Create route in the route table to redirect the traffic to firewall
 
-1.	Get the route table associated with HDInsight on AKS cluster pool.
-   
-    ```azurecli
-    ROUTE_TABLE_ID=$(az network vnet subnet show --name $HDIAKS_SUBNET_NAME --vnet-name $VNET_NAME --resource-group $RG --query routeTable.id -o tsv)
-    
-    ROUTE_TABLE_NAME=$(az network route-table show --ids $ROUTE_TABLE_ID --query 'name' -o tsv)
-    ```
-1. Create the route.
-    ```azurecli
-    az network route-table route create -g $AKS_MANAGED_RG --name $FWROUTE_NAME --route-table-name $ROUTE_TABLE_NAME --address-prefix 0.0.0.0/0 --next-hop-type VirtualAppliance --next-hop-ip-address $FWPRIVATE_IP
-    
-    az network route-table route create -g $AKS_MANAGED_RG --name $FWROUTE_NAME_INTERNET --route-table-name $ROUTE_TABLE_NAME --address-prefix $FWPUBLIC_IP/32 --next-hop-type Internet
-   ```
+Create a route table to be associated to HDInsight on AKS cluster pool. For more information, see [create route table commands](../virtual-network/manage-route-table.md#create-route-table---commands).
+
 ## Create cluster
  
-In the previous steps, we have routed the traffic to firewall.
+In the previous steps, we routed network traffic to firewall.
 
 The following steps provide details about the specific network and application rules needed by each cluster type. You can refer to the cluster creation pages for creating [Apache Flink](./flink/flink-create-cluster-portal.md), [Trino](./trino/trino-create-cluster.md), and [Apache Spark](./spark/hdinsight-on-aks-spark-overview.md) clusters based on your need.
 
@@ -245,7 +234,7 @@ The following steps provide details about the specific network and application r
   az network route-table route create -g $AKS_MANAGED_RG --name clientip --route-table-name $ROUTE_TABLE_NAME --address-prefix {Client_IPs} --next-hop-type Internet
   ```
 
-  If you can't reach the cluster and have configured NSG, follow [use NSG to restrict the traffic](./secure-traffic-by-nsg.md) to allow the traffic.
+  If you can't reach the cluster after having configured NSG, follow [use NSG to restrict the traffic](./secure-traffic-by-nsg.md) to allow the traffic.
 
 > [!TIP]
 > If you want to allow more traffic, you can configure it over the firewall.

articles/service-health/resource-health-alert-monitor-guide.md

@@ -37,9 +37,9 @@ For information on how to configure resource health notification alerts by using
 1. In the Azure [portal](https://portal.azure.com/), select **Service Health**.
 
     ![Service Health Selection](./media/resource-health-alert-monitor-guide/service-health-selection.png)
-1. In the **Resource Health** section, select **Service Health**.
+1. In the **Resource Health** section, select **Resource Health**.
 1. Select **Add resource health alert**.
-1. The ** an alert rule wizard** opens to the **Conditions** tab, with the **Scope** tab already populated. Follow the steps for Resource Health alerts, starting from the **Conditions** tab, in the [new alert rule wizard](../azure-monitor/alerts/alerts-create-activity-log-alert-rule.md).
+1. The **Create an alert rule** wizard opens to the **Conditions** tab, with the **Scope** tab already populated. Follow the steps for Resource Health alerts, starting from the **Conditions** tab, in the [new alert rule wizard](../azure-monitor/alerts/alerts-create-activity-log-alert-rule.md).
 
 ## Next steps