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

Author: PatAltimore

.openpublishing.redirection.json

@@ -6,15 +6,15 @@ ms.reviewer: amberb
 ms.service: cost-management-billing
 ms.subservice: billing
 ms.topic: conceptual
-ms.date: 03/21/2024
+ms.date: 01/21/2025
 ms.author: banders
 ---
 
 # Terms in the Azure usage and charges file for a Microsoft Customer Agreement
 
 This article applies to a billing account for a Microsoft Customer Agreement. [Check if you have access to a Microsoft Customer Agreement](#check-access-to-a-microsoft-customer-agreement).
 
-The Azure usage and charges CSV file contains daily and meter-level usage charges for the current billing period.
+The Azure usage and charges CSV file contain daily and meter-level usage charges for the current billing period.
 
 To get your Azure usage and charges file, see [View and download Azure usage and charges for your Microsoft Customer Agreement](download-azure-daily-usage.md). It's available in a comma-separated values (.csv) file format that you can open in a spreadsheet application.
 
@@ -45,7 +45,7 @@ If you're an EA customer, notice that the terms in the Azure billing profile usa
 | MeterRegion | meterRegion | Detail required for a service. Useful to find the region context of the resource. |
 | MeterName | meterName | Name of the meter. Represents the Azure service deployable resource. |
 | ConsumedQuantity | quantity | Measured quantity purchased or consumed. The amount of the meter used during the billing period. |
-| ResourceRate | effectivePrice | The price represents the actual rate that you end up paying per unit, after discounts are taken into account. It's the price that should be used with the `Quantity` to do `Price` \* `Quantity` calculations to reconcile charges. The price takes into account the following scenarios and the scaled unit price that's also present in the files. As a result, it might differ from the scaled unit price. |
+| ResourceRate | effectivePrice | The price represents the actual rate that you end up paying per unit, after discounts are taken into account. It's the price that should be used with the `Quantity` to do `Price` \* `Quantity` calculations to reconcile charges. The price takes into account the following scenarios and the scaled unit price that's also present in the files. As a result, it might differ from the scaled unit price. <br> [Reservation](../reservations/understand-reserved-instance-usage-ea.md) and [savings plan](../savings-plan/utilization-cost-reports.md) charges might be zero in actual cost reports but are shown in amortized cost reports. |
 | ExtendedCost | cost | Cost of the charge in the billing currency before credits or taxes. |
 | ResourceLocation | resourceLocation | Location of the used resource's data center. |
 | ConsumedService | consumedService | Name of the service. |

articles/azure-web-pubsub/howto-troubleshoot-resource-logs.md

@@ -5,20 +5,45 @@ services: ddos-protection
 author: AbdullahBell
 ms.service: azure-ddos-protection
 ms.topic: concept-article
-ms.date: 07/17/2024
+ms.date: 01/21/2025
 ms.author: abell
 ---
-# Types of attacks Azure DDoS Protection mitigates
+# Types of attacks Azure DDoS Protection mitigate
 
 Azure DDoS Protection can mitigate the following types of attacks:
 
-- **Volumetric attacks**: These attacks flood the network layer with a substantial amount of seemingly legitimate traffic. They include UDP floods, amplification floods, and other spoofed-packet floods. DDoS Protection mitigates these potential multi-gigabyte attacks by absorbing and scrubbing them, with Azure's global network scale, automatically.
-- **Protocol attacks**: These attacks render a target inaccessible, by exploiting a weakness in the layer 3 and layer 4 protocol stack. They include SYN flood attacks, reflection attacks, and other protocol attacks. DDoS Protection mitigates these attacks, differentiating between malicious and legitimate traffic, by interacting with the client, and blocking malicious traffic. 
-- **Resource (application) layer attacks**: These attacks target web application packets, to disrupt the transmission of data between hosts. They include HTTP protocol violations, SQL injection, cross-site scripting, and other layer 7 attacks. Use a Web Application Firewall, such as the Azure [Application Gateway web application firewall](../web-application-firewall/ag/ag-overview.md?toc=%2fazure%2fvirtual-network%2ftoc.json), as well as DDoS Protection to provide defense against these attacks. There are also third-party web application firewall offerings available in the [Azure Marketplace](https://azuremarketplace.microsoft.com/marketplace/apps?page=1&search=web%20application%20firewall).
+- **Volumetric attacks**: These attacks flood the network layer with a substantial amount of seemingly legitimate traffic. They include UDP floods, amplification floods, and other spoofed-packet floods. DDoS Protection mitigates these potential multi-gigabyte attacks by absorbing and scrubbing them, with Azure's global network scale, automatically. Common attack types are listed in the following table.
 
-## Azure DDoS Protection
+    | **Attack Type**                | **Description**                                                                 |
+    |--------------------------------|---------------------------------------------------------------------------------|
+    | **ICMP Flood**                 | Overwhelms the target with ICMP Echo Request (ping) packets, causing disruption. |
+    | **IP/ICMP Fragmentation**      | Exploits IP packet fragmentation to overwhelm the target with fragmented packets.|
+    | **IPsec Flood**                | Floods the target with IPsec packets, overwhelming the processing capability.    |
+    | **UDP Flood**                  | Sends a large number of UDP packets to random ports, causing resource exhaustion.|
+    | **Reflection Amplification Attack** | Uses a third-party server to amplify the attack traffic towards the target.    |
+
+- **Protocol attacks**: These attacks render a target inaccessible, by exploiting a weakness in the layer 3 and layer 4 protocol stack. They include SYN flood attacks, reflection attacks, and other protocol attacks. DDoS Protection mitigates these attacks, differentiating between malicious and legitimate traffic, by interacting with the client, and blocking malicious traffic. Common attack types are listed in the following table.
+
+    | **Attack Type**                | **Description**                                                                 |
+    |--------------------------------|---------------------------------------------------------------------------------|
+    | **SYN Flood**                  | Exploits the TCP handshake process to overwhelm the target with connection requests. |
+    | **Fragmented Packet Attack**   | Sends fragmented packets to the target, causing resource exhaustion during reassembly. |
+    | **Ping of Death**              | Sends malformed or oversized packets to crash or destabilize the target system. |
+    | **Smurf Attack**               | Uses ICMP echo requests to flood the target with traffic by exploiting network devices. |
+
+- **Resource (application) layer attacks**: These attacks target web application packets, to disrupt the transmission of data between hosts. They include HTTP protocol violations, SQL injection, cross-site scripting, and other layer 7 attacks. Use a Web Application Firewall, such as the Azure [Application Gateway web application firewall](../web-application-firewall/ag/ag-overview.md?toc=%2fazure%2fvirtual-network%2ftoc.json), and DDoS Protection to provide defense against these attacks. There are also third-party web application firewall offerings available in the [Azure Marketplace](https://azuremarketplace.microsoft.com/marketplace/apps?page=1&search=web%20application%20firewall). Common attacks types are listed in the following table.
+
+
+    | **Attack Type**                | **Description**                                                                 |
+    |--------------------------------|---------------------------------------------------------------------------------|
+    | **BGP Hijacking**              | Involves taking control of a group of IP addresses by corrupting Internet routing tables. |
+    | **Slowloris**                  | Keeps many connections to the target web server open and holds them open as long as possible. |
+    | **Slow Post**                  | Sends HTTP POST headers that are incomplete, causing the server to wait for the rest of the data. |
+    | **Slow Read**                  | Reads responses from the server slowly, causing the server to keep the connection open. |
+    | **HTTP(/s) Flooding**          | Floods the target with HTTP requests, overwhelming the server's ability to respond. |
+    | **Low and Slow attack**        | Uses a few connections to slowly send or request data, evading detection. |
+    | **Large Payload POST**         | Sends large payloads in HTTP POST requests to exhaust server resources. |
 
-Azure DDoS Protection protects resources in a virtual network including public IP addresses associated with virtual machines, load balancers, and application gateways. When coupled with the Application Gateway web application firewall, or a third-party web application firewall deployed in a virtual network with a public IP, Azure DDoS Protection can provide full layer 3 to layer 7 mitigation capability.
 
 ## Next steps
 

articles/cost-management-billing/understand/mca-understand-your-usage.md

@@ -4,6 +4,8 @@
   href: overview.md
 - name: Reliability fundamentals
   items:
+  - name: Business continuity, high availability, and disaster recovery
+    href: concept-business-continuity-high-availability-disaster-recovery.md
   - name: Shared responsibility for resiliency
     href: concept-shared-responsibility.md
   - name: Azure service incident response
@@ -88,12 +90,6 @@
         href: migrate-vm.md
       - name: Workload - Azure Kubernetes and MySQL
         href: migrate-workload-aks-mysql.md
-- name: Disaster recovery
-  items:
-  - name: What is disaster recovery?
-    href: disaster-recovery-overview.md
-  - name: Business continuity management program
-    href: business-continuity-management-program.md
 - name: Reliability guides by service
   items:
   - name: Overview

articles/ddos-protection/types-of-attacks.md

@@ -5,7 +5,7 @@ author: anaharris-ms
 ms.service: azure
 ms.subservice: azure-availability-zones
 ms.topic: conceptual
-ms.date: 06/13/2024
+ms.date: 01/22/2025
 ms.author: anaharris
 ms.custom: references_regions, subject-reliability
 ---
@@ -106,6 +106,7 @@ As mentioned previously, Azure classifies services into three categories: founda
 > | Azure VMware Solution                                |
 > | Microsoft Azure Attestation                          |
 > | Microsoft Purview                                    |
+> | SQL Server on Azure Virtual Machines                 |
 > | SQL Server Stretch Database                          |
 > | Virtual Machines: Bsv2-series                        |
 > | Virtual Machines: Dasv5 and Dadsv5-series            |