Skip to content

Commit f53cd24

Browse files
authored
Merge pull request #100666 from MicrosoftDocs/master
1/09 PM Publish
2 parents 8b37091 + b091147 commit f53cd24

File tree

123 files changed

+1451
-601
lines changed

Some content is hidden

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

123 files changed

+1451
-601
lines changed

CODEOWNERS

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,17 @@
11
# Testing the new code owners feature in GitHub. Please contact Cory Fowler if you have questions.
2-
# articles/storage/ @tamram @robinsh
3-
# articles/virtual-machines/ @iainfoulds @cynthn
4-
# articles/virtual-machines/linux/ @iainfoulds @cynthn
5-
# articles/virtual-machines/windows/ @iainfoulds @cynthn
6-
# articles/application-insights/ @SergeyKanzhelev
7-
# articles/cosmos-db/ @mimig1
8-
9-
# All Articles
10-
articles/ @apex-docs-pr-reviewers
11-
122
# Cognitive Services
133
articles/cognitive-services/ @diberry @erhopf, @nitinme
144

155
# DevOps
16-
176
articles/ansible/ @TomArcherMsft
187
articles/chef/ @TomArcherMsft
198
articles/jenkins/ @TomArcherMsft
209
articles/terraform/ @TomArcherMsft
2110

2211
# Governance
23-
2412
articles/governance/ @DCtheGeek
13+
14+
# Configuration
15+
*.json @SyntaxC4
16+
.acrolinx-config.edn @MonicaRush
17+
articles/zone-pivot-groups.yml @SyntaxC4

articles/active-directory/users-groups-roles/domains-admin-takeover.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -125,40 +125,40 @@ cmdlet | Usage
125125

126126
1. Connect to Azure AD using the credentials that were used to respond to the self-service offering:
127127
```powershell
128-
Install-Module -Name MSOnline
129-
$msolcred = get-credential
128+
Install-Module -Name MSOnline
129+
$msolcred = get-credential
130130
131-
connect-msolservice -credential $msolcred
131+
connect-msolservice -credential $msolcred
132132
```
133133
2. Get a list of domains:
134134

135135
```powershell
136-
Get-MsolDomain
136+
Get-MsolDomain
137137
```
138138
3. Run the Get-MsolDomainVerificationDns cmdlet to create a challenge:
139139
```powershell
140-
Get-MsolDomainVerificationDns –DomainName *your_domain_name* –Mode DnsTxtRecord
141-
140+
Get-MsolDomainVerificationDns –DomainName *your_domain_name* –Mode DnsTxtRecord
141+
```
142142
For example:
143-
144-
Get-MsolDomainVerificationDns –DomainName contoso.com –Mode DnsTxtRecord
143+
```
144+
Get-MsolDomainVerificationDns –DomainName contoso.com –Mode DnsTxtRecord
145145
```
146146

147147
4. Copy the value (the challenge) that is returned from this command. For example:
148148
```powershell
149-
MS=32DD01B82C05D27151EA9AE93C5890787F0E65D9
149+
MS=32DD01B82C05D27151EA9AE93C5890787F0E65D9
150150
```
151151
5. In your public DNS namespace, create a DNS txt record that contains the value that you copied in the previous step. The name for this record is the name of the parent domain, so if you create this resource record by using the DNS role from Windows Server, leave the Record name blank and just paste the value into the Text box.
152152
6. Run the Confirm-MsolDomain cmdlet to verify the challenge:
153153

154154
```powershell
155-
Confirm-MsolEmailVerifiedDomain -DomainName *your_domain_name*
155+
Confirm-MsolDomain –DomainName *your_domain_name* –ForceTakeover Force
156156
```
157157

158158
For example:
159159

160160
```powershell
161-
Confirm-MsolEmailVerifiedDomain -DomainName contoso.com
161+
Confirm-MsolDomain –DomainName contoso.com –ForceTakeover Force
162162
```
163163

