Skip to content

Commit 5bc630f

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into tamram-0409
2 parents e60cb00 + c0ed565 commit 5bc630f

File tree

72 files changed

+9434
-1874
lines changed

Some content is hidden

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

72 files changed

+9434
-1874
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,11 @@
325325
"redirect_url": "/articles/active-directory/users-groups-roles/groups-create-rule",
326326
"redirect_document_id": false
327327
},
328+
{
329+
"source_path_from_root": "/articles/frontdoor/front-door-whats-new.md",
330+
"redirect_url": "https://azure.microsoft.com/updates/?category=networking&query=Azure%20Front%20Door",
331+
"redirect_document_id": false
332+
},
328333
{
329334
"source_path_from_root": "/articles/load-balancer/azure-media-player/components-limitations.md",
330335
"redirect_url": "/articles/load-balancer/concepts",

articles/active-directory/develop/scenario-desktop-acquire-token.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,7 +1009,7 @@ This flow isn't supported on MSAL for macOS.
10091009

10101010
# [Node.js](#tab/nodejs)
10111011

1012-
This extract is from the [MSAL Node dev samples](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/samples/msal-node-samples/standalone-samples/username-password). In the code snippet below, the username and password are hardcoded for illustration purposes only. This should be avoided in production. Instead, a basic UI prompting the user to enter her username/password would be recommended.
1012+
This extract is from the [MSAL Node dev samples](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/samples/msal-node-samples/username-password). In the code snippet below, the username and password are hardcoded for illustration purposes only. This should be avoided in production. Instead, a basic UI prompting the user to enter her username/password would be recommended.
10131013

10141014
```JavaScript
10151015
const msal = require("@azure/msal-node");
@@ -1252,7 +1252,7 @@ This flow doesn't apply to macOS.
12521252

12531253
# [Node.js](#tab/nodejs)
12541254

1255-
This extract is from the [MSAL Node dev samples](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/samples/msal-node-samples/standalone-samples/device-code).
1255+
This extract is from the [MSAL Node dev samples](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/samples/msal-node-samples/device-code).
12561256

12571257
```JavaScript
12581258
const msal = require('@azure/msal-node');

articles/active-directory/managed-identities-azure-resources/tutorial-windows-vm-ua-arm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Tutorial`:` Use a managed identity to access Azure Resource Manager - Windows - Azure AD
2+
title: "Tutorial: Use a managed identity to access Azure Resource Manager - Windows - Azure AD"
33
description: A tutorial that walks you through the process of using a user-assigned managed identity on a Windows VM, to access Azure Resource Manager.
44
services: active-directory
55
documentationcenter: ''

articles/aks/concepts-scale.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ This article introduces the core concepts that help you scale applications in AK
2121

2222
You can manually scale replicas (pods) and nodes to test how your application responds to a change in available resources and state. Manually scaling resources also lets you define a set amount of resources to use to maintain a fixed cost, such as the number of nodes. To manually scale, you define the replica or node count. The Kubernetes API then schedules creating additional pods or draining nodes based on that replica or node count.
2323

24-
When scaling down nodes, the Kubernetes API calls the relevant Azure Compute API tied to the compute type used by your cluster. For example, for clusters built on VM Scale Sets the logic for selecting which nodes to remove is determined by the VM Scale Sets API. To learn more about how nodes are selected for removal on scale down, see the [VMSS FAQ](../virtual-machine-scale-sets/virtual-machine-scale-sets-faq.md#if-i-reduce-my-scale-set-capacity-from-20-to-15-which-vms-are-removed).
24+
When scaling down nodes, the Kubernetes API calls the relevant Azure Compute API tied to the compute type used by your cluster. For example, for clusters built on VM Scale Sets the logic for selecting which nodes to remove is determined by the VM Scale Sets API. To learn more about how nodes are selected for removal on scale down, see the [VMSS FAQ](../virtual-machine-scale-sets/virtual-machine-scale-sets-faq.yml#if-i-reduce-my-scale-set-capacity-from-20-to-15--which-vms-are-removed-).
2525

2626
To get started with manually scaling pods and nodes see [Scale applications in AKS][aks-scale].
2727

articles/aks/csi-storage-drivers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Create the AKS cluster with support for CSI storage drivers:
8282

8383
```azurecli-interactive
8484
# Create an AKS-managed Azure AD cluster
85-
az aks create -g MyResourceGroup -n MyManagedCluster --network-plugin azure -k 1.17.9 --aks-custom-headers EnableAzureDiskFileCSIDriver=true
85+
az aks create -g MyResourceGroup -n MyManagedCluster --network-plugin azure --aks-custom-headers EnableAzureDiskFileCSIDriver=true
8686
```
8787

8888
If you want to create clusters in tree storage drivers instead of CSI storage drivers, you can do so by omitting the custom `--aks-custom-headers` parameter.

articles/azure-arc/data/release-notes.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.reviewer: mikeray
77
services: azure-arc
88
ms.service: azure-arc
99
ms.subservice: azure-arc-data
10-
ms.date: 04/06/2021
10+
ms.date: 04/09/2021
1111
ms.topic: conceptual
1212
# Customer intent: As a data professional, I want to understand why my solutions would benefit from running with Azure Arc enabled data services so that I can leverage the capability of the feature.
1313
---
@@ -20,7 +20,7 @@ This article highlights capabilities, features, and enhancements recently releas
2020

2121
## March 2021
2222

23-
The March 2021 release is introduced on April 6, 2021.
23+
The March 2021 release was initially introduced on April 5th 2021, and the final stages of release were completed April 9th 2021.
2424

2525
Review limitations of this release in [Known issues - Azure Arc enabled data services (Preview)](known-issues.md).
2626

@@ -41,7 +41,9 @@ Both custom resource definitions (CRD) for PostgreSQL have been consolidated int
4141

4242
You will delete the previous CRDs as you cleanup past installations. See [Cleanup from past installations](create-data-controller-using-kubernetes-native-tools.md#cleanup-from-past-installations).
4343

44-
### Azure Arc enabled managed instance
44+
### Azure Arc enabled SQL Managed Instance
45+
46+
- You can now create a SQL managed instance from the Azure portal in the direct connected mode.
4547

4648
- You can now restore a database to SQL Managed Instance with 3 replicas and it will be automatically added to the availability group.
4749

articles/azure-resource-manager/managed-applications/microsoft-solutions-armapicontrol.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.author: tomfitz
99

1010
---
1111

12-
# Microsoft.Common.ArmApiControl UI element
12+
# Microsoft.Solutions.ArmApiControl UI element
1313

1414
ArmApiControl lets you get results from an Azure Resource Manager API operation. Use the results to populate dynamic content in other controls.
1515

articles/azure-resource-manager/managed-applications/tutorial-create-managed-app-with-custom-provider.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ You can go to managed application instance and perform **custom action** in "Ove
344344

345345
## Looking for help
346346

347-
If you have questions about Azure Managed Applications, try asking on [Stack Overflow](https://stackoverflow.com/questions/tagged/azure-managedapps). A similar question may have already been asked and answered, so check first before posting. Add the tag `azure-managedapps` to get a fast response!
347+
If you have questions about Azure Managed Applications, you can try asking on [Stack Overflow](https://stackoverflow.com/questions/tagged/azure-managed-app) with tag azure-managed-app or [Microsoft Q&A] (https://docs.microsoft.com/answers/topics/azure-managed-applications.html) with tag azure-managed-application. A similar question may have already been asked and answered, so check first before posting. Please use respective tags for faster response.
348348

349349
## Next steps
350350

articles/azure-sql/database/sql-vulnerability-assessment.md

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.topic: how-to
1111
author: davidtrigano
1212
ms.author: datrigan
1313
ms.reviewer: vanto
14-
ms.date: 02/11/2021
14+
ms.date: 04/09/2021
1515
tags: azure-synapse
1616
---
1717
# SQL vulnerability assessment helps you identify database vulnerabilities
@@ -120,6 +120,44 @@ Select **Export Scan Results** to create a downloadable Excel report of your sca
120120

121121
Select **Scan History** in the vulnerability assessment pane to view a history of all scans previously run on this database. Select a particular scan in the list to view the detailed results of that scan.
122122

123+
### Disable specific findings from Azure Security Center (preview)
124+
125+
If you have an organizational need to ignore a finding, rather than remediate it, you can optionally disable it. Disabled findings don't impact your secure score or generate unwanted noise.
126+
127+
When a finding matches the criteria you've defined in your disable rules, it won't appear in the list of findings. Typical scenarios include:
128+
129+
- Disable findings with severity below medium
130+
- Disable findings that are non-patchable
131+
- Disable findings from benchmarks that aren't of interest for a defined scope
132+
133+
> [!IMPORTANT]
134+
> To disable specific findings, you need permissions to edit a policy in Azure Policy. Learn more in [Azure RBAC permissions in Azure Policy](../../governance/policy/overview.md#azure-rbac-permissions-in-azure-policy).
135+
136+
To create a rule:
137+
138+
1. From the recommendations detail page for **Vulnerability assessment findings on your SQL servers on machines should be remediated**, select **Disable rule**.
139+
140+
1. Select the relevant scope.
141+
142+
1. Define your criteria. You can use any of the following criteria:
143+
- Finding ID
144+
- Severity
145+
- Benchmarks
146+
147+
:::image type="content" source="../../security-center/media/defender-for-sql-on-machines-vulnerability-assessment/disable-rule-vulnerability-findings-sql.png" alt-text="Create a disable rule for VA findings on SQL servers on machines":::
148+
149+
1. Select **Apply rule**. Changes might take up to 24hrs to take effect.
150+
151+
1. To view, override, or delete a rule:
152+
153+
1. Select **Disable rule**.
154+
155+
1. From the scope list, subscriptions with active rules show as **Rule applied**.
156+
157+
:::image type="content" source="../../security-center/media/remediate-vulnerability-findings-vm/modify-rule.png" alt-text="Modify or delete an existing rule":::
158+
159+
1. To view or delete the rule, select the ellipsis menu ("...").
160+
123161
## Manage vulnerability assessments programmatically
124162

125163
### Using Azure PowerShell
@@ -241,4 +279,4 @@ To handle Boolean types as true/false, set the baseline result with binary input
241279

242280
- Learn more about [Azure Defender for SQL](azure-defender-for-sql.md).
243281
- Learn more about [data discovery and classification](data-discovery-and-classification-overview.md).
244-
- Learn more about [Storing vulnerability assessment scan results in a storage account accessible behind firewalls and VNets](sql-database-vulnerability-assessment-storage.md).
282+
- Learn more about [Storing vulnerability assessment scan results in a storage account accessible behind firewalls and VNets](sql-database-vulnerability-assessment-storage.md).

0 commit comments

Comments
 (0)