Skip to content

Commit 4237651

Browse files
authored
Merge pull request #171159 from MicrosoftDocs/master
9/01 PM Publish
2 parents 3f2c37d + 19d6cd3 commit 4237651

File tree

155 files changed

+1501
-804
lines changed

Some content is hidden

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

155 files changed

+1501
-804
lines changed

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
exempt-pr-labels: keep-open
2121
operations-per-run: 800
2222
ascending: true
23-
start-date: '2018-11-29'
23+
start-date: '2020-03-03'
2424
stale-pr-message: >
2525
This pull request has been inactive for at least 14 days.
2626
If you are finished with your changes, don't forget to sign off. See the [contributor guide](https://review.docs.microsoft.com/help/contribute/contribute-how-to-write-pull-request-automation) for instructions.

.openpublishing.redirection.json

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4378,6 +4378,11 @@
43784378
"redirect_url": "/azure/security/benchmarks",
43794379
"redirect_document_id": false
43804380
},
4381+
{
4382+
"source_path_from_root": "/articles/azure-resource-manager/templates/view-resources.md",
4383+
"redirect_url": "/azure/azure-resource-manager/templates/export-template-portal",
4384+
"redirect_document_id": false
4385+
},
43814386
{
43824387
"source_path_from_root": "/articles/azure-resource-manager/management/azure-resource-manager-security-controls.md",
43834388
"redirect_url": "/azure/azure-resource-manager/management/security-baseline",
@@ -5373,6 +5378,21 @@
53735378
"redirect_url": "/azure/architecture/vdc/networking-virtual-datacenter",
53745379
"redirect_document_id": false
53755380
},
5381+
{
5382+
"source_path_from_root": "/articles/automation/automation-quickstart-create-account.md",
5383+
"redirect_url": "/azure/automation/quickstarts/create-account-portal",
5384+
"redirect_document_id": false
5385+
},
5386+
{
5387+
"source_path_from_root": "/articles/automation/automation-quickstart-create-runbook.md",
5388+
"redirect_url": "/azure/automation/quickstarts/create-powershell-runbook",
5389+
"redirect_document_id": false
5390+
},
5391+
{
5392+
"source_path_from_root": "/articles/automation/automation-quickstart-dsc-configuration.md",
5393+
"redirect_url": "/azure/automation/quickstarts/dsc-configuration",
5394+
"redirect_document_id": false
5395+
},
53765396
{
53775397
"source_path_from_root": "/articles/automation/automation-change-tracking.md",
53785398
"redirect_url": "/azure/automation/change-tracking",
@@ -22348,21 +22368,6 @@
2234822368
"redirect_url": "/azure/media-services/live-video-analytics-edge/http-extension-protocol",
2234922369
"redirect_document_id": true
2235022370
},
22351-
{
22352-
"source_path_from_root": "/articles/media-services/previous/media-services-fmp4-live-ingest-overview.md",
22353-
"redirect_url": "/azure/media-services/media-services-fmp4-live-ingest-overview",
22354-
"redirect_document_id": false
22355-
},
22356-
{
22357-
"source_path_from_root": "/articles/media-services/previous/media-services-specifications-live-timed-metadata.md",
22358-
"redirect_url": "/azure/media-services/media-services-specifications-live-timed-metadata",
22359-
"redirect_document_id": false
22360-
},
22361-
{
22362-
"source_path_from_root": "/articles/media-services/previous/media-services-specifications-ms-sstr-amendment-hevc.md",
22363-
"redirect_url": "/azure/media-services/media-services-specifications-ms-sstr-amendment-hevc",
22364-
"redirect_document_id": false
22365-
},
2236622371
{
2236722372
"source_path_from_root": "/articles/media-services/media-services-dotnet-connect-programmatically.md",
2236822373
"redirect_url": "/azure/media-services/media-services-use-aad-auth-to-access-ams-api",

articles/active-directory-domain-services/faqs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
ms.subservice: domain-services
1212
ms.workload: identity
1313
ms.topic: how-to
14-
ms.date: 06/18/2021
14+
ms.date: 09/01/2021
1515
ms.author: justinha
1616

1717
title: Frequently asked questions (FAQs) about Azure Active Directory (AD) Domain Services
@@ -88,7 +88,7 @@ sections:
8888
- question: |
8989
Can I move an existing Azure AD Domain Services managed domain to a different subscription, resource group, region, or virtual network?
9090
answer: |
91-
No. After you create an Azure AD Domain Services managed domain, you can't then move the managed domain to a different resource group, virtual network, subscription, etc. Take care to select the most appropriate subscription, resource group, region, and virtual network when you deploy the managed domain.
91+
No. After you create an Azure AD Domain Services managed domain, you can't then move the managed domain to a different subscription, resource group, region, virtual network, or subnet. Take care to select the most appropriate subscription, resource group, region, virtual network, and subnet when you deploy the managed domain.
9292
9393
- question: |
9494
Can I rename an existing Azure AD Domain Services domain name?

articles/active-directory/fundamentals/whats-new.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ For more information on My Apps, read [Sign in and start apps from the My Apps p
9191
**Service category:** MS Graph
9292
**Product capability:** Developer Experience
9393

94-
Application authentication method policies in MS Graph which allow IT admins to enforce lifetime on application password secret credential or block the use of secrets altogether. Policies can be enforced for an entire tenant as a default configuration and it can be scoped to specific applications or service principals. [Learn more](/graph/api/resources/policy-overview?view=graph-rest-1.0).
94+
Application authentication method policies in MS Graph which allow IT admins to enforce lifetime on application password secret credential or block the use of secrets altogether. Policies can be enforced for an entire tenant as a default configuration and it can be scoped to specific applications or service principals. [Learn more](/graph/api/resources/policy-overview?view=graph-rest-beta).
9595

9696
---
9797

@@ -1249,4 +1249,4 @@ The refreshed Authentication Methods Activity dashboard gives admins an overview
12491249

12501250
Refresh and session token lifetimes configurability in CTL are retired. Azure Active Directory no longer honors refresh and session token configuration in existing policies. [Learn more](../develop/active-directory-configurable-token-lifetimes.md#token-lifetime-policies-for-refresh-tokens-and-session-tokens).
12511251

1252-
---
1252+
---

articles/active-directory/saas-apps/animaker-tutorial.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,26 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
6969

7070
![Edit Basic SAML Configuration](common/edit-urls.png)
7171

72-
1. On the **Basic SAML Configuration** section, the user does not have to perform any step as the app is already pre-integrated with Azure.
72+
1. On the **Set up single sign-on with SAML** page, enter the values for the following fields:
73+
74+
a. In the **Identifier** text box, type a URL using the following pattern:
75+
`https://app.animaker.com/login/samlsuccess/<Anyone_Home_Provided_Unique_Value>`
76+
77+
b. In the **Reply URL** text box, type a URL using the following pattern:
78+
`https://app.animaker.com/login/samlsuccess/<Anyone_Home_Provided_Unique_Value>`
79+
80+
> [!NOTE]
81+
> These values are not real. Update these values with the actual Identifier and Reply URL. Contact [Animaker support team](mailto:[email protected]) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
82+
7383

7484
1. Click **Set additional URLs** and perform the following step if you wish to configure the application in **SP** initiated mode:
7585

7686
In the **Sign-on URL** text box, type the URL:
77-
`https://app.animaker.com/login/samlsuccess/azure/`
87+
`https://app.animaker.com/login/samlsuccess/<Anyone_Home_Provided_Unique_Value>`
88+
89+
1. Animaker application expects the SAML assertions in a specific format, which requires you to add custom attribute mappings to your SAML token attributes configuration. The following screenshot shows the list of default attributes, where as **nameidentifier** is mapped with **user.userprincipalname**. Appraisd application expects **nameidentifier** to be mapped with **user.mail**, so you need to edit the attribute mapping by clicking on **Edit** icon and change the attribute mapping.
90+
91+
![Screenshot shows the User Attributes pane with the edit icon highlighted.](common/edit-attribute.png)
7892

7993
1. On the **Set up single sign-on with SAML** page, In the **SAML Signing Certificate** section, click copy button to copy **App Federation Metadata Url** and save it on your computer.
8094

@@ -110,7 +124,7 @@ To configure single sign-on on **Animaker** side, you need to send the **App Fed
110124

111125
### Create Animaker test user
112126

113-
In this section, you create a user called Britta Simon in Animaker. Work with [Animaker support team](mailto:[email protected]) to add the users in the Animaker platform. Users must be created and activated before you use single sign-on.
127+
In this section, you create a user called Britta Simon in Animaker. Work with [Animaker support team](mailto:[email protected]) to add the users in the Animaker platform. Users must be created and activated before you use single sign-on.
114128

115129
## Test SSO
116130

articles/aks/csi-secrets-store-driver.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ The Secrets Store CSI Driver for Kubernetes allows for the integration of Azure
1919

2020
- Before you start, install the latest version of the [Azure CLI](/cli/azure/install-azure-cli-windows) and the *aks-preview* extension.
2121

22+
### Supported Kubernetes versions
23+
24+
The minimum recommended Kubernetes version for this feature is 1.18.
25+
2226
## Features
2327

2428
- Mount secrets, keys, and/or certs to a pod using a CSI volume
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
---
2+
title: Availability Zone support for public multi-tenant App Service
3+
description: Learn how to deploy your App Service so that your apps are zone redundant.
4+
author: seligj95
5+
ms.topic: article
6+
ms.date: 09/01/2021
7+
ms.author: jordanselig
8+
ms.custom: references_regions
9+
---
10+
# Availability Zone support for public multi-tenant App Service
11+
12+
Microsoft Azure App Service can be deployed into [Availability Zones (AZ)](../availability-zones/az-overview.md) which enables [high availability](https://en.wikipedia.org/wiki/High_availability) for your apps. This architecture is also known as zone redundancy.
13+
14+
An app lives in an App Service plan (ASP), and the App Service plan exists in a single scale unit. When an App Service is configured to be zone redundant, the platform automatically spreads the VM instances in the App Service plan across all three zones in the selected region. If a capacity larger than three is specified and the number of instances is divisible by three, the instances will be spread evenly. Otherwise, instance counts beyond 3*N will get spread across the remaining one or two zones.
15+
16+
## Requirements
17+
18+
Zone redundancy, is a property of the App Service plan. The following are the current requirements/limitations for enabling zone redundancy:
19+
20+
- Both Windows and Linux are supported
21+
- Requires either **Premium v2** or **Premium v3** App Service plans
22+
- Minimum instance count of three
23+
- The platform will enforce this minimum count behind the scenes if you specify an instance count fewer than three
24+
- Can be enabled in any of the following regions:
25+
- West US 2
26+
- West US 3
27+
- Central US
28+
- East US
29+
- East US 2
30+
- Canada Central
31+
- Brazil South
32+
- North Europe
33+
- West Europe
34+
- Germany West Central
35+
- France Central
36+
- UK South
37+
- Japan East
38+
- Southeast Asia
39+
- Australia East
40+
- Zone redundancy can only be specified when creating a **new** App Service plan
41+
- Currently you can't convert a pre-existing App Service plan. See next bullet for details on how to create a new App Service plan that supports zone redundancy.
42+
- Zone redundancy is only supported in the newer portion of the App Service footprint
43+
- Currently if you're running on Pv3, then it is possible that you're already on a footprint that supports zone redundancy. In this scenario, you can create a new App Service plan and specify zone redundancy when creating the new App Service plan.
44+
- If you aren't using Pv3 or a scale unit that supports zone redundancy, are in an unsupported region, or are unsure, follow the steps below:
45+
- Create a new resource group in a region that is supported
46+
- This ensures the App Service control plane can find a scale unit in the selected region that supports zone redundancy
47+
- Create a new App Service plan (and app) in a region of your choice using the **new** resource group
48+
- Must be created using [Azure Resource Manager (ARM) templates](../azure-resource-manager/templates/overview.md)
49+
50+
In the case when a zone goes down, the App Service platform will detect lost instances and automatically attempt to find new replacement instances. If you also have autoscale configured, and if it decides more instances are needed, autoscale will also issue a request to App Service to add more instances (autoscale behavior is independent of App Service platform behavior). It's important to note there's no guarantee that requests for additional instances in a zone-down scenario will succeed since back filling lost instances occurs on a best-effort basis. The recommended solution is to provision your App Service plans to account for losing a zone as described previously in the next section this article.
51+
52+
Applications deployed in an App Service plan enabled for zone redundancy will continue to run and serve traffic even if other zones in the same region suffer an outage. However it's possible that non-runtime behaviors including application service plan scaling, application creation, application configuration, and application publishing may still be impacted from an outage in other Availability Zones. Zone redundancy for App Service plans only ensures continued uptime for deployed applications.
53+
54+
## How to Deploy a Zone Redundant App Service
55+
56+
Currently, you need to use an ARM template to create a zone redundant App Service. Once created via an ARM template, the App Service plan can be viewed and interacted with via the Azure portal and CLI tooling. An ARM template is only needed for the initial creation of the App Service plan.
57+
58+
The only changes needed in an ARM template to specify a zone redundant App Service are the new ***zoneRedundant*** property (required) and optionally the App Service plan instance count (***capacity***) on the [Microsoft.Web/serverfarms](https://docs.microsoft.com/azure/templates/microsoft.web/serverfarms?tabs=json) resource. If you don't specify a capacity, the platform defaults to 3. The ***zoneRedundant*** property should be set to ***true*** and ***capacity*** should be set based on the workload requirement, but no less than three. A good rule of thumb to choose capacity is to ensure sufficient instances for the application such that losing one zone of instances leaves sufficient capacity to handle expected load.
59+
60+
> [!TIP]
61+
> To decide instance capacity, you can use the following calculation:
62+
>
63+
> Since the platform spreads VMs across 3 zones and you need to account for at least the failure of 1 zone, multiply peak workload instance count by a factor of zones/(zones-1), or 3/2. For example, if your typical peak workload requires 4 instances, you should provision 6 instances: (2/3 * 6 instances) = 4 instances.
64+
>
65+
66+
The ARM template snippet below shows the new ***zoneRedundant*** property and ***capacity*** specification.
67+
68+
```json
69+
"resources": [
70+
{
71+
"type": "Microsoft.Web/serverfarms",
72+
"apiVersion": "2018-02-01",
73+
"name": "your-appserviceplan-name-here",
74+
"location": "West US 3",
75+
"sku": {
76+
"name": "P1v3",
77+
"tier": "PremiumV3",
78+
"size": "P1v3",
79+
"family": "Pv3",
80+
"capacity": 3
81+
},
82+
"kind": "app",
83+
"properties": {
84+
"zoneRedundant": true
85+
}
86+
}
87+
]
88+
```
89+
90+
## Next steps
91+
92+
> [!div class="nextstepaction"]
93+
> [Learn how to create and deploy ARM templates](../azure-resource-manager/templates/quickstart-create-templates-use-visual-studio-code.md)
94+
95+
> [!div class="nextstepaction"]
96+
> [ARM Quickstart Templates](https://azure.microsoft.com/resources/templates/)

0 commit comments

Comments
 (0)