Skip to content

Commit f16750e

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into us303970-content-curation
2 parents 5e6f1d2 + ead0d96 commit f16750e

File tree

127 files changed

+923
-557
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+923
-557
lines changed

articles/app-service/app-service-web-tutorial-custom-domain.md

Lines changed: 37 additions & 37 deletions
Large diffs are not rendered by default.

articles/app-service/configure-domain-traffic-manager.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Once you have finished adding or modifying DNS records at your domain provider,
7373

7474
Since Traffic Manager only supports custom domain mapping with CNAME records, and because DNS standards don't support CNAME records for mapping root domains (for example, **contoso.com**), Traffic Manager doesn't support mapping to root domains. To work around this issue, use a URL redirect from at the app level. In ASP.NET Core, for example, you can use [URL Rewriting](/aspnet/core/fundamentals/url-rewriting). Then, use Traffic Manager to load balance the subdomain (**www.contoso.com**). Another approach is you can [create an alias record for your domain name apex to reference an Azure Traffic Manager profile](../dns/tutorial-alias-tm.md). An example is contoso.com. Instead of using a redirecting service, you can configure Azure DNS to reference a Traffic Manager profile directly from your zone.
7575

76-
For high availability scenarios, you can implement a load-balancing DNS setup without Traffic Manager by creating multiple *A records* that point from the root domain to each app copy's IP address. Then, [map the same root domain to all the app copies](app-service-web-tutorial-custom-domain.md#2-create-the-dns-records). Since the same domain name cannot be mapped to two different apps in the same region, this setup only works when your app copies are in different regions.
76+
For high availability scenarios, you can implement a load-balancing DNS setup without Traffic Manager by creating multiple *A records* that point from the root domain to each app copy's IP address. Then, [map the same root domain to all the app copies](app-service-web-tutorial-custom-domain.md#create-the-dns-records). Since the same domain name cannot be mapped to two different apps in the same region, this setup only works when your app copies are in different regions.
7777

7878
## Enable custom domain
7979
After the records for your domain name have propagated, use the browser to verify that your custom domain name resolves to your App Service app.

articles/app-service/configure-language-python.md

Lines changed: 53 additions & 55 deletions
Large diffs are not rendered by default.

articles/app-service/configure-ssl-app-service-certificate.md

Lines changed: 44 additions & 46 deletions
Large diffs are not rendered by default.

articles/app-service/configure-ssl-bindings.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ There are two changes you need to make, potentially:
6666

6767
- By default, your app uses a shared public IP address. When you bind a certificate with IP SSL, App Service creates a new, dedicated IP address for your app. If you mapped an A record to your app, update your domain registry with this new, dedicated IP address.
6868

69-
Your app's **Custom domain** page is updated with the new, dedicated IP address. Copy this IP address, then [remap the A record](app-service-web-tutorial-custom-domain.md#2-create-the-dns-records) to this new IP address.
69+
Your app's **Custom domain** page is updated with the new, dedicated IP address. Copy this IP address, then [remap the A record](app-service-web-tutorial-custom-domain.md#create-the-dns-records) to this new IP address.
7070