164164
A successful challenge returns you to the prompt without an error.

articles/api-management/api-management-howto-mutual-certificates.md

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.service: api-management
1212
ms.workload: mobile
1313
ms.tgt_pltfrm: na
1414
ms.topic: article
15-
ms.date: 06/20/2018
15+
ms.date: 01/08/2020
1616
ms.author: apimpm
1717
---
1818

@@ -26,19 +26,22 @@ For information about managing certificates using the API Management REST API, s
2626

2727
[!INCLUDE [updated-for-az](../../includes/updated-for-az.md)]
2828

29-
This guide shows you how to configure your API Management service instance to use client certificate authentication to access the back-end service for an API. Before following the steps in this article, you should have your back-end service configured for client certificate authentication ([to configure certificate authentication in Azure WebSites refer to this article][to configure certificate authentication in Azure WebSites refer to this article]). You need access to the certificate and the password for uploading it to the API Management service.
29+
This guide shows you how to configure your API Management service instance to use client certificate authentication to access the back-end service for an API. Before following the steps in this article, you should have your back-end service configured for client certificate authentication ([to configure certificate authentication in the Azure App Service refer to this article][to configure certificate authentication in Azure WebSites refer to this article]). You need access to the certificate and the password for uploading it to the API Management service.
3030

3131
## <a name="step1"> </a>Upload a Certificate
3232

