Skip to content

Commit d900c04

Browse files
authored
Merge pull request #293367 from MicrosoftDocs/main
1/22/2025 11:00 AM IST Publish
2 parents 4b6a29d + 6a5c407 commit d900c04

File tree

56 files changed

+5825
-5610
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+5825
-5610
lines changed

.openpublishing.publish.config.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,6 @@
128128
"branch": "master",
129129
"branch_mapping": {}
130130
},
131-
{
132-
"path_to_root": "azure-docs-snippets-pr",
133-
"url": "https://github.com/MicrosoftDocs/azure-docs-snippets-pr",
134-
"branch": "main",
135-
"branch_mapping": {}
136-
},
137131
{
138132
"path_to_root": "azure-functions-dapr-extension",
139133
"url": "https://github.com/Azure/azure-functions-dapr-extension",

.openpublishing.redirection.json

Lines changed: 5113 additions & 5103 deletions
Large diffs are not rendered by default.

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

Lines changed: 167 additions & 142 deletions
Large diffs are not rendered by default.

articles/batch/batch-account-create-portal.md

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Create a Batch account in the Azure portal
33
description: Learn how to use the Azure portal to create and manage an Azure Batch account for running large-scale parallel workloads in the cloud.
44
ms.topic: how-to
5-
ms.date: 04/16/2024
5+
ms.date: 01/22/2025
66
ms.custom: subject-rbac-steps, linux-related-content
77
---
88

@@ -98,7 +98,7 @@ Get-AzMarketplaceTerms -Publisher 'microsoft-azure-batch' -Product 'ubuntu-serve
9898
<a name="allow-azure-batch-to-access-the-subscription-one-time-operation"></a>
9999
### Allow Batch to access the subscription
100100

101-
When you create the first user subscription mode Batch account in an Azure subscription, you must register your subscription with Batch. You need to do this registration only once per subscription.
101+
When you create the first user subscription mode Batch account in an Azure subscription, you must register your subscription with Batch resource provider, and assign **Azure Batch Service Orchestration Role** to Microsoft Azure Batch service principal. You need to do this configuration only once per subscription.
102102

103103
> [!IMPORTANT]
104104
> You need **Owner** permissions in the subscription to take this action.
@@ -112,9 +112,9 @@ When you create the first user subscription mode Batch account in an Azure subsc
112112

113113
1. Return to the **Subscription** page and select **Access control (IAM)** from the left navigation.
114114
1. At the top of the **Access control (IAM)** page, select **Add** > **Add role assignment**.
115-
1. On the **Add role assignment** screen, under **Assignment type**, select **Privileged administrator role**, and then select **Next**.
116-
1. On the **Role** tab, select either the **Contributor** or **Owner** role for the Batch account, and then select **Next**.
115+
1. On the **Role** tab, search for and select **Azure Batch Service Orchestration Role**, and then select **Next**.
117116
1. On the **Members** tab, select **Select members**. On the **Select members** screen, search for and select **Microsoft Azure Batch**, and then select **Select**.
117+
1. Select **Review + assign** to go to **Review + assign** tab, and select **Review + create** again to apply role assignment changes.
118118

119119
For detailed steps, see [Assign Azure roles by using the Azure portal](../role-based-access-control/role-assignments-portal.yml).
120120

@@ -147,6 +147,7 @@ To create a Batch account with authentication mode settings:
147147
1. You can select either of the 3 **"Microsoft Entra ID**, **Shared Key**, **Task Authentication Token** authentication mode for the Batch account to support or leave the settings at default values.
148148

149149
:::image type="content" source="media/batch-account-create-portal/authentication-mode-property.png" alt-text="Screenshot of the Authentication Mode options when creating a Batch account.":::
150+
150151
1. Leave the remaining settings at default values, select **Review + create**, and then select **Create**.
151152

152153
> [!TIP]
@@ -157,38 +158,31 @@ To create a Batch account with authentication mode settings:
157158
158159
### Grant access to the key vault manually
159160

160-
You can also grant access to the key vault manually in [Azure portal](https://portal.azure.com).
161+
To grant access to the key vault manually in [Azure portal](https://portal.azure.com), you need to assign **Key Vault Secrets Officer** role for Batch:
161162

162-
#### If the Key Vault permission model is **Azure role-based access control**:
163163
1. Select **Access control (IAM)** from the left navigation of the key vault page.
164164
1. At the top of the **Access control (IAM)** page, select **Add** > **Add role assignment**.
165-
1. On the **Add role assignment** screen, under **Role** tab, under **Job function roles** sub tab, select either **Key Vault Secrets Officer** or **Key Vault Administrator** role for the Batch account, and then select **Next**.
165+
1. On the **Add role assignment** screen, under **Role** tab, under **Job function roles** sub tab, search and select **Key Vault Secrets Officer** role for the Batch account, and then select **Next**.
166166
1. On the **Members** tab, select **Select members**. On the **Select members** screen, search for and select **Microsoft Azure Batch**, and then select **Select**.
167-
1. Click the **Review + create** button on the bottom to go to **Review + assign** tab, and click the **Review + create** button on the bottom again.
167+
1. Select the **Review + create** button on the bottom to go to **Review + assign** tab, and select the **Review + create** button on the bottom again.
168168

169169
For detailed steps, see [Assign Azure roles by using the Azure portal](../role-based-access-control/role-assignments-portal.yml).
170170

171-
#### If the Key Vault permission model is **Vault access policy**:
171+
> [!NOTE]
172+
> **KeyVaultNotFound** error returns for Batch account creation if the RBAC role isn't assigned for Batch in the referenced key vault.
173+
174+
If the Key Vault permission model is **Vault access policy**, you also need to configure the **Access policies**:
175+
172176
1. Select **Access policies** from the left navigation of the key vault page.
173177
1. On the **Access policies** page, select **Create**.
174-
1. On the **Create an access policy** screen, select a minimum of **Get**, **List**, **Set**, and **Delete** permissions under **Secret permissions**. For [key vaults with soft-delete enabled](/azure/key-vault/general/soft-delete-overview), also select **Recover**.
178+
1. On the **Create an access policy** screen, select a minimum of **Get**, **List**, **Set**, **Delete**, and **Recover** permissions under **Secret permissions**.
175179

176180
:::image type="content" source="media/batch-account-create-portal/secret-permissions.png" alt-text="Screenshot of the Secret permissions selections for Azure Batch":::
177181

178182
1. Select **Next**.
179183
1. On the **Principal** tab, search for and select **Microsoft Azure Batch**.
180184
1. Select the **Review + create** tab, and then select **Create**.
181185

182-
<!--can't find this link or screen
183-
184-
Select **Add**, then ensure that the **Azure Virtual Machines for deployment** and **Azure Resource Manager for template deployment** check boxes are selected for the linked **Key Vault** resource. Select **Save** to commit your changes.
185-
186-
:::image type="content" source="media/batch-account-create-portal/key-vault-access-policy.png" alt-text="Screenshot of the Access policy screen.":::
187-
188-
-->
189-
> [!NOTE]
190-
> Currently, the Batch account name supports only access policies. When creating a Batch account, ensure that the key vault uses the associated access policy instead of the EntraID RBAC permissions. For more information on how to add an access policy to your Azure key vault instance, see [Configure your Azure Key Vault instance](batch-customer-managed-key.md).
191-
192186
### Configure subscription quotas
193187

194188
For user subscription Batch accounts, [core quotas](batch-quota-limit.md) must be set manually. Standard Batch core quotas don't apply to accounts in user subscription mode. The [quotas in your subscription](/azure/azure-resource-manager/management/azure-subscription-service-limits) for regional compute cores, per-series compute cores, and other resources are used and enforced.
Binary file not shown.
64.2 KB
Loading

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ ms.reviewer: amberb
66
ms.service: cost-management-billing
77
ms.subservice: billing
88
ms.topic: conceptual
9-
ms.date: 03/21/2024
9+
ms.date: 01/21/2025
1010
ms.author: banders
1111
---
1212

1313
# Terms in the Azure usage and charges file for a Microsoft Customer Agreement
1414

1515
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).
1616

17-
The Azure usage and charges CSV file contains daily and meter-level usage charges for the current billing period.
17+
The Azure usage and charges CSV file contain daily and meter-level usage charges for the current billing period.
1818

1919
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.
2020

@@ -45,7 +45,7 @@ If you're an EA customer, notice that the terms in the Azure billing profile usa
4545
| MeterRegion | meterRegion | Detail required for a service. Useful to find the region context of the resource. |
4646
| MeterName | meterName | Name of the meter. Represents the Azure service deployable resource. |
4747
| ConsumedQuantity | quantity | Measured quantity purchased or consumed. The amount of the meter used during the billing period. |
48-
| 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. |
48+
| 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. |
4949
| ExtendedCost | cost | Cost of the charge in the billing currency before credits or taxes. |
5050
| ResourceLocation | resourceLocation | Location of the used resource's data center. |
5151
| ConsumedService | consumedService | Name of the service. |

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

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,45 @@ services: ddos-protection
55
author: AbdullahBell
66
ms.service: azure-ddos-protection
77
ms.topic: concept-article
8-
ms.date: 07/17/2024
8+
ms.date: 01/21/2025
99
ms.author: abell
1010
---
11-
# Types of attacks Azure DDoS Protection mitigates
11+
# Types of attacks Azure DDoS Protection mitigate
1212

1313
Azure DDoS Protection can mitigate the following types of attacks:
1414

15-
- **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.
16-
- **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.
17-
- **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).
15+
- **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.
1816

19-
## Azure DDoS Protection
17+
| **Attack Type** | **Description** |
18+
|--------------------------------|---------------------------------------------------------------------------------|
19+
| **ICMP Flood** | Overwhelms the target with ICMP Echo Request (ping) packets, causing disruption. |
20+
| **IP/ICMP Fragmentation** | Exploits IP packet fragmentation to overwhelm the target with fragmented packets.|
21+
| **IPsec Flood** | Floods the target with IPsec packets, overwhelming the processing capability. |
22+
| **UDP Flood** | Sends a large number of UDP packets to random ports, causing resource exhaustion.|
23+
| **Reflection Amplification Attack** | Uses a third-party server to amplify the attack traffic towards the target. |
24+
25+
- **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.
26+
27+
| **Attack Type** | **Description** |
28+
|--------------------------------|---------------------------------------------------------------------------------|
29+
| **SYN Flood** | Exploits the TCP handshake process to overwhelm the target with connection requests. |
30+
| **Fragmented Packet Attack** | Sends fragmented packets to the target, causing resource exhaustion during reassembly. |
31+
| **Ping of Death** | Sends malformed or oversized packets to crash or destabilize the target system. |
32+
| **Smurf Attack** | Uses ICMP echo requests to flood the target with traffic by exploiting network devices. |
33+
34+
- **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.
35+
36+
37+
| **Attack Type** | **Description** |
38+
|--------------------------------|---------------------------------------------------------------------------------|
39+
| **BGP Hijacking** | Involves taking control of a group of IP addresses by corrupting Internet routing tables. |
40+
| **Slowloris** | Keeps many connections to the target web server open and holds them open as long as possible. |
41+
| **Slow Post** | Sends HTTP POST headers that are incomplete, causing the server to wait for the rest of the data. |
42+
| **Slow Read** | Reads responses from the server slowly, causing the server to keep the connection open. |
43+
| **HTTP(/s) Flooding** | Floods the target with HTTP requests, overwhelming the server's ability to respond. |
44+
| **Low and Slow attack** | Uses a few connections to slowly send or request data, evading detection. |
45+
| **Large Payload POST** | Sends large payloads in HTTP POST requests to exhaust server resources. |
2046

21-
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.
2247

2348
## Next steps
2449

articles/event-grid/communication-services-email-events.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
---
22
title: Azure Communication Services - Email events
33
description: This article describes how to use Azure Communication Services as an Event Grid event source for Email Events.
4-
ms.topic: conceptual
5-
ms.date: 09/30/2022
4+
ms.topic: concept-article
5+
ms.date: 01/21/2025
66
author: anmolbohra97
77
ms.author: anmolbohra
8+
# Customer intent: I want to learn about what email events from Azure Communication Servics are supported through Azure Event Grid.
89
---
910

1011
# Azure Communication Services - Email events
@@ -13,7 +14,7 @@ This article provides the properties and schema for communication services email
1314

1415
## Events types
1516

16-
Azure Communication Services emits the following telephony and SMS event types:
17+
Azure Communication Services emits the following telephony and Short Message Service (SMS) event types:
1718

1819
| Event type | Description |
1920
| ----------------------------------------------------------- | ---------------------------------------------------------------------------------------------- |
@@ -54,7 +55,7 @@ This section contains an example of what that data would look like for each even
5455
> Possible values for `Status` are:
5556
> - `Delivered`: The message was successfully handed over to the intended destination (recipient Mail Transfer Agent).
5657
> - `Suppressed`: The recipient email had hard bounced previously, and all subsequent emails to this recipient are being temporarily suppressed as a result.
57-
> - `Bounced`: The email hard bounced, which may have happened because the email address does not exist or the domain is invalid.
58+
> - `Bounced`: The email hard bounced, which might happen because the email address doesn't exist or the domain is invalid.
5859
> - `Quarantined`: The message was quarantined (as spam, bulk mail, or phishing).
5960
> - `FilteredSpam`: The message was identified as spam, and was rejected or blocked (not quarantined).
6061
> - `Expanded`: A distribution group recipient was expanded before delivery to the individual members of the group.

0 commit comments

Comments
 (0)