Skip to content

Commit c255796

Browse files
authored
Merge pull request #100978 from MicrosoftDocs/release-mvc-cost-mgt-billing
Release mvc cost mgt billing
2 parents 66cd78d + 607dfe2 commit c255796

File tree

1,163 files changed

+52991
-7974
lines changed

Some content is hidden

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

1,163 files changed

+52991
-7974
lines changed

.openpublishing.redirection.json

Lines changed: 44649 additions & 3 deletions
Large diffs are not rendered by default.

articles/active-directory-domain-services/join-windows-vm-template.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,6 @@ In this article, you used the Azure portal to configure and deploy resources usi
139139
[create-azure-ad-tenant]: ../active-directory/fundamentals/sign-up-organization.md
140140
[associate-azure-ad-tenant]: ../active-directory/fundamentals/active-directory-how-subscriptions-associated-directory.md
141141
[create-azure-ad-ds-instance]: tutorial-create-instance.md
142-
[template-overview]: ../azure-resource-manager/template-deployment-overview.md
143-
[deploy-powershell]: ../azure-resource-manager/resource-group-template-deploy.md
144-
[deploy-cli]: ../azure-resource-manager/resource-group-template-deploy-cli.md
142+
[template-overview]: ../azure-resource-manager/templates/overview.md
143+
[deploy-powershell]: ../azure-resource-manager/templates/deploy-powershell.md
144+
[deploy-cli]: ../azure-resource-manager/templates/deploy-cli.md

articles/active-directory-domain-services/mismatched-tenant-error.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ In this example deployment scenario, the Contoso Azure AD DS managed domain is e
5252
The following two options resolve the mismatched directory error:
5353

5454
* [Delete the Azure AD DS managed domain](delete-aadds.md) from your existing Azure AD directory. [Create a replacement Azure AD DS managed domain](tutorial-create-instance.md) in the same Azure AD directory as the virtual network you wish to use. When ready, join all machines previously joined to the deleted domain to the recreated managed domain.
55-
* [Move the Azure subscription](../billing/billing-subscription-transfer.md) containing the virtual network to the same Azure AD directory as the Azure AD DS managed domain.
55+
* [Move the Azure subscription](../cost-management-billing/manage/billing-subscription-transfer.md) containing the virtual network to the same Azure AD directory as the Azure AD DS managed domain.
5656

5757
## Next steps
5858

articles/active-directory-domain-services/security-audit-events.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ To enable Azure AD DS security audit events using Azure PowerShell, complete the
122122
123123
1. Create the target resource for the security audit events.
124124
125-
* **Azure storage** - [Create a storage account using Azure PowerShell](../storage/common/storage-quickstart-create-account.md?tabs=azure-powershell)
125+
* **Azure storage** - [Create a storage account using Azure PowerShell](../storage/common/storage-account-create.md?tabs=azure-powershell)
126126
* **Azure event hubs** - [Create an event hub using Azure PowerShell](../event-hubs/event-hubs-quickstart-powershell.md). You may also need to use the [New-AzEventHubAuthorizationRule](/powershell/module/az.eventhub/new-azeventhubauthorizationrule) cmdlet to create an authorization rule that grants Azure AD DS permissions to the event hub *namespace*. The authorization rule must include the **Manage**, **Listen**, and **Send** rights.
127127
128128
> [!IMPORTANT]

articles/active-directory-domain-services/troubleshoot-alerts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ The Azure AD DS managed domain's health automatically updates itself within two
8888

8989
Azure AD DS requires an active subscription, and can't be moved to a different subscription. If the Azure subscription that the Azure AD DS managed domain was associated with is deleted, you must recreate an Azure subscription and Azure AD DS managed domain.
9090

91-
1. [Create an Azure subscription](../billing/billing-create-subscription.md).
91+
1. [Create an Azure subscription](../cost-management-billing/manage/create-subscription.md).
9292
1. [Delete the Azure AD DS managed domain](delete-aadds.md) from your existing Azure AD directory.
9393
1. [Create a replacement Azure AD DS managed domain](tutorial-create-instance.md).
9494

