Merge pull request #294753 from MicrosoftDocs/repo_sync_working_branch

Taojunshen · web-flow · commit ba9bd69e329b · 2025-02-18T01:35:50.000+08:00
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
diff --git a/articles/app-service/app-service-configure-premium-tier.md b/articles/app-service/app-service-configure-premium-tier.md
@@ -26,9 +26,16 @@ The Premium V3 tier is available for both native and custom containers, includin
 
 Premium V3 as well as specific Premium V3 SKUs are available in some Azure regions and availability in additional regions is being added continually. To see if a specific PremiumV3 offering is available in your region, run the following Azure CLI command in the [Azure Cloud Shell](../cloud-shell/overview.md) (substitute _P1v3_ with the desired SKU):
 
+**Windows** SKU availability
+
 ```azurecli-interactive
 az appservice list-locations --sku P1V3
 ```
+**Linux** SKU availability
+
+```azurecli-interactive
+az appservice list-locations --linux-workers-enabled --sku P1V3
+```
 
 <a name="create"></a>
 
diff --git a/articles/app-service/configure-custom-container.md b/articles/app-service/configure-custom-container.md
@@ -21,7 +21,7 @@ This guide provides key concepts and instructions for containerization of Window
 
 ::: zone pivot="container-linux"
 
-This guide provides key concepts and instructions for containerization of Linux apps in App Service. If you're new to Azure App Service, follow the [custom container quickstart](quickstart-custom-container.md) and [tutorial](tutorial-custom-container.md) first. For sidecar containers (preview), see [Tutorial: Configure a sidecar container for custom container in Azure App Service (preview)](tutorial-custom-container-sidecar.md).
+This guide provides key concepts and instructions for containerization of Linux apps in App Service. If you're new to Azure App Service, follow the [custom container quickstart](quickstart-custom-container.md) and [tutorial](tutorial-custom-container.md) first. For sidecar containers, see [Tutorial: Configure a sidecar container for custom container in Azure App Service](tutorial-custom-container-sidecar.md).
 
 ::: zone-end
 
@@ -478,7 +478,7 @@ Further troubleshooting information is available at the Azure App Service blog:
 ## Configure multi-container apps
 
 > [!NOTE]
