Skip to content

Commit 81facea

Browse files
authored
Merge pull request #245069 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 274cc19 + 1f036a5 commit 81facea

11 files changed

+65
-61
lines changed

articles/active-directory/develop/access-tokens.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ Azure AD makes available a tenant-independent version of the document for multi-
111111
```
112112
113113
1. Applications that use Azure AD's tenant ID (`tid`) claim as a trust boundary instead of the standard issuer claim should ensure that the tenant-id claim is a GUID and that the issuer and tenant ID match.
114+
114115
Using tenant-independent metadata is more efficient for applications which accept tokens from many tenants.
115116
> [!NOTE]
116117
> With Azure AD tenant-independent metadata, claims should be interpreted within the tenant, just as under standard OpenID Connect, claims are interpreted within the issuer. That is, `{"sub":"ABC123","iss":"https://login.microsoftonline.com/{example-tenant-id}/v2.0","tid":"{example-tenant-id}"}` and `{"sub":"ABC123","iss":"https://login.microsoftonline.com/{another-tenand-id}/v2.0","tid":"{another-tenant-id}"}` describe different users, even though the `sub` is the same, because claims like `sub` are interpreted within the context of the issuer/tenant.

articles/active-directory/develop/scenario-web-api-call-api-call-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ In this scenario, you've added the **Microsoft.Identity.Web.GraphServiceClient**
6868

6969
#### Option 2: Call a downstream web API with the helper class
7070

71-
In this scenario, you've added `.AddDownstreamWebApi()` in *Startup.cs* as specified in [Code configuration](scenario-web-api-call-api-app-configuration.md#option-2-call-a-downstream-web-api-other-than-microsoft-graph), and you can directly inject an `IDownstreamWebApi` service in your controller or page constructor and use it in the actions:
71+
In this scenario, you've added `.AddDownstreamApi()` in *Startup.cs* as specified in [Code configuration](scenario-web-api-call-api-app-configuration.md#option-2-call-a-downstream-web-api-other-than-microsoft-graph), and you can directly inject an `IDownstreamWebApi` service in your controller or page constructor and use it in the actions:
7272

7373
```csharp
7474
[Authorize]

articles/active-directory/develop/scenario-web-app-sign-user-sign-in.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ In Java, sign-out is handled by calling the Microsoft identity platform `logout`
353353

354354
# [Node.js](#tab/nodejs)
355355

356-
When the user selects the **Sign out** button, the app triggers the `/signout` route, which destroys the session and redirects the browser to Microsoft identity platform sign-out endpoint.
356+
When the user selects the **Sign out** button, the app triggers the `/auth/signout` route, which destroys the session and redirects the browser to Microsoft identity platform sign-out endpoint.
357357

358358
:::code language="js" source="~/ms-identity-node/App/auth/AuthProvider.js" range="157-175":::
359359

articles/aks/app-routing.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,8 @@ The application routing add-on creates an ingress class on the cluster called *w
321321
2. Copy the following YAML into a new file named **ingress.yaml** and save the file to your local computer.
322322
323323
> [!NOTE]
324-
> Update *`<Hostname>`* with your DNS host name and *`<KeyVaultCertificateUri>`* with the ID returned from Azure Key Vault. `secretName` is the name of the secret that will be generated to store the certificate. This certificate will be presented in the browser.
324+
> Update *`<Hostname>`* with your DNS host name and *`<KeyVaultCertificateUri>`* with the ID returned from Azure Key Vault.
325+
> The *`secretName`* key in the `tls` section defines the name of the secret that contains the certificate for this Ingress resource. This certificate will be presented in the browser when a client browses to the URL defined in the `<Hostname>` key. Make sure that the value of `secretName` is equal to `keyvault-` followed by the value of the Ingress resource name (from `metadata.name`). In the example YAML, secretName will need to be equal to `keyvault-aks-helloworld`.
325326
326327
```yaml
327328
apiVersion: networking.k8s.io/v1
@@ -347,7 +348,7 @@ The application routing add-on creates an ingress class on the cluster called *w
347348
tls:
348349
- hosts:
349350
- <Hostname>
350-
secretName: keyvault-aks-helloworld
351+
secretName: keyvault-<Ingress resource name>
351352
```
352353
353354
### Create the resources on the cluster
@@ -447,7 +448,8 @@ OSM issues a certificate that Nginx uses as the client certificate to proxy HTTP
447448
2. Copy the following YAML into a new file named **ingress.yaml** and save the file to your local computer.
448449
449450
> [!NOTE]
450-
> Update *`<Hostname>`* with your DNS host name and *`<KeyVaultCertificateUri>`* with the ID returned from Azure Key Vault. `secretName` is the name of the secret that will be generated to store the certificate. This certificate will be presented in the browser.
451+
> Update *`<Hostname>`* with your DNS host name and *`<KeyVaultCertificateUri>`* with the ID returned from Azure Key Vault.
452+
> The *`secretName`* key in the `tls` section defines the name of the secret that contains the certificate for this Ingress resource. This certificate will be presented in the browser when a client browses to the URL defined in the `<Hostname>` key. Make sure that the value of `secretName` is equal to `keyvault-` followed by the value of the Ingress resource name (from `metadata.name`). In the example YAML, secretName will need to be equal to `keyvault-aks-helloworld`.
451453
452454
```yaml
453455
apiVersion: networking.k8s.io/v1
@@ -480,7 +482,7 @@ OSM issues a certificate that Nginx uses as the client certificate to proxy HTTP
480482
tls:
481483
- hosts:
482484
- <Hostname>
483-
secretName: keyvault-aks-helloworld
485+
secretName: keyvault-<Ingress resource name>
484486
```
485487
486488
### Create the resources on the cluster

