Skip to content

Commit e6bce4b

Browse files
Merge pull request #106925 from MicrosoftDocs/master
Merge master to live 4 AM
2 parents 3616b42 + 57ae3c0 commit e6bce4b

File tree

46 files changed

+101
-57
lines changed

Some content is hidden

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

46 files changed

+101
-57
lines changed

articles/aks/limit-egress-traffic.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,17 @@ The following FQDN / application rules are required:
5858
> [!IMPORTANT]
5959
> ***.blob.core.windows.net and aksrepos.azurecr.io** are no longer required FQDN rules for egress lockdown. For existing clusters, [perform a cluster upgrade operation][aks-upgrade] using the `az aks upgrade` command to remove these rules.
6060
61+
> [!IMPORTANT]
62+
> *.cdn.mscr.io has been replaced by a *.data.mcr.microsoft.com for the Azure public cloud regions. Please upgdate your existing firewall rules for the changes to take effect.
63+
6164
- Azure Global
6265

6366
| FQDN | Port | Use |
6467
|----------------------------|-----------|----------|
6568
| *.hcp.\<location\>.azmk8s.io | HTTPS:443, TCP:22, TCP:9000 | This address is the API server endpoint. Replace *\<location\>* with the region where your AKS cluster is deployed. |
6669
| *.tun.\<location\>.azmk8s.io | HTTPS:443, TCP:22, TCP:9000 | This address is the API server endpoint. Replace *\<location\>* with the region where your AKS cluster is deployed. |
6770
| mcr.microsoft.com | HTTPS:443 | This address is required to access images in Microsoft Container Registry (MCR). This registry contains first-party images/charts(for example, moby, etc.) required for the functioning of the cluster during upgrade and scale of the cluster |
68-
| *.cdn.mscr.io | HTTPS:443 | This address is required for MCR storage backed by the Azure content delivery network (CDN). |
71+
| *.data.mcr.microsoft.com | HTTPS:443 | This address is required for MCR storage backed by the Azure content delivery network (CDN). |
6972
| management.azure.com | HTTPS:443 | This address is required for Kubernetes GET/PUT operations. |
7073
| login.microsoftonline.com | HTTPS:443 | This address is required for Azure Active Directory authentication. |
7174
| ntp.ubuntu.com | UDP:123 | This address is required for NTP time synchronization on Linux nodes. |
@@ -80,7 +83,7 @@ The following FQDN / application rules are required:
8083
| *.tun.\<location\>.cx.prod.service.azk8s.cn | HTTPS:443, TCP:22, TCP:9000 | This address is the API server endpoint. Replace *\<location\>* with the region where your AKS cluster is deployed. |
8184
| *.azk8s.cn | HTTPS:443 | This address is required to download required binaries and images|
8285
| mcr.microsoft.com | HTTPS:443 | This address is required to access images in Microsoft Container Registry (MCR). This registry contains first-party images/charts(for example, moby, etc.) required for the functioning of the cluster during upgrade and scale of the cluster |
83-
| *.cdn.mscr.io | HTTPS:443 | This address is required for MCR storage backed by the Azure Content Delivery Network (CDN). |
86+
| *.cdn.mscr.io | HTTPS:443 | This address is required for MCR storage backed by the Azure Content Delivery Network (CDN). |
8487
| management.chinacloudapi.cn | HTTPS:443 | This address is required for Kubernetes GET/PUT operations. |
8588
| login.chinacloudapi.cn | HTTPS:443 | This address is required for Azure Active Directory authentication. |
8689
| ntp.ubuntu.com | UDP:123 | This address is required for NTP time synchronization on Linux nodes. |
@@ -93,7 +96,7 @@ The following FQDN / application rules are required:
9396
| *.hcp.\<location\>.cx.aks.containerservice.azure.us | HTTPS:443, TCP:22, TCP:9000 | This address is the API server endpoint. Replace *\<location\>* with the region where your AKS cluster is deployed. |
9497
| *.tun.\<location\>.cx.aks.containerservice.azure.us | HTTPS:443, TCP:22, TCP:9000 | This address is the API server endpoint. Replace *\<location\>* with the region where your AKS cluster is deployed. |
9598
| mcr.microsoft.com | HTTPS:443 | This address is required to access images in Microsoft Container Registry (MCR). This registry contains first-party images/charts(for example, moby, etc.) required for the functioning of the cluster during upgrade and scale of the cluster |
96-
| *.cdn.mscr.io | HTTPS:443 | This address is required for MCR storage backed by the Azure Content Delivery Network (CDN). |
99+
|*.cdn.mscr.io | HTTPS:443 | This address is required for MCR storage backed by the Azure Content Delivery Network (CDN). |
97100
| management.usgovcloudapi.net | HTTPS:443 | This address is required for Kubernetes GET/PUT operations. |
98101
| login.microsoftonline.us | HTTPS:443 | This address is required for Azure Active Directory authentication. |
99102
| ntp.ubuntu.com | UDP:123 | This address is required for NTP time synchronization on Linux nodes. |

