Merge branch 'main' into release-ga-lbcd

Author: v-alje

.openpublishing.redirection.json

@@ -5,6 +5,11 @@
       "redirect_url": "/previous-versions/azure/private-multi-access-edge-compute-mec/index",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/site-recovery/shared-disks-common-questions.md",
+      "redirect_url": "/azure/site-recovery/azure-to-azure-common-questions",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/network-watcher/traffic-analytics-schema-update.md",
       "redirect_url": "/previous-versions/azure/network-watcher/traffic-analytics-schema-update",
@@ -499,6 +504,11 @@
       "redirect_url": "/azure/security/fundamentals/azure-CA-details",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/security/fundamentals/recover-from-identity-compromise.md",
+      "redirect_url": "/azure/security/fundamentals/ransomware-detect-respond#road-to-recovery",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/event-grid/event-schema-storage-actions.md",
       "redirect_url": "/azure/storage-actions/overview",

articles/app-service/configure-language-java-deploy-run.md

@@ -193,7 +193,7 @@ Azure provides seamless Java App Service development experience in popular Java
 - **Eclipse IDE**: [Create a Hello World web app for Azure App Service by using Eclipse](/azure/developer/java/toolkit-for-eclipse/create-hello-world-web-app).
 
 ### Kudu and OneDeploy APIs