articles/aks/azure-csi-files-storage-provision.md

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -328,37 +328,37 @@ To mount the Azure Files file share into your pod, you configure the volume in t
328328

329329
1. Create a new file named `azure-files-pod.yaml` and copy in the following contents. If you changed the name of the file share or secret name, update the `shareName` and `secretName`. You can also update the `mountPath`, which is the path where the Files share is mounted in the pod. For Windows Server containers, specify a `mountPath` using the Windows path convention, such as *'D:'*.
330330

331-
```yaml
332-
apiVersion: v1
333-
kind: Pod
334-
metadata:
331+
```yaml
332+
apiVersion: v1
333+
kind: Pod
334+
metadata:
335+
name: mypod
336+
spec:
337+
nodeSelector:
338+
kubernetes.io/os: linux
339+
containers:
340+
- image: 'mcr.microsoft.com/oss/nginx/nginx:1.15.5-alpine'
335341
name: mypod
336-
spec:
337-
nodeSelector:
338-
kubernetes.io/os: linux
339-
containers:
340-
- image: mcr.microsoft.com/oss/nginx/nginx:1.15.5-alpine
341-
name: mypod
342-
resources:
343-
requests:
344-
cpu: 100m
345-
memory: 128Mi
346-
limits:
347-
cpu: 250m
348-
memory: 256Mi
349-
volumeMounts:
350-
- name: azure
351-
mountPath: /mnt/azure
352-
volumes:
353-
- name: azure
354-
csi:
355-
driver: file.csi.azure.com
356-
readOnly: false
357-
volumeAttributes:
358-
secretName: azure-secret # required
359-
shareName: aksshare # required
360-
mountOptions: "dir_mode=0777,file_mode=0777,cache=strict,actimeo=30,nosharesock" # optional
361-
```
342+
resources:
343+
requests:
344+
cpu: 100m
345+
memory: 128Mi
346+
limits:
347+
cpu: 250m
348+
memory: 256Mi
349+
volumeMounts:
350+
- name: azure
351+
mountPath: /mnt/azure
352+
volumes:
353+
- name: azure
354+
csi:
355+
driver: file.csi.azure.com
356+
readOnly: false
357+
volumeAttributes:
358+
secretName: azure-secret # required
359+
shareName: aksshare # required
360+
mountOptions: 'dir_mode=0777,file_mode=0777,cache=strict,actimeo=30,nosharesock' # optional
361+
```
362362

363363
2. Create the pod using the [`kubectl apply`][kubectl-apply] command.
364364

articles/aks/use-byo-cni.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ At this point, the cluster is ready for installation of a CNI plugin.
170170
Learn more about networking in AKS in the following articles:
171171

172172
* [Use a static IP address with the Azure Kubernetes Service (AKS) load balancer](static-ip.md)
173-
* [Use an internal load balancer with Azure Container Service (AKS)](internal-lb.md)
173+
* [Use an internal load balancer with Azure Kubernetes Service (AKS)](internal-lb.md)
174174
* [Create a basic ingress controller with external network connectivity][aks-ingress-basic]
175175
* [Enable the HTTP application routing add-on][aks-http-app-routing]
176176
* [Create an ingress controller that uses an internal, private network and IP address][aks-ingress-internal]

articles/app-service/monitor-instances-health-check.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ This article uses Health check in the Azure portal to monitor App Service instan
1616

1717
![Health check failure][1]
1818

