Skip to content

Commit 7516d80

Browse files
v-shilsv-shils
authored
Merge branch 'master' into patch-12
2 parents b228ba4 + 5bd652a commit 7516d80

21 files changed

+77
-56
lines changed

‎articles/active-directory/users-groups-roles/licensing-service-plan-reference.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ When managing licenses in [the Azure portal](https://portal.azure.com/#blade/Mic
101101
| SKYPE FOR BUSINESS PSTN CONFERENCING | MCOMEETADV | 0c266dff-15dd-4b49-8397-2bb16070ed52 | MCOMEETADV (3e26ee1f-8a5f-4d52-aee2-b81ce45c8f40) | AUDIO CONFERENCING (3e26ee1f-8a5f-4d52-aee2-b81ce45c8f40) |
102102
| SKYPE FOR BUSINESS PSTN DOMESTIC AND INTERNATIONAL CALLING | MCOPSTN2 | d3b4fe1f-9992-4930-8acb-ca6ec609365e | MCOPSTN2 (5a10155d-f5c1-411a-a8ec-e99aae125390) | DOMESTIC AND INTERNATIONAL CALLING PLAN (5a10155d-f5c1-411a-a8ec-e99aae125390) |
103103
| SKYPE FOR BUSINESS PSTN DOMESTIC CALLING | MCOPSTN1 | 0dab259f-bf13-4952-b7f8-7db8f131b28d | MCOPSTN1 (4ed3ff63-69d7-4fb7-b984-5aec7f605ca8) | DOMESTIC CALLING PLAN (4ed3ff63-69d7-4fb7-b984-5aec7f605ca8) |
104+
| SKYPE FOR BUSINESS PSTN DOMESTIC CALLING (120 Minutes)| MCOPSTN5 | 54a152dc-90de-4996-93d2-bc47e670fc06 | MCOPSTN5 (54a152dc-90de-4996-93d2-bc47e670fc06) | DOMESTIC CALLING PLAN (54a152dc-90de-4996-93d2-bc47e670fc06) |
104105
| VISIO ONLINE PLAN 1 | VISIOONLINE_PLAN1 | 4b244418-9658-4451-a2b8-b5e2b364e9bd | ONEDRIVE_BASIC (da792a53-cbc0-4184-a10d-e544dd34b3c1)<br/>VISIOONLINE (2bdbaf8f-738f-4ac7-9234-3c3ee2ce7d0f) | ONEDRIVE_BASIC (da792a53-cbc0-4184-a10d-e544dd34b3c1)<br/>VISIOONLINE (2bdbaf8f-738f-4ac7-9234-3c3ee2ce7d0f) |
105106
| VISIO Online Plan 2 | VISIOCLIENT | c5928f49-12ba-48f7-ada3-0d743a3601d5 | ONEDRIVE_BASIC (da792a53-cbc0-4184-a10d-e544dd34b3c1)<br/>VISIO_CLIENT_SUBSCRIPTION (663a804f-1c30-4ff0-9915-9db84f0d1cea)<br/>VISIOONLINE (2bdbaf8f-738f-4ac7-9234-3c3ee2ce7d0f) | ONEDRIVE_BASIC (da792a53-cbc0-4184-a10d-e544dd34b3c1)<br/>VISIO_CLIENT_SUBSCRIPTION (663a804f-1c30-4ff0-9915-9db84f0d1cea)<br/>VISIOONLINE (2bdbaf8f-738f-4ac7-9234-3c3ee2ce7d0f) |
106107
| WINDOWS 10 ENTERPRISE E3 | WIN10_PRO_ENT_SUB | cb10e6cd-9da4-4992-867b-67546b1db821 | WIN10_PRO_ENT_SUB (21b439ba-a0ca-424f-a6cc-52f954a5b111) | WINDOWS 10 ENTERPRISE (21b439ba-a0ca-424f-a6cc-52f954a5b111)

‎articles/aks/api-server-authorized-ip-ranges.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,13 +216,13 @@ To enable API server authorized IP ranges, you provide a list of authorized IP a
216216

217217
Use [az aks update][az-aks-update] command and specify the *--api-server-authorized-ip-ranges* to allow. These IP address ranges are usually address ranges used by your on-premises networks. Add the public IP address of your own Azure firewall obtained in the previous step, such as *20.42.25.196/32*.
218218

219-
The following example enables API server authorized IP ranges on the cluster named *myAKSCluster* in the resource group named *myResourceGroup*. The IP address ranges to authorize are *20.42.25.196/32* (the Azure firewall public IP address), then *172.0.0.10/16* and *168.10.0.10/18*:
219+
The following example enables API server authorized IP ranges on the cluster named *myAKSCluster* in the resource group named *myResourceGroup*. The IP address ranges to authorize are *20.42.25.196/32* (the Azure firewall public IP address), then *172.0.0.0/16* and *168.10.0.0/18*:
220220

221221
```azurecli-interactive
222222
az aks update \
223223
--resource-group myResourceGroup \
224224
--name myAKSCluster \
225-
--api-server-authorized-ip-ranges 20.42.25.196/32,172.0.0.10/16,168.10.0.10/18
225+
--api-server-authorized-ip-ranges 20.42.25.196/32,172.0.0.0/16,168.10.0.0/18
226226
```
227227

228228
## Update or disable authorized IP ranges

‎articles/aks/concepts-storage.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ Applications often need to be able to store and retrieve data. As Kubernetes typ
3030
Traditional volumes to store and retrieve data are created as Kubernetes resources backed by Azure Storage. You can manually create these data volumes to be assigned to pods directly, or have Kubernetes automatically create them. These data volumes can use Azure Disks or Azure Files:
3131

3232
- *Azure Disks* can be used to create a Kubernetes *DataDisk* resource. Disks can use Azure Premium storage, backed by high-performance SSDs, or Azure Standard storage, backed by regular HDDs. For most production and development workloads, use Premium storage. Azure Disks are mounted as *ReadWriteOnce*, so are only available to a single node. For storage volumes that can be accessed by multiple nodes simultaneously, use Azure Files.
33-
- *Azure Files* can be used to mount an SMB 3.0 share backed by an Azure Storage account to pods. Files let you share data across multiple nodes and pods. Currently, Files can only use Azure Standard storage backed by regular HDDs.
33+
- *Azure Files* can be used to mount an SMB 3.0 share backed by an Azure Storage account to pods. Files let you share data across multiple nodes and pods. Files can use Azure Standard storage backed by regular HDDs, or Azure Premium storage, backed by high-performance SSDs.
34+
> [!NOTE]
35+
> Azure Files support premium storage in AKS clusters that run Kubernetes 1.13 or higher.
3436
3537
In Kubernetes, volumes can represent more than just a traditional disk where information can be stored and retrieved. Kubernetes volumes can also be used as a way to inject data into a pod for use by the containers. Common additional volume types in Kubernetes include:
3638

‎articles/aks/tutorial-kubernetes-prepare-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Stop and remove the container instances and resources with the [docker-compose d
101101
docker-compose down
102102
```
103103

104-
When the local application has been removed, you have a Docker image that contains the Azure Vote application, *azure-front-front*, for use with the next tutorial.
104+
When the local application has been removed, you have a Docker image that contains the Azure Vote application, *azure-vote-front*, for use with the next tutorial.
105105

106106
## Next steps
107107

‎articles/automation/automation-update-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ You can use the Update Management solution in Azure Automation to manage operati
1717
You can enable Update Management for virtual machines directly from your Azure Automation account. To learn how to enable Update Management for virtual machines from your Automation account, see [Manage updates for multiple virtual machines](manage-update-multi.md). You can also enable Update Management for a virtual machine from the virtual machine page in the Azure portal. This scenario is available for [Linux](../virtual-machines/linux/tutorial-monitoring.md#enable-update-management) and [Windows](../virtual-machines/windows/tutorial-monitoring.md#enable-update-management) virtual machines.
1818

1919
> [!NOTE]
20-
> The Update Management solution requires linking a Log Analytics workspace to your Automation account. For a definitive list of supported regions, see [https://docs.microsoft.com/en-us/azure/automation/how-to/region-mappings]. The region mappings do not affect the ability to manage virtual machines in a
20+
> The Update Management solution requires linking a Log Analytics workspace to your Automation account. For a definitive list of supported regions, see [Azure Workspace mappings](./how-to/region-mappings.md). The region mappings do not affect the ability to manage virtual machines in a
2121
> separate region than your Automation account.
2222
2323
[!INCLUDE [azure-monitor-log-analytics-rebrand](../../includes/azure-monitor-log-analytics-rebrand.md)]

‎articles/azure-functions/functions-bindings-signalr-service.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,14 +276,15 @@ The following example adds a user to a group.
276276
[FunctionName("addToGroup")]
277277
public static Task AddToGroup(
278278
[HttpTrigger(AuthorizationLevel.Anonymous, "post")]HttpRequest req,
279-
string userId,
279+
ClaimsPrincipal claimsPrincipal,
280280
[SignalR(HubName = "chat")]
281281
IAsyncCollector<SignalRGroupAction> signalRGroupActions)
282282
{
283+
var userIdClaim = claimsPrincipal.FindFirst(ClaimTypes.NameIdentifier);
283284
return signalRGroupActions.AddAsync(
284285
new SignalRGroupAction
285286
{
286-
UserId = userId,
287+
UserId = userIdClaim.Value,
287288
GroupName = "myGroup",
288289
Action = GroupAction.Add
289290
});
@@ -298,20 +299,24 @@ The following example removes a user from a group.
298299
[FunctionName("removeFromGroup")]
299300
public static Task RemoveFromGroup(
300301
[HttpTrigger(AuthorizationLevel.Anonymous, "post")]HttpRequest req,
301-
string userId,
302+
ClaimsPrincipal claimsPrincipal,
302303
[SignalR(HubName = "chat")]
303304
IAsyncCollector<SignalRGroupAction> signalRGroupActions)
304305
{
306+
var userIdClaim = claimsPrincipal.FindFirst(ClaimTypes.NameIdentifier);
305307
return signalRGroupActions.AddAsync(
306308
new SignalRGroupAction
307309
{
308-
UserId = userId,
310+
UserId = userIdClaim.Value,
309311
GroupName = "myGroup",
310312
Action = GroupAction.Remove
311313
});
312314
}
313315
```
314316

317+
> [!NOTE]
318+
> In order to get the `ClaimsPrincipal` correctly bound, you must have configured the authentication settings in Azure Functions.
319+
315320
### 2.x JavaScript send message output examples
316321

317322
#### Broadcast to all clients

‎articles/azure-monitor/insights/solution-office-365.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -565,12 +565,12 @@ These records are created when an Active Directory user attempts to log on.
565565
566566
| Property | Description |
567567
|:--- |:--- |
568-
| OfficeWorkload | AzureActiveDirectory |
569-
| RecordType | AzureActiveDirectoryAccountLogon |
570-
| Application | The application that triggers the account login event, such as Office 15. |
571-
| Client | Details about the client device, device OS, and device browser that was used for the of the account login event. |
572-
| LoginStatus | This property is from OrgIdLogon.LoginStatus directly. The mapping of various interesting logon failures could be done by alerting algorithms. |
573-
| UserDomain | The Tenant Identity Information (TII). |
568+
| `OfficeWorkload` | AzureActiveDirectory |
569+
| `RecordType` | AzureActiveDirectoryAccountLogon |
570+
| `Application` | The application that triggers the account login event, such as Office 15. |
571+
| `Client` | Details about the client device, device OS, and device browser that was used for the of the account login event. |
572+
| `LoginStatus` | This property is from OrgIdLogon.LoginStatus directly. The mapping of various interesting logon failures could be done by alerting algorithms. |
573+
| `UserDomain` | The Tenant Identity Information (TII). |
574574
575575
576576
### Azure Active Directory
@@ -748,4 +748,4 @@ The following table provides sample log searches for update records collected by
748748
749749
* Use [log queries in Azure Monitor](../log-query/log-query-overview.md) to view detailed update data.
750750
* [Create your own dashboards](../learn/tutorial-logs-dashboards.md) to display your favorite Office 365 search queries.
751-
* [Create alerts](../platform/alerts-overview.md) to be proactively notified of important Office 365 activities.
751+
* [Create alerts](../platform/alerts-overview.md) to be proactively notified of important Office 365 activities.

‎articles/azure-monitor/log-query/string-operations.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ ms.author: bwren
2525

2626
This article describes how to edit, compare, search in and perform a variety of other operations on strings.
2727

28-
Each character in a string has an index number, according to its location. The first character is at index 0, the next character is 1, and so one. Different string functions use index numbers as shown in the following sections. Many of the following examples use the **print** command for to demonstrate string manipulation without using a specific data source.
28+
Each character in a string has an index number, according to its location. The first character is at index 0, the next character is 1, and so on. Different string functions use index numbers as shown in the following sections. Many of the following examples use the **print** command for to demonstrate string manipulation without using a specific data source.
2929

3030

3131
## Strings and escaping them
32-
String values are wrapped with either with single or double quote characters. Backslash (\) is used to escape characters to the character following it, such as \t for tab, \n for newline, and \" the quote character itself.
32+
String values are wrapped with either with single or double quote characters. Backslash (\\) is used to escape characters to the character following it, such as \t for tab, \n for newline, and \" the quote character itself.
3333

3434
```Kusto
3535
print "this is a 'string' literal in double \" quotes"
@@ -85,7 +85,7 @@ Operator |Description |Case-Sensitive|Example (yie
8585

8686
## countof
8787

88-
Counts occurrences of a substring in a string. Can match plain strings or use regex. Plain string matches may overlap while regex matches don't.
88+
Counts occurrences of a substring in a string. Can match plain strings or use regex. Plain string matches may overlap while regex matches do not.
8989

9090
### Syntax
9191
```
@@ -124,7 +124,7 @@ print countof("abcabc", "a.c", "regex"); // result: 2
124124

125125
## extract
126126

127-
Gets a match for a regular expression from a given string. Optionally also converts the extracted substring the specified type.
127+
Gets a match for a regular expression from a given string. Optionally also converts the extracted substring to the specified type.
128128

129129
### Syntax
130130

‎articles/azure-monitor/platform/alert-management-solution.md

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -84,26 +84,26 @@ The solution does import alerts from System Center Operations Manager and create
8484

8585
| Property | Description |
8686
|:--- |:--- |
87-
| Type |*Alert* |
88-
| SourceSystem |*OpsManager* |
89-
| AlertContext |Details of the data item that caused the alert to be generated in XML format. |
90-
| AlertDescription |Detailed description of the alert. |
91-
| AlertId |GUID of the alert. |
92-
| AlertName |Name of the alert. |
93-
| AlertPriority |Priority level of the alert. |
94-
| AlertSeverity |Severity level of the alert. |
95-
| AlertState |Latest resolution state of the alert. |
96-
| LastModifiedBy |Name of the user who last modified the alert. |
97-
| ManagementGroupName |Name of the management group where the alert was generated. |
98-
| RepeatCount |Number of times the same alert was generated for the same monitored object since being resolved. |
99-
| ResolvedBy |Name of the user who resolved the alert. Empty if the alert has not yet been resolved. |
100-
| SourceDisplayName |Display name of the monitoring object that generated the alert. |
101-
| SourceFullName |Full name of the monitoring object that generated the alert. |
102-
| TicketId |Ticket ID for the alert if the System Center Operations Manager environment is integrated with a process for assigning tickets for alerts. Empty of no ticket ID is assigned. |
103-
| TimeGenerated |Date and time that the alert was created. |
104-
| TimeLastModified |Date and time that the alert was last changed. |
105-
| TimeRaised |Date and time that the alert was generated. |
106-
| TimeResolved |Date and time that the alert was resolved. Empty if the alert has not yet been resolved. |
87+
| `Type` |*Alert* |
88+
| `SourceSystem` |*OpsManager* |
89+
| `AlertContext` |Details of the data item that caused the alert to be generated in XML format. |
90+
| `AlertDescription` |Detailed description of the alert. |
91+
| `AlertId` |GUID of the alert. |
92+
| `AlertName` |Name of the alert. |
93+
| `AlertPriority` |Priority level of the alert. |
94+
| `AlertSeverity` |Severity level of the alert. |
95+
| `AlertState` |Latest resolution state of the alert. |
96+
| `LastModifiedBy` |Name of the user who last modified the alert. |
97+
| `ManagementGroupName` |Name of the management group where the alert was generated. |
98+
| `RepeatCount` |Number of times the same alert was generated for the same monitored object since being resolved. |
99+
| `ResolvedBy` |Name of the user who resolved the alert. Empty if the alert has not yet been resolved. |
100+
| `SourceDisplayName` |Display name of the monitoring object that generated the alert. |
101+
| `SourceFullName` |Full name of the monitoring object that generated the alert. |
102+
| `TicketId` |Ticket ID for the alert if the System Center Operations Manager environment is integrated with a process for assigning tickets for alerts. Empty of no ticket ID is assigned. |
103+
| `TimeGenerated` |Date and time that the alert was created. |
104+
| `TimeLastModified` |Date and time that the alert was last changed. |
105+
| `TimeRaised` |Date and time that the alert was generated. |
106+
| `TimeResolved` |Date and time that the alert was resolved. Empty if the alert has not yet been resolved. |
107107

108108
## Sample log searches
109109
The following table provides sample log searches for alert records collected by this solution:

‎articles/backup/backup-configure-vault.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ In this article you learn how to:
2727
The MARS agent is used by Azure Backup to back up files, folders, and system state from on-premises machines and Azure VMs to a backup Recovery Services vault in Azure. You can run the agent as follows:
2828

2929
- Run the agent directly on on-premises Windows machines so that they can back up directly to a backup Recovery Services vault in Azure.
30-
- Run the agent Azure VMs running Windows (side-by-side with the Azure VM backup extension) to back up specific files and folders on the VM.
30+
- Run the agent on Azure VMs running Windows (side-by-side with the Azure VM backup extension) to back up specific files and folders on the VM.
3131
- Run the agent on a Microsoft Azure Backup Server (MABS) or a System Center Data Protection - Manager (DPM) server. In this scenario, machines and workloads back up to MABS/DPM, and then MABS/DPM backs up to a vault in Azure using the MARS agent.
3232
What you can back up depends on where the agent is installed.
3333

‎articles/cloud-shell/overview.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,9 @@ Cloud Shell is a flexible tool that can be used from:
6666
* [Visual Studio Code Azure Account extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode.azure-account)
6767

6868
### Connect your Microsoft Azure Files storage
69-
Cloud Shell machines are temporary and require a new or existing Azure Files share to be mounted as `clouddrive` to persist your files.
69+
Cloud Shell machines are temporary, but your files are persisted in two ways: through a disk image, and through a mounted file share named `clouddrive`. On first launch, Cloud Shell prompts to create a resource group, storage account, and Azure Files share on your behalf. This is a one-time step and will be automatically attached for all sessions. A single file share can be mapped and will be used by both Bash and PowerShell in Cloud Shell.
7070

71-
On first launch Cloud Shell prompts to create a resource group, storage account, and Azure Files share on your behalf. This is a one-time step and will be automatically attached for all sessions. A single file share can be mapped and will be used by both Bash and PowerShell in Cloud Shell.
72-
73-
Read more to learn how to mount a [new or existing storage account](persisting-shell-storage.md).
71+
Read more to learn how to mount a [new or existing storage account](persisting-shell-storage.md) or to learn about the [persistence mechanisms used in Cloud Shell](persisting-shell-storage.md#how-cloud-shell-storage-works).
7472

7573
## Concepts
7674
* Cloud Shell runs on a temporary host provided on a per-session, per-user basis

‎articles/data-factory/transform-data-using-stored-procedure.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,17 @@ The following table describes these JSON properties:
7070
| storedProcedureName | Specify the name of the stored procedure to invoke. | Yes |
7171
| storedProcedureParameters | Specify the values for stored procedure parameters. Use `"param1": { "value": "param1Value","type":"param1Type" }` to pass parameter values and their type supported by the data source. If you need to pass null for a parameter, use `"param1": { "value": null }` (all lower case). | No |
7272

73+
## Parameter data type mapping
74+
The data type you specify for the parameter is the Azure Data Factory type that maps to the data type in the data source you are using. You can find the data type mappings for your data source in the connectors area. Some examples are
75+
76+
| Data Source | Data Type Mapping |
77+
| ---------------------|-------------------|
78+
| Azure SQL Data Warehouse | https://docs.microsoft.com/en-us/azure/data-factory/connector-azure-sql-data-warehouse#data-type-mapping-for-azure-sql-data-warehouse |
79+
| Azure SQL Database | https://docs.microsoft.com/en-us/azure/data-factory/connector-azure-sql-database#data-type-mapping-for-azure-sql-database |
80+
| Oracle | https://docs.microsoft.com/en-us/azure/data-factory/connector-oracle#data-type-mapping-for-oracle |
81+
| SQL Server | https://docs.microsoft.com/en-us/azure/data-factory/connector-sql-server#data-type-mapping-for-sql-server |
82+
83+
7384
## Error info
7485

7586
When a stored procedure fails and returns error details, you can't capture the error info directly in the activity output. However, Data Factory pumps all of its activity run events to Azure Monitor. Among the events that Data Factory pumps to Azure Monitor, it pushes error details there. You can, for example, set up email alerts from those events. For more info, see [Alert and Monitor data factories using Azure Monitor](monitor-using-azure-monitor.md).

0 commit comments

Comments
 (0)