articles/azure-functions/functions-networking-options.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ Private site access refers to making your app accessible only from a private net
5050
* Keep in mind that with service endpoints, your function still has full outbound access to the internet, even with virtual network integration configured.
5151
* Private site access is also available within an App Service Environment that's configured with an internal load balancer (ILB). For more information, see [Create and use an internal load balancer with an App Service Environment](../app-service/environment/create-ilb-ase.md).
5252

53+
To learn how to set up private site access, see [Establish Azure Functions private site access](functions-create-private-site-access.md).
54+
5355
## Virtual network integration
5456

5557
Virtual network integration allows your function app to access resources inside a virtual network.

articles/cosmos-db/consistency-levels.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,37 +35,37 @@ The semantics of the five consistency levels are described here:
3535

3636
- **Strong**: Strong consistency offers a linearizability guarantee. Linearizability refers to serving requests concurrently. The reads are guaranteed to return the most recent committed version of an item. A client never sees an uncommitted or partial write. Users are always guaranteed to read the latest committed write.
3737

38-
- **Bounded staleness**: The reads are guaranteed to honor the consistent-prefix guarantee. The reads might lag behind writes by at most *"K"* versions (i.e., "updates") of an item or by *"T"* time interval. In other words, when you choose bounded staleness, the "staleness" can be configured in two ways:
38+
The following graphic illustrates the strong consistency with musical notes. After the data is written to the "East US" region, when you read the data from other regions, you get the most recent value:
39+
40+
![video](media/consistency-levels/strong-consistency.gif)
41+
42+
- **Bounded staleness**: 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. In other words, when you choose bounded staleness, the "staleness" can be configured in two ways:
3943

4044
* The number of versions (*K*) of the item
4145
* The time interval (*T*) by which the reads might lag behind the writes
4246

4347
Bounded staleness offers total global order except within the "staleness window." The monotonic read guarantees exist within a region both inside and outside the staleness window. Strong consistency has the same semantics as the one offered by bounded staleness. The staleness window is equal to zero. Bounded staleness is also referred to as time-delayed linearizability. 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.
4448

45-
- **Session**: Within a single client session reads are guaranteed to honor the consistent-prefix (assuming a single “writer” session), monotonic reads, monotonic writes, read-your-writes, and write-follows-reads guarantees. Clients outside of the session performing writes will see eventual consistency.
49+
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 "East US" region, the "West US" and "Australia East" regions read the written value based on the configured maximum lag time or the maximum operations:
50+
51+
![video](media/consistency-levels/bounded-staleness-consistency.gif)
52+
53+
- **Session**: Within a single client session reads are guaranteed to honor the consistent-prefix (assuming a single "writer" session), monotonic reads, monotonic writes, read-your-writes, and write-follows-reads guarantees. Clients outside of the session performing writes will see eventual consistency.
4654

47-
- **Consistent prefix**: Updates that are returned contain some prefix of all the updates, with no gaps. Consistent prefix consistency level guarantees that reads never see out-of-order writes.
55+
Session consistency is the widely used consistency level for both single region as well as globally distributed applications. It provides write latencies, availability, and read throughput comparable to that of eventual consistency but also provides the consistency guarantees that suit the needs of applications written to operate in the context of a user. The following graphic illustrates the session consistency with musical notes. The "West US" region and the "East US" regions are using the same session (Session A) so they both read the data at the same time. Whereas the "Australia East" region is using "Session B" so, it receives data a later but in the same order as the writes.
4856

49-
- **Eventual**: There's no ordering guarantee for reads. In the absence of any further writes, the replicas eventually converge.
57+
![video](media/consistency-levels/session-consistency.gif)
5058

51-
## Consistency levels explained through baseball
59+
- **Consistent prefix**: Updates that are returned contain some prefix of all the updates, with no gaps. Consistent prefix consistency level guarantees that read never see out-of-order writes.
5260

53-
Let's take a baseball game scenario as an example. Imagine a sequence of writes that represent the score from a baseball game. The inning-by-inning line score is described in the [Replicated data consistency through baseball](https://www.microsoft.com/en-us/research/wp-content/uploads/2011/10/ConsistencyAndBaseballReport.pdf) paper. This hypothetical baseball game is currently in the middle of the seventh inning. It's the seventh-inning stretch. The visitors are behind with a score of 2 to 5 as shown below:
61+
If writes were performed in the order `A, B, C`, then a client sees either `A`, `A,B`, or `A,B,C`, but never out of order like `A,C` or `B,A,C`. Consistent Prefix provides write latencies, availability, and read throughput comparable to that of eventual consistency, but also provides the order guarantees that suit the needs of scenarios where order is important. The following graphic illustrates the consistency prefix consistency with musical notes. In all the regions, the reads never see out of order writes:
5462