33+
> [!NOTE]
34+
> Instead of an uploaded certificate you can use a certificate stored in the [Azure Key Vault](https://azure.microsoft.com/services/key-vault/) service as shown in this [example](https://github.com/galiniliev/api-management-policy-snippets/blob/galin/AkvCert/examples/Look%20up%20Key%20Vault%20certificate%20using%20Managed%20Service%20Identity%20and%20call%20backend.policy.xml).
35+
3336
![Add client certificates](media/api-management-howto-mutual-certificates/apim-client-cert-new.png)
3437

3538
Follow the steps below to upload a new client certificate. If you have not created an API Management service instance yet, see the tutorial [Create an API Management service instance][Create an API Management service instance].
3639

3740
1. Navigate to your Azure API Management service instance in the Azure portal.
3841
2. Select **Certificates** from the menu.
39-
3. Click the **+ Add** button.
40-
![Add client certificates](media/api-management-howto-mutual-certificates/apim-client-cert-add.png)
41-
4. Browse for the certificate, provide its ID and password.
42+
3. Click the **+ Add** button.
43+
![Add client certificates](media/api-management-howto-mutual-certificates/apim-client-cert-add.png)
44+
4. Browse for the certificate, provide its ID and password.
4245
5. Click **Create**.
4346

4447
> [!NOTE]
@@ -61,14 +64,14 @@ If the certificate is in use by an API, then a warning screen is displayed. To d
6164

6265
## <a name="step2"> </a>Configure an API to use a client certificate for gateway authentication
6366

64-
1. Click **APIs** from the **API Management** menu on the left and navigate to the API.
67+
1. Click **APIs** from the **API Management** menu on the left and navigate to the API.
6568
![Enable client certificates](media/api-management-howto-mutual-certificates/apim-client-cert-enable.png)
6669

67-
2. In the **Design** tab, click on a pencil icon of the **Backend** section.
68-
3. Change the **Gateway credentials** to **Client cert** and select your certificate from the dropdown.
70+
2. In the **Design** tab, click on a pencil icon of the **Backend** section.
71+
3. Change the **Gateway credentials** to **Client cert** and select your certificate from the dropdown.
6972
![Enable client certificates](media/api-management-howto-mutual-certificates/apim-client-cert-enable-select.png)
7073

71-
4. Click **Save**.
74+
4. Click **Save**.
7275

7376
> [!WARNING]
7477
> This change is effective immediately, and calls to operations of that API will use the certificate to authenticate on the back-end server.

articles/api-management/api-management-howto-properties.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@ ms.service: api-management
1111
ms.workload: mobile
1212
ms.tgt_pltfrm: na
1313
ms.topic: article
14-
ms.date: 11/05/2019
14+
ms.date: 01/08/2020
1515
ms.author: apimpm
1616
---
1717

1818
# How to use named values in Azure API Management policies
1919

2020
API Management policies are a powerful capability of the system that allow the Azure portal to change the behavior of the API through configuration. Policies are a collection of statements that are executed sequentially on the request or response of an API. Policy statements can be constructed using literal text values, policy expressions, and named values.
2121

22-
Each API Management service instance has a properties collection of key/value pairs, which is called named values, that are global to the service instance. There is no imposed limit on the number of items in the collection. Named values can be used to manage constant string values across all API configuration and policies. Each named value may have the following attributes:
22+
Each API Management service instance has a collection of key/value pairs, which is called named values, that are global to the service instance. There is no imposed limit on the number of items in the collection. Named values can be used to manage constant string values across all API configuration and policies. Each named value may have the following attributes:
2323

24-
| Attribute | Type | Description |
25-
| -------------- | --------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
24+
| Attribute | Type | Description |
25+
| -------------- | --------------- | -------------------------------------------------------------------------------------------------------------------------------------- |
2626
| `Display name` | string | Used for referencing the named value in policies. A string of one to 256 characters. Only letters, numbers, dot, and dash are allowed. |
27-
| `Value` | string | Actual value. Must not be empty or consist only of whitespace. Maximum of 4096 characters long. |
28-
| `Secret` | boolean | Determines whether the value is a secret and should be encrypted or not. |
27+
| `Value` | string | Actual value. Must not be empty or consist only of whitespace. Maximum of 4096 characters long. |
28+
| `Secret` | boolean | Determines whether the value is a secret and should be encrypted or not. |
2929
| `Tags` | array of string | Used to filter the named value list. Up to 32 tags. |
3030

3131
![Named values](./media/api-management-howto-properties/named-values.png)
@@ -38,6 +38,9 @@ Named values can contain literal strings and [policy expressions](/azure/api-man
3838
| Credential | •••••••••••••••••••••• | True | security |
3939
| Expression | @(DateTime.Now.ToString()) | False | |
4040

41+
> [!NOTE]
42+
> Instead of named values stored within an API Management service, you can use values stored in the [Azure Key Vault](https://azure.microsoft.com/services/key-vault/) service as demonstrated by this [example](https://github.com/Azure/api-management-policy-snippets/blob/master/examples/Look%20up%20Key%20Vault%20secret%20using%20Managed%20Service%20Identity.policy.xml).
43+
4144
## To add and edit a named value
4245

4346
![Add a named value](./media/api-management-howto-properties/add-property.png)
@@ -46,7 +49,7 @@ Named values can contain literal strings and [policy expressions](/azure/api-man
4649
2. Select **Named values**.
4750
3. Press **+Add**.
4851

49-
Name and Value are required values. If value is a secret, check the *This is a secret* checkbox. Enter one or more optional tags to help with organizing your named values, and click Save.
52+
Name and Value are required values. If value is a secret, check the _This is a secret_ checkbox. Enter one or more optional tags to help with organizing your named values, and click Save.
5053

5154
4. Click **Create**.
5255

articles/app-service/containers/configure-language-ruby.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.custom: seodec18
1111

1212
# Configure a Linux Ruby app for Azure App Service
1313

14-
This article describes how [Azure App Service](app-service-linux-intro.md) runs Ruby apps, and how you can customize the behavior of App Service when needed. Ruby apps must be deployed with all the required [pip](https://pypi.org/project/pip/) modules.
14+
This article describes how [Azure App Service](app-service-linux-intro.md) runs Ruby apps, and how you can customize the behavior of App Service when needed. Ruby apps must be deployed with all the required [gems](https://rubygems.org/gems).
1515

1616
This guide provides key concepts and instructions for Ruby developers who use a built-in Linux container in App Service. If you've never used Azure App Service, you should follow the [Ruby quickstart](quickstart-ruby.md) and [Ruby with PostgreSQL tutorial](tutorial-ruby-postgres-app.md) first.
1717

articles/app-service/overview-managed-identity.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.reviewer: yevbronsh
1515
> [!Important]
1616
> Managed identities for App Service and Azure Functions will not behave as expected if your app is migrated across subscriptions/tenants. The app will need to obtain a new identity, which can be done by disabling and re-enabling the feature. See [Removing an identity](#remove) below. Downstream resources will also need to have access policies updated to use the new identity.
1717
18-
This topic shows you how to create a managed identity for App Service and Azure Functions applications and how to use it to access other resources. A managed identity from Azure Active Directory allows your app to easily access other AAD-protected resources such as Azure Key Vault. The identity is managed by the Azure platform and does not require you to provision or rotate any secrets. For more about managed identities in AAD, see [Managed identities for Azure resources](../active-directory/managed-identities-azure-resources/overview.md).
18+
This topic shows you how to create a managed identity for App Service and Azure Functions applications and how to use it to access other resources. A managed identity from Azure Active Directory (AAD) allows your app to easily access other AAD-protected resources such as Azure Key Vault. The identity is managed by the Azure platform and does not require you to provision or rotate any secrets. For more about managed identities in AAD, see [Managed identities for Azure resources](../active-directory/managed-identities-azure-resources/overview.md).
1919

2020
Your application can be granted two types of identities:
2121
- A **system-assigned identity** is tied to your application and is deleted if your app is deleted. An app can only have one system-assigned identity.
@@ -74,7 +74,7 @@ The following steps will walk you through creating a web app and assigning it an
7474
7575
The following steps will walk you through creating a web app and assigning it an identity using Azure PowerShell:
7676
77-
1. If needed, install the Azure PowerShell using the instruction found in the [Azure PowerShell guide](/powershell/azure/overview), and then run `Login-AzAccount` to create a connection with Azure.
77+
1. If needed, install the Azure PowerShell using the instructions found in the [Azure PowerShell guide](/powershell/azure/overview), and then run `Login-AzAccount` to create a connection with Azure.
7878
7979
2. Create a web application using Azure PowerShell. For more examples of how to use Azure PowerShell with App Service, see [App Service PowerShell samples](../app-service/samples-powershell.md):
8080
@@ -232,12 +232,12 @@ Where `<PRINCIPALID>` and `<CLIENTID>` are replaced with GUIDs. The principalId
232232

233233
## Obtaining tokens for Azure resources
234234

235-
An app can use its identity to get tokens to other resources protected by AAD, such as Azure Key Vault. These tokens represent the application accessing the resource, and not any specific user of the application.
235+
An app can use its managed identity to get tokens to access other resources protected by AAD, such as Azure Key Vault. These tokens represent the application accessing the resource, and not any specific user of the application.
236236

237237
> [!IMPORTANT]
238-
> You may need to configure the target resource to allow access from your application. For example, if you request a token to Key Vault, you need to make sure you have added an access policy that includes your application's identity. Otherwise, your calls to Key Vault will be rejected, even if they include the token. To learn more about which resources support Azure Active Directory tokens, see [Azure services that support Azure AD authentication](../active-directory/managed-identities-azure-resources/services-support-managed-identities.md#azure-services-that-support-azure-ad-authentication).
238+
> You may need to configure the target resource to allow access from your application. For example, if you request a token to access Key Vault, you need to make sure you have added an access policy that includes your application's identity. Otherwise, your calls to Key Vault will be rejected, even if they include the token. To learn more about which resources support Azure Active Directory tokens, see [Azure services that support Azure AD authentication](../active-directory/managed-identities-azure-resources/services-support-managed-identities.md#azure-services-that-support-azure-ad-authentication).
239239
240-
There is a simple REST protocol for obtaining a token in App Service and Azure Functions. This can be used for all applications and languages. For some .NET and Java, the Azure SDK provides an abstraction over this protocol and facilitates a local development experience.
240+
There is a simple REST protocol for obtaining a token in App Service and Azure Functions. This can be used for all applications and languages. For .NET and Java, the Azure SDK provides an abstraction over this protocol and facilitates a local development experience.
241241

242242
### Using the REST protocol
243243

articles/automation/automation-dsc-onboarding.md

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ Azure Automation State Configuration can be used to manage a variety of machines
3232

3333
- Azure virtual machines
3434
- Azure virtual machines (classic)
35-
- Amazon Web Services (AWS) EC2 instances
36-
- Physical/virtual Windows machines on-premises, or in a cloud other than Azure/AWS
35+
- Physical/virtual Windows machines on-premises, or in a cloud other than Azure (including AWS EC2 instances)
3736
- Physical/virtual Linux machines on-premises, in Azure, or in a cloud other than Azure
3837

3938
In addition, if you are not ready to manage machine configuration from the cloud, Azure Automation
@@ -99,13 +98,7 @@ Examples are provided in
9998
To find the registration key and registration URL to use as parameters in the template,
10099
see the following [**Secure registration**](#secure-registration) section.
101100

102-
## Amazon Web Services (AWS) virtual machines
103-
104-
You can easily onboard Amazon Web Services virtual machines for configuration management by Azure
105-
Automation State Configuration using the AWS DSC Toolkit. You can learn more about the toolkit
106-
[here](https://blogs.msdn.microsoft.com/powershell/2016/04/20/aws-dsc-toolkit/).
107-
108-
## Physical/virtual Windows machines on-premises, or in a cloud other than Azure/AWS
101+
## Physical/virtual Windows machines on-premises, or in a cloud other than Azure (including AWS EC2 instances)
109102

110103
Windows servers running on-premises or in other cloud environments
111104
can also be onboarded to Azure Automation State Configuration, as long as they have

articles/automation/automation-onboard-solutions-from-automation-account.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ If the selected workspace already has the solution, the solution isn't re-deploy
5353

5454
When a computer is added to the Update Management or the Change Tracking and Inventory solutions, they're added to one of two saved searches in your workspace. These saved searches are queries that contain the computers that are targeted for these solutions.
5555

56-
Navigate to your Automation account and select **Saved searches** under **General**. The two saved searches used by these solutions can be seen in the following table:
56+
Navigate to your Log Analytics workspace and select **Saved searches** under **General**. The two saved searches used by these solutions can be seen in the following table:
5757

5858
|Name |Category |Alias |
5959
|---------|---------|---------|

articles/automation/troubleshoot/desired-state-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ Treat the cross-subscription node as though it lives in a separate cloud, or on-
269269

270270
Follow the steps below to register the node.
271271

272-
* Windows - [Physical/virtual Windows machines on-premises, or in a cloud other than Azure/AWS](../automation-dsc-onboarding.md#physicalvirtual-windows-machines-on-premises-or-in-a-cloud-other-than-azureaws).
272+
* Windows - [Physical/virtual Windows machines on-premises, or in a cloud other than Azure/AWS](../automation-dsc-onboarding.md#physicalvirtual-windows-machines-on-premises-or-in-a-cloud-other-than-azure-including-aws-ec2-instances).
273273
* Linux - [Physical/virtual Linux machines on-premises, or in a cloud other than Azure](../automation-dsc-onboarding.md#physicalvirtual-linux-machines-on-premises-or-in-a-cloud-other-than-azure).
274274

275275
### <a name="agent-has-a-problem"></a>Scenario: Error message - "Provisioning Failed"

0 commit comments

Comments
 (0)