71-
- If you have an SNI SSL binding to `<app-name>.azurewebsites.net`, [remap any CNAME mapping](app-service-web-tutorial-custom-domain.md#2-create-the-dns-records) to point to `sni.<app-name>.azurewebsites.net` instead (add the `sni` prefix).
71+
- If you have an SNI SSL binding to `<app-name>.azurewebsites.net`, [remap any CNAME mapping](app-service-web-tutorial-custom-domain.md#create-the-dns-records) to point to `sni.<app-name>.azurewebsites.net` instead (add the `sni` prefix).
7272

7373
## 3. Test HTTPS
7474

articles/app-service/manage-scale-up.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@
22
title: Scale up features and capacities
33
description: Learn how to scale up an app in Azure App Service. Get more CPU, memory, disk space, and extra features.
44
ms.assetid: f7091b25-b2b6-48da-8d4a-dcf9b7baccab
5-
ms.topic: article
6-
ms.date: 05/08/2023
5+
ms.topic: how-to
6+
ms.date: 08/26/2024
77
ms.author: msangapu
88
author: msangapu-msft
99
---
1010
# Scale up an app in Azure App Service
1111

1212
This article shows you how to scale your app in Azure App Service. There are two workflows for scaling, scale up and scale out, and this article explains the scale up workflow.
1313

14-
* [Scale up](https://en.wikipedia.org/wiki/Scalability#Horizontal_and_vertical_scaling): Get more CPU, memory, disk space, and extra features
14+
* [Scale up](https://en.wikipedia.org/wiki/Scalability#Horizontal_and_vertical_scaling): Get more CPU, memory, or disk space, or extra features
1515
like dedicated virtual machines (VMs), custom domains and certificates, staging slots, autoscaling, and more. You scale up by changing the pricing tier of the
1616
App Service plan that your app belongs to.
1717
* [Scale out](https://en.wikipedia.org/wiki/Scalability#Horizontal_and_vertical_scaling): Increase the number of VM instances that run your app.
18-
Basic, Standard and Premium service plans scale out to as many as 3, 10 and 30 instances respectively. [App Service Environments](environment/intro.md)
19-
in **Isolated** tier further increases your scale-out count to 100 instances. For more information about scaling out, see
18+
Basic, Standard, and Premium service plans scale out to as many as 3, 10, and 30 instances, respectively. [App Service Environments](environment/intro.md)
19+
in the Isolated tier further increase your scale-out count to 100 instances. For more information about scaling out, see
2020
[Scale instance count manually or automatically](/azure/azure-monitor/autoscale/autoscale-get-started). There, you find out how
2121
to use autoscaling, which is to scale instance count automatically based on predefined rules and schedules.
2222

2323
>[!IMPORTANT]
24-
> [App Service now offers an automatic scale-out option to handle varying incoming HTTP requests.](./manage-automatic-scaling.md)
24+
> [App Service offers an automatic scale-out option to handle varying incoming HTTP requests.](./manage-automatic-scaling.md)
2525
>
2626
2727
The scale settings take only seconds to apply and affect all apps in your [App Service plan](../app-service/overview-hosting-plans.md).
@@ -30,7 +30,7 @@ They don't require you to change your code or redeploy your application.
3030
For information about the pricing and features of individual App Service plans, see [App Service Pricing Details](https://azure.microsoft.com/pricing/details/web-sites/).
3131

3232
> [!NOTE]
33-
> Before you switch an App Service plan from the **Free** tier, you must first remove the [spending limits](https://azure.microsoft.com/pricing/spending-limits/) in place for your Azure subscription. To view or change options for your Microsoft Azure App Service subscription, see [Microsoft Azure Subscriptions][azuresubscriptions].
33+
> Before you switch an App Service plan from the Free tier, you must first remove the [spending limits](https://azure.microsoft.com/pricing/spending-limits/) in place for your Azure subscription. To view or change options for your App Service subscription, see [Cost Management + Billing][azuresubscriptions] in the Azure portal.
3434
>
3535
>
3636
@@ -61,35 +61,35 @@ If your app depends on other services, such as Azure SQL Database or Azure Stora
6161

6262
1. In the **Overview** page for your app, select the **Resource group** link.
6363

64-
![Scale up your Azure app's related resources](./media/web-sites-scale/RGEssentialsLink.png)
64+
![Scale up your Azure app's related resources.](./media/web-sites-scale/RGEssentialsLink.png)
6565

66-
2. In the **Summary** part of the **Resource group** page, select a resource that you want to scale. The following screenshot
66+
2. On the **Overview** page for the resource group, select a resource that you want to scale. The following screenshot
6767
shows a SQL Database resource.
6868

6969
![Navigate to resource group page to scale up your Azure app](./media/web-sites-scale/ResourceGroup.png)
7070

71-
To scale up the related resource, see the documentation for the specific resource type. For example, to scale up a single SQL Database, see [Scale single database resources in Azure SQL Database](/azure/azure-sql/database/single-database-scale). To scale up an Azure Database for MySQL resource, see [Scale MySQL resources](/azure/mysql/concepts-pricing-tiers#scale-resources).
71+
To scale up the related resource, see the documentation for the specific resource type. For example, to scale up a single SQL database, see [Scale single database resources in Azure SQL Database](/azure/azure-sql/database/single-database-scale). To scale up an Azure Database for MySQL resource, see [Scale Azure Database for MySQL resources](/azure/mysql/concepts-pricing-tiers#scale-resources).
7272

7373
<a name="OtherFeatures"></a>
7474
<a name="devfeatures"></a>
7575

7676
## Compare pricing tiers
7777

78-
For detailed information, such as VM sizes for each pricing tier, see [App Service Pricing Details](https://azure.microsoft.com/pricing/details/app-service).
78+
For detailed information, such as VM sizes for each pricing tier, see [App Service Pricing Details](https://azure.microsoft.com/pricing/details/app-service/windows/).
7979

8080
For a table of service limits, quotas, and constraints, and supported features in each tier, see [App Service limits](../azure-resource-manager/management/azure-subscription-service-limits.md#app-service-limits).
8181

8282
<a name="Next Steps"></a>
8383

84-
## More resources
84+
## Related content
8585

86-
* [Scale instance count manually or automatically](/azure/azure-monitor/autoscale/autoscale-get-started)
86+
* [Get started with autoscale in Azure](/azure/azure-monitor/autoscale/autoscale-get-started)
8787
* [Configure Premium V3 tier for App Service](app-service-configure-premium-tier.md)
8888
* [Tutorial: Run a load test to identify performance bottlenecks in a web app](../load-testing/tutorial-identify-bottlenecks-azure-portal.md)
8989
<!-- LINKS -->
9090
[vmsizes]:https://azure.microsoft.com/pricing/details/app-service/
9191
[SQLaccountsbilling]:https://go.microsoft.com/fwlink/?LinkId=234930
92-
[azuresubscriptions]:https://account.windowsazure.com/subscriptions
92+
[azuresubscriptions]:https://ms.portal.azure.com/#view/Microsoft_Azure_Billing/BillingMenuBlade/~/Overview
9393

9494
<!-- IMAGES -->
9595
[ChooseWHP]: ./media/web-sites-scale/scale1ChooseWHP.png
-9.63 KB
Loading
-11.5 KB
Loading
-7.04 KB
Loading
-11 KB
Loading

0 commit comments

Comments
 (0)