Skip to content

Commit a0184f7

Browse files
authored
Merge pull request #221549 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)
2 parents 0513fc8 + ea52b9a commit a0184f7

File tree

11 files changed

+27
-21
lines changed

11 files changed

+27
-21
lines changed

articles/active-directory/app-provisioning/functions-for-customizing-application-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ The **interval** string must have one of the following values:
294294
| Get a date ten days prior to hire date | "d" | -10 | 2012-03-16-07:00 | 3/6/2012 7:00:00 AM |
295295
| Add two weeks to hire date | "ww" | 2 | 2012-03-16-07:00 | 3/30/2012 7:00:00 AM |
296296
| Add ten months to hire date | "m" | 10 | 2012-03-16-07:00 | 1/16/2013 7:00:00 AM |
297-
| Add two years to hire date | "yyyy" | 10 | 2012-03-16-07:00 | 3/16/2014 7:00:00 AM |
297+
| Add two years to hire date | "yyyy" | 2 | 2012-03-16-07:00 | 3/16/2014 7:00:00 AM |
298298

299299
---
300300
### DateDiff

articles/active-directory/app-provisioning/how-provisioning-works.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ The provisioning service continues running back-to-back incremental cycles indef
138138
- The service is manually stopped using the Azure portal, or using the appropriate Microsoft Graph API command.
139139
- A new initial cycle is triggered using the **Restart provisioning** option in the Azure portal, or using the appropriate Microsoft Graph API command. This action clears any stored watermark and causes all source objects to be evaluated again. This will not break the links between source and target objects. To break the links use [Restart synchronizationJob](https://learn.microsoft.com/graph/api/synchronization-synchronizationjob-restart?view=graph-rest-beta&tabs=http) with the following request:
140140

141-
# [HTTP](#tab/http)
142141
<!-- {
143142
"blockType": "request",
144143
"name": "synchronizationjob_restart"

articles/active-directory/conditional-access/concept-conditional-access-users-groups.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ A workload identity is an identity that allows an application or service princip
103103

104104
Organizations can target specific workload identities to be included or excluded from policy.
105105

106-
For more information, see the article [Conditional Access for workload identities preview](workload-identity.md).
106+
For more information, see the article [Conditional Access for workload identities](workload-identity.md).
107107

108108
## Next steps
109109

articles/azure-monitor/essentials/prometheus-metrics-enable.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This article describes how to configure your Azure Kubernetes Service (AKS) clus
1616
## Prerequisites
1717

1818
- You must either have an [Azure Monitor workspace](azure-monitor-workspace-overview.md) or [create a new one](azure-monitor-workspace-overview.md#create-an-azure-monitor-workspace).
19-
- The cluster must use [managed identity authentication](../containers/container-insights-enable-aks.md#migrate-to-managed-identity-authentication).
19+
- The cluster must use [managed identity authentication](../../aks/use-managed-identity.md).
2020
- The following resource providers must be registered in the subscription of the AKS cluster and the Azure Monitor Workspace.
2121
- Microsoft.ContainerService
2222
- Microsoft.Insights

articles/azure-monitor/logs/cost-logs.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,8 @@ Use the following query to make a recommendation for the optimal pricing tier ba
211211
// Set these parameters before running query
212212
// For pay-as-you-go (per-GB) and commitment tier pricing details, see https://azure.microsoft.com/pricing/details/monitor/.
213213
// You can see your per-node costs in your Azure usage and charge data. For more information, see https://learn.microsoft.com/azure/cost-management-billing/understand/download-azure-daily-usage.
214+
let workspaceHasSecurityCenter = true;
215+
let daysToEvaluate = 7;
214216
let PerNodePrice = 15.; // Monthly price per monitored node
215217
let PerNodeOveragePrice = 2.30; // Price per GB for data overage in the Per Node pricing tier
216218
let PerGBPrice = 2.30; // Enter the pay-as-you-go price for your workspace's region (from https://azure.microsoft.com/pricing/details/monitor/)

articles/communication-services/quickstarts/email/includes/send-email-net.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ var bccRecipients = new List<EmailAddress>
212212
new EmailAddress("<[email protected]>"),
213213
};
214214

215-
EmailRecipient emailRecipients = new EmailRecipients(toRecipients, ccRecipients, bccRecipients);
215+
EmailRecipients emailRecipients = new EmailRecipients(toRecipients, ccRecipients, bccRecipients);
216216
```
217217

218218
You can download the sample app demonstrating this from [GitHub](https://github.com/Azure-Samples/communication-services-dotnet-quickstarts/tree/main/SendEmailAdvanced/SendEmailToMultipleRecipients)
@@ -228,7 +228,7 @@ string attachmentFileInBytes = Convert.ToBase64String(bytes);
228228

229229
var emailAttachment = new EmailAttachment(
230230
"<your-attachment-name>",
231-
"<your-attachment-name>",
231+
<EmailAttachmentType>,
232232
attachmentFileInBytes
233233
);
234234

articles/container-apps/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
href: authentication.md
7979
- name: Dapr integration
8080
href: dapr-overview.md
81-
- name: Azure Arc-enable Kubernetes clusters
81+
- name: Azure Arc-enabled Kubernetes clusters
8282
href: azure-arc-overview.md
8383
- name: How-to guides
8484
items:

articles/cosmos-db/consistency-levels.md

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,23 +65,28 @@ Strong consistency offers a linearizability guarantee. Linearizability refers to
6565

6666
### Bounded staleness consistency
6767

68-
In bounded staleness consistency, the reads are guaranteed to honor the consistent-prefix guarantee. The reads might lag behind writes by at most *"K"* versions (that is, "updates") of an item or by *"T"* time interval, whichever is reached first. In other words, when you choose bounded staleness, the "staleness" can be configured in two ways:
68+
For single-region write accounts with two or more regions, data is replicated from the primary region to all secondary (read-only) regions. For multi-region write accounts with two or more regions, data is replicated from the region it was originally written in to all other writable regions. In both scenarios, while not common, there may occasionally be a replication lag from one region to another.
69+
70+
In bounded staleness consistency, data between any two regions will not lag by more than "K" versions (that is, "updates") of an item or by "T" time intervals, whichever is reached first. In other words, when you choose bounded staleness, the maximum "staleness" of the data in any region can be configured in two ways:
6971

7072
- The number of versions (*K*) of the item
7173
- The time interval (*T*) reads might lag behind the writes
7274

73-
For a single region account, the minimum value of *K* and *T* is 10 write operations or 5 seconds. For multi-region accounts the minimum value of *K* and *T* is 100,000 write operations or 300 seconds.
75+
Bounded Staleness is beneficial primarily to single-region write accounts with two or more regions. If the data lag in a region (determined per physical partition) exceeds the configured staleness value, writes for that partition will be throttled until staleness is back within the configured upper bound.
7476

75-
Bounded staleness offers total global order outside of the "staleness window." When a client performs read operations within a region that accepts writes, the guarantees provided by bounded staleness consistency are identical to those guarantees by the strong consistency. As the staleness window approaches for either time or updates, whichever is closer, the service will throttle new writes to allow replication to catch up and honor the consistency guarantee.
77+
For a single-region account, Bounded Staleness provides the same write consistency guarantees as Session and Eventual Consistency with data being replicated to a local majority (three replicas in a four replica set) in the single region.
7678

77-
Inside the staleness window, Bounded Staleness provides the following consistency guarantees:
79+
> [!IMPORTANT]
80+
> With Bounded Staleness consistency, staleness checks are made only across regions and not within a region. Within a given region, data is always replicated to a local majority (three replicas in a four replica set) regardless of the consistency level.
7881
79-
- Consistency for clients in the same region for an account with single write region = [Strong](#strong-consistency)
80-
- Consistency for clients in different regions for an account with single write region = [Consistent Prefix](#consistent-prefix-consistency)
81-
- Consistency for clients writing to a single region for an account with multiple write regions = [Consistent Prefix](#consistent-prefix-consistency)
82-
- Consistency for clients writing to different regions for an account with multiple write regions = [Eventual](#eventual-consistency)
82+
Reads when using Bounded Staleness will return the latest data available in that region by reading from two available replicas in that region. Since writes within a region always replicate to a local majority (3 out of 4 replicas), consulting two replicas will return the most up to date data available in that region.
83+
84+
> [!IMPORTANT]
85+
> With Bounded Staleness consistency, reads issued against a non-primary region may not necessarily return the most recent version of the data globally, but are guaranteed to return the most recent version of the data in that region, which will be within the maximum staleness boundary globally.
86+
87+
Bounded Staleness works best for globally distributed applications using a single-region write accounts with two or more regions, where near strong consistency across regions is desired. For multi-region write accounts with two or more regions, application servers should direct reads and writes to the same region in which the application servers are hosted. Thus, Bounded Staleness in a multi-write account is an anti-pattern as it would require a dependency on replication lag between regions, which should not matter if data is read from the same region it was written to.
8388

84-
Bounded staleness is frequently chosen by globally distributed applications that expect low write latencies but require total global order guarantee. Bounded staleness is great for applications featuring group collaboration and sharing, stock ticker, publish-subscribe/queueing etc. The following graphic illustrates the bounded staleness consistency with musical notes. After the data is written to the "West US 2" region, the "East US 2" and "Australia East" regions read the written value based on the configured maximum lag time or the maximum operations:
89+
The following graphic illustrates the bounded staleness consistency with musical notes. After the data is written to the "West US 2" region, the "East US 2" and "Australia East" regions read the written value based on the configured maximum lag time or the maximum operations:
8590

8691
:::image type="content" source="media/consistency-levels/bounded-staleness-consistency.gif" alt-text="Illustration of bounded staleness consistency level":::
8792

articles/digital-twins/tutorial-end-to-end.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ To publish the function app to Azure, you'll need to create a storage account, t
112112
1. Create an Azure function app by running the following command:
113113
114114
```azurecli-interactive
115-
az functionapp create --name <name-for-new-function-app> --storage-account <name-of-storage-account-from-previous-step> --consumption-plan-location <location> --runtime dotnet --resource-group <resource-group>
115+
az functionapp create --name <name-for-new-function-app> --storage-account <name-of-storage-account-from-previous-step> --functions-version 4 --consumption-plan-location <location> --runtime dotnet --runtime-version 6 --resource-group <resource-group>
116116
```
117117
118118
1. Next, you'll zip up the functions and publish them to your new Azure function app.
@@ -420,4 +420,4 @@ In this tutorial, you created an end-to-end scenario that shows Azure Digital Tw
420420
Next, start looking at the concept documentation to learn more about elements you worked with in the tutorial:
421421

422422
> [!div class="nextstepaction"]
423-
> [Custom models](concepts-models.md)
423+
> [Custom models](concepts-models.md)

articles/sentinel/connect-azure-functions-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Make sure that you have the following permissions and credentials before using A
4545
> [!NOTE]
4646
> - You can securely store workspace and API authorization keys or tokens in Azure Key Vault. Azure Key Vault provides a secure mechanism to store and retrieve key values. [Follow these instructions](../app-service/app-service-key-vault-references.md) to use Azure Key Vault with an Azure Function App.
4747
>
48-
> - Some data connectors depend on a parser based on a [Kusto Function](/azure/data-explorer/kusto/query/functions/user-defined-functions) to work as expected. Seethe section for your service in the [Microsoft Sentinel data connectors reference](data-connectors-reference.md) page for links to instructions to create the Kusto function and alias.
48+
> - Some data connectors depend on a parser based on a [Kusto Function](/azure/data-explorer/kusto/query/functions/user-defined-functions) to work as expected. See the section for your service in the [Microsoft Sentinel data connectors reference](data-connectors-reference.md) page for links to instructions to create the Kusto function and alias.
4949
5050

5151
### STEP 1 - Get your source system's API credentials

0 commit comments

Comments
 (0)