Skip to content

Commit c1a6f12

Browse files
authored
Merge branch 'MicrosoftDocs:main' into master
2 parents 854dfd9 + 66e3baf commit c1a6f12

File tree

89 files changed

+1572
-1237
lines changed

Some content is hidden

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

89 files changed

+1572
-1237
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5938,6 +5938,11 @@
59385938
"redirect_url": "/azure/azure-app-configuration/policy-reference",
59395939
"redirect_document_id": false
59405940
},
5941+
{
5942+
"source_path_from_root": "/articles/azure-functions/functions-test-a-function.md",
5943+
"redirect_url": "/azure/azure-functions/supported-languages",
5944+
"redirect_document_id": false
5945+
},
59415946
{
59425947
"source_path_from_root": "/articles/azure-app-configuration/quickstart-azure-function-csharp.md",
59435948
"redirect_url": "/azure/azure-app-configuration/quickstart-azure-functions-csharp",

articles/active-directory/cloud-infrastructure-entitlement-management/cloudknox-onboard-enable-tenant.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ To view a video on how to enable CloudKnox in your Azure AD tenant, select
6666

6767
1. Copy the script on the **Welcome** screen:
6868

69-
`az ad ap create --id b46c3ac5-9da6-418f-a849-0a7a10b3c6c`
69+
`az ad sp create --id b46c3ac5-9da6-418f-a849-0a07a10b3c6c`
7070

7171
1. If you have an Azure subscription, return to the Azure AD portal and select **Cloud Shell** on the navigation bar.
7272
If you don't have an Azure subscription, open a command prompt on a Windows Server.
@@ -106,4 +106,4 @@ Use the **Data Collectors** dashboard in CloudKnox to configure data collection
106106

107107
- For an overview of CloudKnox, see [What's CloudKnox Permissions Management?](cloudknox-overview.md)
108108
- For a list of frequently asked questions (FAQs) about CloudKnox, see [FAQs](cloudknox-faqs.md).
109-
- For information on how to start viewing information about your authorization system in CloudKnox, see [View key statistics and data about your authorization system](cloudknox-ui-dashboard.md).
109+
- For information on how to start viewing information about your authorization system in CloudKnox, see [View key statistics and data about your authorization system](cloudknox-ui-dashboard.md).
3.47 KB
Loading
10.9 KB
Loading

articles/active-directory/reports-monitoring/overview-recommendations.md

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,26 @@ Accidentally dismissed, completed, or postponed a recommendation or resource. Ma
131131

132132
## Common tasks
133133

134-
### Turn on the preview
134+
### Enable recommendations
135135

136-
To turn on the preview:
136+
To enable your Azure AD recommendations:
137137

138138
1. Navigate to the **[Preview features](https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/PreviewHub)** page.
139139
2. Set the **State** to **On**.
140140

141+
![Enable Azure AD recommendations](./media/overview-recommendations/enable-azure-ad-recommendations.png)
142+
143+
144+
145+
### Manage recommendations
146+
147+
To manage your Azure AD recommendations:
148+
149+
1. Navigate to the [Azure AD overview](https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/Overview) page.
150+
151+
2. On the Azure AD overview page, in the toolbar, click **Recommendations (Preview)**.
152+
153+
![Manage Azure AD recommendations](./media/overview-recommendations/manage-azure-ad-recommendations.png)
141154

142155

143156

articles/advisor/advisor-alerts-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Create Azure Advisor alerts for new recommendations using Azure portal
33
description: Create Azure Advisor alerts for new recommendation
4-
ms.topic: article
4+
ms.topic: quickstart
55
ms.date: 09/09/2019
66
---
77

articles/advisor/advisor-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Introduction to Azure Advisor
33
description: Use Azure Advisor to optimize your Azure deployments.
4-
ms.topic: article
4+
ms.topic: overview
55
ms.date: 09/27/2020
66
---
77

articles/aks/use-group-managed-service-accounts.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ Use `az keyvault secret set` to store the standard domain user credential as a s
7777
az keyvault secret set --vault-name MyAKSGMSAVault --name "GMSADomainUserCred" --value "$Domain\\$DomainUsername:$DomainUserPassword"
7878
```
7979

80+
> [!NOTE]
81+
> Use the Fully Qualified Domain Name for the Domain rather than the Partially Qualified Domain Name that may be used on internal networks.
82+
83+
8084
## Optional: Use a custom VNET with custom DNS
8185

8286
Your domain controller needs to be configured through DNS so it is reachable by the AKS cluster. You can configure your network and DNS outside of your AKS cluster to allow your cluster to access the domain controller. Alternatively, you can configure a custom VNET with a custom DNS using Azure CNI with your AKS cluster to provide access to your domain controller. For more details, see [Configure Azure CNI networking in Azure Kubernetes Service (AKS)][aks-cni].
@@ -201,6 +205,8 @@ credspec:
201205
Sid: $GMSA_SID
202206
```
203207
208+
209+
204210
Create a *gmsa-role.yaml* with the following.
205211
206212
```yml

articles/api-management/TOC.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
href: devops-api-development-templates.md
9696
- name: Compute platform
9797
href: compute-infrastructure.md
98-
9998
- name: How-to guides
10099
items:
101100
- name: Define APIs
@@ -338,6 +337,8 @@
338337
href: soft-delete.md
339338
- name: Use managed identities for Azure resources
340339
href: api-management-howto-use-managed-service-identity.md
340+
- name: Validate service updates
341+
href: validate-service-updates.md
341342
- name: Self-hosted gateway
342343
items:
343344
- name: Guidance for running on Kubernetes

0 commit comments

Comments
 (0)