-> Sidecar containers (preview) will succeed multi-container apps in App Service. To get started, see [Tutorial: Configure a sidecar container for custom container in Azure App Service (preview)](tutorial-custom-container-sidecar.md).
+> Sidecar containers will succeed multi-container apps in App Service. To get started, see [Tutorial: Configure a sidecar container for custom container in Azure App Service](tutorial-custom-container-sidecar.md).
 
 - [Use persistent storage in Docker Compose](#use-persistent-storage-in-docker-compose)
 - [Preview limitations](#preview-limitations)
@@ -562,7 +562,7 @@ The following lists show supported and unsupported Docker Compose configuration
 ::: zone pivot="container-linux"
 
 > [!div class="nextstepaction"]
-> [Tutorial: Configure a sidecar container for custom container in Azure App Service (preview)](tutorial-custom-container-sidecar.md)
+> [Tutorial: Configure a sidecar container for custom container in Azure App Service](tutorial-custom-container-sidecar.md)
 
 ::: zone-end
 
diff --git a/articles/app-service/reference-app-settings.md b/articles/app-service/reference-app-settings.md
@@ -26,7 +26,8 @@ The following environment variables are related to the app environment in genera
 | `WEBSITE_PLATFORM_VERSION` | Read-only. App Service platform version. ||
 | `HOME` | Read-only. Path to the home directory (for example, `D:\home` for Windows). ||
 | `SERVER_PORT` | Read-only. The port the app should listen to. | |
-| `WEBSITE_WARMUP_PATH`  | A relative path to ping to warm up the app, beginning with a slash. The default is `/`, which pings the root path. The specific path can be pinged by an unauthenticated client, such as Azure Traffic Manager, even if [App Service authentication](overview-authentication-authorization.md) is set to reject unauthenticated clients. (NOTE: This app setting doesn't change the path used by AlwaysOn.) ||
+| `WEBSITE_WARMUP_PATH` | A relative path to ping to warm up the app, beginning with a slash. The default is `/robots933456.txt`. Whenever the platform starts up a container, the orchestrator makes repeated requests against this endpoint. The platform considers any response from this endpoint as an indication that the container is ready. Once the platform considers the container to be ready, it starts forwarding organic traffic to the newly started container. Unless `WEBSITE_WARMUP_STATUSES` is configured, the platform will consider any response from the container at this endpoint - even error codes such as 404 or 502 - as an indication that the container is ready. Note that this appsetting doesn't change the path used by AlwaysOn. ||
+| `WEBSITE_WARMUP_STATUSES` | A comma-delimited list of HTTP status codes that will be considered successful when the platform makes warmup pings against a newly started container. Used in conjunction with `WEBSITE_WARMUP_PATH`. By default, any status code is considered an indication that the container is ready for organic traffic. This appsetting can be used to require a specific response before organic traffic is routed to the container. `Example: 200,202`. If pings against the app's configured warmup path receive a response with a 200 or 202 status code, organic traffic will be routed to the container. If a status code that is not in the list is received (such as 502), the platform will continue making pings until (1) a 200 or 202 is received, or (2) the container startup timeout limit is reached (see `WEBSITES_CONTAINER_START_TIME_LIMIT`). Note that if the container doesn't respond with an HTTP status code that is in the list, the platform will eventually fail the startup attempt and retry, which will result in 503 errors. ||
 | `WEBSITE_COMPUTE_MODE` | Read-only. Specifies whether app runs on dedicated (`Dedicated`) or shared (`Shared`) VM/s. ||
 | `WEBSITE_SKU` | Read-only. SKU of the app. Possible values are `Free`, `Shared`, `Basic`, and `Standard`. ||
 | `SITE_BITNESS` | Read-only. Shows whether the app is 32-bit (`x86`) or 64-bit (`AMD64`). ||
@@ -49,6 +50,9 @@ The following environment variables are related to the app environment in genera
 | `WEBSITE_SCM_SEPARATE_STATUS` | Read-only. Shows whether the Kudu app is running in a separate process (`1`) or not (`0`). ||
 | `WEBSITE_DNS_ATTEMPTS` | Number of times to try name resolve. ||
 | `WEBSITE_DNS_TIMEOUT` | Number of seconds to wait for name resolve ||
+| `WEBSITES_CONTAINER_START_TIME_LIMIT` | The amount of time (in seconds) that the platform will wait for a container to become ready on startup. This setting applies to both code-based and container-based apps on App Service for Linux. The default value is `230`. When a container starts up, repeated pings are made against the container to gauge its readiness to serve organic traffic (see `WEBSITE_WARMUP_PATH` and `WEBSITE_WARMUP_STATUSES`). These pings are continuously made until either of the following is true: (1) a successful response is received, or (2) the start time limit is reached. If the container isn't deemed ready within the configured timeout, the platform will fail the startup attempt and retry, which will result in 503 errors. For App Service for Windows Containers, the default start time limit is `10 mins`. You can change the start time limit by specifying a timespan like this `00:05:00`, which indicates 5 minutes.||
+
+
 <!-- 
 WEBSITE_PROACTIVE_STACKTRACING_ENABLED
 WEBSITE_CLOUD_NAME
@@ -336,8 +340,7 @@ For more information on custom containers, see [Run a custom container in Azure]
 
 | Setting name| Description | Example |
 |-|-|-|
-| `WEBSITES_ENABLE_APP_SERVICE_STORAGE` | For Linux custom containers: set to `true` to enable the `/home` directory to be shared across scaled instances. The default is `false` for Linux custom containers.<br/><br/>For Windows containers: set to `true` to enable the `c:\home` directory to be shared across scaled instances. The default is `true` for Windows containers.||
-| `WEBSITES_CONTAINER_START_TIME_LIMIT` | Amount of time in seconds to wait for the container to complete start-up before restarting the container. Default is `230`. You can increase it up to the maximum of `1800`. ||
+| `WEBSITES_ENABLE_APP_SERVICE_STORAGE` | For Linux containers, if this app setting is not specified, the `/home` directory is shared across scaled instances by default. You can set it to `false` to disable sharing.<br/><br/>For Windows containers: set to `true` to enable the `c:\home` directory to be shared across scaled instances. The default is `true` for Windows containers.||
 | `WEBSITES_CONTAINER_STOP_TIME_LIMIT` | Amount of time in seconds to wait for the container to terminate gracefully. Default is `5`. You can increase to a maximum of `120` ||
 | `DOCKER_REGISTRY_SERVER_URL` | URL of the registry server, when running a custom container in App Service. For security, this variable isn't passed on to the container. | `https://<server-name>.azurecr.io` |
 | `DOCKER_REGISTRY_SERVER_USERNAME` | Username to authenticate with the registry server at `DOCKER_REGISTRY_SERVER_URL`. For security, this variable isn't passed on to the container. ||
diff --git a/articles/app-service/tutorial-custom-container-sidecar.md b/articles/app-service/tutorial-custom-container-sidecar.md
@@ -170,5 +170,6 @@ You configure sidecar-enabled apps differently than apps that aren't sidecar-ena
 ## More resources
 
 - [Configure custom container](configure-custom-container.md)
+- [Try out sidecars in this guided lab](https://mslabs.cloudguides.com/guides/Sidecars%20in%20Azure%20App%20Service)
 - [Deploy custom containers with GitHub Actions](deploy-container-github-action.md)
 - [OpenTelemetry](https://opentelemetry.io/)
diff --git a/articles/app-service/tutorial-sidecar.md b/articles/app-service/tutorial-sidecar.md
@@ -272,5 +272,6 @@ You can use a similar approach to instrument apps in other language stacks. For
 
 ## More resources
 
+- [Try out sidecars in this guided lab](https://mslabs.cloudguides.com/guides/Sidecars%20in%20Azure%20App%20Service)
 - [Deploy to App Service using GitHub Actions](deploy-github-actions.md)
 - [OpenTelemetry](https://opentelemetry.io/)
diff --git a/articles/energy-data-services/how-to-integrate-elastic-logs-with-azure-monitor.md b/articles/energy-data-services/how-to-integrate-elastic-logs-with-azure-monitor.md
@@ -1,6 +1,6 @@
 ---
 title: Integrate elastic logs with Azure Monitor - Microsoft Azure Data Manager for Energy
-description: This is a how-to article on how to start collecting ElasticSearch logs in Azure Monitor, archiving them to a storage account, and querying them in Log Analytics workspace.
+description: This is a how-to article on how to start collecting Elasticsearch logs in Azure Monitor, archiving them to a storage account, and querying them in Log Analytics workspace.
 author: nitinnms
 ms.author: nitindwivedi
 ms.service: azure-data-manager-energy
diff --git a/articles/external-attack-surface-management/understanding-asset-details.md b/articles/external-attack-surface-management/understanding-asset-details.md
@@ -202,7 +202,7 @@ Web components are categorized based on their function.
 | Hosting Provider | hostingprovider.com |
 | Server | Apache |
 | DNS Server | ISC BIND |
-| Data stores | MySQL, ElasticSearch, MongoDB |
+| Data stores | MySQL, Elasticsearch, MongoDB |
 | Remote access | OpenSSH, Microsoft Admin Center, Netscaler Gateway |
 | Data Exchange | Pure-FTPd |
 | Internet of things (IoT) | HP Deskjet, Linksys Camera, Sonos |
diff --git a/articles/network-watcher/network-watcher-nsg-grafana.md b/articles/network-watcher/network-watcher-nsg-grafana.md
@@ -16,11 +16,11 @@ ms.custom: linux-related-content
 
 [Network Security Group (NSG) flow logs](nsg-flow-logs-overview.md) provide information that can be used to understand ingress and egress IP traffic on network interfaces. These flow logs show outbound and inbound flows on a per NSG rule basis, the NIC the flow applies to, 5-tuple information about the flow (Source/Destination IP, Source/Destination Port, Protocol), and if the traffic was allowed or denied.
 
-You can have many NSGs in your network with flow logging enabled. This amount of logging data makes it cumbersome to parse and gain insights from your logs. This article provides a solution to centrally manage these NSG flow logs using Grafana, an open source graphing tool, ElasticSearch, a distributed search and analytics engine, and Logstash, which is an open source server-side data processing pipeline.
+You can have many NSGs in your network with flow logging enabled. This amount of logging data makes it cumbersome to parse and gain insights from your logs. This article provides a solution to centrally manage these NSG flow logs using Grafana, an open source graphing tool, Elasticsearch, a distributed search and analytics engine, and Logstash, which is an open source server-side data processing pipeline.
 
 ## Scenario
 
-NSG flow logs are enabled using Network Watcher and are stored in Azure blob storage. A Logstash plugin is used to connect and process flow logs from blob storage and send them to ElasticSearch.  Once the flow logs are stored in ElasticSearch, they can be analyzed and visualized into customized dashboards in Grafana.
+NSG flow logs are enabled using Network Watcher and are stored in Azure blob storage. A Logstash plugin is used to connect and process flow logs from blob storage and send them to Elasticsearch.  Once the flow logs are stored in Elasticsearch, they can be analyzed and visualized into customized dashboards in Grafana.
 
 ![NSG Network Watcher Grafana](./media/network-watcher-nsg-grafana/network-watcher-nsg-grafana-fig1.png)
 
@@ -32,7 +32,7 @@ For this scenario, you must have Network Security Group Flow Logging enabled on
 
 ### Setup considerations
 
-In this example Grafana, ElasticSearch, and Logstash are configured on an Ubuntu LTS Server deployed in Azure. This minimal setup is used for running all three components - they are all running on the same VM. This setup should only be used for testing and non-critical workloads. Logstash, Elasticsearch, and Grafana can all be architected to scale independently across many instances. For more information, see the documentation for each of these components.
+In this example Grafana, Elasticsearch, and Logstash are configured on an Ubuntu LTS Server deployed in Azure. This minimal setup is used for running all three components - they are all running on the same VM. This setup should only be used for testing and non-critical workloads. Logstash, Elasticsearch, and Grafana can all be architected to scale independently across many instances. For more information, see the documentation for each of these components.
 
 ### Install Logstash
 
@@ -47,7 +47,7 @@ The following instructions are used to install Logstash in Ubuntu. For instructi
     sudo dpkg -i logstash-5.2.0.deb
     ```
 
-2. Configure Logstash to parse the flow logs and send them to ElasticSearch. Create a Logstash.conf file using:
+2. Configure Logstash to parse the flow logs and send them to Elasticsearch. Create a Logstash.conf file using:
 
     ```bash
     sudo touch /etc/logstash/conf.d/logstash.conf
@@ -137,7 +137,7 @@ The input section designates the input source of the logs that Logstash will pro
 
 The filter section then flattens each flow log file so that each individual flow tuple and its associated properties becomes a separate Logstash event.
 
-Finally, the output section forwards each Logstash event to the ElasticSearch server. Feel free to modify the Logstash config file to suit your specific needs.
+Finally, the output section forwards each Logstash event to the Elasticsearch server. Feel free to modify the Logstash config file to suit your specific needs.
 
 ### Install the Logstash input plugin for Azure Blob storage
 
@@ -149,9 +149,9 @@ sudo /usr/share/logstash/bin/logstash-plugin install logstash-input-azureblob
 
 For more information about this plug in, see [Logstash input plugin for Azure Storage Blobs](https://github.com/Azure/azure-diagnostics-tools/tree/master/Logstash/logstash-input-azureblob).
 
-### Install ElasticSearch
+### Install Elasticsearch
 
-You can use the following script to install ElasticSearch. For information about installing ElasticSearch, see [Elastic Stack](https://www.elastic.co/guide/en/elastic-stack/current/index.html).
+You can use the following script to install Elasticsearch. For information about installing Elasticsearch, see [Elastic Stack](https://www.elastic.co/guide/en/elastic-stack/current/index.html).
 
 ```bash
 sudo apt-get install apt-transport-https openjdk-8-jre-headless uuid-runtime pwgen -y
@@ -177,21 +177,21 @@ sudo service grafana-server start
 
 For additional installation information, see [Installing on Debian / Ubuntu](https://docs.grafana.org/installation/debian/).
 
-#### Add the ElasticSearch server as a data source
+#### Add the Elasticsearch server as a data source
 
-Next, you need to add the ElasticSearch index containing flow logs as a data source. You can add a data source by selecting **Add data source** and completing the form with the relevant information. A sample of this configuration can be found in the following screenshot:
+Next, you need to add the Elasticsearch index containing flow logs as a data source. You can add a data source by selecting **Add data source** and completing the form with the relevant information. A sample of this configuration can be found in the following screenshot:
 
 ![Add data source](./media/network-watcher-nsg-grafana/network-watcher-nsg-grafana-fig2.png)
 
 #### Create a dashboard
 
-Now that you have successfully configured Grafana to read from the ElasticSearch index containing NSG flow logs, you can create and personalize dashboards. To create a new dashboard, select **Create your first dashboard**. The following sample graph configuration shows flows segmented by NSG rule:
+Now that you have successfully configured Grafana to read from the Elasticsearch index containing NSG flow logs, you can create and personalize dashboards. To create a new dashboard, select **Create your first dashboard**. The following sample graph configuration shows flows segmented by NSG rule:
 
 ![Dashboard graph](./media/network-watcher-nsg-grafana/network-watcher-nsg-grafana-fig3.png)
 
 ## Conclusion
 
-By integrating Network Watcher with ElasticSearch and Grafana, you now have a convenient and centralized way to manage and visualize NSG flow logs as well as other data. Grafana has a number of other powerful graphing features that can also be used to further manage flow logs and better understand your network traffic. Now that you have a Grafana instance set up and connected to Azure, feel free to continue to explore the other functionality that it offers.
+By integrating Network Watcher with Elasticsearch and Grafana, you now have a convenient and centralized way to manage and visualize NSG flow logs as well as other data. Grafana has a number of other powerful graphing features that can also be used to further manage flow logs and better understand your network traffic. Now that you have a Grafana instance set up and connected to Azure, feel free to continue to explore the other functionality that it offers.
 
 ## Next step
 