-Deployment clients such as the [Maven plugin](#maven), GitHub Actions using `azure/webapps-deploy@v3` and newer, or the [az webapp deploy](/cli/azure/webapp#az-webapp-deploy) command use OneDeploy, which is invoked by calling the `/api/publish` endpoint of the Kudu site under the hood. For more information on this API, see [this documentation](./deploy-zip.md#deploy-warjarear-packages)
+Deployment clients such as the [Maven plugin](#maven), GitHub Actions using `azure/webapps-deploy@v3` and newer, or the [az webapp deploy](/cli/azure/webapp#az-webapp-deploy) command use OneDeploy, which is invoked by calling the `/api/publish` endpoint of the Kudu site under the hood. For more information on this API, see [this documentation](./deploy-zip.md#deploy-warjarear-packages).
 
 ::: zone pivot="java-javase"
 

articles/app-service/reference-app-settings.md

@@ -202,10 +202,18 @@ This section shows the configurable runtime settings for each supported language
 | `AZURE_SITE_HOME` | Value added to the Java arguments as `-Dsite.home`. The default is the value of `HOME`. |
 | `HTTP_PLATFORM_PORT` | Added to Java arguments as `-Dport.http`. The following environment variables used by different Java web frameworks are also set to this value: `SERVER_PORT`, `MICRONAUT_SERVER_PORT`, `RATPACK_PORT`, `QUARKUS_HTTP_PORT`, `PAYARAMICRO_PORT`. |
 | `AZURE_LOGGING_DIR` | For Windows Apps, added to Java arguments as `-Dsite.logdir`. The default is `%HOME%\LogFiles\`. Default value in Linux is `AZURE_LOGGING_DIR=/home/LogFiles`. |
-| `WEBSITE_AUTH_ROLE_CLAIM_TYPE` | For Java web apps using built-in [authentication](overview-authentication-authorization.md), claims defined in Entra are available in the `HttpServletRequest.isUserInRole` API in the following format: `<claimType>\|<claimValue>` (e.g. `team\|contoso`). To add the values of claims with the type `roles` directly as role names in the `HttpServletRequest` implementation, set `WEBSITE_AUTH_ROLE_CLAIM_TYPE` to the value `roles`. |
+| `WEBSITE_AUTH_ROLE_CLAIM_TYPE` | For Java web apps using built-in [authentication](overview-authentication-authorization.md), claims defined in Entra are available in the `HttpServletRequest.isUserInRole` API in the following format: <code>&lt;claimType&gt;&vert;&lt;claimValue&gt;</code> (e.g. <code>team&vert;contoso</code>). To add the values of claims with the type `roles` directly as role names in the `HttpServletRequest` implementation, set `WEBSITE_AUTH_ROLE_CLAIM_TYPE` to the value `roles`. |
 | `WEBSITE_JAVA_GC_LOGGING` | For webapps using Java 11 or later in Linux, set this to `true` or `1` to capture Java Garbage Collector logs in `/home/LogFiles/Application` which can be used to troubleshoot performance issues. |
-| `WEBSITE_SKIP_DUMP_ON_OUT_OF_MEMORY` | Set to `true` or `1` to disable the following error-handling options that are passed as parameters to the JVM: `-XX:ErrorFile=/home/LogFiles/java_error_XXX.log`, `-XX:+CrashOnOutOfMemoryError`, `-XX:+HeapDumpOnOutOfMemoryError` and `-XX:HeapDumpPath=/home/LogFiles/java_memdump_XXX.log` |
+| `WEBSITE_SKIP_DUMP_ON_OUT_OF_MEMORY` | On Linux, set this to `true` or `1` to disable the following error-handling options that, by default, are passed as parameters to the JVM: `-XX:ErrorFile=/home/LogFiles/java_error_XXX.log`, `-XX:+CrashOnOutOfMemoryError`, `-XX:+HeapDumpOnOutOfMemoryError` and `-XX:HeapDumpPath=/home/LogFiles/java_memdump_XXX.log` |
 | `WEBSITE_WORKING_DIR` | On Linux, set this to a path where the bootstrapping process should change before launching Java/Tomcat/JBoss. This is useful for webapps using Java 8, where Java error logs are saved to the same directory where Java was launched. |
+| `WEBSITE_CATALINA_MAXCONNECTIONS` | Applies to Tomcat on Linux. The value is used to configure the `maxConnections` property of the Connector component in Tomcat's configuration. If not set, the value defaults to `10000`. |
+| `WEBSITE_CATALINA_MAXTHREADS` | Applies to Tomcat on Linux. The value is used to configure the `maxThreads` property of the Connector component in Tomcat's configuration. If not set, the value defaults to `200`. |
+| `WEBSITE_JAVA_JAR_FILE_NAME` | If set and the web application is a standalone Java (Java web server) application, this can be used to designate the name of a JAR file if there are multiple JAR files deployed, or the location of the file is not standard (e.g. in the `wwwroot` directory). Defaults to `app.jar`. |
+| `WEBSITE_JAVA_WAR_FILE_NAME` | If set and the web application is a Tomcat application, this can be used to designate the name of a single WAR file if there are multiple WAR files deployed, or the location of the file is not standard (e.g. in the `wwwroot` directory). Defaults to `app.war`. |
+| `WEBSITE_JAVA_KEYSTORE_PASSWORD` | The value of the keystore password used to store certificates with the `keytool` tool. |
+| `WEBSITE_TOMCAT_APPSERVICE_ERROR_PAGE` | On Tomcat webapps, when set to `1` or `true`, the default Tomcat error page is replaced with a custom App Service error page. Defaults to `true`. |
+| `WEBSITE_TOMCAT_ERROR_DETAILS` | Defaults to `false`. On Tomcat webapps, when set to `1` or `true`, the properties `showReport` and `showServerInfo` of the Error Report Valve are set to `true`, causing to show the stack trace of failed requests and the Tomcat version in the error page. |
+| `WEBSITE_SKIP_TROUBLESHOOT_ARCHIVE` | By default, JAR and WAR archives are scanned for common problems during application startup. This includes looking for duplicate/conflicting Java classes inside the archive, which is a common problem that causes Java apps to crash. Setting this value to `true` or `1` will skip the scanning process. Defaults to `false`. |
 
 <!-- 
 WEBSITE_JAVA_COPY_ALL

articles/azure-app-configuration/reference-kubernetes-provider.md

@@ -12,7 +12,7 @@ ms.author: junbchen
 
 # Azure App Configuration Kubernetes Provider reference
 
-The following reference outlines the properties supported by the Azure App Configuration Kubernetes Provider `v2.1.0` or later. See [release notes](https://github.com/Azure/AppConfiguration/blob/main/releaseNotes/KubernetesProvider.md) for more information on the change.
+The following reference outlines the properties supported by the Azure App Configuration Kubernetes Provider `v2.3.0` or later. See [release notes](https://github.com/Azure/AppConfiguration/blob/main/releaseNotes/KubernetesProvider.md) for more information on the change.
 
 ## Properties
 
@@ -103,6 +103,15 @@ The `spec.secret.target` property has the following child property.
 |Name|Description|Required|Type|
 |---|---|---|---|
 |secretName|The name of the Kubernetes Secret to be created.|true|string|
+|secretData|The setting that specifies how the retrieved data should be populated in the generated Secret.|true|string|
+
+If the `spec.secret.target.secretData` property is not set, the generated Secret is populated with the list of key-values retrieved from Key Vaults, which allows the Secret to be consumed as environment variables. Update this property if you wish to consume the Secret as a mounted file. This property has the following child properties.
+
+|Name|Description|Required|Type|
+|---|---|---|---|
+|type|The setting that indicates how the retrieved data is constructed in the generated Secret. The allowed values include `default`, `json`, `yaml` and `properties`.|optional|string|
+|key|The key name of the retrieved data when the `type` is set to `json`, `yaml` or `properties`. Set it to the file name if the Secret is set up to be consumed as a mounted file.|conditional|string|
+|separator|The delimiter that is used to output the Secret data in hierarchical format when the type is set to `json` or `yaml`. The separator is empty by default and the generated Secret contains key-values in their original form. Configure this setting only if the configuration file loader used in your application can't load key-values without converting them to the hierarchical format.|optional|string|
 
 If the `spec.secret.auth` property isn't set, the system-assigned managed identity is used. It has the following child properties.
 

articles/azure-vmware/attach-azure-netapp-files-to-azure-vmware-solution-hosts.md

@@ -79,6 +79,7 @@ Azure NetApp Files datastores for Azure VMware Solution are currently supported
 
 * AV36 
 * AV36P
+* AV48
 * AV52
 * AV64
 

articles/azure-vmware/configure-azure-elastic-san.md

@@ -3,7 +3,8 @@ title: Use Azure VMware Solution with Azure Elastic SAN
 description: Learn how to use Elastic SAN  with Azure VMware Solution.
 ms.topic: how-to
 ms.service: azure-vmware
-ms.author: v-suzuber
+author: ju-shim
+ms.author: jushiman
 ms.date: 3/22/2024
 ms.custom: references_regions, engagement-fy23
 ---

articles/azure-vmware/configure-pure-cloud-block-store.md

@@ -2,8 +2,8 @@
 title: Configure Pure Cloud Block Store
 description: Learn about Pure Cloud Block Store for Azure VMware Solution.
 ms.topic: how-to
-author: suzizuber
-ms.author: v-suzuber
+author: ju-shim
+ms.author: jushiman
 ms.service: azure-vmware
 ms.date: 3/06/2024
 --- 

articles/azure-vmware/configure-vsan-esa.md

@@ -33,10 +33,12 @@ In this article, you learn more about:
 > - How to enable vSAN Compression
 > - How to enable or disable vSAN Data-In-Transit Encryption
 
-## Supported host type
+## Supported host types
 vSAN ESA (Express Storage Architecture) is supported on the following Azure VMware Solution host types:
 
 - AV48
+- AV48 (Stretched Clusters)
+- AV64 (Gen 2)
 
 ## Supported vSAN services
 

articles/azure-vmware/includes/request-authorization-key.md

@@ -4,8 +4,8 @@ description: Steps to request an authorization key for ExpressRoute.
 ms.topic: include
 ms.service: azure-vmware
 ms.date: 01/04/2024
-author: suzizuber
-ms.author: v-suzuber
+author: ju-shim
+ms.author: jushiman
 ms.custom: engagement-fy23
 ---
 

articles/azure-vmware/includes/vmware-software-versions.md

@@ -4,8 +4,8 @@ description: Supported software versions that are used for Azure VMware Solution
 ms.topic: include
 ms.service: azure-vmware
 ms.date: 4/2/2025
-author: suzizuber
-ms.author: v-suzuber
+author: ju-shim
+ms.author: jushiman
 ms.custom: engagement-fy23
 ---