Skip to content

Commit 6b6332b

Browse files
authored
Merge pull request #262646 from MicrosoftDocs/main
Publish to live, Monday 4 AM PST, 1/8
2 parents 683e047 + e2b92f8 commit 6b6332b

File tree

91 files changed

+1172
-595
lines changed

Some content is hidden

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

91 files changed

+1172
-595
lines changed

articles/app-service/toc.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -497,8 +497,6 @@
497497
href: /troubleshoot/azure/app-service/backing-up-restoring-and-cloning-microsoft-azure-app-services?toc=/azure/app-service/toc.json
498498
- name: Built-in Linux containers FAQs
499499
href: /troubleshoot/azure/app-service/faqs-app-service-linux?toc=/azure/app-service/toc.json
500-
- name: Configuration and management FAQs for Web Apps
501-
href: /troubleshoot/azure/app-service/web-apps-configuration-and-management-faqs?toc=/azure/app-service/toc.json
502500
- name: Deployment FAQs for Web Apps
503501
href: /troubleshoot/azure/app-service/web-apps-deployment-faqs?toc=/azure/app-service/toc.json
504502
- name: FAQs about scaling web apps

articles/azure-arc/kubernetes/tutorial-gitops-flux2-ci-cd.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,6 @@ For the details on installation, refer to the [GitOps Connector](https://github.
245245

246246
| Variable | Value |
247247
| -------- | ----- |
248-
| AZ_ACR_NAME | (your Azure Container Registry instance, for example. azurearctest.azurecr.io) |
249248
| AZURE_SUBSCRIPTION | (your Azure Service Connection, which should be **arc-demo-acr** from earlier in the tutorial) |
250249
| AZ_ACR_NAME | Azure ACR name, for example arc-demo-acr |
251250
| ENVIRONMENT_NAME | Dev |

articles/azure-functions/migrate-dotnet-to-isolated-model.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ $AppInfo = @{}
3333
3434
foreach ($App in $FunctionApps)
3535
{
36-
if ($App.ApplicationSettings["FUNCTIONS_WORKER_RUNTIME"] -eq 'dotnet')
36+
if ($App.Runtime -eq 'dotnet')
3737
{
38-
$AppInfo.Add($App.Name, $App.ApplicationSettings["FUNCTIONS_WORKER_RUNTIME"])
38+
$AppInfo.Add($App.Name, $App.Runtime)
3939
}
4040
}
4141

articles/azure-monitor/essentials/data-collection-rule-best-practices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Best practices for data collection rule creation and management in Azure Monitor
33
description: Details on the best practices to be followed to correctly create and maintain data collection rule in Azure Monitor.
44
ms.topic: conceptual
5-
ms.date: 12/14/2022
5+
ms.date: 01/08/2024
66
ms.reviewer: brunoga
77

88
---

articles/azure-monitor/essentials/prometheus-grafana.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Use Azure Monitor managed service for Prometheus as data source for Grafa
33
description: Details on how to configure Azure Monitor managed service for Prometheus as data source for both Azure Managed Grafana and self-hosted Grafana in an Azure virtual machine.
44
author: bwren
55
ms.topic: conceptual
6-
ms.date: 09/28/2022
6+
ms.date: 01/08/2024
77
---
88

99
# Use Azure Monitor managed service for Prometheus as data source for Grafana using managed system identity

articles/azure-monitor/essentials/prometheus-rule-groups.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: EdB-MSFT
55
ms-author: edbaynash
66
ms.topic: conceptual
77
ms.custom: ignite-2022
8-
ms.date: 09/28/2022
8+
ms.date: 11/09/2023
99
---
1010

1111
# Azure Monitor managed service for Prometheus rule groups

articles/backup/backup-azure-database-postgresql-support-matrix.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ You can use [Azure Backup](./backup-overview.md) to protect Azure Database for P
1515

1616
## Supported regions
1717

18-
Azure Database for PostgreSQL server backup is available in the following regions:
19-
20-
East US, East US 2, Central US, South Central US, West US, West US 2, West Central US, Brazil South, Canada Central, North Europe, West Europe, UK South, UK West, Germany West Central, Switzerland North, Switzerland West, East Asia, Southeast Asia, Japan East, Japan West, Korea Central, Korea South, India Central, Australia East, Australia Central, Australia Central 2, UAE North
18+
Azure Database for PostgreSQL server backup is available in all regions, except for Germany Central (Sovereign), Germany Northeast (Sovereign) and China regions.
2119

2220
## Support scenarios
2321

articles/cosmos-db/concepts-limits.md

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,31 +50,59 @@ The actual minimum RU/s may vary depending on your account configuration. You ca
5050

5151
#### Minimum throughput on container
5252

53-
To estimate the minimum throughput required of a container with manual throughput, find the maximum of:
53+
**Manual throughput**
54+
55+
To estimate the minimum RU/s required of a container with manual throughput, find the maximum of:
5456

5557
* 400 RU/s
5658
* Current storage in GB * 1 RU/s
5759
* Highest RU/s ever provisioned on the container / 100
5860

5961
For example, you have a container provisioned with 400 RU/s and 0-GB storage. You increase the throughput to 50,000 RU/s and import 20 GB of data. The minimum RU/s is now `MAX(400, 20 * 1 RU/s per GB, 50,000 RU/s / 100)` = 500 RU/s. Over time, the storage grows to 2000 GB. The minimum RU/s is now `MAX(400, 2000 * 1 RU/s per GB, 50,000 / 100)` = 2000 RU/s.
6062

63+
**Autoscale throughput**
64+
65+
To estimate the minimum autoscale max RU/s required of a container with autoscale throughput, find the maximum of:
66+
67+
* 1000 RU/s
68+
* Current storage in GB * 10 RU/s
69+
* Highest RU/s ever provisioned on the container / 10
70+
71+
For example, you have a container provisioned with 1000 RU/s and 0-GB storage. You increase the throughput to 50,000 RU/s and import 20 GB of data. The minimum max RU/s is now `MAX(1000, 20 * 10 RU/s per GB, 50,000 RU/s / 10)` = 5000 RU/s. Over time, the storage grows to 2000 GB. The minimum max RU/s is now `MAX(1000, 2000 * 10 RU/s per GB, 50,000 / 10)` = 20,000 RU/s.
72+
6173
#### Minimum throughput on shared throughput database
6274

63-
To estimate the minimum throughput required of a shared throughput database with manual throughput, find the maximum of:
75+
**Manual throughput**
76+
77+
To estimate the minimum RU/s required of a shared throughput database with manual throughput, find the maximum of:
6478

6579
* 400 RU/s
6680
* Current storage in GB * 1 RU/s
6781
* Highest RU/s ever provisioned on the database / 100
6882
* 400 + MAX(Container count - 25, 0) * 100 RU/s
6983

70-
For example, you have a database provisioned with 400 RU/s, 15 GB of storage, and 10 containers. The minimum RU/s is `MAX(400, 15 * 1 RU/s per GB, 400 / 100, 400 + 0 )` = 400 RU/s. If there were 30 containers in the database, the minimum RU/s would be `400 + MAX(30 - 25, 0) * 100 RU/s` = 900 RU/s.
84+
For example, you have a database provisioned with 400 RU/s, 15 GB of storage, and 10 containers. The minimum RU/s is `MAX(400, 15 * 1 RU/s per GB, 400 / 100, 400 + 0 )` = 400 RU/s. If there were 30 containers in the database, the minimum RU/s would be `400 + MAX(30 - 25, 0) * 100 RU/s` = 900 RU/s.
7185

72-
In summary, here are the minimum provisioned RU limits when using manual throughput.
86+
**Autoscale throughput**
7387

74-
| Resource | Limit |
75-
| --- | --- |
76-
| Minimum RUs per container ([dedicated throughput provisioned mode with manual throughput](./resource-model.md#azure-cosmos-db-containers)) | 400 |
77-
| Minimum RUs per database ([shared throughput provisioned mode with manual throughput](./resource-model.md#azure-cosmos-db-containers)) | 400 RU/s for first 25 containers. |
88+
To estimate the minimum autoscale max RU/s required of a shared throughput database with autoscale throughput, find the maximum of:
89+
90+
* 1000 RU/s
91+
* Current storage in GB * 10 RU/s
92+
* Highest RU/s ever provisioned on the database / 10
93+
* 1000 + MAX(Container count - 25, 0) * 1000 RU/s
94+
95+
For example, you have a database provisioned with 1000 RU/s, 15 GB of storage, and 10 containers. The minimum max RU/s for autoscale database is `MAX(1000, 15 * 10 RU/s per GB, 1000 / 10, 1000 + 0 )` = 1000 RU/s. If there were 30 containers in the database, the minimum max RU/s would be `1000 + MAX(30 - 25, 0) * 1000 RU/s` = 5000 RU/s.
96+
97+
98+
In summary, here are the minimum provisioned RU limits when using provisioned throughput.
99+
100+
| Provisioning Type | Resource | Limit |
101+
| --- | --- | --- |
102+
| Manual throughput | Minimum RUs per container ([dedicated throughput provisioned mode with manual throughput](./set-throughput.md#set-throughput-on-a-container)) | 400 |
103+
| Manual throughput | Minimum RUs per database ([shared throughput provisioned mode with manual throughput](./set-throughput.md#set-throughput-on-a-database) | 400 RU/s for first 25 containers. |
104+
| Autoscale throughput | Minimum max RUs per container ([dedicated throughput provisioned mode with autoscale throughput](./provision-throughput-autoscale.md#how-autoscale-provisioned-throughput-works)) | 1000 |
105+
| Autoscale throughput | Minimum max RUs per database ([shared throughput provisioned mode with autoscale throughput](./provision-throughput-autoscale.md#how-autoscale-provisioned-throughput-works)) | 1000 RU/s for first 25 containers. |
78106

79107
Azure Cosmos DB supports programmatic scaling of throughput (RU/s) per container or database via the SDKs or portal.
80108

articles/cosmos-db/emulator-release-notes.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,27 @@ ms.date: 09/11/2023
1515
The Azure Cosmos DB emulator is updated at a regular cadence with release notes provided in this article.
1616

1717
> [!div class="nextstepaction"]
18-
> [Download latest version (``2.14.12``)](https://aka.ms/cosmosdb-emulator)
18+
> [Download latest version (``2.14.16``)](https://aka.ms/cosmosdb-emulator)
1919
2020
## Supported versions
2121

2222
Only the most recent version of the Azure Cosmos DB emulator is actively supported.
2323

24-
## Latest version ``2.14.12``
24+
## Latest version ``2.14.16``
2525

26-
> *Released March 20, 2023*
26+
> *Released January 8, 2024*
2727
28-
- This release fixes an issue impacting Gremlin and Table endpoint API types. Prior to this fix a client application fails with a 500 status code when trying to connect to the public emulator's endpoint.
28+
- This release fixes an issue which was causing emulator to bind with `loopback` instead of `public interface` even after passing /AllowNetworkAccess command line option.
2929

3030
## Previous releases
3131

3232
> [!WARNING]
3333
> Previous versions of the emulator are not supported by the product group.
3434
35+
### ``2.14.12`` (March 20, 2023)
36+
37+
- This release fixes an issue impacting Gremlin and Table endpoint API types. Prior to this fix a client application fails with a 500 status code when trying to connect to the public emulator's endpoint.
38+
3539
### ``2.14.11`` (January 27, 2023)
3640

3741
- This release updates the Azure Cosmos DB Emulator background services to match the latest online functionality of the Azure Cosmos DB.

articles/cosmos-db/nosql/how-to-delete-by-partition-key.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ Update your Azure Cosmos DB account to enable "Delete by partition key" feature
4646
$capabilities = ($cosmosdb | ConvertFrom-Json).capabilities
4747
```
4848
- Step 3: Add "Delete items by partition key" capability in the list of capabilities if it doesn't exist already.
49-
>!Note
50-
The list of capabilities must always specify all capabilities that you want to enable, inclusively. This includes capabilities that are already enabled for the account that you want to keep.
49+
> [!NOTE]
50+
> The list of capabilities must always specify all capabilities that you want to enable, inclusively. This includes capabilities that are already enabled for the account that you want to keep.
5151
5252
```azurecli-interactive
5353
$capabilities += $DeleteByPk

0 commit comments

Comments
 (0)