19-
Please note that _/api/health_ is just an example added for illustration purposes. You should make sure that the path you are selecting is a valid path and we do not create a healthcheck path by default but it needs to exist for your application.
19+
Please note that _/api/health_ is just an example added for illustration purposes. We do not create a Health Check path by default. You should make sure that the path you are selecting is a valid path that exists within your application
2020

2121
## What App Service does with Health checks
2222

2323
- When given a path on your app, Health check pings this path on all instances of your App Service app at 1-minute intervals.
24-
- If an instance doesn't respond with a status code between 200-299 (inclusive) after 10 requests, App Service determines it's unhealthy and removes it. (The required number of failed requests for an instance to be deemed unhealthy is configurable to a minimum of two requests.)
24+
- If an instance doesn't respond with a status code between 200-299 (inclusive) after 10 requests, App Service determines it's unhealthy and removes it from the load balancer for this Web App. The required number of failed requests for an instance to be deemed unhealthy is configurable to a minimum of two requests.
2525
- After removal, Health check continues to ping the unhealthy instance. If the instance begins to respond with a healthy status code (200-299) then the instance is returned to the load balancer.
26-
- If an instance remains unhealthy for one hour, it will be replaced with new instance.
26+
- If an instance remains unhealthy for one hour, it will be replaced with a new instance.
2727
- When scaling out, App Service pings the Health check path to ensure new instances are ready.
2828

2929
> [!NOTE]
@@ -41,8 +41,9 @@ Please note that _/api/health_ is just an example added for illustration purpose
4141
4. Select **Save**.
4242

4343
> [!NOTE]
44-
> - Your [App Service plan](./overview-hosting-plans.md) should be scaled to two or more instances to fully utilize Health check. The Health check path should check critical components of your application. For example, if your application depends on a database and a messaging system, the Health check endpoint should connect to those components. If the application can't connect to a critical component, then the path should return a 500-level response code to indicate the app is unhealthy. Also, if the path does not return a response within 1 minute, the health check ping is considered unhealthy.
45-
> - When selecting the Health check path, make sure you're selecting a path that returns 200 status code only when the app is fully warmed up.
44+
> - Your [App Service plan](./overview-hosting-plans.md) should be scaled to two or more instances to fully utilize Health check.
45+
> - The Health check path should check critical components of your application. For example, if your application depends on a database and a messaging system, the Health check endpoint should connect to those components. If the application can't connect to a critical component, then the path should return a 500-level response code to indicate the app is unhealthy. Also, if the path does not return a response within 1 minute, the health check ping is considered unhealthy.
46+
> - When selecting the Health check path, make sure you're selecting a path that returns a 200 status code, only when the app is fully warmed up.
4647
4748
> [!CAUTION]
4849
> Health check configuration changes restart your app. To minimize impact to production apps, we recommend [configuring staging slots](deploy-staging-slots.md) and swapping to production.
@@ -156,7 +157,7 @@ After providing your application's Health check path, you can monitor the health
156157

157158
- Health check can be enabled for **Free** and **Shared** App Service Plans so you can have metrics on the site's health and setup alerts, but because **Free** and **Shared** sites can't scale out, any unhealthy instances won't be replaced. You should scale up to the **Basic** tier or higher so you can scale out to 2 or more instances and utilize the full benefit of Health check. This is recommended for production-facing applications as it will increase your app's availability and performance.
158159
- The App Service plan can have a maximum of one unhealthy instance replaced per hour and, at most, three instances per day.
159-
- There's a limit of replaced instances we have per scale unit, and its value is reset once at 12h.
160+
- There's a non-configurable limit on the total amount of instances replaced by Health Check per scale unit. If this limit is reached, no unhealthy instances will be replaced. This value gets reset every 12 hours.
160161

161162
## Frequently Asked Questions
162163

@@ -192,7 +193,7 @@ Imagine you have two applications (or one app with a slot) with Health check ena
192193
193194
### What if all my instances are unhealthy?
194195

195-
In the scenario where all instances of your application are unhealthy, App Service will remove instances from the load balancer up to the percentage specified in `WEBSITE_HEALTHCHECK_MAXUNHEALTHYWORKERPERCENT`. In this scenario, taking all unhealthy app instances out of the load balancer rotation would effectively cause an outage for your application.
196+
In the scenario where all instances of your application are unhealthy, App Service will not remove instances from the load balancer. In this scenario, taking all unhealthy app instances out of the load balancer rotation would effectively cause an outage for your application; however, the instances replacement will still be honored.
196197

197198
### Does Health check work on App Service Environments?
198199

