Skip to content

Commit f9448a4

Browse files
authored
Merge pull request #79054 from MicrosoftDocs/master
6/7 AM Publish
2 parents 265a7e5 + 1de8b91 commit f9448a4

File tree

18 files changed

+146
-49
lines changed

18 files changed

+146
-49
lines changed

articles/active-directory/users-groups-roles/directory-assign-admin-roles.md

Lines changed: 48 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ The following administrator roles are available:
8888
[Intune](https://docs.microsoft.com/intune/role-based-access-control) | View all Intune audit data
8989
[Cloud App Security](https://docs.microsoft.com/cloud-app-security/manage-admins) | Has read-only permissions and can manage alerts<br>Can create and modify file policies and allow file governance actions<br> Can view all the built-in reports under Data Management
9090

91-
<!--* **[Compliance Data Administrator](#compliance-data-administrator)**: Users with this role have permissions to protect and track data in the Microsoft 365 compliance center, Microsoft 365 admin center, and Azure. Users can also manage all features within the Exchange admin center, Compliance Manager, and Teams & Skype for Business admin center and create support tickets for Azure and Microsoft 365.
91+
* **[Compliance Data Administrator](#compliance-data-administrator)**: Users with this role have permissions to protect and track data in the Microsoft 365 compliance center, Microsoft 365 admin center, and Azure. Users can also manage all features within the Exchange admin center, Compliance Manager, and Teams & Skype for Business admin center and create support tickets for Azure and Microsoft 365.
9292

9393
In | Can do
9494
----- | ----------
@@ -97,7 +97,7 @@ The following administrator roles are available:
9797
[Office 365 Security & Compliance Center](https://support.office.com/article/About-Office-365-admin-roles-da585eea-f576-4f55-a1e0-87090b6aaa9d) | Manage data governance<br>Perform legal and data investigation<br>Manage Data Subject Request
9898
[Intune](https://docs.microsoft.com/intune/role-based-access-control) | View all Intune audit data
9999
[Cloud App Security](https://docs.microsoft.com/cloud-app-security/manage-admins) | Has read-only permissions and can manage alerts<br>Can create and modify file policies and allow file governance actions<br> Can view all the built-in reports under Data Management
100-
-->
100+
101101
* **[Conditional Access Administrator](#conditional-access-administrator)**: Users with this role have the ability to manage Azure Active Directory conditional access settings.
102102
> [!NOTE]
103103
> To deploy Exchange ActiveSync conditional access policy in Azure, the user must also be a Global Administrator.
@@ -208,7 +208,7 @@ Additionally, the user can access reports related to adoption & usage of Kaizala
208208
[Azure Security Center](https://docs.microsoft.com/azure/role-based-access-control/built-in-roles) | Can view security policies, view security states, edit security policies, view alerts and recommendations, dismiss alerts and recommendations
209209
[Office 365 service health](https://docs.microsoft.com/office365/enterprise/view-service-health) | View the health of Office 365 services
210210

211-
<!--* **[Security operator](#security-operator)**: Users with this role can manage alerts and have global read-only access on security-related feature, including all information in Microsoft 365 security center, Azure Active Directory, Identity Protection, Privileged Identity Management, as well as the ability to read Azure Active Directory sign-in reports and audit logs, and in Office 365 Security & Compliance Center.
211+
* **[Security operator](#security-operator)**: Users with this role can manage alerts and have global read-only access on security-related feature, including all information in Microsoft 365 security center, Azure Active Directory, Identity Protection, Privileged Identity Management and Office 365 Security & Compliance Center. More information about Office 365 permissions is available at [Permissions in the Office 365 Security & Compliance Center](https://docs.microsoft.com/en-us/office365/securitycompliance/permissions-in-the-security-and-compliance-center).
212212

213213
In | Can do
214214
--- | ---
@@ -220,7 +220,8 @@ Additionally, the user can access reports related to adoption & usage of Kaizala
220220
[Intune](https://docs.microsoft.com/intune/role-based-access-control) | All permissions of the Security Reader role
221221
[Cloud App Security](https://docs.microsoft.com/cloud-app-security/manage-admins) | All permissions of the Security Reader role
222222
[Office 365 service health](https://docs.microsoft.com/office365/enterprise/view-service-health) | View the health of Office 365 services
223-
-->
223+
<!--* **[Security Operator](#security-operator)**: Users with this role can manage alerts and have global read-only access on security-related feature, including all information in Microsoft 365 security center, Azure Active Directory, Identity Protection, Privileged Identity Management.-->
224+
224225
* **[Security Reader](#security-reader)**: Users with this role have global read-only access on security-related feature, including all information in Microsoft 365 security center, Azure Active Directory, Identity Protection, Privileged Identity Management, as well as the ability to read Azure Active Directory sign-in reports and audit logs, and in Office 365 Security & Compliance Center. More information about Office 365 permissions is available at [Permissions in the Office 365 Security & Compliance Center](https://support.office.com/article/Permissions-in-the-Office-365-Security-Compliance-Center-d10608af-7934-490a-818e-e68f17d0e9c1).
225226

226227
In | Can do
@@ -563,6 +564,28 @@ Can read and manage compliance configuration and reports in Azure AD and Office
563564
| microsoft.office365.skypeForBusiness/allEntities/allTasks | Manage all aspects of Skype for Business Online. |
564565
| microsoft.office365.supportTickets/allEntities/allTasks | Create and manage Office 365 support tickets. |
565566

567+
### Compliance Data Administrator
568+
Creates and manages compliance content.
569+
570+
> [!NOTE]
571+
> This role has additional permissions outside of Azure Active Directory. For more information, see role description above.
572+
>
573+
>
574+
575+
| **Actions** | **Description** |
576+
| --- | --- |
577+
| microsoft.aad.cloudAppSecurity/allEntities/allTasks | Read and configure Microsoft Cloud App Security. |
578+
| microsoft.azure.informationProtection/allEntities/allTasks | Manage all aspects of Azure Information Protection. |
579+
| microsoft.azure.serviceHealth/allEntities/allTasks | Read and configure Azure Service Health. |
580+
| microsoft.azure.supportTickets/allEntities/allTasks | Create and manage Azure support tickets. |
581+
| microsoft.office365.webPortal/allEntities/basic/read | Read basic properties on all resources in microsoft.office365.webPortal. |
582+
| microsoft.office365.complianceManager/allEntities/allTasks | Manage all aspects of Office 365 Compliance Manager |
583+
| microsoft.office365.exchange/allEntities/allTasks | Manage all aspects of Exchange Online. |
584+
| microsoft.office365.serviceHealth/allEntities/allTasks | Read and configure Office 365 Service Health. |
585+
| microsoft.office365.sharepoint/allEntities/allTasks | Create and delete all resources, and read and update standard properties in microsoft.office365.sharepoint. |
586+
| microsoft.office365.skypeForBusiness/allEntities/allTasks | Manage all aspects of Skype for Business Online. |
587+
| microsoft.office365.supportTickets/allEntities/allTasks | Create and manage Office 365 support tickets. |
588+
566589
### Conditional Access Administrator
567590
Can manage conditional access capabilities.
568591

@@ -1079,6 +1102,25 @@ Can read security information and reports, and manage configuration in Azure AD
10791102
| microsoft.office365.protectionCenter/allEntities/update | Update all resources in microsoft.office365.protectionCenter. |
10801103
| microsoft.office365.serviceHealth/allEntities/allTasks | Read and configure Office 365 Service Health. |
10811104

1105+
### Security Operator
1106+
Creates and manages security events.
1107+
1108+
> [!NOTE]
1109+
> This role has additonal permissions outside of Azure Active Directory. For more information, see role description above.
1110+
>
1111+
>
1112+
1113+
| **Actions** | **Description** |
1114+
| --- | --- |
1115+
| microsoft.aad.cloudAppSecurity/allEntities/allTasks | Read and configure Microsoft Cloud App Security. |
1116+
| microsoft.aad.identityProtection/allEntities/read | Read all resources in microsoft.aad.identityProtection. |
1117+
| microsoft.aad.privilegedIdentityManagement/allEntities/read | Read all resources in microsoft.aad.privilegedIdentityManagement. |
1118+
| microsoft.azure.advancedThreatProtection/allEntities/read | Read and configure Azure AD Advanced Threat Protection. |
1119+
| microsoft.intune/allEntities/allTasks | Manage all aspects of Intune. |
1120+
| microsoft.office365.securityComplianceCenter/allEntities/allTasks | Read and configure Security & Compliance Center. |
1121+
| microsoft.office365.usageReports/allEntities/read | Read Office 365 usage reports. |
1122+
| microsoft.windows.defenderAdvancedThreatProtection/allEntities/read | Read and configure Windows Defender Advanced Threat Protection. |
1123+
10821124
### Security Reader
10831125
Can read security information and reports in Azure AD and Office 365.
10841126

@@ -1264,6 +1306,7 @@ Cloud Application Administrator | Cloud application administrator | 158c047a-c90
12641306
Cloud Device Administrator | Cloud device administrator | 7698a772-787b-4ac8-901f-60d6b08affd2
12651307
Company Administrator | Global administrator | 62e90394-69f5-4237-9190-012177145e10
12661308
Compliance Administrator | Compliance administrator | 17315797-102d-40b4-93e0-432062caca18
1309+
Compliance Data Administrator | Compliance data administrator | e6d1a23a-da11-4be4-9570-befc86d067a7
12671310
Conditional Access Administrator | Conditional Access administrator | b1be1c3e-b65d-4f19-8427-f6fa0d97feb9
12681311
CRM Service Administrator | Dynamics 365 administrator | 44367163-eba1-44c3-98af-f5787879f96a
12691312
Customer LockBox Access Approver | Customer Lockbox access approver | 5c4f9dcd-47dc-4cf7-8c9a-9e4207cbfc91
@@ -1293,6 +1336,7 @@ Reports Reader | Reports reader | 4a5d8f65-41da-4de4-8968-e035b65339cf
12931336
Search Administrator | Search administrator | 0964bb5e-9bdb-4d7b-ac29-58e794862a40
12941337
Search Editor | Search editor | 8835291a-918c-4fd7-a9ce-faa49f0cf7d9
12951338
Security Administrator | Security administrator | 194ae4cb-b126-40b2-bd5b-6091b380977d
1339+
Security Operator | Security operator | 5f2222b1-57c3-48ba-8ad5-d4759f1fde6f
12961340
Security Reader | Security reader | 5d6b6bb7-de71-4623-b4af-96380a352509
12971341
Service Support Administrator | Service administrator | f023fd81-a637-4b56-95fd-791ac0226033
12981342
SharePoint Service Administrator | Sharepoint administrator | f28a1f50-f6e7-4571-818b-6a12f2af6b6c

articles/app-service/operating-system-functionality.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ It is important to monitor your disk utilization as your application grows. If t
6161

6262
- The app may throw an error indicating not enough space on the disk.
6363
- You may see disk errors when browsing to the Kudu console.
64-
- Deployment from VSTS or Visual Studio may fail with `ERROR_NOT_ENOUGH_DISK_SPACE: Web deployment task failed. (Web Deploy detected insufficient space on disk)`.
64+
- Deployment from Azure DevOps or Visual Studio may fail with `ERROR_NOT_ENOUGH_DISK_SPACE: Web deployment task failed. (Web Deploy detected insufficient space on disk)`.
6565
- Your app may suffer slow performance.
6666

6767
<a id="NetworkDrives"></a>

articles/azure-cache-for-redis/cache-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ You can use any of the commands listed at [Redis commands](https://redis.io/comm
247247
* `redis-cli -h <Azure Cache for Redis name>.redis.cache.windows.net -a <key>`
248248

249249
> [!NOTE]
250-
> The Redis command-line tools do not work with the SSL port, but you can use a utility such as `stunnel` to securely connect the tools to the SSL port by following the directions in the [Announcing ASP.NET Session State Provider for Redis Preview Release](https://blogs.msdn.com/b/webdev/archive/2014/05/12/announcing-asp-net-session-state-provider-for-redis-preview-release.aspx) blog post.
250+
> The Redis command-line tools do not work with the SSL port, but you can use a utility such as `stunnel` to securely connect the tools to the SSL port by following the directions in the [How to use the Redis command-line tool with Azure Cache for Redis](https://docs.microsoft.com/en-us/azure/azure-cache-for-redis/cache-how-to-redis-cli-tool) article.
251251
>
252252
>
253253

articles/azure-monitor/platform/activity-logs-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ There is a single Activity Log for each Azure subscription. It provides data abo
2424

2525

2626
> [!NOTE]
27-
> The Azure Activity Log is primarily for activities that occur in Azure Resource Manager. It does not track ugresources using the Classic/RDFE model. Some Classic resource types have a proxy resource provider in Azure Resource Manager (for example, Microsoft.ClassicCompute). If you interact with a Classic resource type through Azure Resource Manager using these proxy resource providers, the operations appear in the Activity Log. If you interact with a Classic resource type outside of the Azure Resource Manager proxies, your actions are only recorded in the Operation Log. The Operation Log can be browsed in a separate section of the portal.
27+
> The Azure Activity Log is primarily for activities that occur in Azure Resource Manager. It does not track resources using the Classic/RDFE model. Some Classic resource types have a proxy resource provider in Azure Resource Manager (for example, Microsoft.ClassicCompute). If you interact with a Classic resource type through Azure Resource Manager using these proxy resource providers, the operations appear in the Activity Log. If you interact with a Classic resource type outside of the Azure Resource Manager proxies, your actions are only recorded in the Operation Log. The Operation Log can be browsed in a separate section of the portal.
2828
2929
## Activity Log retention
3030
Activity Log events are stored for 90 days. To store this data for longer periods, [collect it in Azure Monitor](activity-log-collect.md) or [export it to storage or Event Hubs](activity-log-export.md).

articles/azure-resource-manager/resource-group-create-multiple.md

Lines changed: 38 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,55 @@
22
title: Deploy multiple instances of Azure resources | Microsoft Docs
33
description: Use copy operation and arrays in an Azure Resource Manager template to iterate multiple times when deploying resources.
44
services: azure-resource-manager
5-
documentationcenter: na
65
author: tfitzmac
7-
editor: ''
8-
96
ms.service: azure-resource-manager
10-
ms.devlang: na
117
ms.topic: conceptual
12-
ms.tgt_pltfrm: na
13-
ms.workload: na
14-
ms.date: 05/01/2019
8+
ms.date: 06/06/2019
159
ms.author: tomfitz
1610

1711
---
18-
# Deploy more than one instance of a resource or property in Azure Resource Manager Templates
12+
# Resource, property, or variable iteration in Azure Resource Manager templates
13+
14+
This article shows you how to create more than one instance of a resource, variable, or property in your Azure Resource Manager template. To create multiple instances, add the `copy` object to your template.
15+
16+
When used with a resource, the copy object has the following format:
17+
18+
```json
19+
"copy": {
20+
"name": "<name-of-loop>",
21+
"count": <number-of-iterations>,
22+
"mode": "serial" <or> "parallel",
23+
"batchSize": <number-to-deploy-serially>
24+
}
25+
```
26+
27+
When used with a variable or property, the copy object has the following format:
28+
29+
```json
30+
"copy": [
31+
{
32+
"name": "<name-of-loop>",
33+
"count": <number-of-iterations>,
34+
"input": <values-for-the-property-or-variable>
35+
}
36+
]
37+
```
38+
39+
Both uses are described in greater detail in this article. For a tutorial, see [Tutorial: create multiple resource instances using Resource Manager templates](./resource-manager-tutorial-create-multiple-instances.md).
40+
41+
If you need to specify whether a resource is deployed at all, see [condition element](resource-group-authoring-templates.md#condition).
1942

20-
This article shows you how to iterate in your Azure Resource Manager template to create more than one instance of a resource. If you need to specify whether a resource is deployed at all, see [condition element](resource-group-authoring-templates.md#condition).
43+
## Copy limits
2144

22-
For a tutorial, see [Tutorial: create multiple resource instances using Resource Manager templates](./resource-manager-tutorial-create-multiple-instances.md).
45+
To specify the number of iterations, you provide a value for the count property. The count can't exceed 800.
2346

47+
The count can't be a negative number. If you deploy a template with REST API version **2019-05-10** or later, you can set count to zero. Earlier versions of the REST API don't support zero for count. Currently, Azure CLI or PowerShell don't support zero for count, but that support will be added in a future release.
2448

25-
[!INCLUDE [updated-for-az](../../includes/updated-for-az.md)]
49+
The limits for the count are the same whether used with a resource, variable, or property.
2650

2751
## Resource iteration
2852

29-
When you must decide during deployment to create one or more instances of a resource, add a `copy` element to the resource type. In the copy element, you specify the number of iterations and a name for this loop. The count value must be a positive integer and can't be more than 800.
53+
When you must decide during deployment to create one or more instances of a resource, add a `copy` element to the resource type. In the copy element, specify the number of iterations and a name for this loop.
3054

3155
The resource to create several times takes the following format:
3256

@@ -67,7 +91,7 @@ Creates these names:
6791
* storage1
6892
* storage2.
6993

70-
To offset the index value, you can pass a value in the copyIndex() function. The number of iterations to perform is still specified in the copy element, but the value of copyIndex is offset by the specified value. So, the following example:
94+
To offset the index value, you can pass a value in the copyIndex() function. The number of iterations is still specified in the copy element, but the value of copyIndex is offset by the specified value. So, the following example:
7195

7296
```json
7397
"name": "[concat('storage', copyIndex(1))]",
@@ -152,7 +176,7 @@ For information about using copy with nested templates, see [Using copy](resourc
152176
To create more than one value for a property on a resource, add a `copy` array in the properties element. This array contains objects, and each object has the following properties:
153177

154178
* name - the name of the property to create several values for
155-
* count - the number of values to create. The count value must be a positive integer and can't be more than 800.
179+
* count - the number of values to create.
156180
* input - an object that contains the values to assign to the property
157181

158182
The following example shows how to apply `copy` to the dataDisks property on a virtual machine:

articles/cognitive-services/Anomaly-Detector/tutorials/anomaly-detection-streaming-databricks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.author: aahi
1414

1515
# Tutorial: Anomaly detection on streaming data using Azure Databricks
1616

17-
[Azure Databricks](https://azure.microsoft.com/en-us/services/databricks/) is a fast, easy, and collaborative Apache Spark–based analytics service. The Anomaly Detector API, part of Azure Cognitive Services, provides a way of monitoring your time series data. Use this tutorial to run anomaly detection on a stream of data in near real-time using Azure Databricks. You'll ingest twitter data using Azure Event Hubs, and import them into Azure Databricks using the Spark Event Hubs connector. Afterwards, you'll use the API to detect anomalies on the streamed data.
17+
[Azure Databricks](https://azure.microsoft.com/services/databricks/) is a fast, easy, and collaborative Apache Spark–based analytics service. The Anomaly Detector API, part of Azure Cognitive Services, provides a way of monitoring your time series data. Use this tutorial to run anomaly detection on a stream of data in near real-time using Azure Databricks. You'll ingest twitter data using Azure Event Hubs, and import them into Azure Databricks using the Spark Event Hubs connector. Afterwards, you'll use the API to detect anomalies on the streamed data.
1818

1919
The following illustration shows the application flow:
2020

articles/cognitive-services/Speech-Service/ship-application.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ The Cognitive Services Speech SDK is tested on Windows 10 and on Windows Server
2525

2626
The Cognitive Services Speech SDK requires the [Microsoft Visual C++ Redistributable for Visual Studio 2019](https://support.microsoft.com/help/2977003/the-latest-supported-visual-c-downloads) on the system. You can download installers for the latest version of the `Microsoft Visual C++ Redistributable for Visual Studio 2019` here:
2727

28-
- [Win32](https://aka.ms/vs/15/release/vc_redist.x86.exe)
29-
- [x64](https://aka.ms/vs/15/release/vc_redist.x64.exe)
28+
- [Win32](https://aka.ms/vs/16/release/vc_redist.x86.exe)
29+
- [x64](https://aka.ms/vs/16/release/vc_redist.x64.exe)
3030

3131
If your application uses managed code, the `.NET Framework 4.6.1` or later is required on the target machine.
3232

0 commit comments

Comments
 (0)