Skip to content

Commit 380e3c8

Browse files
authored
Merge pull request #100401 from MicrosoftDocs/master
Merge Master to Live, 3 AM
2 parents c32050b + 127f58f commit 380e3c8

File tree

243 files changed

+1846
-945
lines changed

Some content is hidden

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

243 files changed

+1846
-945
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@
4545
"redirect_url": "/azure//virtual-machines/windows/sql/virtual-machines-windows-portal-sql-create-failover-cluster-premium-file-share",
4646
"redirect_document_id": false
4747
},
48+
{
49+
"source_path": "articles/virtual-machines/linux/cli-manage-nodejs.md",
50+
"redirect_url": "/azure/virtual-machines/linux/create-cli-complete",
51+
"redirect_document_id": false
52+
},
4853
{
4954
"source_path": "articles/virtual-machines/windows/maintenance-and-updates.md",
5055
"redirect_url": "/azure/virtual-machines/maintenance-and-updates?toc=/azure/virtual-machines/windows/toc.json&bc=/azure/virtual-machines/windows/breadcrumb/toc.json",

FETCH_HEAD

Whitespace-only changes.

articles/active-directory/devices/azureadjoin-plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ When you're using AD FS, you need to enable the following WS-Trust endpoints:
7373
`/adfs/services/trust/2005/certificatemixed`
7474
`/adfs/services/trust/13/certificatemixed`
7575

76-
If your identity provider does not support these protocols, Azure AD join does not work natively. Beginning with Windows 10 1809, your users can sign in to an Azure AD joined device with a SAML-based identity provider through [web sign-in on Windows 10](https://docs.microsoft.com/windows/whats-new/whats-new-windows-10-version-1809#web-sign-in-to-windows-10). Currently, web sign-in is a preview feature and is not meant for production deployments.
76+
If your identity provider does not support these protocols, Azure AD join does not work natively.
7777

7878
>[!NOTE]
7979
> Currently, Azure AD join does not work with [AD FS 2019 configured with external authentication providers as the primary authentication method](https://docs.microsoft.com/windows-server/identity/ad-fs/operations/additional-authentication-methods-ad-fs#enable-external-authentication-methods-as-primary). Azure AD join defaults to password authentication as the primary method, which results in authentication failures in this scenario
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
---
2+
title: Identity data storage for Australian customers - Azure AD
3+
description: Learn about where Azure Active Directory stores identity-related data for its Australian customers.
4+
services: active-directory
5+
author: msaburnley
6+
manager: daveba
7+
ms.author: ajburnle
8+
9+
ms.service: active-directory
10+
ms.subservice: fundamentals
11+
ms.workload: identity
12+
ms.topic: conceptual
13+
ms.date: 12/13/2019
14+
ms.custom: "it-pro, seodec18"
15+
ms.collection: M365-identity-device-management
16+
---
17+
18+
# Identity data storage for Australian customers in Azure Active Directory
19+
20+
Identity data is stored by Azure AD in a geographical location based on the address provided by your organization when subscribing for a Microsoft Online service such as Office 365 and Azure. For information on where your Identity Customer Data is stored, you can use the [Where is your data located?](https://www.microsoft.com/trustcenter/privacy/where-your-data-is-located) section of the Microsoft Trust Center.
21+
22+
> [!NOTE]
23+
> Services and applications that integrate with Azure AD have access to Identity Customer Data. Evaluate each service and application you use to determine how Identity Customer Data is processed by that specific service and application, and whether they meet your company's data storage requirements. For more information about Microsoft services' data residency, see the Where is your data located? section of the Microsoft Trust Center.
24+
25+
For customers who provided an address in Australia, Azure AD keeps identity data for these services within Australian datacenters:
26+
- Azure AD Directory Management
27+
- Authentication
28+
29+
All other Azure AD services store customer data in global datacenters. To locate the datacenter for a service, see [Azure Active Directory – Where is your data located?](https://www.microsoft.com/trustcenter/privacy/where-your-data-is-located)
30+
31+
## Microsoft Azure multi-factor authentication (MFA)
32+
33+
MFA stores Identity Customer Data in global datacenters. To learn more about the user information collected and stored by cloud-based Azure MFA and Azure MFA Server, see [Azure Multi-Factor Authentication user data collection](https://docs.microsoft.com/azure/active-directory/authentication/concept-mfa-data-residency).
34+
35+
## Next steps
36+
For more information about any of the features and functionality described above, see these articles:
37+
- [What is Multi-Factor Authentication?](https://docs.microsoft.com/azure/active-directory/authentication/multi-factor-authentication)

articles/active-directory/fundamentals/toc.yml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
- name: Fundamentals documentation
22
href: index.yml
3-
- name: 'Overview'
3+
- name: Overview
44
expanded: true
55
items:
66
- name: What is Azure Active Directory?
77
href: active-directory-whatis.md
88
- name: What's new in Azure Active Directory
99
href: whats-new.md
10-
- name: 'Quickstarts'
10+
- name: Quickstarts
11+
expanded: true
1112
items:
1213
- name: Access the portal and create a tenant
1314
href: active-directory-access-create-new-tenant.md
1415
- name: View your groups with assigned members
1516
href: active-directory-groups-view-azure-portal.md
16-
- name: 'Concepts'
17+
- name: Concepts
18+
expanded: true
1719
items:
1820
- name: Identity secure score
1921
href: identity-secure-score.md
20-
- name: 'Security'
22+
- name: Security
2123
items:
2224
- name: Enable MFA
2325
href: concept-fundamentals-mfa-get-started.md
@@ -37,6 +39,8 @@
3739
href: active-directory-deployment-checklist-p2.md
3840
- name: Identity data storage for the EU
3941
href: active-directory-data-storage-eu.md
42+
- name: Identity data storage for Austrailia
43+
href: active-directory-data-storage-australia.md
4044
- name: What's new in Microsoft 365 Government
4145
href: whats-new-microsoft-365-government.md
4246
- name: Azure AD Operations reference
@@ -51,10 +55,10 @@
5155
href: active-directory-ops-guide-govern.md
5256
- name: Operations
5357
href: active-directory-ops-guide-ops.md
54-
- name: 'How-to guides'
58+
- name: How-to guides
5559
expanded: true
5660
items:
57-
- name: 'Organization'
61+
- name: Organization
5862
items:
5963
- name: Sign up for Azure AD as an organization
6064
href: sign-up-organization.md
@@ -68,7 +72,7 @@
6872
href: active-directory-how-subscriptions-associated-directory.md
6973
- name: Add your privacy info
7074
href: active-directory-properties-area.md
71-
- name: 'Groups'
75+
- name: Groups
7276
items:
7377
- name: Create a group and add members
7478
href: active-directory-groups-create-azure-portal.md
@@ -82,7 +86,7 @@
8286
href: active-directory-groups-settings-azure-portal.md
8387
- name: Add or remove group owners
8488
href: active-directory-accessmanagement-managing-group-owners.md
85-
- name: 'Users'
89+
- name: Users
8690
items:
8791
- name: Add or delete a new user
8892
href: add-users-azure-active-directory.md
@@ -96,7 +100,8 @@
96100
href: license-users-groups.md
97101
- name: Restore a deleted user
98102
href: active-directory-users-restore.md
99-
- name: 'Resources'
103+
- name: Resources
104+
expanded: true
100105
items:
101106
- name: Get support for Azure Active Directory
102107
href: active-directory-troubleshooting-support-howto.md

articles/active-directory/reports-monitoring/reference-azure-monitor-sign-ins-log-schema.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,4 +167,4 @@ This article describes the Azure Active Directory (Azure AD) sign-in log schema
167167
## Next steps
168168

169169
* [Interpret audit logs schema in Azure Monitor](reference-azure-monitor-audit-log-schema.md)
170-
* [Read more about Azure diagnostic logs](../../azure-monitor/platform/resource-logs-overview.md)
170+
* [Read more about Azure diagnostic logs](../../azure-monitor/platform/platform-logs-overview.md)

articles/analysis-services/analysis-services-logging.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.reviewer: minewiskan
1111
---
1212
# Setup diagnostic logging
1313

14-
An important part of any Analysis Services solution is monitoring how your servers are performing. With [Azure resource diagnostic logs](../azure-monitor/platform/resource-logs-overview.md), you can monitor and send logs to [Azure Storage](https://azure.microsoft.com/services/storage/), stream them to [Azure Event Hubs](https://azure.microsoft.com/services/event-hubs/), and export them to [Azure Monitor logs](../azure-monitor/azure-monitor-log-hub.md).
14+
An important part of any Analysis Services solution is monitoring how your servers are performing. With [Azure resource diagnostic logs](../azure-monitor/platform/platform-logs-overview.md), you can monitor and send logs to [Azure Storage](https://azure.microsoft.com/services/storage/), stream them to [Azure Event Hubs](https://azure.microsoft.com/services/event-hubs/), and export them to [Azure Monitor logs](../azure-monitor/azure-monitor-log-hub.md).
1515

1616
![Diagnostic logging to Storage, Event Hubs, or Azure Monitor logs](./media/analysis-services-logging/aas-logging-overview.png)
1717

@@ -321,6 +321,6 @@ Set-AzDiagnosticSetting -ResourceId $account.ResourceId`
321321

322322
## Next steps
323323

324-
Learn more about [Azure resource diagnostic logging](../azure-monitor/platform/resource-logs-overview.md).
324+
Learn more about [Azure resource diagnostic logging](../azure-monitor/platform/platform-logs-overview.md).
325325

326326
See [Set-AzDiagnosticSetting](https://docs.microsoft.com/powershell/module/az.monitor/set-azdiagnosticsetting) in PowerShell help.

articles/analysis-services/analysis-services-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ Modern data exploration and visualization tools like Power BI, Excel, Reporting
221221

222222
## Monitoring and diagnostics
223223

224-
Azure Analysis Services is integrated with Azure metrics, providing an extensive number of resource-specific metrics to help you monitor the performance and health of your servers. To learn more, see [Monitor server metrics](analysis-services-monitor.md). Record metrics with [Azure resource diagnostic logs](../azure-monitor/platform/resource-logs-overview.md). Monitor and send logs to [Azure Storage](https://azure.microsoft.com/services/storage/), stream them to [Azure Event Hubs](https://azure.microsoft.com/services/event-hubs/), and export them to [Azure Monitor logs](https://azure.microsoft.com/services/log-analytics/), a service of [Azure](https://www.microsoft.com/cloud-platform/operations-management-suite). To learn more, see [Setup diagnostic logging](analysis-services-logging.md).
224+
Azure Analysis Services is integrated with Azure metrics, providing an extensive number of resource-specific metrics to help you monitor the performance and health of your servers. To learn more, see [Monitor server metrics](analysis-services-monitor.md). Record metrics with [Azure resource diagnostic logs](../azure-monitor/platform/platform-logs-overview.md). Monitor and send logs to [Azure Storage](https://azure.microsoft.com/services/storage/), stream them to [Azure Event Hubs](https://azure.microsoft.com/services/event-hubs/), and export them to [Azure Monitor logs](https://azure.microsoft.com/services/log-analytics/), a service of [Azure](https://www.microsoft.com/cloud-platform/operations-management-suite). To learn more, see [Setup diagnostic logging](analysis-services-logging.md).
225225

226226
Azure Analysis Services also supports using [Dynamic Management Views (DMVs)](https://docs.microsoft.com/analysis-services/instances/use-dynamic-management-views-dmvs-to-monitor-analysis-services). Based on SQL syntax, DMVs interface schema rowsets that return metadata and monitoring information about server instance.
227227

articles/api-management/api-management-security-controls.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ This article documents the security controls built into API Management.
3030
| Security control | Yes/No | Notes| Documentation |
3131
|---|---|--|--|
3232
| Azure monitoring support (Log analytics, App insights, etc.)| Yes | | |
33-
| Control and management plane logging and audit| Yes | [Azure Monitor activity logs](../azure-monitor/platform/activity-logs-overview.md) | |
34-
| Data plane logging and audit| Yes | [Azure Monitor diagnostic logs](../azure-monitor/platform/resource-logs-overview.md) and (optionally) [Azure Application Insights](../azure-monitor/app/app-insights-overview.md). | |
33+
| Control and management plane logging and audit| Yes | [Azure Monitor activity logs](../azure-monitor/platform/platform-logs-overview.md) | |
34+
| Data plane logging and audit| Yes | [Azure Monitor diagnostic logs](../azure-monitor/platform/platform-logs-overview.md) and (optionally) [Azure Application Insights](../azure-monitor/app/app-insights-overview.md). | |
3535

3636

3737
## Identity

articles/app-service/app-service-web-get-started-html.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ In the following example, replace <app_name> with a unique app name.
4646
```bash
4747
cd html-docs-hello-world
4848

49-
az webapp up --location westeurope --name <app_name>
49+
az webapp up --location westeurope --name <app_name> --html
5050
```
5151

5252
The `az webapp up` command does the following actions:
@@ -98,7 +98,7 @@ Save your changes and exit nano. Use the command `^O` to save and `^X` to exit.
9898
You'll now redeploy the app with the same `az webapp up` command.
9999

100100
```bash
101-
az webapp up --location westeurope --name <app_name>
101+
az webapp up --location westeurope --name <app_name> --html
102102
```
103103

104104
Once deployment has completed, switch back to the browser window that opened in the **Browse to the app** step, and refresh the page.

0 commit comments

Comments
 (0)