Skip to content

Commit 15e11db

Browse files
authored
Merge pull request #183920 from MicrosoftDocs/master
Merge master to live, 4 AM
2 parents fb9eb66 + 12ff136 commit 15e11db

15 files changed

+134
-40
lines changed

articles/active-directory-b2c/identity-provider-swissid.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ In this article, you learn how to provide sign-up and sign-in to customers with
2929

3030
To enable sign-in for users with a SwissID account in Azure AD B2C, you need to create an application. To create SwissID application, follow these steps:
3131

32-
1. Contact [SwissID Business Partner support](https://www.swissid.ch/en/b2b-kontakt.html).
32+
1. Contact [SwissID Business Partner support](https://www.swissid.ch/en/b2c-kontakt.html).
3333
1. After the sign up with SwissID, provide information about your Azure AD B2C tenant:
3434

3535

articles/active-directory-b2c/whats-new-docs.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,30 @@ manager: CelesteDG
1515

1616
Welcome to what's new in Azure Active Directory B2C documentation. This article lists new docs that have been added and those that have had significant updates in the last three months. To learn what's new with the B2C service, see [What's new in Azure Active Directory](../active-directory/fundamentals/whats-new.md).
1717

18+
## December 2021
19+
20+
### New articles
21+
22+
- [TOTP display control](display-control-time-based-one-time-password.md)
23+
- [Set up sign-up and sign-in with a SwissID account using Azure Active Directory B2C](identity-provider-swissid.md)
24+
- [Set up sign-up and sign-in with a PingOne account using Azure Active Directory B2C](identity-provider-ping-one.md)
25+
- [Tutorial: Configure Haventec with Azure Active Directory B2C for single step, multifactor passwordless authentication](partner-haventec.md)
26+
- [Tutorial: Acquire an access token for calling a web API in Azure AD B2C](tutorial-acquire-access-token.md)
27+
- [Tutorial: Sign in and sign out users with Azure AD B2C in a Node.js web app](tutorial-authenticate-nodejs-web-app-msal.md)
28+
- [Tutorial: Call a web API protected with Azure AD B2C](tutorial-call-api-with-access-token.md)
29+
30+
### Updated articles
31+
32+
- [About claim resolvers in Azure Active Directory B2C custom policies](claim-resolver-overview.md)
33+
- [Azure Active Directory B2C service limits and restrictions](service-limits.md)
34+
- [Add Conditional Access to user flows in Azure Active Directory B2C](conditional-access-user-flow.md)
35+
- [Display controls](display-controls.md)
36+
- ['Azure AD B2C: Frequently asked questions (FAQ)'](faq.yml)
37+
- [Manage Azure AD B2C with Microsoft Graph](microsoft-graph-operations.md)
38+
- [Define an Azure AD MFA technical profile in an Azure AD B2C custom policy](multi-factor-auth-technical-profile.md)
39+
- [Enable multifactor authentication in Azure Active Directory B2C](multi-factor-authentication.md)
40+
- [String claims transformations](string-transformations.md)
41+
1842
## November 2021
1943

2044
### Updated articles

articles/active-directory/develop/whats-new-docs.md

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
author: mmacy
77
manager: CelesteDG
88

9-
ms.date: 12/06/2021
9+
ms.date: 01/03/2022
1010
ms.service: active-directory
1111
ms.subservice: develop
1212
ms.topic: reference
@@ -19,6 +19,23 @@ ms.custom: has-adal-ref
1919

2020
Welcome to what's new in the Microsoft identity platform documentation. This article lists new docs that have been added and those that have had significant updates in the last three months.
2121

22+
## December 2021
23+
24+
### New articles
25+
26+
- [Build Zero Trust-ready apps using Microsoft identity platform features and tools](zero-trust-for-developers.md)
27+
- [Quickstart: Sign in users in single-page apps (SPA) using the auth code flow](single-page-app-quickstart.md)
28+
- [Run automated integration tests](test-automate-integration-testing.md)
29+
- [Secure identity in line-of-business application using Zero Trust principles](secure-line-of-business-apps.md)
30+
- [What are workload identities?](workload-identities-overview.md)
31+
32+
### Updated articles
33+
34+
- [Claims mapping policy type](reference-claims-mapping-policy-type.md)
35+
- [Microsoft identity platform developer glossary](developer-glossary.md)
36+
- [Quickstart: Sign in and get an access token in an Angular SPA using the auth code flow](quickstart-v2-javascript-auth-code-angular.md)
37+
- [Token cache serialization in MSAL.NET](msal-net-token-cache-serialization.md)
38+
2239
## November 2021
2340

2441
### Updated articles
@@ -51,25 +68,3 @@ Welcome to what's new in the Microsoft identity platform documentation. This art
5168
- [Microsoft Graph API](microsoft-graph-intro.md)
5269
- [Microsoft identity platform and the OAuth 2.0 client credentials flow](v2-oauth2-client-creds-grant-flow.md)
5370
- [What's new for authentication?](reference-breaking-changes.md)
54-
55-
## September 2021
56-
57-
### New articles
58-
59-
- [Desktop app that calls web APIs: Acquire a token interactively](scenario-desktop-acquire-token-interactive.md)
60-
- [Desktop app that calls web APIs: Acquire a token using Device Code flow](scenario-desktop-acquire-token-device-code-flow.md)
61-
- [Desktop app that calls web APIs: Acquire a token using Integrated Windows Authentication](scenario-desktop-acquire-token-integrated-windows-authentication.md)
62-
- [Desktop app that calls web APIs: Acquire a token using Username and Password](scenario-desktop-acquire-token-username-password.md)
63-
- [Desktop app that calls web APIs: Acquire a token using WAM](scenario-desktop-acquire-token-wam.md)
64-
- [Implement role-based access control in apps](howto-implement-rbac-for-apps.md)
65-
- [Migrate public client applications from ADAL.NET to MSAL.NET](msal-net-migration-public-client.md)
66-
67-
### Updated articles
68-
69-
- [Enhance security with the principle of least privilege](secure-least-privileged-access.md)
70-
- [Migrate confidential client applications from ADAL.NET to MSAL.NET](msal-net-migration-confidential-client.md)
71-
- [Microsoft identity platform videos](identity-videos.md)
72-
- [National clouds](authentication-national-cloud.md)
73-
- [Shared device mode for Android devices](msal-android-shared-devices.md)
74-
- [Token cache serialization in MSAL.NET](msal-net-token-cache-serialization.md)
75-
- [Validation differences by supported account types (signInAudience)](supported-accounts-validation.md)

articles/active-directory/manage-apps/configure-risk-based-step-up-consent.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ For example, consent requests for newly registered multi-tenant apps that are no
2323

2424
When a risky consent request is detected, the consent prompt displays a message that indicates that admin approval is needed. If the [admin consent request workflow](configure-admin-consent-workflow.md) is enabled, the user can send the request to an admin for further review directly from the consent prompt. If the admin consent request workflow isn't enabled, the following message is displayed:
2525

26-
> "**AADSTS90094**: \<clientAppDisplayName> needs permission to access resources in your organization that only an admin can grant. Request an admin to grant permission to this app before you can use it."
26+
> **AADSTS90094**: \<clientAppDisplayName> needs permission to access resources in your organization that only an admin can grant. Request an admin to grant permission to this app before you can use it.
27+
2728
In this case, an audit event is also logged with a category of "ApplicationManagement," an activity type of "Consent to application," and a status reason of "Risky application detected."
2829

2930
## Prerequisites

articles/azure-functions/functions-add-output-binding-storage-queue-vs-code.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ Extension bundles usage is enabled in the host.json file at the root of the proj
7575

7676
:::code language="json" source="~/functions-quickstart-java/functions-add-output-binding-storage-queue/host.json":::
7777

78+
Now, you can add the storage output binding to your project.
79+
7880
::: zone-end
7981

8082
::: zone pivot="programming-language-csharp"
@@ -83,8 +85,6 @@ Extension bundles usage is enabled in the host.json file at the root of the proj
8385

8486
::: zone-end
8587

86-
Now, you can add the storage output binding to your project.
87-
8888
## Add an output binding
8989

9090
In Functions, each type of binding requires a `direction`, `type`, and a unique `name` to be defined in the function.json file. The way you define these attributes depends on the language of your function app.

articles/backup/backup-support-matrix-iaas.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ For Azure VM Linux backups, Azure Backup supports the list of Linux [distributio
8181
- Azure Backup doesn't support Core OS Linux.
8282
- Azure Backup doesn't support 32-bit operating systems.
8383
- Other bring-your-own Linux distributions might work as long as the [Azure VM agent for Linux](../virtual-machines/extensions/agent-linux.md) is available on the VM, and as long as Python is supported.
84-
- Azure Backup doesn't support a proxy-configured Linux VM if it doesn't have Python version 2.7 installed.
84+
- Azure Backup doesn't support a proxy-configured Linux VM if it doesn't have Python version 2.7 or higher installed.
8585
- Azure Backup doesn't support backing up NFS files that are mounted from storage, or from any other NFS server, to Linux or Windows machines. It only backs up disks that are locally attached to the VM.
8686

8787
## Support matrix for managed pre-post scripts for Linux databases
@@ -255,4 +255,4 @@ On-premises/Azure VMs with MABS | ![Yes][green] | ![Yes][green]
255255

256256
[green]: ./media/backup-support-matrix/green.png
257257
[yellow]: ./media/backup-support-matrix/yellow.png
258-
[red]: ./media/backup-support-matrix/red.png
258+
[red]: ./media/backup-support-matrix/red.png

articles/backup/tutorial-sap-hana-restore-cli.md

Lines changed: 69 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22
title: Tutorial - SAP HANA DB restore on Azure using CLI
33
description: In this tutorial, learn how to restore SAP HANA databases running on an Azure VM from an Azure Backup Recovery Services vault using Azure CLI.
44
ms.topic: tutorial
5-
ms.date: 12/4/2019
5+
ms.date: 12/23/2021
66
ms.custom: devx-track-azurecli
7+
author: v-amallick
8+
ms.service: backup
9+
ms.author: v-amallick
710
---
811

912
# Tutorial: Restore SAP HANA databases in an Azure VM using Azure CLI
@@ -21,11 +24,11 @@ By the end of this tutorial you'll be able to:
2124
2225
This tutorial assumes you have an SAP HANA database running on Azure VM that's backed-up using Azure Backup. If you've used [Back up an SAP HANA database in Azure using CLI](tutorial-sap-hana-backup-cli.md) to back up your SAP HANA database, then you're using the following resources:
2326

24-
* a resource group named *saphanaResourceGroup*
25-
* a vault named *saphanaVault*
26-
* protected container named *VMAppContainer;Compute;saphanaResourceGroup;saphanaVM*
27-
* backed-up database/item named *saphanadatabase;hxe;hxe*
28-
* resources in the *westus2* region
27+
* A resource group named *saphanaResourceGroup*
28+
* A vault named *saphanaVault*
29+
* Protected container named *VMAppContainer;Compute;saphanaResourceGroup;saphanaVM*
30+
* Backed-up database/item named *saphanadatabase;hxe;hxe*
31+
* Resources in the *westus2* region
2932

3033
## View restore points for a backed-up database
3134

@@ -168,6 +171,66 @@ Name Resource
168171

169172
The response will give you the job name. This job name can be used to track the job status using the [az backup job show](/cli/azure/backup/job#az_backup_job_show) cmdlet.
170173

174+
## Restore to secondary region
175+
176+
To restore a database to the secondary region, specify a target vault and server located in the secondary region, in the restore configuration.
177+
178+
```azurecli-interactive
179+
az backup recoveryconfig show --resource-group saphanaResourceGroup \
180+
--vault-name saphanaVault \
181+
--container-name VMAppContainer;compute;hanasnapshotcvtmachines;hanasnapcvt01 \
182+
--item-name SAPHanaDatabase;h10;h10 \
183+
--restore-mode AlternateWorkloadRestore \
184+
--from-full-rp-name 293170069256531 \
185+
--rp-name 293170069256531 \
186+
--target-server-name targethanaserver \
187+
--target-container-name VMAppContainer;compute;saphanaTargetRG;targethanaserver \
188+
--target-item-name h10 \
189+
--target-server-type HANAInstance \
190+
--workload-type SAPHANA \
191+
--target-resource-group saphanaTargetRG \
192+
--target-vault-name targetVault \
193+
--backup-management-type AzureWorkload
194+
```
195+
196+
Following is the response to the above command that will be a recovery configuration object:
197+
198+
```output
199+
{
200+
"alternate_directory_paths": null,
201+
"container_id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/saphanaTargetRG/providers/Microsoft.RecoveryServices/vaults/targetVault/backupFabrics/Azure/protectionContainers/vmappcontainer;compute;saphanaTargetRG;targethanaserver",
202+
"container_uri": "VMAppContainer;compute;hanasnapshotcvtmachines;hanasnapcvt01",
203+
"database_name": "SAPHanaDatabase;h10;h10",
204+
"filepath": null,
205+
"item_type": "SAPHana",
206+
"item_uri": "SAPHanaDatabase;h10;h10",
207+
"log_point_in_time": null,
208+
"recovery_mode": null,
209+
"recovery_point_id": "293170069256531",
210+
"restore_mode": "AlternateLocation",
211+
"source_resource_id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/saphanaResourceGroup/providers/Microsoft.Compute/virtualMachines/hanasnapcvt01",
212+
"workload_type": "SAPHanaDatabase"
213+
}
214+
```
215+
216+
Use this recovery configuration in the [az restore restore-azurewl](/cli/azure/backup/restore#az_backup_restore_restore_azurewl) cmdlet. Select the `--use-secondary-region` flag to restore the database to the secondary region.
217+
218+
```azurecli-interactive
219+
az backup restore restore-azurewl --resource-group saphanaResourceGroup \
220+
--vault-name saphanaVault \
221+
--recovery-config recoveryconfig.json \
222+
--use-secondary-region \
223+
--output table
224+
```
225+
226+
The output will be as follows:
227+
228+
```output
229+
Name Operation Status Item Name Backup Management Type Start Time UTC Duration
230+
------------------------------------ ------------------ ---------- ------------------- ------------------------ -------------------------------- --------------
231+
00000000-0000-0000-0000-000000000000 CrossRegionRestore InProgress H10 [hanasnapcvt01] AzureWorkload 2021-12-22T05:21:34.165617+00:00 0:00:05.665470
232+
```
233+
171234
## Restore as files
172235

173236
To restore the backup data as files instead of a database, we'll use **RestoreAsFiles** as the restore mode. Then choose the restore point, which can either be a previous point-in-time or any of the previous restore points. Once the files are dumped to a specified path, you can take these files to any SAP HANA machine where you want to restore them as a database. Because you can move these files to any machine, you can now restore the data across subscriptions and regions.

articles/hdinsight/hdinsight-release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ If you would like to subscribe on release notes, watch releases on [this GitHub
1717

1818
## Release date: 12/27/2021
1919

20-
This release applies for both HDInsight 4.0. HDInsight release is made available to all regions over several days. The release date here indicates the first region release date. If you don't see below changes, wait for the release being live in your region over several days.
20+
This release applies for HDInsight 4.0. HDInsight release is made available to all regions over several days. The release date here indicates the first region release date. If you don't see below changes, wait for the release being live in your region over several days.
2121

2222
The OS versions for this release are:
2323
- HDInsight 4.0: Ubuntu 18.04.5 LTS
20.2 KB
Loading
19.4 KB
Loading

0 commit comments

Comments
 (0)