articles/azure-maps/power-bi-visual-add-3d-column-layer.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Add a 3D column layer to an Azure Maps Power BI visual
33
titleSuffix: Microsoft Azure Maps
4-
description: In this article, you will learn how to use the 3D column layer in an Azure Maps Power BI visual.
4+
description: This article demonstrates how to use the 3D column layer in an Azure Maps Power BI visual.
55
author: deniseatmicrosoft
66
ms.author: limingchen
77
ms.date: 11/29/2021
@@ -12,34 +12,34 @@ services: azure-maps
1212

1313
# Add a 3D column layer
1414

15-
The **3D column layer** is useful for taking data to the next dimension by allowing visualization of location data as 3D cylinders on the map. Similar to the bubble layer, the 3D column chart can easily visualize two metrics at the same time using color and relative height. In order for the columns to have height, a measure needs to be added to the **Size** bucket of the **Fields** pane. If a measure is not provided, columns with no height show as flat squares or circles depending on the **Shape** option.
15+
The **3D column layer** is useful for taking data to the next dimension by allowing visualization of location data as 3D cylinders on the map. Similar to the bubble layer, the 3D column chart can easily visualize two metrics at the same time using color and relative height. In order for the columns to have height, a measure needs to be added to the **Size** bucket of the **Fields** pane. If a measure isn't provided, columns with no height show as flat squares or circles depending on the **Shape** option.
1616

1717
:::image type="content" source="./media/power-bi-visual/3d-column-layer-styled.png" alt-text="A map displaying point data using the 3D column layer":::
1818

1919
Users can tilt and rotate the map to view your data from different perspectives. The map can be tilted or pitched using one of the following methods.
2020

21-
- Turn on the **Navigation controls** option in the **Map settings** of the **Format** pane. This will add a button to tilt the map.
22-
- Press the right mouse button down and drag the mouse up or down.
21+
- Turn on the **Navigation controls** option in the **Map settings** of the **Format** pane to add a button that tilts the map.
22+
- Hold down the right mouse button and drag the mouse up or down.
2323
- Using a touch screen, touch the map with two fingers and drag them up or down together.
2424
- With the map focused, hold the **Shift** key, and press the **Up** or **Down arrow** keys.
2525

2626
The map can be rotated using one of the following methods.
2727

28-
- Turn on the **Navigation controls** option in the **Map settings** of the **Format** pane. This will add a button to rotate the map.
29-
- Press the right mouse button down and drag the mouse left or right.
28+
- Turn on the **Navigation controls** option in the **Map settings** of the **Format** pane to add a button that rotates the map.
29+
- Hold down the right mouse button and drag the mouse left or right.
3030
- Using a touch screen, touch the map with two fingers and rotate.
3131
- With the map focused, hold the **Shift** key, and press the **Left** or **Right arrow** keys.
3232

3333
The following are all settings in the **Format** pane that are available in the **3D column layer** section.
3434

3535
| Setting | Description |
3636
|----------------------|------------------|
37-
| Column shape | The shape of the 3D column.<br/><br/>&nbsp;&nbsp;&nbsp;&nbsp;• Box – columns rendered as rectangular boxes.<br/>&nbsp;&nbsp;&nbsp;&nbsp;• Cylinder – columns rendered as cylinders. |
38-
| Height | The height of each column. If a field is passed into the **Size** bucket of the **Fields** pane, columns will be scaled relative to this height value. |
37+
| Column shape | The shape of the 3D column.<br><br>&nbsp;&nbsp;&nbsp;&nbsp;• Box – columns rendered as rectangular boxes.<br>&nbsp;&nbsp;&nbsp;&nbsp;• Cylinder – columns rendered as cylinders. |
38+
| Height | The height of each column. If a field is passed into the **Size** bucket of the **Fields** pane, columns are scaled relative to this height value. |
3939
| Scale height on zoom | Specifies if the height of the columns should scale relative to the zoom level. |
4040
| Width | The width of each column. |
4141
| Scale width on zoom | Specifies if the width of the columns should scale relative to the zoom level. |
42-
| Fill color | Color of each column. This option is hidden when a field is passed into the **Legend** bucket of the **Fields** pane and a separate **Data colors** section will appear in the **Format** pane. |
42+
| Fill color | Color of each column. This option is hidden when a field is passed into the **Legend** bucket of the **Fields** pane and a separate **Data colors** section appears in the **Format** pane. |
4343
| Transparency | Transparency of each column. |
4444
| Min zoom | Minimum zoom level tiles are available. |
4545
| Max zoom | Maximum zoom level tiles are available. |

0 commit comments

Comments
 (0)