articles/active-directory/authentication/concept-mfa-licensing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Azure MFA versions and consumption plans - Azure Active Directory
3-
description: Information about the Multi-factor Authentication client and the different methods and versions available.
3+
description: Information about the Multi-factor Authentication client and the different methods and versions available.
44

55
services: multi-factor-authentication
66
ms.service: active-directory
@@ -28,7 +28,7 @@ The following table describes the differences between versions of multi-factor a
2828

2929
| Version | Description |
3030
| --- | --- |
31-
| Free option | Customers who are utilizing the free benefits of Azure AD can use [security defaults](../conditional-access/concept-conditional-access-security-defaults.md) to enable multi-factor authentication in their environment. |
31+
| Free option | Customers who are utilizing the free benefits of Azure AD can use [security defaults](../fundamentals/concept-fundamentals-security-defaults.md) to enable multi-factor authentication in their environment. |
3232
| Multi-Factor Authentication for Office 365 | This version is managed from the Office 365 or Microsoft 365 portal. Administrators can [secure Office 365 resources with two-step verification](https://support.office.com/article/Set-up-multi-factor-authentication-for-Office-365-users-8f0454b2-f51a-4d9c-bcde-2c48e41621c6). This version is part of an Office 365 subscription. |
3333
| Multi-Factor Authentication for Azure AD Administrators | Users assigned the Azure AD Global Administrator role in Azure AD tenants can enable two-step verification at no additional cost. |
3434
| Azure Multi-Factor Authentication | Often referred to as the "full" version, Azure Multi-Factor Authentication offers the richest set of capabilities. It provides additional configuration options via the [Azure portal](https://portal.azure.com), advanced reporting, and support for a range of on-premises and cloud applications. Azure Multi-Factor Authentication is a feature of [Azure Active Directory Premium](https://www.microsoft.com/cloud-platform/azure-active-directory-features) and [Microsoft 365 Business](https://www.microsoft.com/microsoft-365/business). |
@@ -44,7 +44,7 @@ The following table provides a list of the features that are available in the va
4444
> This comparison table discusses the features that are part of each version of Multi-Factor Authentication. If you have the full Azure Multi-Factor Authentication service, some features may not be available depending on whether you use [MFA in the cloud or MFA on-premises](concept-mfa-whichversion.md).
4545
>
4646
47-
| Feature | Multi-Factor Authentication for Office 365 | Multi-Factor Authentication for Azure AD Administrators | Azure Multi-Factor Authentication | Security defaults |
47+
| Feature | Multi-Factor Authentication for Office 365 | Multi-Factor Authentication for Azure AD Administrators | Azure Multi-Factor Authentication | Security defaults |
4848
| --- |:---:|:---:|:---:|:---:|
4949
| Protect Azure AD admin accounts with MFA ||● (Azure AD Global Administrator accounts only) |||
5050
| Mobile app as a second factor |||||

articles/active-directory/fundamentals/active-directory-how-subscriptions-associated-directory.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Use **Switch directory** to go to your new directory. It can take several hours
7575

7676
![Directory switcher page, with sample information](media/active-directory-how-subscriptions-associated-directory/directory-switcher.png)
7777

78-
Changing the subscription directory is a service-level operation, so it doesn't affect subscription billing ownership. The Account Admin can still change the Service Admin from the [Account Center](https://account.azure.com/subscriptions). To delete the original directory, you must transfer the subscription billing ownership to a new Account Admin. To learn more about transferring billing ownership, see [Transfer ownership of an Azure subscription to another account](../../billing/billing-subscription-transfer.md).
78+
Changing the subscription directory is a service-level operation, so it doesn't affect subscription billing ownership. The Account Admin can still change the Service Admin from the [Account Center](https://account.azure.com/subscriptions). To delete the original directory, you must transfer the subscription billing ownership to a new Account Admin. To learn more about transferring billing ownership, see [Transfer ownership of an Azure subscription to another account](../../cost-management-billing/manage/billing-subscription-transfer.md).
7979

8080
## Post-association steps
8181

articles/active-directory/managed-identities-azure-resources/TOC.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
- name: Quickstarts
88
items:
99
- name: Use a VM managed identity to access Azure Resource Manager
10-
items:
10+
items:
1111
- name: Windows VM
1212
href: tutorial-windows-vm-access-arm.md
1313
- name: Linux VM
@@ -74,7 +74,7 @@
7474
href: qs-configure-rest-vm.md
7575
- name: Azure SDKs
7676
href: qs-configure-sdk-windows-vm.md
77-
77+
7878
- name: Configure managed identities on virtual machine scale sets
7979
items:
8080
- name: Portal
@@ -87,7 +87,7 @@
8787
href: qs-configure-template-windows-vmss.md
8888
- name: REST
8989
href: qs-configure-rest-vmss.md
90-
90+
9191
- name: Use managed identities on VMs
9292
items:
9393
- name: Acquire an access token
@@ -98,7 +98,7 @@
9898
href: how-to-use-vm-sdk.md
9999
- name: Stop using VM extension and start using Azure IMDS
100100
href: howto-migrate-vm-extension.md
101-
101+
102102
- name: Assign a managed identity access to another Azure resource
103103
items:
104104
- name: Portal
@@ -107,7 +107,7 @@
107107
href: howto-assign-access-cli.md
108108
- name: PowerShell
109109
href: howto-assign-access-powershell.md
110-
110+
111111
- name: Manage user-assigned managed identities
112112
items:
113113
- name: Portal
@@ -128,13 +128,13 @@
128128
href: how-to-view-managed-identity-service-principal-cli.md
129129
- name: PowerShell
130130
href: how-to-view-managed-identity-service-principal-powershell.md
131-
131+
132132
- name: Reference
133133
items:
134134
- name: CLI
135135
href: /cli/azure/identity
136136
- name: PowerShell
137-
href: /powershell/module/az.managedserviceidentity#managed_service_identity
137+
href: /powershell/module/az.managedserviceidentity#managed_service_identity
138138
- name: .NET
139139
href: /dotnet/api/microsoft.azure.management.resourcemanager.fluent.authentication#azure-dotnet
140140
- name: Java
@@ -145,9 +145,9 @@
145145
href: https://rubygems.org/gems/azure_mgmt_msi
146146
- name: Node.js
147147
href: /javascript/api/ms-rest-azure
148-
- name: Go
148+
- name: Go
149149
href: https://godoc.org/github.com/Azure/azure-sdk-for-go/services/msi/mgmt/2015-08-31-preview/msi
150-
150+
151151
- name: Resources
152152
items:
153153
- name: FAQs and known issues
@@ -158,4 +158,3 @@
158158
href: https://stackoverflow.com/questions/tagged/azure-msi
159159
- name: AAD Developers forum
160160
href: https://feedback.azure.com/forums/169401-azure-active-directory/category/164757-developer-experiences
161-

articles/active-directory/managed-identities-azure-resources/overview.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
title: Managed identities for Azure resources
33
description: An overview of the managed identities for Azure resources.
44
services: active-directory
5-
documentationcenter:
5+
documentationcenter:
66
author: MarkusVi
77
manager: daveba
8-
editor:
8+
editor:
99
ms.assetid: 0232041d-b8f5-4bd2-8d11-27999ad69370
1010
ms.service: active-directory
1111
ms.subservice: msi
12-
ms.devlang:
12+
ms.devlang:
1313
ms.topic: overview
1414
ms.custom: mvc
1515
ms.date: 09/26/2019
@@ -23,7 +23,7 @@ ms.collection: M365-identity-device-management
2323

2424
[!INCLUDE [preview-notice](../../../includes/active-directory-msi-preview-notice.md)]
2525

26-
A common challenge when building cloud applications is how to manage the credentials in your code for authenticating to cloud services. Keeping the credentials secure is an important task. Ideally, the credentials never appear on developer workstations and aren't checked into source control. Azure Key Vault provides a way to securely store credentials, secrets, and other keys, but your code has to authenticate to Key Vault to retrieve them.
26+
A common challenge when building cloud applications is how to manage the credentials in your code for authenticating to cloud services. Keeping the credentials secure is an important task. Ideally, the credentials never appear on developer workstations and aren't checked into source control. Azure Key Vault provides a way to securely store credentials, secrets, and other keys, but your code has to authenticate to Key Vault to retrieve them.
2727

2828
The managed identities for Azure resources feature in Azure Active Directory (Azure AD) solves this problem. The feature provides Azure services with an automatically managed identity in Azure AD. You can use the identity to authenticate to any service that supports Azure AD authentication, including Key Vault, without any credentials in your code.
2929

@@ -47,9 +47,9 @@ There are two types of managed identities:
4747
- A **system-assigned managed identity** is enabled directly on an Azure service instance. When the identity is enabled, Azure creates an identity for the instance in the Azure AD tenant that's trusted by the subscription of the instance. After the identity is created, the credentials are provisioned onto the instance. The lifecycle of a system-assigned identity is directly tied to the Azure service instance that it's enabled on. If the instance is deleted, Azure automatically cleans up the credentials and the identity in Azure AD.
4848
- A **user-assigned managed identity** is created as a standalone Azure resource. Through a create process, Azure creates an identity in the Azure AD tenant that's trusted by the subscription in use. After the identity is created, the identity can be assigned to one or more Azure service instances. The lifecycle of a user-assigned identity is managed separately from the lifecycle of the Azure service instances to which it's assigned.
4949

50-
Internally, managed identities are service principals of a special type, which are locked to only be used with Azure resources. When the managed identity is deleted, the corresponding service principal is automatically removed.
50+
Internally, managed identities are service principals of a special type, which are locked to only be used with Azure resources. When the managed identity is deleted, the corresponding service principal is automatically removed.
5151

52-
Your code can use a managed identity to request access tokens for services that support Azure AD authentication. Azure takes care of rolling the credentials that are used by the service instance.
52+
Your code can use a managed identity to request access tokens for services that support Azure AD authentication. Azure takes care of rolling the credentials that are used by the service instance.
5353

5454
The following diagram shows how managed service identities work with Azure virtual machines (VMs):
5555

@@ -60,7 +60,7 @@ The following diagram shows how managed service identities work with Azure virtu
6060
| Creation | Created as part of an Azure resource (for example, an Azure virtual machine or Azure App Service) | Created as a stand-alone Azure resource |
6161
| Lifecycle | Shared lifecycle with the Azure resource that the managed identity is created with. <br/> When the parent resource is deleted, the managed identity is deleted as well. | Independent life-cycle. <br/> Must be explicitly deleted. |
6262
| Sharing across Azure resources | Cannot be shared. <br/> It can only be associated with a single Azure resource. | Can be shared <br/> The same user-assigned managed identity can be associated with more than one Azure resource. |
63-
| Common use cases | Workloads that are contained within a single Azure resource <br/> Workloads for which you need independent identities. <br/> For example, an application that runs on a single virtual machine | Workloads that run on multiple resources and which can share a single identity. <br/> Workloads that need pre-authorization to a secure resource as part of a provisioning flow. <br/> Workloads where resources are recycled frequently, but permissions should stay consistent. <br/> For example, a workload where multiple virtual machines need to access the same resource |
63+
| Common use cases | Workloads that are contained within a single Azure resource <br/> Workloads for which you need independent identities. <br/> For example, an application that runs on a single virtual machine | Workloads that run on multiple resources and which can share a single identity. <br/> Workloads that need pre-authorization to a secure resource as part of a provisioning flow. <br/> Workloads where resources are recycled frequently, but permissions should stay consistent. <br/> For example, a workload where multiple virtual machines need to access the same resource |
6464

6565
### How a system-assigned managed identity works with an Azure VM
6666

@@ -113,7 +113,7 @@ Learn how to use a managed identity with a Windows VM:
113113
* [Access Azure Data Lake Store](tutorial-windows-vm-access-datalake.md)
114114
* [Access Azure Resource Manager](tutorial-windows-vm-access-arm.md)
115115
* [Access Azure SQL](tutorial-windows-vm-access-sql.md)
116-
* [Access Azure Storage by using an access key](tutorial-windows-vm-access-storage.md)
116+
* [Access Azure Storage by using an access key](tutorial-vm-windows-access-storage.md)
117117
* [Access Azure Storage by using shared access signatures](tutorial-windows-vm-access-storage-sas.md)
118118
* [Access a non-Azure AD resource with Azure Key Vault](tutorial-windows-vm-access-nonaad.md)
119119

0 commit comments

Comments
 (0)