55-
| | **1** | **2** | **3** | **4** | **5** | **6** | **7** | **8** | **9** | **Runs** |
56-
| - | - | - | - | - | - | - | - | - | - | - |
57-
| **Visitors** | 0 | 0 | 1 | 0 | 1 | 0 | 0 | | | 2 |
58-
| **Home** | 1 | 0 | 1 | 1 | 0 | 2 | | | | 5 |
63+
![video](media/consistency-levels/consistent-prefix.gif)
5964

60-
An Azure Cosmos container holds the run totals for the visitors and home teams. While the game is in progress, different read guarantees might result in clients reading different scores. The following table lists the complete set of scores that might be returned by reading the visitors' and home scores with each of the five consistency guarantees. The visitors' score is listed first. Different possible return values are separated by commas.
65+
- **Eventual**: There's no ordering guarantee for reads. In the absence of any further writes, the replicas eventually converge.
66+
Eventual consistency is the weakest form of consistency because a client may read the values that are older than the ones it had read before. Eventual consistency is ideal where the application does not require any ordering guarantees. Examples include count of Retweets, Likes, or non-threaded comments. The following graphic illustrates the eventual consistency with musical notes.
6167

62-
| **Consistency level** | **Scores (Visitors, Home)** |
63-
| - | - |
64-
| **Strong** | 2-5 |
65-
| **Bounded staleness** | Scores that are at most one inning out of date: 2-3, 2-4, 2-5 |
66-
| **Session** | <ul><li>For the writer: 2-5</li><li> For anyone other than the writer: 0-0, 0-1, 0-2, 0-3, 0-4, 0-5, 1-0, 1-1, 1-2, 1-3, 1-4, 1-5, 2-0, 2-1, 2-2, 2-3, 2-4, 2-5</li><li>After reading 1-3: 1-3, 1-4, 1-5, 2-3, 2-4, 2-5</li> |
67-
| **Consistent prefix** | 0-0, 0-1, 1-1, 1-2, 1-3, 2-3, 2-4, 2-5 |
68-
| **Eventual** | 0-0, 0-1, 0-2, 0-3, 0-4, 0-5, 1-0, 1-1, 1-2, 1-3, 1-4, 1-5, 2-0, 2-1, 2-2, 2-3, 2-4, 2-5 |
68+
![video](media/consistency-levels/eventual-consistency.gif)
6969

7070
## Additional reading
7171

articles/cosmos-db/create-sql-api-python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ You can now use the Data Explorer tool in the Azure portal to create a database
4848

4949
|Setting|Suggested value|Description
5050
|---|---|---|
51-
|**Database ID**|Tasks|Enter *ToDoList* as the name for the new database. Database names must contain from 1 through 255 characters, and they cannot contain `/, \\, #, ?`, or a trailing space. Check the **Provision database throughput** option, it allows you to share the throughput provisioned to the database across all the containers within the database. This option also helps with cost savings. |
51+
|**Database ID**|Tasks|Enter *Tasks* as the name for the new database. Database names must contain from 1 through 255 characters, and they cannot contain `/, \\, #, ?`, or a trailing space. Check the **Provision database throughput** option, it allows you to share the throughput provisioned to the database across all the containers within the database. This option also helps with cost savings. |
5252
|**Throughput**|400|Leave the throughput at 400 request units per second (RU/s). If you want to reduce latency, you can scale up the throughput later.|
5353
|**Container ID**|Items|Enter *Items* as the name for your new container. Container IDs have the same character requirements as database names.|
5454
|**Partition key**| /category| The sample described in this article uses */category* as the partition key.|

articles/cosmos-db/how-to-provision-database-throughput.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.author: mjbrown
1010

1111
# Provision throughput on a database in Azure Cosmos DB
1212

13-
This article explains how to provision throughput on a database in Azure Cosmos DB. You can provision throughput for a single [container](how-to-provision-container-throughput.md), or for a database and share the throughput among the containers within it. To learn when to use container-level and database-level throughput, see the [Use cases for provisioning throughput on containers and databases](set-throughput.md) article. You can provision database level throughput by using the Azure portal or Azure Cosmos DB SDKs.
13+
This article explains how to provision throughput on a database in Azure Cosmos DB. You can provision throughput for a single [container](how-to-provision-container-throughput.md), or for a database and share the throughput among the containers within it. To learn when to use container level and database level throughput, see the [Use cases for provisioning throughput on containers and databases](set-throughput.md) article. You can provision database level throughput by using the Azure portal or Azure Cosmos DB SDKs.
1414

1515
## Provision throughput using Azure portal
1616

76.5 KB
Loading
74.5 KB
Loading
60.3 KB
Loading
76 KB
Loading
71.6 KB
Loading

0 commit comments

Comments
 (0)