Skip to content

Commit bc70545

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into posteol
2 parents 290d01d + 94cc833 commit bc70545

File tree

5 files changed

+21
-18
lines changed

5 files changed

+21
-18
lines changed

articles/app-service/environment/version-comparison.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ ms.topic: article
1212
App Service Environment has three versions. App Service Environment v3 is the latest version and provides advantages and feature differences over earlier versions.
1313

1414
> [!IMPORTANT]
15+
> App Service Environment v1 and v2 [will be retired on 31 August 2024](https://azure.microsoft.com/updates/app-service-environment-version-1-and-version-2-will-be-retired-on-31-august-2024-4/). After that date, those versions will no longer be supported and any remaining App Service Environment v1 and v2s and the applications running on them will be deleted.
16+
>
17+
> There's a new version of App Service Environment that is easier to use and runs on more powerful infrastructure. To learn more about the new version, start with the [Introduction to the App Service Environment](overview.md). If you're currently using App Service Environment v1 or v2, please follow the steps in [this article](upgrade-to-asev3.md) to migrate to the new version.
1518
> This article includes information about App Service Environment v1 and v2. [App Service Environment v1 and v2 will be retired on 31 August 2024](https://azure.microsoft.com/updates/v2/App-Service-Environment-v1v2-Retirement-Update). There's a new version of App Service Environment that is easier to use and runs on more powerful infrastructure. To learn more about the new version, start with the [Introduction to the App Service Environment](overview.md). If you're currently using App Service Environment v2, please follow the steps in [this article](upgrade-to-asev3.md) to migrate to the new version.
1619
>
1720
> After 31 August 2024, decommissioning of the App Service Environment v1 and v2 hardware will begin, and this may affect the availability and performance of your apps and data. Service Level Agreement (SLA) and Service Credits will no longer apply for App Service Environment v1 and v2 workloads that continue to be in production after 31 August 2024.
@@ -35,7 +38,7 @@ App Service Environment has three versions. App Service Environment v3 is the la
3538
|Dedicated host group |No |No |[Yes](creation.md#deployment-considerations) (not compatible with zone redundancy) |
3639
|Upgrade preference for planned maintenance |No |No |[Yes](how-to-upgrade-preference.md) |
3740
|FTPS |Yes |Yes |Yes, [must be explicitly enabled](configure-network-settings.md#ftp-access). Access to FTPS endpoint using custom domain suffix isn't supported. |
38-
|FTPS endpoint structure |ftps://APP-NAME.ASE-NAME.appserviceenvironment.net |ftps://APP-NAME.ASE-NAME.appserviceenvironment.net - Custom domain suffix is supported if you have one configured by replacing the App Service Environment name and the default domain suffix with your custom domain suffix. |ftps://ASE-NAME.ftp.appserviceenvironment.net/site/wwwroot - Custom domain suffix isn't supported. Each app on the same App Service Environment v3 uses the same FTPS endpoint but has its own unique application scope credentials for authentication. |
41+
|FTPS endpoint structure |ftps://APP-NAME.ASE-NAME.appserviceenvironment.NET |ftps://APP-NAME.ASE-NAME.appserviceenvironment.NET - Custom domain suffix is supported if you have one configured by replacing the App Service Environment name and the default domain suffix with your custom domain suffix. |ftps://ASE-NAME.ftp.appserviceenvironment.NET/site/wwwroot - Custom domain suffix isn't supported. Each app on the same App Service Environment v3 uses the same FTPS endpoint but has its own unique application scope credentials for authentication. |
3942
|Remote debugging |Yes |Yes |Yes, [must be explicitly enabled](configure-network-settings.md#remote-debugging-access) |
4043
|[Azure virtual network (classic)](../../virtual-network/create-virtual-network-classic.md) support |Yes |No |No |
4144

@@ -68,7 +71,7 @@ App Service Environment v3 runs on the latest [Virtual Machine Scale Sets](../..
6871
|---------|---------|---------|---------|
6972
|IP-based Transport Layer Security (TLS) or Secure Sockets Layer (SSL) binding with your apps |Yes |Yes |No |
7073
|Custom domain suffix |Yes (requires SNI based TLS connection) |Yes (only supported with certain API versions) |[Yes](how-to-custom-domain-suffix.md) |
71-
|Default host name|If you have a custom domain suffix, the default host name includes your custom domain suffix and is in the form *APP-NAME.internal.contoso.com*. |If you have a custom domain suffix, the default host name includes your custom domain suffix and is in the form *APP-NAME.internal.contoso.com*. |The default host name always uses the App Service Environment default domain suffix and is in the form *APP-NAME.ASE-NAME.appserviceenvironment.net*. App Service Environment v3 keeps the default domain suffix when you add a custom domain suffix. If you add a custom domain suffix, the custom domain suffix configuration is under the `customDnsSuffixConfiguration` property. |
74+
|Default host name|If you have a custom domain suffix, the default host name includes your custom domain suffix and is in the form *APP-NAME.internal.contoso.com*. |If you have a custom domain suffix, the default host name includes your custom domain suffix and is in the form *APP-NAME.internal.contoso.com*. |The default host name always uses the App Service Environment default domain suffix and is in the form *APP-NAME.ASE-NAME.appserviceenvironment.NET*. App Service Environment v3 keeps the default domain suffix when you add a custom domain suffix. If you add a custom domain suffix, the custom domain suffix configuration is under the `customDnsSuffixConfiguration` property. |
7275
|Support for App Service Managed Certificates |No |No |No |
7376

7477
### Backup and restore
@@ -169,7 +172,7 @@ This limitation is a result of the underlying infrastructure change that was imp
169172

170173
The custom domain suffix is for the App Service Environment. It's available on App Service Environment v1 and v3, but was removed from App Service Environment v2.
171174

172-
It's different from a custom domain binding on App Service. The custom domain suffix defines a root domain that can be used by the App Service Environment. In the public variation of Azure App Service, the default root domain for all web apps is azurewebsites.net. For ILB App Service Environments, the default root domain is appserviceenvironment.net. However, since an ILB App Service Environment is internal to a customer's virtual network, customers can use a root domain in addition to the default one that makes sense for use within a company's internal virtual network. For example, a hypothetical Contoso Corporation might use a default root domain of internal.contoso.com for apps that are intended to only be resolvable and accessible within Contoso's virtual network. An app in this virtual network could be reached by accessing APP-NAME.internal.contoso.com.
175+
It's different from a custom domain binding on App Service. The custom domain suffix defines a root domain that can be used by the App Service Environment. In the public variation of Azure App Service, the default root domain for all web apps is azurewebsites.NET. For ILB App Service Environments, the default root domain is appserviceenvironment.NET. However, since an ILB App Service Environment is internal to a customer's virtual network, customers can use a root domain in addition to the default one that makes sense for use within a company's internal virtual network. For example, a hypothetical Contoso Corporation might use a default root domain of internal.contoso.com for apps that are intended to only be resolvable and accessible within Contoso's virtual network. An app in this virtual network could be reached by accessing APP-NAME.internal.contoso.com.
173176

174177
For more information on custom domain suffix, see [Custom domain suffix for App Service Environments](how-to-custom-domain-suffix.md).
175178

articles/hdinsight-aks/rest-api-cluster-creation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Variables required in the script
4545
- [HDInsight on AKS VM list](/azure/hdinsight-aks/virtual-machine-recommendation-capacity-planning)
4646
- recommendation-capacity-planning
4747

48-
To create a cluster, copy the following command to your REST API tool e.g Postman
48+
To create a cluster, copy the following command to your REST API tool.
4949

5050
```
5151
PUT https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusterpools/{clusterPoolName}/clusters/{clusterName}?api-version=2023-06-01-preview

articles/hdinsight/hdinsight-release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ For workload specific versions, see [HDInsight 5.x component versions](./hdinsig
4848

4949
## Updates
5050

51-
**[Adding Azure Monitor Agent](./azure-monitor-agent.md) for Log Analytics in HDInsight**
51+
**[Addition of Azure Monitor Agent](./azure-monitor-agent.md) for Log Analytics in HDInsight**
5252

5353
Addition of `SystemMSI` and Automated DCR for Log analytics, given the deprecation of [New Azure Monitor experience (preview)](./hdinsight-hadoop-oms-log-analytics-tutorial.md) .
5454

articles/service-fabric/how-to-managed-cluster-large-virtual-machine-scale-sets.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ ms.author: tomcassidy
66
author: tomvcassidy
77
ms.service: azure-service-fabric
88
services: service-fabric
9-
ms.date: 07/11/2022
9+
ms.date: 08/09/2024
1010
---
1111

1212
# Service Fabric managed cluster node type scaling
1313

14-
Each node type in a Service Fabric managed cluster is backed by a virtual machine scale set. To allow managed cluster node types to create [large virtual machine scale sets](../virtual-machine-scale-sets/virtual-machine-scale-sets-placement-groups.md) a property `multiplePlacementGroups` has been added to node type definition. By default, managed cluster node types set this property to false to keep fault and upgrade domains consistent within a placement group, but this setting limits a node type from scaling beyond 100 VMs. To help decide whether your application can make effective use of large scale sets, see [this list of requirements](../virtual-machine-scale-sets/virtual-machine-scale-sets-placement-groups.md#checklist-for-using-large-scale-sets).
14+
A virtual machine scale set backs each node type in a Service Fabric managed cluster. To allow managed cluster node types to create [large virtual machine scale sets](../virtual-machine-scale-sets/virtual-machine-scale-sets-placement-groups.md), a property `multiplePlacementGroups` has been added to node type definition. By default, managed cluster node types set this property to false to keep fault and upgrade domains consistent within a placement group, but this setting limits a node type from scaling beyond 100 VMs. To help decide whether your application can make effective use of large scale sets, see [this list of requirements and limitations](../virtual-machine-scale-sets/virtual-machine-scale-sets-placement-groups.md#checklist-for-using-large-scale-sets).
1515

16-
Since the Azure Service Fabric managed cluster resource provider orchestrates scaling and uses managed disks for data, we are able to support large scale sets for both stateful and stateless secondary node types.
16+
Since the Azure Service Fabric managed cluster resource provider orchestrates scaling and uses managed disks for data, we're able to support large scale sets for both stateful and stateless secondary node types.
1717

1818
> [!NOTE]
1919
> This property can not be modified after a node type is deployed.

articles/service-fabric/how-to-managed-cluster-stateless-node-type.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: tomcassidy
66
author: tomvcassidy
77
ms.service: azure-service-fabric
88
services: service-fabric
9-
ms.date: 07/11/2022
9+
ms.date: 08/09/2024
1010
---
1111

1212
# Deploy a Service Fabric managed cluster with stateless node types
@@ -15,13 +15,13 @@ Service Fabric node types come with an inherent assumption that at some point of
1515

1616
* Primary node types can't be configured to be stateless.
1717
* Stateless node types require an API version of **2021-05-01** or later.
18-
* This will automatically set the **multipleplacementgroup** property to **true** which you can [learn more about here](how-to-managed-cluster-large-virtual-machine-scale-sets.md).
19-
* This enables support for up to 1000 nodes for the given node type.
18+
* This will automatically set the **multipleplacementgroup** property to **true** which you can [learn more about here](how-to-managed-cluster-large-virtual-machine-scale-sets.md). The underlying [virtual machine scale set requirements and limitations](../virtual-machine-scale-sets/virtual-machine-scale-sets-placement-groups.md#checklist-for-using-large-scale-sets) to enabling this property apply for Service Fabric managed clusters.
19+
* This enables support for up to 1,000 nodes for the given node type.
2020
* Stateless node types can utilize a VM SKU temporary disk.
2121

2222
## Enabling stateless node types in a Service Fabric managed cluster
2323

24-
To set one or more node types as stateless in a node type resource, set the **isStateless** property to **true**. When deploying a Service Fabric cluster with stateless node types, it's required to have at least one primary node type, which is not stateless in the cluster.
24+
To set one or more node types as stateless in a node type resource, set the **isStateless** property to **true**. When deploying a Service Fabric cluster with stateless node types, the setup requires at least one primary node type that isn't stateless in the cluster.
2525

2626
Sample templates are available: [Service Fabric Stateless Node types template](https://github.com/Azure-Samples/service-fabric-cluster-templates)
2727

@@ -52,9 +52,9 @@ Sample templates are available: [Service Fabric Stateless Node types template](h
5252

5353
## Enabling stateless node types using Spot VMs in a Service Fabric managed cluster (Preview)
5454

55-
[Azure Spot Virtual Machines on scale sets](../virtual-machine-scale-sets/use-spot.md) enables users to take advantage of unused compute capacity at a significant cost savings. At any point in time when Azure needs the capacity back, the Azure infrastructure will evict these Azure Spot Virtual Machine instances. Therefore, Spot VM node types are great for workloads that can handle interruptions and don't need to be completed within a specific time frame. Recommended workloads include development, testing, batch processing jobs, big data, or other large-scale stateless scenarios.
55+
[Azure Spot Virtual Machines on scale sets](../virtual-machine-scale-sets/use-spot.md) enables users to take advantage of unused compute capacity at a significant cost savings. At any point in time when Azure needs the capacity back, the Azure infrastructure evicts these Azure Spot Virtual Machine instances. Therefore, Spot VM node types are great for workloads that can handle interruptions and don't need to be completed within a specific time frame. Recommended workloads include development, testing, batch processing jobs, big data, or other large-scale stateless scenarios.
5656

57-
To set one or more stateless node types to use Spot VM, set both **isStateless** and **IsSpotVM** properties to true. When deploying a Service Fabric cluster with stateless node types, it's required to have at least one primary node type, which is not stateless in the cluster. Stateless node types configured to use Spot VMs have Eviction Policy set to 'Delete' by default. Customers can configure the 'evictionPolicy' to be 'Delete' or 'Deallocate' but this can only be defined at the time of nodetype creation.
57+
To set one or more stateless node types to use Spot VM, set both **isStateless** and **IsSpotVM** properties to true. When deploying a Service Fabric cluster with stateless node types, it's required to have at least one primary node type, which isn't stateless in the cluster. Stateless node types configured to use Spot VMs have Eviction Policy set to 'Delete' by default. Customers can configure the 'evictionPolicy' to be 'Delete' or 'Deallocate' but this can only be defined at the time of nodetype creation.
5858

5959
Sample templates are available: [Service Fabric Spot Node types template](https://github.com/Azure-Samples/service-fabric-cluster-templates/tree/master/SF-Managed-Standard-SKU-2-NT-Spot)
6060

@@ -87,7 +87,7 @@ Sample templates are available: [Service Fabric Spot Node types template](https:
8787
## Enabling Spot VMs with Try & Restore
8888

8989
This configuration enables the platform to automatically try to restore the evicted Spot VMs. Refer to the virtual machine scale set doc for [details](../virtual-machine-scale-sets/use-spot.md#try--restore).
90-
This configuration can only be enabled on new Spot nodetypes by specifying the **spotRestoreTimeout**, which is an ISO 8601 time duration having a value between 30 & 2880 mins. The platform will try to restore the VMs for this duration, after eviction.
90+
This configuration can only be enabled on new Spot nodetypes by specifying the **spotRestoreTimeout**, which is an ISO 8601 time duration having a value between 30 and 2880 minutes. The platform will try to restore the VMs for this duration, after eviction.
9191

9292
```json
9393
{
@@ -116,16 +116,16 @@ This configuration can only be enabled on new Spot nodetypes by specifying the *
116116
```
117117

118118
## Configure stateless node types for zone resiliency
119-
To configure a Stateless node type for zone resiliency you must [configure managed cluster zone spanning](how-to-managed-cluster-availability-zones.md) at the cluster level.
119+
To configure a Stateless node type for zone resiliency, you must [configure managed cluster zone spanning](how-to-managed-cluster-availability-zones.md) at the cluster level.
120120

121121
>[!NOTE]
122122
> The zonal resiliency property must be set at the cluster level, and this property can't be changed in place.
123123
124124
## Temporary disk support
125125
Stateless node types can be configured to use temporary disk as the data disk instead of a Managed Disk. Using a temporary disk can reduce costs for stateless workloads. To configure a stateless node type to use the temporary disk set the **useTempDataDisk** property to **true**.
126126

127-
* Temporary disk size must be 32GB or more. The size of the temporary disk depends on the VM size.
128-
* The temporary disk is not encrypted by server side encryption unless you enable encryption at host.
127+
* Temporary disk size must be 32 GB or more. The size of the temporary disk depends on the VM size.
128+
* The temporary disk isn't encrypted by server side encryption unless you enable encryption at host.
129129
* The Service Fabric managed cluster resource apiVersion should be **2022-01-01** or later.
130130

131131
```json

0 commit comments

Comments
 (0)