Skip to content

Commit 7fac7a1

Browse files
authored
Merge pull request #199216 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 624b827 + 44c42e4 commit 7fac7a1

File tree

9 files changed

+17
-16
lines changed

9 files changed

+17
-16
lines changed

articles/azure-monitor/app/azure-web-apps-java.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ You can apply additional configurations, and then based on your specific scenari
1919

2020
### Auto-instrumentation through Azure portal
2121

22-
You can turn on monitoring for your Java apps running in Azure App Service just with one click, no code change required.
23-
Application Insights for Java is integrated with Azure App Service on Linux - both code-based and custom containers, and with App Service on Windows for code-based apps.
24-
The integration adds [Application Insights Java 3.x](./java-in-process-agent.md) and you will get the telemetry auto-collected.
22+
You can turn on monitoring for your Java apps running in Azure App Service just with one click, no code change required. The integration adds [Application Insights Java 3.x](./java-in-process-agent.md) and you will get the telemetry auto-collected.
2523

2624
1. **Select Application Insights** in the Azure control panel for your app service, then select **Enable**.
2725

@@ -102,4 +100,4 @@ For the latest updates and bug fixes, [consult the release notes](web-app-extens
102100
* [Monitor service health metrics](../data-platform.md) to make sure your service is available and responsive.
103101
* [Receive alert notifications](../alerts/alerts-overview.md) whenever operational events happen or metrics cross a threshold.
104102
* Use [Application Insights for JavaScript apps and web pages](javascript.md) to get client telemetry from the browsers that visit a web page.
105-
* [Set up Availability web tests](monitor-web-app-availability.md) to be alerted if your site is down.
103+
* [Set up Availability web tests](monitor-web-app-availability.md) to be alerted if your site is down.

articles/azure-monitor/app/codeless-overview.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ As we're adding new integrations, the auto-instrumentation capability matrix bec
2121

2222
|Environment/Resource Provider | .NET | .NET Core | Java | Node.js | Python |
2323
|---------------------------------------|-----------------|-----------------|-----------------|-----------------|-----------------|
24-
|Azure App Service on Windows | GA, OnBD* | GA, opt-in | Public Preview, Container and Custom Containers are GA | Public Preview | Not supported |
24+
|Azure App Service on Windows - Publish as Code | GA, OnBD* | GA | GA | GA, OnBD* | Not supported |
25+
|Azure App Service on Windows - Publish as Docker | Public Preview | Public Preview | Public Preview | Not supported | Not supported |
2526
|Azure App Service on Linux | N/A | Public Preview | GA | GA | Not supported |
2627
|Azure Functions - basic | GA, OnBD* | GA, OnBD* | GA, OnBD* | GA, OnBD* | GA, OnBD* |
2728
|Azure Functions - dependencies | Not supported | Not supported | Public Preview | Not supported | Through [extension](monitor-functions.md#distributed-tracing-for-python-function-apps) |

articles/azure-monitor/app/proactive-performance-diagnostics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.date: 05/04/2017
88
# Smart detection - Performance Anomalies
99

1010
>[!NOTE]
11-
>You can migrate your Application Insight resources to alerts-bases smart detection (preview). The migration creates alert rules for the different smart detection modules. Once created, you can manage and configure these rules just like any other Azure Monitor alert rules. You can also configure action groups for these rules, thus enabling multiple methods of taking actions or triggering notification on new detections.
11+
>You can migrate your Application Insight resources to alerts-based smart detection (preview). The migration creates alert rules for the different smart detection modules. Once created, you can manage and configure these rules just like any other Azure Monitor alert rules. You can also configure action groups for these rules, thus enabling multiple methods of taking actions or triggering notification on new detections.
1212
>
1313
> For more information on the migration process, see [Smart Detection Alerts migration](../alerts/alerts-smart-detections-migration.md).
1414

articles/azure-video-indexer/upload-index-videos.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ When you're uploading videos by using the API, you have the following options:
2727

2828
## Supported file formats
2929

30-
For a list of file formats that you can use with Azure Video Indexer, see [Standard Encoder formats and codecs](/azure/azure/media-services/latest/encode-media-encoder-standard-formats-reference).
30+
For a list of file formats that you can use with Azure Video Indexer, see [Standard Encoder formats and codecs](/azure/media-services/latest/encode-media-encoder-standard-formats-reference).
3131

3232
## Storage of video files
3333

articles/backup/backup-support-matrix-mars-agent.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ The operating systems must be 64 bit and should be running the latest services p
6161

6262
**Operating system** | **Files/folders** | **System state** | **Software/Module requirements**
6363
--- | --- | --- | ---
64+
Windows 11 (Enterprise, Pro, Home) | Yes | No | Check the corresponding server version for software/module requirements
6465
Windows 10 (Enterprise, Pro, Home) | Yes | No | Check the corresponding server version for software/module requirements
6566
Windows Server 2022 (Standard, Datacenter, Essentials) | Yes | Yes | Check the corresponding server version for software/module requirements
6667
Windows 8.1 (Enterprise, Pro)| Yes |No | Check the corresponding server version for software/module requirements

articles/container-apps/networking.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.author: cshoe
1111

1212
# Networking architecture in Azure Container Apps
1313

14-
Azure Container Apps run in the context of an [environment](environment.md), which is supported by a virtual network (VNET). When you create an environment, you can provide a custom VNET, otherwise a VNET is automatically generated for you. Generated VNETs are inaccessible to you as they're created in Microsoft's tenent. To take full control over your VNET, provide an existing VNET to Container Apps as you create your environment.
14+
Azure Container Apps run in the context of an [environment](environment.md), which is supported by a virtual network (VNET). When you create an environment, you can provide a custom VNET, otherwise a VNET is automatically generated for you. Generated VNETs are inaccessible to you as they're created in Microsoft's tenant. To take full control over your VNET, provide an existing VNET to Container Apps as you create your environment.
1515

1616
The following articles feature step-by-step instructions for creating Container Apps environments with different accessibility levels.
1717

@@ -97,7 +97,7 @@ Once you're satisfied with the latest revision, you can lock traffic to that rev
9797

9898
#### Update existing revision
9999

100-
Consider a situation where you have a known good revision that's serving 100% of your traffic, but you want to issue and update to your app. You can deploy and test new revisions using their direct endpoints without affecting the main revision serving the app.
100+
Consider a situation where you have a known good revision that's serving 100% of your traffic, but you want to issue an update to your app. You can deploy and test new revisions using their direct endpoints without affecting the main revision serving the app.
101101

102102
Once you're satisfied with the updated revision, you can shift a portion of traffic to the new revision for testing and verification.
103103

articles/hdinsight/kafka/tutorial-cli-rest-proxy.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ If you don't have an Azure subscription, create a [free account](https://azure.m
5050
|storageAccount|Replace STORAGEACCOUNTNAME with a name for your new storage account.|
5151
|httpPassword|Replace PASSWORD with a password for the cluster login, **admin**.|
5252
|sshPassword|Replace PASSWORD with a password for the secure shell username, **sshuser**.|
53-
|securityGroupName|Replace SECURITYGROUPNAME with the client AAD security group name for Kafka Rest Proxy. The variable will be passed to the `--kafka-client-group-name` parameter for `az-hdinsight-create`.|
54-
|securityGroupID|Replace SECURITYGROUPID with the client AAD security group ID for Kafka Rest Proxy. The variable will be passed to the `--kafka-client-group-id` parameter for `az-hdinsight-create`.|
53+
|securityGroupName|Replace SECURITYGROUPNAME with the client AAD security group name for Kafka REST Proxy. The variable will be passed to the `--kafka-client-group-name` parameter for `az-hdinsight-create`.|
54+
|securityGroupID|Replace SECURITYGROUPID with the client AAD security group ID for Kafka REST Proxy. The variable will be passed to the `--kafka-client-group-id` parameter for `az-hdinsight-create`.|
5555
|storageContainer|Storage container the cluster will use, leave as-is for this tutorial. This variable will be set with the name of the cluster.|
5656
|workernodeCount|Number of worker nodes in the cluster, leave as-is for this tutorial. To guarantee high availability, Kafka requires a minimum of 3 worker nodes|
5757
|clusterType|Type of HDInsight cluster, leave as-is for this tutorial.|
58-
|clusterVersion|HDInsight cluster version, leave as-is for this tutorial. Kafka Rest Proxy requires a minimum cluster version of 4.0.|
59-
|componentVersion|Kafka version, leave as-is for this tutorial. Kafka Rest Proxy requires a minimum component version of 2.1.|
58+
|clusterVersion|HDInsight cluster version, leave as-is for this tutorial. Kafka REST Proxy requires a minimum cluster version of 4.0.|
59+
|componentVersion|Kafka version, leave as-is for this tutorial. Kafka REST Proxy requires a minimum component version of 2.1.|
6060
6161
Update the variables with desired values. Then enter the CLI commands to set the environment variables.
6262
@@ -130,8 +130,8 @@ If you don't have an Azure subscription, create a [free account](https://azure.m
130130
|Parameter | Description|
131131
|---|---|
132132
|--kafka-management-node-size|The size of the node. This tutorial uses the value **Standard_D4_v2**.|
133-
|--kafka-client-group-id|The client AAD security group ID for Kafka Rest Proxy. The value is passed from the variable **$securityGroupID**.|
134-
|--kafka-client-group-name|The client AAD security group name for Kafka Rest Proxy. The value is passed from the variable **$securityGroupName**.|
133+
|--kafka-client-group-id|The client AAD security group ID for Kafka REST Proxy. The value is passed from the variable **$securityGroupID**.|
134+
|--kafka-client-group-name|The client AAD security group name for Kafka REST Proxy. The value is passed from the variable **$securityGroupName**.|
135135
|--version|The HDInsight cluster version must be at least 4.0. The value is passed from the variable **$clusterVersion**.|
136136
|--component-version|The Kafka version must be at least 2.1. The value is passed from the variable **$componentVersion**.|
137137

articles/postgresql/flexible-server/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Flexible servers are best suited for
3737

3838
## High availability
3939

40-
The flexible server deployment model is designed to support high availability within single availability zone and across multiple availability zones. The architecture separates compute and storage. The database engine runs on a container inside a Linux virtual machine, while data files reside on Azure storage. The storage maintains three locally redundant synchronous copies of the database files ensuring data durability.
40+
The flexible server deployment model is designed to support high availability within a single availability zone and across multiple availability zones. The architecture separates compute and storage. The database engine runs on a container inside a Linux virtual machine, while data files reside on Azure storage. The storage maintains three locally redundant synchronous copies of the database files ensuring data durability.
4141

4242
During planned or unplanned failover events, if the server goes down, the service maintains high availability of the servers using following automated procedure:
4343

articles/storage/common/storage-redundancy.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ Premium block blobs are available in a subset of Azure regions:
108108
- (North America) East US
109109
- (North America) East US 2
110110
- (North America) West US 2
111+
- (North America) South Central US
111112
- (South America) Brazil South
112113

113114
#### Premium file share accounts

0 commit comments

Comments
 (0)