Skip to content

Commit cad455c

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into privateappgw
2 parents 826ef2e + 3f468a9 commit cad455c

33 files changed

+428
-156
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2595,6 +2595,11 @@
25952595
"redirect_url": "/azure/azure-maps/zoom-levels-and-tile-grid",
25962596
"redirect_document_id": true
25972597
},
2598+
{
2599+
"source_path": "articles/managed-grafana/how-to-sync-teams-with-azure-ad-groups.md",
2600+
"redirect_url": "managed-grafana/how-to-sync-teams-with-entra-groups",
2601+
"redirect_document_id": false
2602+
},
25982603
{
25992604
"source_path_from_root": "/articles/media-services/azure-media-player/azure-media-player-license.md",
26002605
"redirect_url": "/legal/azure-media-player/azure-media-player-license",

articles/app-service/environment/overview.md

Lines changed: 91 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ A benefit of using an App Service Environment instead of a multitenant service i
6969
App Service Environment v3 differs from earlier versions in the following ways:
7070

7171
- There are no networking dependencies on the customer's virtual network. You can secure all inbound and outbound traffic and route outbound traffic as you want.
72-
- You can deploy an App Service Environment v3 that's enabled for zone redundancy. You set zone redundancy only during creation and only in regions where all App Service Environment v3 dependencies are zone redundant. In this case, each App Service Plan on the App Service Environment will need to have a minimum of three instances so that they can be spread across zones. For more information, see [Migrate App Service Environment to availability zone support](../../availability-zones/migrate-app-service-environment.md).
72+
- You can deploy an App Service Environment v3 that's enabled for zone redundancy. You set zone redundancy only during creation and only in regions where all App Service Environment v3 dependencies are zone redundant. This is a deployment time only decision. Changing zone redundancy is not possible after it has been deployed. With zone redundant App Service Environment, each App Service Plan on the App Service Environment will need to have a minimum of three instances so that they can be spread across zones. For more information, see [Migrate App Service Environment to availability zone support](../../availability-zones/migrate-app-service-environment.md).
7373
- You can deploy an App Service Environment v3 on a dedicated host group. Host group deployments aren't zone redundant.
7474
- Scaling is much faster than with an App Service Environment v2. Although scaling still isn't immediate, as in the multitenant service, it's a lot faster.
7575
- Front-end scaling adjustments are no longer required. App Service Environment v3 front ends automatically scale to meet your needs and are deployed on better hosts.
@@ -165,6 +165,7 @@ App Service Environment v3 is available in the following regions:
165165
| Southeast Asia |||
166166
| Spain Central ||** |
167167
| Sweden Central |||
168+
| Sweden South || |
168169
| Switzerland North |||
169170
| Switzerland West || |
170171
| UAE Central || |
@@ -188,23 +189,109 @@ App Service Environment v3 is available in the following regions:
188189
| US DoD Central || |
189190
| US DoD East || |
190191
| US Gov Arizona || |
191-
| US Gov Iowa | | |
192192
| US Gov Texas || |
193193
| US Gov Virginia |||
194194

195195
### Microsoft Azure operated by 21Vianet
196196

197197
| Region | Single zone support | Availability zone support |
198198
| -------------------- | :--------------------------: | :-------------------------: |
199-
| China East 2 | | |
199+
| | App Service Environment v3 | App Service Environment v3 |
200200
| China East 3 || |
201-
| China North 2 | | |
202201
| China North 3 |||
203202

204203
### In-region data residency
205204

206205
An App Service Environment will only store customer data including app content, settings and secrets within the region where it's deployed. All data is guaranteed to remain in the region. For more information, see [Data residency in Azure](https://azure.microsoft.com/explore/global-infrastructure/data-residency/#overview).
207206

207+
## Pricing tiers
208+
209+
The following sections list the regional pricing tiers (SKUs) availability for App Service Environment v3.
210+
211+
> [!NOTE]
212+
> Windows Container plans currently do not support memory intensive SKUs.
213+
>
214+
215+
### Azure Public:
216+
217+
| Region | Standard | Large | Memory intensive |
218+
| -------------------- | :----------: | :---------: | :---------------: |
219+
| | I1v2-I3v2 | I4v2-I6v2 | I1mv2-I5mv2 |
220+
| Australia Central ||||
221+
| Australia Central 2 ||||
222+
| Australia East ||||
223+
| Australia Southeast ||||
224+
| Brazil South ||| |
225+
| Brazil Southeast ||||
226+
| Canada Central ||||
227+
| Canada East ||||
228+
| Central India ||||
229+
| Central US || ✅ * | |
230+
| East Asia ||||
231+
| East US ||| |
232+
| East US 2 ||||
233+
| France Central ||||
234+
| France South ||||
235+
| Germany North ||||
236+
| Germany West Central ||||
237+
| Israel Central ||| |
238+
| Italy North ||| |
239+
| Japan East ||||
240+
| Japan West ||||
241+
| Jio India Central ||| |
242+
| Jio India West ||| |
243+
| Korea Central ||| |
244+
| Korea South ||||
245+
| Mexico Central ||| |
246+
| North Central US ||||
247+
| North Europe ||||
248+
| Norway East ||||
249+
| Norway West ||||
250+
| Poland Central ||| |
251+
| Qatar Central ||| |
252+
| South Africa North ||||
253+
| South Africa West ||||
254+
| South Central US ||||
255+
| South India ||| |
256+
| Southeast Asia ||||
257+
| Spain Central ||| |
258+
| Sweden Central ||||
259+
| Sweden South ||||
260+
| Switzerland North ||||
261+
| Switzerland West ||||
262+
| UAE Central ||| |
263+
| UAE North ||||
264+
| UK South ||||
265+
| UK West ||||
266+
| West Central US || ✅ * | |
267+
| West Europe || ✅ * | |
268+
| West India ||||
269+
| West US ||| |
270+
| West US 2 ||||
271+
| West US 3 ||||
272+
273+
\* Windows Container does not support Large skus in this region.
274+
\** Linux does not support Memory intensive skus in this region.
275+
276+
### Azure Government:
277+
278+
| Region | Standard | Large | Memory intensive |
279+
| -------------------- | :----------: | :---------: | :---------------: |
280+
| | I1v2-I3v2 | I4v2-I6v2 | I1mv2-I5mv2 |
281+
| US DoD Central ||✅ * | |
282+
| US DoD East ||✅ * | |
283+
| US Gov Arizona ||✅ * | |
284+
| US Gov Texas ||✅ * | |
285+
| US Gov Virginia ||✅ * | |
286+
287+
### Microsoft Azure operated by 21Vianet:
288+
289+
| Region | Standard | Large | Memory intensive |
290+
| -------------------- | :----------: | :---------: | :---------------: |
291+
| | I1v2-I3v2 | I4v2-I6v2 | I1mv2-I5mv2 |
292+
| China East 3 || ✅ * | |
293+
| China North 3 || ✅ * | |
294+
208295
## Next steps
209296

210297
> [!div class="nextstepaction"]

articles/automation/troubleshoot/change-tracking.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ Here are possible causes specific to this issue:
136136
Verify that the daemon for the Log Analytics agent for Linux (**omsagent**) is running on your machine. Run the following query in the Log Analytics workspace that's linked to your Automation account.
137137

138138
```loganalytics
139-
Copy
140139
Heartbeat
141140
| summarize by Computer, Solutions
142141
```
-4.72 KB
Loading

articles/container-apps/metrics.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: container-apps
55
author: v-jaswel
66
ms.service: azure-container-apps
77
ms.topic: how-to
8-
ms.date: 04/30/2024
8+
ms.date: 09/23/2024
99
ms.author: v-wellsjason
1010
---
1111

@@ -19,23 +19,23 @@ The metrics explorer in the Azure portal allows you to visualize the data. You c
1919

2020
Container Apps provides these basic metrics.
2121

22-
| Category | Title | Description | Metric ID | Unit |
22+
| Title | Dimensions | Description | Metric ID | Unit |
2323
|--|--|--|--|--|
24-
| Basic | CPU Usage | CPU consumed by the container app, in nano cores (1,000,000,000 nanocores = 1 core) | UsageNanoCores | `nanocores` |
25-
| Basic | Memory Working Set Bytes | Container app working set memory used in bytes | `WorkingSetBytes` | bytes |
26-
| Basic | Network In Bytes | Network received bytes | `RxBytes` | bytes |
27-
| Basic | Network Out Bytes | Network transmitted bytes | `TxBytes` | bytes |
28-
| Basic | Replica count | Number of active replicas | `Replicas` | n/a |
29-
| Basic | Replica Restart Count | Restarts count of container app replicas | `RestartCount` | n/a |
30-
| Basic | Requests | Requests processed | `Requests` | n/a |
31-
| Basic | Reserved Cores | Number of reserved cores for container app revisions | `CoresQuotaUsed` | n/a |
32-
| Basic | Resiliency Connection Timeouts | Total connection timeouts | `ResiliencyConnectTimeouts` | n/a |
33-
| Basic | Resiliency Ejected Hosts | Number of currently ejected hosts | `ResiliencyEjectedHosts` | n/a |
34-
| Basic | Resiliency Ejections Aborted | Number of ejections aborted due to the max ejection % | `ResiliencyEjectionsAborted` | n/a |
35-
| Basic | Resiliency Request Retries | Total request retries | `ResiliencyRequestRetries` | n/a |
36-
| Basic | Resiliency Request Timeouts | Total requests that timed out waiting for a response | `ResiliencyRequestTimeouts` | n/a |
37-
| Basic | Resiliency Requests Pending Connection Pool | Total requests pending a connection pool connection | `ResiliencyRequestsPendingConnectionPool` | n/a |
38-
| Basic | Total Reserved Cores | Total cores reserved for the container app | `TotalCoresQuotaUsed` | n/a |
24+
| CPU Usage | Replica, Revision | CPU consumed by the container app, in nano cores (1,000,000,000 nanocores = 1 core) | `UsageNanoCores` | nanocores |
25+
| Memory Working Set Bytes | Replica, Revision | Container app working set memory used in bytes | `WorkingSetBytes` | bytes |
26+
| Network In Bytes | Replica, Revision | Network received bytes | `RxBytes` | bytes |
27+
| Network Out Bytes | Replica, Revision | Network transmitted bytes | `TxBytes` | bytes |
28+
| Replica count | Revision | Number of active replicas | `Replicas` | n/a |
29+
| Replica Restart Count | Replica, Revision | Restarts count of container app replicas | `RestartCount` | n/a |
30+
| Requests | Replica, Revision, Status Code, Status Code Category | Requests processed | `Requests` | n/a |
31+
| Reserved Cores | Revision | Number of reserved cores for container app revisions | `CoresQuotaUsed` | n/a |
32+
| Resiliency Connection Timeouts | Revision | Total connection timeouts | `ResiliencyConnectTimeouts` | n/a |
33+
| Resiliency Ejected Hosts | Revision | Number of currently ejected hosts | `ResiliencyEjectedHosts` | n/a |
34+
| Resiliency Ejections Aborted | Revision | Number of ejections aborted due to the max ejection % | `ResiliencyEjectionsAborted` | n/a |
35+
| Resiliency Request Retries | Revision | Total request retries | `ResiliencyRequestRetries` | n/a |
36+
| Resiliency Request Timeouts | Revision | Total requests that timed out waiting for a response | `ResiliencyRequestTimeouts` | n/a |
37+
| Resiliency Requests Pending Connection Pool | Replica | Total requests pending a connection pool connection | `ResiliencyRequestsPendingConnectionPool` | n/a |
38+
| Total Reserved Cores | None | Total cores reserved for the container app | `TotalCoresQuotaUsed` | n/a |
3939

4040
The metrics namespace is `microsoft.app/containerapps`.
4141

articles/event-hubs/apache-kafka-developer-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ See the following quickstarts in the **azure-event-hubs-for-kafka** repo:
2626
| [Go](https://github.com/Azure/azure-event-hubs-for-kafka/tree/master/quickstart/go) | <p>This quickstart will show how to create and connect to an Event Hubs Kafka endpoint using an example producer and consumer written in Go.</p><p>This sample is based on [Confluent's Apache Kafka Golang client](https://github.com/confluentinc/confluent-kafka-go), modified for use with Event Hubs for Kafka.</p>|
2727
| [Sarama kafka Go](https://github.com/Azure/azure-event-hubs-for-kafka/tree/master/quickstart/go-sarama-client) | This quickstart will show how to create and connect to an Event Hubs Kafka endpoint using an example producer and consumer written in Go using the [Sarama Kafka client](https://github.com/Shopify/sarama) library. |
2828
| [Kafka](https://github.com/Azure/azure-event-hubs-for-kafka/tree/master/quickstart/kafka-cli) | This quickstart will show how to create and connect to an Event Hubs Kafka endpoint using the CLI that comes bundled with the Apache Kafka distribution.|
29-
| [Kafkacat](https://github.com/Azure/azure-event-hubs-for-kafka/tree/master/quickstart/kafkacat) | kafkacat is a non-JVM command-line consumer and producer based on librdkafka, popular due to its speed and small footprint. This quickstart contains a sample configuration and several simple sample kafkacat commands. |
29+
| [kcat](https://github.com/Azure/azure-event-hubs-for-kafka/tree/master/quickstart/kafkacat) | kcat is a non-JVM command-line consumer and producer based on librdkafka, popular due to its speed and small footprint. This quickstart contains a sample configuration and several simple sample kafkacat commands. |
3030

3131
### Quickstarts in DOCS
3232
See the quickstart: [Data streaming with Event Hubs using the Kafka protocol](event-hubs-quickstart-kafka-enabled-event-hubs.md) in this content set, which provides step-by-step instructions on how to stream into Event Hubs. You learn how to use your producers and consumers to talk to Event Hubs with just a configuration change in your applications.

0 commit comments

Comments
 (0)