Skip to content

Commit dffeeb2

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-roles-may
2 parents 7a6f9bc + e0d816b commit dffeeb2

File tree

70 files changed

+1400
-918
lines changed

Some content is hidden

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

70 files changed

+1400
-918
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-create-vnet-classic-cli",
3636
"redirect_document_id": false
3737
},
38-
3938
{
4039
"source_path": "articles/virtual-network/virtual-networks-specifying-a-dns-settings-in-a-virtual-network-configuration-file.md",
4140
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-specifying-a-dns-settings-in-a-virtual-network-configuration-file",
@@ -20691,6 +20690,11 @@
2069120690
"redirect_url": "https://go.microsoft.com/fwlink/?linkid=847458",
2069220691
"redirect_document_id": false
2069320692
},
20693+
{
20694+
"source_path": "articles/marketplace/partner-center-portal/billing-details.md",
20695+
"redirect_url": "https://docs.microsoft.com/azure/marketplace/marketplace-commercial-transaction-capabilities-and-considerations",
20696+
"redirect_document_id": false
20697+
},
2069420698
{
2069520699
"source_path": "articles/multi-factor-authentication/multi-factor-authentication-app-faq.md",
2069620700
"redirect_url": "./end-user/microsoft-authenticator-app-faq",

articles/active-directory/conditional-access/concept-conditional-access-cloud-apps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Administrators can assign a Conditional Access policy to the following cloud app
6868

6969
Office 365 provides cloud-based productivity and collaboration services like Exchange, SharePoint, and Microsoft Teams. Office 365 cloud services are deeply integrated to ensure smooth and collaborative experiences. This integration can cause confusion when creating policies as some apps such as Microsoft Teams have dependencies on others such as SharePoint or Exchange.
7070

71-
The Office 365 (preview) app makes it possible to target these services all at once. We recommend using the new Office 365 (preview) app, instead of targeting individual cloud apps. Targeting this group of applications helps to avoid issues that may arise due to inconsistent policies and dependencies.
71+
The Office 365 (preview) app makes it possible to target these services all at once. We recommend using the new Office 365 (preview) app, instead of targeting individual cloud apps to avoid issues with [service dependencies](service-dependencies.md). Targeting this group of applications helps to avoid issues that may arise due to inconsistent policies and dependencies.
7272

7373
Administrators can choose to exclude specific apps from policy if they wish by including the Office 365 (preview) app and excluding the specific apps of their choice in policy.
7474

articles/active-directory/conditional-access/service-dependencies.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: conditional-access
88
ms.topic: article
9-
ms.date: 11/21/2019
9+
ms.date: 05/04/2020
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -20,7 +20,7 @@ ms.collection: M365-identity-device-management
2020

2121
With Conditional Access policies, you can specify access requirements to websites and services. For example, your access requirements can include requiring multi-factor authentication (MFA) or [managed devices](require-managed-devices.md).
2222

23-
When you access a site or service directly, the impact of a related policy is typically easy to assess. For example, if you have a policy that requires MFA for SharePoint Online configured, MFA is enforced for each sign-in to the SharePoint web portal. However, it is not always straight-forward to assess the impact of a policy because there are cloud apps with dependencies to other cloud apps. For example, Microsoft Teams can provide access to resources in SharePoint Online. So, when you access Microsoft Teams in our current scenario, you are also subject to the SharePoint MFA policy.
23+
When you access a site or service directly, the impact of a related policy is typically easy to assess. For example, if you have a policy that requires multi-factor authentication (MFA) for SharePoint Online configured, MFA is enforced for each sign-in to the SharePoint web portal. However, it is not always straight-forward to assess the impact of a policy because there are cloud apps with dependencies to other cloud apps. For example, Microsoft Teams can provide access to resources in SharePoint Online. So, when you access Microsoft Teams in our current scenario, you are also subject to the SharePoint MFA policy.
2424

2525
## Policy enforcement
2626

@@ -35,6 +35,8 @@ The diagram below illustrates MS Teams service dependencies. Solid arrows indica
3535

3636
As a best practice, you should set common policies across related apps and services whenever possible. Having a consistent security posture provides you with the best user experience. For example, setting a common policy across Exchange Online, SharePoint Online, Microsoft Teams, and Skype for business significantly reduces unexpected prompts that may arise from different policies being applied to downstream services.
3737

38+
A great way to accomplish this with applications in the Office stack is to use the [Office 365 (preview)](concept-conditional-access-cloud-apps.md#office-365-preview) instead of targeting individual applications.
39+
3840
The below table lists additional service dependencies, where the client apps must satisfy
3941

4042
| Client apps | Downstream service | Enforcement |
4.45 KB
Loading
2.85 KB
Loading

articles/active-directory/develop/registration-config-how-to.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,7 @@ You can find the authentication endpoints for your application in the [Azure por
2929

3030
- Use the endpoint specific to the authentication protocol you are using, in conjunction with the application ID to craft the authentication request specific to your application.
3131

32+
**National clouds** (for example Azure AD China, Germany, and US Government) have their own app registration portal and Azure AD authentication endpoints. Learn more in the [National clouds overview](authentication-national-cloud.md).
33+
3234
## Next steps
3335
[Azure Active Directory developer's guide](https://docs.microsoft.com/azure/active-directory/develop/active-directory-developers-guide)

articles/aks/developer-best-practices-pod-security.md

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
2-
title: Pod security best practices
3-
titleSuffix: Azure Kubernetes Service
2+
title: Developer best practices - Pod security in Azure Kubernetes Services (AKS)
43
description: Learn the developer best practices for how to secure pods in Azure Kubernetes Service (AKS)
54
services: container-service
65
author: zr-msft
@@ -70,7 +69,7 @@ To limit the risk of credentials being exposed in your application code, avoid t
7069
The following [associated AKS open source projects][aks-associated-projects] let you automatically authenticate pods or request credentials and keys from a digital vault:
7170
7271
* Managed identities for Azure resources, and
73-
* Azure Key Vault FlexVol driver
72+
* [Azure Key Vault Provider for Secrets Store CSI Driver](https://github.com/Azure/secrets-store-csi-driver-provider-azure#usage)
7473
7574
Associated AKS open source projects are not supported by Azure technical support. They are provided to gather feedback and bugs from our community. These projects are not recommended for production use.
7675
@@ -84,28 +83,28 @@ With a managed identity, your application code doesn't need to include credentia
8483
8584
For more information about pod identities, see [Configure an AKS cluster to use pod managed identities and with your applications][aad-pod-identity]
8685
87-
### Use Azure Key Vault with FlexVol
86+
### Use Azure Key Vault with Secrets Store CSI Driver
8887
89-
Managed pod identities work great to authenticate against supporting Azure services. For your own services or applications without managed identities for Azure resources, you still authenticate using credentials or keys. A digital vault can be used to store these credentials.
88+
Using the pod identity project enables authentication against supporting Azure services. For your own services or applications without managed identities for Azure resources, you can still authenticate using credentials or keys. A digital vault can be used to store these secret contents.
9089
91-
When applications need a credential, they communicate with the digital vault, retrieve the latest credentials, and then connect to the required service. Azure Key Vault can be this digital vault. The simplified workflow for retrieving a credential from Azure Key Vault using pod managed identities is shown in the following diagram:
90+
When applications need a credential, they communicate with the digital vault, retrieve the latest secret contents, and then connect to the required service. Azure Key Vault can be this digital vault. The simplified workflow for retrieving a credential from Azure Key Vault using pod managed identities is shown in the following diagram:
9291
93-
![Simplified workflow for retrieving a credential from Key Vault using a pod managed identity](media/developer-best-practices-pod-security/basic-key-vault-flexvol.png)
92+
![Simplified workflow for retrieving a credential from Key Vault using a pod managed identity](media/developer-best-practices-pod-security/basic-key-vault.png)
9493
95-
With Key Vault, you store and regularly rotate secrets such as credentials, storage account keys, or certificates. You can integrate Azure Key Vault with an AKS cluster using a FlexVolume. The FlexVolume driver lets the AKS cluster natively retrieve credentials from Key Vault and securely provide them only to the requesting pod. Work with your cluster operator to deploy the Key Vault FlexVol driver onto the AKS nodes. You can use a pod managed identity to request access to Key Vault and retrieve the credentials you need through the FlexVolume driver.
94+
With Key Vault, you store and regularly rotate secrets such as credentials, storage account keys, or certificates. You can integrate Azure Key Vault with an AKS cluster using the [Azure Key Vault provider for the Secrets Store CSI Driver](https://github.com/Azure/secrets-store-csi-driver-provider-azure#usage). The Secrets Store CSI driver enables the AKS cluster to natively retrieve secret contents from Key Vault and securely provide them only to the requesting pod. Work with your cluster operator to deploy the Secrets Store CSI Driver onto AKS worker nodes. You can use a pod managed identity to request access to Key Vault and retrieve the secret contents needed through the Secrets Store CSI Driver.
9695
97-
Azure Key Vault with FlexVol is intended for use with applications and services running on Linux pods and nodes.
96+
Azure Key Vault with Secrets Store CSI Driver can be used for Linux nodes and pods which require a Kubernetes version of 1.16 or greater. For Windows nodes and pods a Kubernetes version of 1.18 or greater is required.
9897
9998
## Next steps
10099
101100
This article focused on how to secure your pods. To implement some of these areas, see the following articles:
102101
103102
* [Use managed identities for Azure resources with AKS][aad-pod-identity]
104-
* [Integrate Azure Key Vault with AKS][aks-keyvault-flexvol]
103+
* [Integrate Azure Key Vault with AKS][aks-keyvault-csi-driver]
105104
106105
<!-- EXTERNAL LINKS -->
107106
[aad-pod-identity]: https://github.com/Azure/aad-pod-identity#demo
108-
[aks-keyvault-flexvol]: https://github.com/Azure/kubernetes-keyvault-flexvol
107+
[aks-keyvault-csi-driver]: https://github.com/Azure/secrets-store-csi-driver-provider-azure#usage
109108
[linux-capabilities]: http://man7.org/linux/man-pages/man7/capabilities.7.html
110109
[selinux-labels]: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.12/#selinuxoptions-v1-core
111110
[aks-associated-projects]: https://github.com/Azure/AKS/blob/master/previews.md#associated-projects
@@ -114,4 +113,4 @@ This article focused on how to secure your pods. To implement some of these area
114113
[best-practices-cluster-security]: operator-best-practices-cluster-security.md
115114
[best-practices-container-image-management]: operator-best-practices-container-image-management.md
116115
[aks-pod-identities]: operator-best-practices-identity.md#use-pod-identities
117-
[apparmor-seccomp]: operator-best-practices-cluster-security.md#secure-container-access-to-resources
116+
[apparmor-seccomp]: operator-best-practices-cluster-security.md#secure-container-access-to-resources

articles/azure-monitor/app/powershell.md

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Automate Azure Application Insights with PowerShell | Microsoft Docs
33
description: Automate creating and managing resources, alerts, and availability tests in PowerShell using an Azure Resource Manager template.
44
ms.topic: conceptual
5-
ms.date: 10/17/2019
5+
ms.date: 05/02/2020
66

77
---
88

@@ -17,10 +17,10 @@ The key to creating these resources is JSON templates for [Azure Resource Manage
1717
## One-time setup
1818
If you haven't used PowerShell with your Azure subscription before:
1919

20-
Install the Azure Powershell module on the machine where you want to run the scripts:
20+
Install the Azure PowerShell module on the machine where you want to run the scripts:
2121

2222
1. Install [Microsoft Web Platform Installer (v5 or higher)](https://www.microsoft.com/web/downloads/platform.aspx).
23-
2. Use it to install Microsoft Azure Powershell.
23+
2. Use it to install Microsoft Azure PowerShell.
2424

2525
In addition to using Resource Manager templates, there is a rich set of [Application Insights PowerShell cmdlets](https://docs.microsoft.com/powershell/module/az.applicationinsights), which make it easy to configure Application Insights resources programatically. The capabilities enabled by the cmdlets include:
2626

@@ -83,20 +83,20 @@ Create a new .json file - let's call it `template1.json` in this example. Copy t
8383
"defaultValue": 90,
8484
"allowedValues": [
8585
30,
86-
60,
87-
90,
88-
120,
89-
180,
90-
270,
91-
365,
92-
550,
93-
730
86+
60,
87+
90,
88+
120,
89+
180,
90+
270,
91+
365,
92+
550,
93+
730
9494
],
9595
"metadata": {
9696
"description": "Data retention in days"
9797
}
9898
},
99-
"ImmediatePurgeDataOn30Days": {
99+
"ImmediatePurgeDataOn30Days": {
100100
"type": "bool",
101101
"defaultValue": false,
102102
"metadata": {
@@ -225,7 +225,21 @@ Additional properties are available via the cmdlets:
225225

226226
Refer to the [detailed documentation](https://docs.microsoft.com/powershell/module/az.applicationinsights) for the parameters for these cmdlets.
227227

228-
## Set the data retention
228+
## Set the data retention
229+
230+
Below are three methods to programmatically set the data retention on an Application Insights resource.
231+
232+
### Setting data retention using a PowerShell commands
233+
234+
Here's a simple set of PowerShell commands to set the data retention for your Application Insights resource:
235+
236+
```PS
237+
$Resource = Get-AzResource -ResourceType Microsoft.Insights/components -ResourceGroupName MyResourceGroupName -ResourceName MyResourceName
238+
$Resource.Properties.RetentionInDays = 365
239+
$Resource | Set-AzResource -Force
240+
```
241+
242+
### Setting data retention using REST
229243

230244
To get the current data retention for your Application Insights resource, you can use the OSS tool [ARMClient](https://github.com/projectkudu/ARMClient). (Learn more about ARMClient from articles by [David Ebbo](http://blog.davidebbo.com/2015/01/azure-resource-manager-client.html) and [Daniel Bowbyes](https://blog.bowbyes.co.nz/2016/11/02/using-armclient-to-directly-access-azure-arm-rest-apis-and-list-arm-policy-details/).) Here's an example using `ARMClient`, to get the current retention:
231245

@@ -248,6 +262,8 @@ New-AzResourceGroupDeployment -ResourceGroupName "<resource group>" `
248262
-appName myApp
249263
```
250264

265+
### Setting data retention using a PowerShell script
266+
251267
The following script can also be used to change retention. Copy this script to save as `Set-ApplicationInsightsRetention.ps1`.
252268

253269
```PS
@@ -303,9 +319,9 @@ This script can then be used as:
303319
```PS
304320
Set-ApplicationInsightsRetention `
305321
[-SubscriptionId] <String> `
306-
[-ResourceGroupName] <String> `
307-
[-Name] <String> `
308-
[-RetentionInDays <Int>]
322+
[-ResourceGroupName] <String> `
323+
[-Name] <String> `
324+
[-RetentionInDays <Int>]
309325
```
310326

311327
## Set the daily cap

0 commit comments

Comments
 (0)