Skip to content

Commit 035f398

Browse files
authored
Merge pull request #262019 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents 164a431 + 0a0e63a commit 035f398

12 files changed

+47
-49
lines changed

articles/app-service/overview-managed-identity.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -432,9 +432,9 @@ The **IDENTITY_ENDPOINT** is a local URL from which your app can request tokens.
432432
> | resource | Query | The Microsoft Entra resource URI of the resource for which a token should be obtained. This could be one of the [Azure services that support Microsoft Entra authentication](../active-directory/managed-identities-azure-resources/services-support-managed-identities.md#azure-services-that-support-azure-ad-authentication) or any other resource URI. |
433433
> | api-version | Query | The version of the token API to be used. Use `2019-08-01`. |
434434
> | X-IDENTITY-HEADER | Header | The value of the IDENTITY_HEADER environment variable. This header is used to help mitigate server-side request forgery (SSRF) attacks. |
435-
> | client_id | Query | (Optional) The client ID of the user-assigned identity to be used. Cannot be used on a request that includes `principal_id`, `mi_res_id`, or `object_id`. If all ID parameters (`client_id`, `principal_id`, `object_id`, and `mi_res_id`) are omitted, the system-assigned identity is used. |
436-
> | principal_id | Query | (Optional) The principal ID of the user-assigned identity to be used. `object_id` is an alias that may be used instead. Cannot be used on a request that includes client_id, mi_res_id, or object_id. If all ID parameters (`client_id`, `principal_id`, `object_id`, and `mi_res_id`) are omitted, the system-assigned identity is used. |
437-
> | mi_res_id | Query | (Optional) The Azure resource ID of the user-assigned identity to be used. Cannot be used on a request that includes `principal_id`, `client_id`, or `object_id`. If all ID parameters (`client_id`, `principal_id`, `object_id`, and `mi_res_id`) are omitted, the system-assigned identity is used. |
435+
> | client_id | Query | (Optional) The client ID of the user-assigned identity to be used. Cannot be used on a request that includes `principal_id`, `msi_res_id`, or `object_id`. If all ID parameters (`client_id`, `principal_id`, `object_id`, and `msi_res_id`) are omitted, the system-assigned identity is used. |
436+
> | principal_id | Query | (Optional) The principal ID of the user-assigned identity to be used. `object_id` is an alias that may be used instead. Cannot be used on a request that includes client_id, msi_res_id, or object_id. If all ID parameters (`client_id`, `principal_id`, `object_id`, and `msi_res_id`) are omitted, the system-assigned identity is used. |
437+
> | msi_res_id | Query | (Optional) The Azure resource ID of the user-assigned identity to be used. Cannot be used on a request that includes `principal_id`, `client_id`, or `object_id`. If all ID parameters (`client_id`, `principal_id`, `object_id`, and `msi_res_id`) are omitted, the system-assigned identity is used. |
438438
439439
> [!IMPORTANT]
440440
> If you are attempting to obtain tokens for user-assigned identities, you must include one of the optional properties. Otherwise the token service will attempt to obtain a token for a system-assigned identity, which may or may not exist.

articles/azure-monitor/logs/cross-workspace-query.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Query and correlated data from multiple Log Analytics workspaces, a
44
ms.topic: how-to
55
author: guywi-ms
66
ms.author: guywild
7-
ms.date: 05/30/2023
7+
ms.date: 12/28/2023
88
# Customer intent: As a data analyst, I want to write KQL queries that correlate data from multiple Log Analytics workspaces, applications, or resources, to enable my analysis.
99

1010
---

articles/azure-monitor/logs/log-analytics-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Overview of Log Analytics in Azure Monitor
33
description: This overview describes Log Analytics, which is a tool in the Azure portal used to edit and run log queries for analyzing data in Azure Monitor logs.
44
ms.topic: conceptual
5-
ms.date: 06/28/2022
5+
ms.date: 12/28/2023
66

77
---
88

articles/azure-monitor/logs/log-analytics-workspace-insights-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ services: azure-monitor
55
ms.topic: conceptual
66
author: guywild
77
ms.author: guywild
8-
ms.reviewer: noakuper
9-
ms.date: 06/27/2022
8+
ms.reviewer: osalzberg
9+
ms.date: 12/28/2023
1010

1111
---
1212

articles/azure-monitor/logs/queries.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ ms.subservice: logs
55
ms.topic: article
66
author: guywild
77
ms.author: guywild
8-
ms.reviewer: roygal
9-
ms.date: 06/22/2022
8+
ms.reviewer: ilanawaitser
9+
ms.date: 12/28/2023
1010
---
1111

1212
# Use queries in Log Analytics
@@ -107,4 +107,4 @@ The queries that are available when you open Log Analytics are determined by the
107107
108108
## Next steps
109109

110-
[Get started with KQL queries](get-started-queries.md)
110+
[Get started with KQL queries](get-started-queries.md)

articles/azure-monitor/logs/scope.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ description: Describes the scope and time range for a log query in Azure Monitor
44
ms.topic: conceptual
55
author: guywi-ms
66
ms.author: guywild
7-
ms.date: 10/20/2021
7+
ms.reviewer: ilanawaitser
8+
ms.date: 12/28/2023
89

910
---
1011

@@ -85,4 +86,4 @@ If the query uses **app** to retrieve data from a classic Application Insights a
8586
## Next steps
8687

8788
- Walk through a [tutorial on using Log Analytics in the Azure portal](../logs/log-analytics-tutorial.md).
88-
- Walk through a [tutorial on writing queries](../logs/get-started-queries.md).
89+
- Walk through a [tutorial on writing queries](../logs/get-started-queries.md).

articles/cosmos-db/burst-capacity-faq.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,14 @@ sections:
5151
- question: |
5252
How can I enable burst capacity on an account programatically?
5353
answer: |
54-
You can use the [Azure Cosmos DB Resource Provider REST API version `2023-03-15-preview`](/rest/api/cosmos-db-resource-provider/2023-03-15-preview/database-accounts/create-or-update) or a [Resource Manager template with API version `2023-03-01-preview`](/azure/templates/microsoft.documentdb/2023-03-01-preview/databaseaccounts) to set the property `enableBurstCapacity` to true.
54+
You can use the [Azure Cosmos DB Resource Provider REST API version `2023-09-15` or later](/rest/api/cosmos-db-resource-provider/database-accounts/create-or-update) or a [Resource Manager template with API version `2023-03-01-preview`](/azure/templates/microsoft.documentdb/2023-03-01-preview/databaseaccounts) to set the property `enableBurstCapacity` to true.
5555
You can also use the Azure CLI or PowerShell.
5656
5757
#### [PowerShell](#tab/azure-powershell)
5858
5959
```azurepowershell
60-
// Add the preview extension 2.0.5-preview or higher
61-
$installParameters = @{
62-
Name = "Az.CosmosDB"
63-
AllowPrerelease = $true
64-
Force = $true
65-
}
66-
Install-Module @installParameters
60+
// Add Azure Cosmos DB extension 1.13.0 or higher
61+
Install-Module -Name Az.CosmosDB -RequiredVersion 1.13.0
6762
6863
// Enable burst capacity on an account
6964
$parameters = @{
@@ -77,9 +72,6 @@ sections:
7772
#### [Azure CLI](#tab/azure-cli)
7873
7974
```azurecli
80-
// Add the preview extension version 0.24.0 or higher
81-
az extension add --name cosmosdb-preview --version 0.24.0
82-
8375
// Enable burst capacity on an account
8476
az cosmosdb update \
8577
--resource-group '<resource-group-name>' \

articles/cosmos-db/burst-capacity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Burst capacity applies only to Azure Cosmos DB accounts using provisioned throug
2222
## How burst capacity works
2323

2424
> [!NOTE]
25-
> The current implementation of burst capacity is subject to change in the future. Usage of burst capacity is subject to system resource availability and is not guaranteed. Azure Cosmos DB may also use burst capacity for background maintenance tasks. If your workload requires consistent throughput beyond what you have provisioned, it's recommended to provision your RU/s accordingly without relying on burst capacity. Before enabling burst capacity, it is also recommended to evaluate if your partition layout can be [merged](merge.md) to permanently give more RU/s per physical partition without relying on burst capacity.
25+
> The current implementation of burst capacity is subject to change in the future. Usage of burst capacity is subject to system resource availability and is **not guaranteed**. Azure Cosmos DB may also use burst capacity for background maintenance tasks. If your workload requires consistent throughput beyond what you have provisioned, it's recommended to provision your RU/s accordingly without relying on burst capacity. Before enabling burst capacity, it is also recommended to evaluate if your partition layout can be [merged](merge.md) to permanently give more RU/s per physical partition without relying on burst capacity.
2626
2727
Let's take an example of a physical partition that has 100 RU/s of provisioned throughput and is idle for 5 minutes. With burst capacity, it can accumulate a maximum of 100 RU/s * 300 seconds = 30,000 RU of burst capacity. The capacity can be consumed at a maximum rate of 3000 RU/s, so if there's a sudden spike in request volume, the partition can burst up to 3000 RU/s for up 30,000 RU / 3000 RU/s = 10 seconds. Without burst capacity, any requests that are consumed beyond the provisioned 100 RU/s would have been rate limited (429).
2828

articles/cosmos-db/nosql/sdk-java-spark-v3.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,20 @@ If you have any feedback or ideas on how to improve your experience create an is
3232
## Version compatibility
3333
* [Version compatibility for Spark 3.1](https://aka.ms/azure-cosmos-spark-3-1-version-compatibility)
3434
* [Version compatibility for Spark 3.2](https://aka.ms/azure-cosmos-spark-3-2-version-compatibility)
35+
* [Version compatibility for Spark 3.3](https://aka.ms/azure-cosmos-spark-3-3-version-compatibility)
36+
* [Version compatibility for Spark 3.4](https://aka.ms/azure-cosmos-spark-3-4-version-compatibility)
3537

3638
## Release notes
3739
* [Release notes for Spark 3.1](https://aka.ms/azure-cosmos-spark-3-1-changelog)
3840
* [Release notes for Spark 3.2](https://aka.ms/azure-cosmos-spark-3-2-changelog)
41+
* [Release notes for Spark 3.3](https://aka.ms/azure-cosmos-spark-3-3-changelog)
42+
* [Release notes for Spark 3.4](https://aka.ms/azure-cosmos-spark-3-4-changelog)
3943

4044
## Download
4145
* [Download of Azure Cosmos DB Spark connector for Spark 3.1](https://aka.ms/azure-cosmos-spark-3-1-download)
4246
* [Download of Azure Cosmos DB Spark connector for Spark 3.2](https://aka.ms/azure-cosmos-spark-3-2-download)
47+
* [Download of Azure Cosmos DB Spark connector for Spark 3.3](https://aka.ms/azure-cosmos-spark-3-3-download)
48+
* [Download of Azure Cosmos DB Spark connector for Spark 3.4](https://aka.ms/azure-cosmos-spark-3-4-download)
4349

4450
Azure Cosmos DB Spark connector is available on [Maven Central Repo](https://search.maven.org/search?q=g:com.azure.cosmos.spark).
4551

articles/defender-for-cloud/exempt-resource.md

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,15 @@ author: dcurwin
88
ms.date: 10/29/2023
99
---
1010

11-
# Exempt resources from recommendations
11+
# Exempt resources from recommendations
1212

13-
14-
When you investigate security recommendations in Microsoft Defender for Cloud, you usually review the list of affected resources. Occasionally, a resource will be listed that you feel shouldn't be included. Or a recommendation will show in a scope where you feel it doesn't belong. For example, a resource might have been remediated by a process not tracked by Defender for Cloud, or a recommendation might be inappropriate for a specific subscription. Or perhaps your organization has decided to accept the risks related to the specific resource or recommendation.
13+
When you investigate security recommendations in Microsoft Defender for Cloud, you usually review the list of affected resources. Occasionally, a resource is listed that you feel shouldn't be included. Or a recommendation shows in a scope where you feel it doesn't belong. For example, a resource might be remediated by a process not tracked by Defender for Cloud, or a recommendation might be inappropriate for a specific subscription. Or perhaps your organization decided to accept the risks related to the specific resource or recommendation.
1514

1615
In such cases, you can create an exemption to:
1716

18-
- **Exempt a resource** to ensure it isn't listed with the unhealthy resources in the future, and doesn't impact your secure score. The resource will be listed as not applicable and the reason will be shown as "exempted" with the specific justification you select.
17+
- **Exempt a resource** to ensure it isn't listed with the unhealthy resources in the future, and doesn't affect your secure score. The resource will be listed as not applicable and the reason will be shown as "exempted" with the specific justification you select.
1918

20-
- **Exempt a subscription or management group** to ensure that the recommendation doesn't impact your secure score and won't be shown for the subscription or management group in the future. This relates to existing resources and any you create in the future. The recommendation will be marked with the specific justification you select for the scope that you selected.
19+
- **Exempt a subscription or management group** to ensure that the recommendation doesn't affect your secure score and won't be shown for the subscription or management group in the future. This relates to existing resources and any you create in the future. The recommendation will be marked with the specific justification you select for the scope that you selected.
2120

2221
For the scope you need, you can create an exemption rule to:
2322

@@ -26,17 +25,17 @@ For the scope you need, you can create an exemption rule to:
2625

2726
## Before you start
2827

29-
This feature is in preview. [!INCLUDE [Legalese](../../includes/defender-for-cloud-preview-legal-text.md)] This is a premium Azure Policy capability that's offered at no additional cost for customers with Microsoft Defender for Cloud's enhanced security features enabled. For other users, charges might apply in the future.
28+
This feature is in preview. [!INCLUDE [Legalese](../../includes/defender-for-cloud-preview-legal-text.md)] This is a premium Azure Policy capability offered at no extra cost for customers with Microsoft Defender for Cloud's enhanced security features enabled. For other users, charges might apply in the future.
3029

3130
- You need the following permissions to make exemptions:
32-
- **Owner** or **Security Admin** or **Resource Policy Contributor** to create an exemption
33-
- To create a rule, you need permissions to edit policies in Azure Policy. [Learn more](../governance/policy/overview.md#azure-rbac-permissions-in-azure-policy).
31+
- **Owner** or **Security Admin** or **Resource Policy Contributor** to create an exemption
32+
- To create a rule, you need permissions to edit policies in Azure Policy. [Learn more](../governance/policy/overview.md#azure-rbac-permissions-in-azure-policy).
3433

3534
- You can create exemptions for recommendations included in Defender for Cloud's default [Microsoft cloud security benchmark](/security/benchmark/azure/introduction) standard, or any of the supplied regulatory standards.
3635
- Custom recommendations can't be exempted.
36+
- If a recommendation is disabled, all of its subrecommendations are exempted.
3737
- In addition to working in the portal, you can create exemptions using the Azure Policy API. Learn more [Azure Policy exemption structure](../governance/policy/concepts/exemption-structure.md).
3838

39-
4039
## Define an exemption
4140

4241
To create an exemption rule:
@@ -49,7 +48,7 @@ To create an exemption rule:
4948

5049
1. In the **Exempt** pane:
5150
1. Select the scope for the exemption.
52-
- If you select a management group, the recommendation will be exempted from all subscriptions within that group
51+
- If you select a management group, the recommendation is exempted from all subscriptions within that group
5352
- If you're creating this rule to exempt one or more resources from the recommendation, choose "Selected resources" and select the relevant ones from the list
5453

5554
1. Enter a name for the exemption rule.
@@ -60,20 +59,19 @@ To create an exemption rule:
6059
> [!NOTE]
6160
> When you exempt a recommendation as mitigated, you aren't given points towards your secure score. But because points aren't *removed* for the unhealthy resources, the result is that your score will increase.
6261

63-
- **Risk accepted (waiver)** – if you’ve decided to accept the risk of not mitigating this recommendation
62+
- **Risk accepted (waiver)** – if you decided to accept the risk of not mitigating this recommendation
6463
1. Enter a description.
6564
1. Select **Create**.
6665
:::image type="content" source="media/exempt-resource/defining-recommendation-exemption.png" alt-text="Steps to create an exemption rule to exempt a recommendation from your subscription or management group." lightbox="media/exempt-resource/defining-recommendation-exemption.png":::
6766

68-
6967
## After creating the exemption
7068

71-
After creating the exemption it can take up to 30 minutes to take effect. After it takes effect:
72-
69+
After creating the exemption, it can take up to 30 minutes to take effect. After it takes effect:
70+
7371
- The recommendation or resources won't impact your secure score.
74-
- If you've exempted specific resources, they'll be listed in the **Not applicable** tab of the recommendation details page.
75-
- If you've exempted a recommendation, it will be hidden by default on Defender for Cloud's recommendations page. This is because the default options of the **Recommendation status** filter on that page are to exclude **Not applicable** recommendations. The same is true if you exempt all recommendations in a security control.
72+
- If you exempted specific resources, they'll be listed in the **Not applicable** tab of the recommendation details page.
73+
- If you exempted a recommendation, it will be hidden by default on Defender for Cloud's recommendations page. This is because the default options of the **Recommendation status** filter on that page are to exclude **Not applicable** recommendations. The same is true if you exempt all recommendations in a security control.
7674

7775
## Next steps
7876

79-
[Review exempted resources](review-exemptions.md) in Defender for Cloud.
77+
[Review exempted resources](review-exemptions.md) in Defender for Cloud.

0 commit comments

Comments
 (0)