Skip to content

Commit 38c9476

Browse files
authored
Merge pull request #218583 from MicrosoftDocs/main
11/16 Publish at 7AM
2 parents 2f63230 + aa5819f commit 38c9476

37 files changed

+171
-195
lines changed

articles/active-directory/verifiable-credentials/verifiable-credentials-configure-issuer.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,6 @@ Now that you have a new credential, you're going to gather some information abou
144144

145145
1. Copy your **Tenant ID**, and record it for later. The Tenant ID is the guid in the manifest URL highlighted in red above.
146146

147-
>[!NOTE]
148-
> When setting up access policies for Azure Key Vault, you must add the access policies for both **Verifiable Credentials Service Request** and **Verifiable Credentials Service**.
149-
150147
## Download the sample code
151148

152149
The sample application is available in .NET, and the code is maintained in a GitHub repository. Download the sample code from [GitHub](https://github.com/Azure-Samples/active-directory-verifiable-credentials-dotnet), or clone the repository to your local machine:

articles/active-directory/verifiable-credentials/verifiable-credentials-configure-tenant.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ To add the required permissions, follow these steps:
137137

138138
1. Select **APIs my organization uses**.
139139

140-
1. Search for the **Verifiable Credentials Service Request** and **Verifiable Credentials Service** service principals, and select them.
140+
1. Search for the **Verifiable Credentials Service Request** service principal and select it.
141141

142142
:::image type="content" source="media/verifiable-credentials-configure-tenant/add-app-api-permissions-select-service-principal.png" alt-text="Screenshot that shows how to select the service principal.":::
143143

@@ -159,14 +159,15 @@ You can choose to grant issuance and presentation permissions separately if you
159159
1. Navigate to the Verified ID service in the Azure portal.
160160
1. Select **Registration**.
161161
1. Notice that there are two sections:
162-
1. Website ID registration
163-
1. Domain verification.
162+
1. DID registration
163+
1. Domain ownership verification.
164164
1. Select on each section and download the JSON file under each.
165165
1. Create a website that you can use to distribute the files. If you specified **https://contoso.com** as your domain, the URLs for each of the files would look as shown below:
166166
- `https://contoso.com/.well-known/did.json`
167167
- `https://contoso.com/.well-known/did-configuration.json`
168168

169169
Once that you have successfully completed the verification steps, you are ready to continue to the next tutorial.
170+
If you have selected ION as the trust system, you will not see the DID registration section as it is not applicable for ION and you only have to distribute the did-configuration.json file.
170171

171172
## Next steps
172173

articles/aks/learn/tutorial-kubernetes-workload-identity.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Tutorial - Use a workload identity with an application on Azure Kubernete
33
description: In this Azure Kubernetes Service (AKS) tutorial, you deploy an Azure Kubernetes Service cluster and configure an application to use a workload identity.
44
services: container-service
55
ms.topic: tutorial
6-
ms.date: 09/29/2022
6+
ms.date: 11/16/2022
77
---
88

99
# Tutorial: Use a workload identity with an application on Azure Kubernetes Service (AKS)
@@ -223,8 +223,8 @@ spec:
223223
- image: ghcr.io/azure/azure-workload-identity/msal-go
224224
name: oidc
225225
env:
226-
- name: KEYVAULT_NAME
227-
value: ${KEYVAULT_NAME}
226+
- name: KEYVAULT_URL
227+
value: ${KEYVAULT_URL}
228228
- name: SECRET_NAME
229229
value: ${KEYVAULT_SECRET_NAME}
230230
nodeSelector:
@@ -302,4 +302,4 @@ This tutorial is for introductory purposes. For guidance on a creating full solu
302302
[az-aks-get-credentials]: /cli/azure/aks#az-aks-get-credentials
303303
[az-identity-federated-credential-create]: /cli/azure/identity/federated-credential#az-identity-federated-credential-create
304304
[aks-tutorial]: ../tutorial-kubernetes-prepare-app.md
305-
[aks-solution-guidance]: /azure/architecture/reference-architectures/containers/aks-start-here
305+
[aks-solution-guidance]: /azure/architecture/reference-architectures/containers/aks-start-here

articles/azure-maps/how-to-dev-guide-js-sdk.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,16 @@ The Azure Maps JavaScript/TypeScript REST SDK (JavaScript SDK) supports searchin
3030
> az maps account create --kind "Gen2" --account-name "myMapAccountName" --resource-group "<resource group>" --sku "G2"
3131
> ```
3232
33+
## Create a Node.js project
34+
35+
The example below creates a new directory then a Node.js program named _mapsDemo_ using npm:
36+
37+
```powershell
38+
mkdir mapsDemo
39+
cd mapsDemo
40+
npm init
41+
```
42+
3343
## Install the search package
3444

3545
To use Azure Maps JavaScript SDK, you'll need to install the search package. Each of the Azure Maps services including search, routing, rendering and geolocation are each in their own package.
@@ -55,16 +65,6 @@ mapsDemo
5565
| [Search][search readme] | [@azure/maps-search][search package] | [search samples][search sample] |
5666
| [Route][js route readme] | [@azure-rest/maps-route][js route package] | [route samples][js route sample] |
5767

58-
## Create a Node.js project
59-
60-
The example below creates a new directory then a Node.js program named _mapsDemo_ using npm:
61-
62-
```powershell
63-
mkdir mapsDemo
64-
cd mapsDemo
65-
npm init
66-
```
67-
6868
## Create and authenticate a MapsSearchClient
6969

7070
You'll need a `credential` object for authentication when creating the `MapsSearchClient` object used to access the Azure Maps search APIs. You can use either an Azure Active Directory (Azure AD) credential or an Azure subscription key to authenticate. For more information on authentication, see [Authentication with Azure Maps][authentication].
Lines changed: 51 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,78 @@
11
---
22
title: Overview of common autoscale patterns
33
description: Learn some of the common patterns to auto scale your resource in Azure.
4+
author: EdB-MSFT
45
ms.topic: conceptual
5-
ms.date: 04/22/2022
6+
ms.date: 11/17/2022
67
ms.subservice: autoscale
7-
ms.reviewer: riroloff
8+
ms.author: edbaynash
9+
ms.reviewer: akkumari
810
---
911
# Overview of common autoscale patterns
10-
This article describes some of the common patterns to scale your resource in Azure.
1112

12-
Azure Monitor autoscale applies only to [Virtual Machine Scale Sets](https://azure.microsoft.com/services/virtual-machine-scale-sets/), [Cloud Services](https://azure.microsoft.com/services/cloud-services/), [App Service - Web Apps](https://azure.microsoft.com/services/app-service/web/), and [API Management services](../../api-management/api-management-key-concepts.md).
13+
Autoscale settings help ensure that you have the right amount of resources running to handle the fluctuating load of your application. You can configure autoscale settings to be triggered based on metrics that indicate load or performance, or triggered at a scheduled date and time.
1314

14-
## Lets get started
15+
Azure autoscale supports many resource types. For more information about supported resources, see [autoscale supported resources](./autoscale-overview.md#supported-services-for-autoscale).
1516

16-
This article assumes that you are familiar with auto scale. You can [get started here to scale your resource][1]. The following are some of the common scale patterns.
17+
This article describes some of the common patterns you can use to scale your resources in Azure.
18+
## Prerequisites
1719

18-
## Scale based on CPU
20+
This article assumes that you're familiar with auto scale. [Get started here to scale your resource](./autoscale-get-started.md).
1921

20-
You have a web app (/VMSS/cloud service role) and
22+
## Scale based on metrics
2123

22-
- You want to scale out/scale in based on CPU.
23-
- Additionally, you want to ensure there is a minimum number of instances.
24-
- Also, you want to ensure that you set a maximum limit to the number of instances you can scale to.
24+
Scale your resource based on metrics produce by the resource itself or any other resource.
25+
For example:
26+
* Scale your Virtual Machine Scale Set based on the CPU usage of the virtual machine.
27+
* Ensure a minimum number of instances.
28+
* Set a maximum limit on the number of instances.
2529

26-
[![Scale based on CPU](./media/autoscale-common-scale-patterns/scale-based-on-cpu.png)](./media/autoscale-common-scale-patterns/scale-based-on-cpu.png#lightbox)
30+
The image below shows a default scale condition for a Virtual Machine Scale Set
31+
* The **Scale rule** tab shows that the metric source is the scale set itself and the metric used is Percentage CPU.
32+
* The minimum number of instances running is set to 2.
33+
* The maximum number of instances is set to 10.
34+
* When the scale set starts, the default number of instances is 3.
2735

28-
## Scale differently on weekdays vs weekends
36+
:::image type="content" source="./media/autoscale-common-scale-patterns/scale-based-on-cpu.png" alt-text="A screenshot showing an autoscale setting, scaling by CPU %." lightbox="./media/autoscale-common-scale-patterns/scale-based-on-cpu.png":::
2937

30-
You have a web app (/VMSS/cloud service role) and
38+
## Scale based on another resource's metric
3139

32-
- You want 3 instances by default (on weekdays)
33-
- You don't expect traffic on weekends and hence you want to scale down to 1 instance on weekends.
40+
Scale a resource based on the metrics from a different resource.
41+
The image below shows a scale rule that is scaling a Virtual Machine Scale Set based on the number of allocated ports on a load balancer.
3442

35-
[![Scale differently on weekdays vs weekends](./media/autoscale-common-scale-patterns/scale-differently-on-weekends.png)](./media/autoscale-common-scale-patterns/scale-differently-on-weekends.png#lightbox)
43+
:::image type="content" source="./media/autoscale-common-scale-patterns/scale-rule-other-resource.png" alt-text="A screenshot showing autoscale rule based on load balancer metrics." lightbox="./media/autoscale-common-scale-patterns/scale-rule-other-resource.png":::
3644

37-
## Scale differently during holidays
45+
## Scale differently on weekends
3846

39-
You have a web app (/VMSS/cloud service role) and
47+
You can scale your resources differently on different days of the week..
48+
For example, you have a web app and want to:
49+
- Set a minimum of 3 instances on weekdays.
50+
- Scale down to 1 instance on weekends when there's less traffic.
4051

41-
- You want to scale up/down based on CPU usage by default
42-
- However, during holiday season (or specific days that are important for your business) you want to override the defaults and have more capacity at your disposal.
52+
:::image type="content" source="./media/autoscale-common-scale-patterns/scale-differently-on-weekends.png" alt-text="A screenshot showing two autoscale profiles, one default and one for weekends." lightbox="./media/autoscale-common-scale-patterns/scale-differently-on-weekends.png":::
4353

44-
[![Scale differently on holidays](./media/autoscale-common-scale-patterns/scale-for-holiday.png)](./media/autoscale-common-scale-patterns/scale-for-holiday.png#lightbox)
54+
## Scale differently during specific events
4555

46-
## Scale based on custom metric
56+
You can set your scale rules and instance limits differently for specific events.
57+
For example:
58+
- Set a minimum of 3 instances by default
59+
- For the week of Back Friday, set the minimum number of instances to 10 to handle the anticipated traffic.
4760

48-
You have a web front end and an API tier that communicates with the backend.
61+
:::image type="content" source="./media/autoscale-common-scale-patterns/scale-for-event.png" alt-text="A screenshot showing two autoscale profiles, one default and one for a specific date range." lightbox="./media/autoscale-common-scale-patterns/scale-for-event.png":::
4962

50-
- You want to scale the API tier based on custom events in the front end (example: You want to scale your checkout process based on the number of items in the shopping cart)
63+
## Scale based on custom metrics
64+
Scale by custom metrics generated by your application.
65+
For example, you have a web front end and an API tier that communicates with the backend, and you want to scale the API tier based on custom events in the front end.
5166

52-
![Scale based on custom metric][5]
67+
:::image type="content" source="./media/autoscale-common-scale-patterns/custom-metric-scale.png" alt-text="A screenshot showing an autoscale profile, and rule scaling by a custom metric." lightbox="./media/autoscale-common-scale-patterns/custom-metric-scale.png":::
5368

54-
<!--Reference-->
55-
[1]: ./autoscale-get-started.md
56-
[2]: ./media/autoscale-common-scale-patterns/scale-based-on-cpu.png
57-
[3]: ./media/autoscale-common-scale-patterns/weekday-weekend-scale.png
58-
[4]: ./media/autoscale-common-scale-patterns/holidays-scale.png
59-
[5]: ./media/autoscale-common-scale-patterns/custom-metric-scale.png
69+
Next steps
70+
71+
Learn more about autoscale by referring to the following articles :
72+
73+
* [Azure Monitor autoscale common metrics](./autoscale-common-metrics.md)
74+
* [Azure Monitor autoscale custom metrics](./autoscale-custom-metric.md)
75+
* [Autoscale with multiple profiles](./autoscale-multiprofile.md)
76+
* [Flapping in Autoscale](./autoscale-custom-metric.md)
77+
* [Use autoscale actions to send email and webhook alert notifications](./autoscale-webhook-email.md)
78+
* [Autoscale REST API](/rest/api/monitor/autoscalesettings)
-213 KB
Loading
-2.73 KB
Loading
-134 KB
Loading
43.2 KB
Loading

0 commit comments

Comments
 (0)