Skip to content

Commit bba811b

Browse files
PMEds28PMEds28
authored
Merge pull request #86641 from MicrosoftDocs/master
Merge Master to Live, 3 AM
2 parents 94ee81a + 8276e0e commit bba811b

File tree

189 files changed

+2652
-2004
lines changed

Some content is hidden

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

189 files changed

+2652
-2004
lines changed

‎.openpublishing.redirection.json

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41483,8 +41483,23 @@
4148341483
},
4148441484
{
4148541485
"source_path": "articles/machine-learning/service/tutorial-data-prep.md",
41486-
"redirect_url": "/azure/machine-learning/service/tutorial-auto-train-models",
41487-
"redirect_document_id": false
41486+
"redirect_url": "/azure/machine-learning/service/tutorial-auto-train-models",
41487+
"redirect_document_id": false
41488+
},
41489+
{
41490+
"source_path": "articles/cognitive-services/text-analytics/how-tos/deploy-sentiment-analysis-on-container-instances.md",
41491+
"redirect_url": "/azure/cognitive-services/text-analytics/how-tos/text-analytics-how-to-use-container-instances?tabs=sentiment",
41492+
"redirect_document_id": false
41493+
},
41494+
{
41495+
"source_path": "articles/cognitive-services/text-analytics/how-tos/use-language-detection-on-aks.md",
41496+
"redirect_url": "/azure/cognitive-services/text-analytics/how-tos/text-analytics-how-to-use-kubernetes-service?tabs=language",
41497+
"redirect_document_id": false
41498+
},
41499+
{
41500+
"source_path": "articles/cognitive-services/text-analytics/how-tos/use-sentiment-analysis-on-aks.md",
41501+
"redirect_url": "/azure/cognitive-services/text-analytics/how-tos/text-analytics-how-to-use-kubernetes-service?tabs=sentiment",
41502+
"redirect_document_id": false
4148841503
}
4148941504
]
4149041505
}

‎articles/active-directory/authentication/concept-authentication-methods.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,8 @@ To work properly, phone numbers must be in the format *+CountryCode PhoneNumber*
192192
>
193193
> Password reset does not support phone extensions. Even in the +1 4255551234X12345 format, extensions are removed before the call is placed.
194194
195+
Microsoft does not guarantee consistent SMS or Voice-based Multi-Factor Authentication prompt delivery by the same number. In the interest of our users, Microsoft may add or remove Short codes at any time as we make route adjustments to improve SMS deliverability. Microsoft does not support short codes for countries/regions besides the United States and Canada.
196+
195197
#### Text message
196198

197199
An SMS is sent to the mobile phone number containing a verification code. Enter the verification code provided in the sign-in interface to continue.

‎articles/active-directory/saas-apps/cisco-webex-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
115115

116116
d. Select Source as **Attribute**.
117117

118-
e. From the **Source attribute** list, type the attribute value shown for that row.
118+
e. From the **Source attribute** list, select the attribute value shown for that row from the drop-down list.
119119

120120
f. Click **Save**.
121121

@@ -205,4 +205,4 @@ When you click the Cisco Webex Meetings tile in the Access Panel, you should be
205205

206206
- [What is conditional access in Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/conditional-access/overview)
207207

208-
- [Try ServiceNow with Azure AD](https://aad.portal.azure.com)
208+
- [Try ServiceNow with Azure AD](https://aad.portal.azure.com)

‎articles/api-management/api-management-using-with-vnet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ When an API Management service instance is hosted in a VNET, the ports in the fo
138138

139139
+ **SMTP Relay**: Outbound network connectivity for the SMTP Relay, which resolves under the host `smtpi-co1.msn.com`, `smtpi-ch1.msn.com`, `smtpi-db3.msn.com`, `smtpi-sin.msn.com` and `ies.global.microsoft.com`
140140

141-
+ **Developer portal CAPTCHA**: Outbound network connectivity for the developer portal's CAPTCHA, which resolves under the host `client.hip.live.com`.
141+
+ **Developer portal CAPTCHA**: Outbound network connectivity for the developer portal's CAPTCHA, which resolves under the hosts `client.hip.live.com` and `partner.hip.live.com`.
142142

143143
+ **Azure portal Diagnostics**: To enable the flow of diagnostic logs from Azure portal when using the API Management extension from inside a Virtual Network, outbound access to `dc.services.visualstudio.com` on port 443 is required. This helps in troubleshooting issues you might face when using extension.
144144

‎articles/application-gateway/troubleshoot-app-service-redirection-app-service-url.md

Lines changed: 40 additions & 36 deletions
Large diffs are not rendered by default.

‎articles/azure-functions/functions-create-first-java-maven.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ ms.devlang: java
1313
ms.date: 08/10/2018
1414
ms.author: routlaw
1515
ms.reviewer: glenga
16-
ms.custom: mvc, devcenter, seo-java-july2019
16+
ms.custom: mvc, devcenter, seo-java-july2019, seo-java-august2019
1717
---
1818

19-
# Create your first function with Java and Maven
19+
# Quickstart: Use Java to create and publish a function to Azure Functions
2020

2121
This article guides you through using the Maven command-line tool to build and publish a Java function to Azure Functions. When you're done, your function code runs on the [Consumption Plan](functions-scale.md#consumption-plan) in Azure and can be triggered using an HTTP request.
2222

‎articles/azure-monitor/platform/itsmc-overview.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ITSMC supports connections with the following ITSM tools:
3030
- Provance
3131
- Cherwell
3232

33-
With ITSMC, you can
33+
With ITSMC, you can:
3434

3535
- Create work items in ITSM tool, based on your Azure alerts (metric alerts, Activity Log alerts and Log Analytics alerts).
3636
- Optionally, you can sync your incident and change request data from your ITSM tool to an Azure Log Analytics workspace.
@@ -99,7 +99,7 @@ Once you have prepped your ITSM tools, follow the steps below to create a connec
9999
4. Specify the connection settings as described in [Configuring the ITSMC connection with your ITSM products/services article](../../azure-monitor/platform/itsmc-connections.md).
100100

101101
> [!NOTE]
102-
>
102+
>
103103
> By default, ITSMC refreshes the connection's configuration data once in every 24 hours. To refresh your connection's data instantly for any edits or template updates that you make, click the **Sync** button on your connection's blade.
104104
105105
![Connection refresh](media/itsmc-overview/itsmc-connections-refresh.png)
@@ -137,7 +137,7 @@ Use the following procedure:
137137
When creating/editing an Azure alert rule, use an Action group, which has an ITSM Action. When the alert triggers, work item is created/updated in the ITSM tool.
138138

139139
> [!NOTE]
140-
>
140+
>
141141
> For information on pricing of ITSM Action, see the [pricing page](https://azure.microsoft.com/pricing/details/monitor/) for Action Groups.
142142
143143

@@ -170,7 +170,7 @@ Incidents and change requests are synced from your ITSM product to your Log Anal
170170
The following information shows examples of data gathered by ITSMC:
171171

172172
> [!NOTE]
173-
>
173+
>
174174
> Depending on the work item type imported into Log Analytics, **ServiceDesk_CL** contains the following fields:
175175
176176
**Work item:** **Incidents**

‎articles/azure-monitor/platform/metrics-supported.md

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1429,33 +1429,33 @@ Azure Monitor provides several ways to interact with metrics, including charting
14291429
|---|---|---|---|---|---|
14301430
|cpu_percent|CPU percentage|Percent|Average|CPU percentage|No Dimensions|
14311431
|physical_data_read_percent|Data IO percentage|Percent|Average|Data IO percentage|No Dimensions|
1432-
|log_write_percent|Log IO percentage|Percent|Average|Log IO percentage|No Dimensions|
1433-
|dtu_consumption_percent|DTU percentage|Percent|Average|DTU percentage|No Dimensions|
1434-
|storage|Data space used|Bytes|Maximum|Total database size|No Dimensions|
1432+
|log_write_percent|Log IO percentage|Percent|Average|Log IO percentage. Not applicable to data warehouses.|No Dimensions|
1433+
|dtu_consumption_percent|DTU percentage|Percent|Average|DTU percentage. Applies to DTU-based databases.|No Dimensions|
1434+
|storage|Data space used|Bytes|Maximum|Total database size. Not applicable to data warehouses.|No Dimensions|
14351435
|connection_successful|Successful Connections|Count|Total|Successful Connections|No Dimensions|
14361436
|connection_failed|Failed Connections|Count|Total|Failed Connections|No Dimensions|
14371437
|blocked_by_firewall|Blocked by Firewall|Count|Total|Blocked by Firewall|No Dimensions|
1438-
|deadlock|Deadlocks|Count|Total|Deadlocks|No Dimensions|
1439-
|storage_percent|Data space used percent|Percent|Maximum|Database size percentage|No Dimensions|
1440-
|xtp_storage_percent|In-Memory OLTP storage percent|Percent|Average|In-Memory OLTP storage percent|No Dimensions|
1441-
|workers_percent|Workers percentage|Percent|Average|Workers percentage|No Dimensions|
1442-
|sessions_percent|Sessions percentage|Percent|Average|Sessions percentage|No Dimensions|
1443-
|dtu_limit|DTU Limit|Count|Average|DTU Limit|No Dimensions|
1444-
|dtu_used|DTU used|Count|Average|DTU used|No Dimensions|
1445-
|cpu_limit|CPU limit|Count|Average|CPU limit|No Dimensions|
1446-
|cpu_used|CPU used|Count|Average|CPU used|No Dimensions|
1447-
|dwu_limit|DWU limit|Count|Maximum|DWU limit|No Dimensions|
1448-
|dwu_consumption_percent|DWU percentage|Percent|Maximum|DWU percentage|No Dimensions|
1449-
|dwu_used|DWU used|Count|Maximum|DWU used|No Dimensions|
1438+
|deadlock|Deadlocks|Count|Total|Deadlocks. Not applicable to data warehouses.|No Dimensions|
1439+
|storage_percent|Data space used percent|Percent|Maximum|Database size percentage. Not applicable to data warehouses or hyperscale databases.|No Dimensions|
1440+
|xtp_storage_percent|In-Memory OLTP storage percent|Percent|Average|In-Memory OLTP storage percent. Not applicable to data warehouses.|No Dimensions|
1441+
|workers_percent|Workers percentage|Percent|Average|Workers percentage. Not applicable to data warehouses.|No Dimensions|
1442+
|sessions_percent|Sessions percentage|Percent|Average|Sessions percentage. Not applicable to data warehouses.|No Dimensions|
1443+
|dtu_limit|DTU Limit|Count|Average|DTU Limit. Applies to DTU-based databases.|No Dimensions|
1444+
|dtu_used|DTU used|Count|Average|DTU used. Applies to DTU-based databases.|No Dimensions|
1445+
|cpu_limit|CPU limit|Count|Average|CPU limit. Applies to vCore-based databases.|No Dimensions|
1446+
|cpu_used|CPU used|Count|Average|CPU used. Applies to vCore-based databases.|No Dimensions|
1447+
|dwu_limit|DWU limit|Count|Maximum|DWU limit. Applies only to data warehouses.|No Dimensions|
1448+
|dwu_consumption_percent|DWU percentage|Percent|Maximum|DWU percentage. Applies only to data warehouses.|No Dimensions|
1449+
|dwu_used|DWU used|Count|Maximum|DWU used. Applies only to data warehouses.|No Dimensions|
14501450
|dw_cpu_percent|DW node level CPU percentage|Percent|Average|DW node level CPU percentage|DwLogicalNodeId|
14511451
|dw_physical_data_read_percent|DW node level Data IO percentage|Percent|Average|DW node level Data IO percentage|DwLogicalNodeId|
1452-
|cache_hit_percent|Cache hit percentage|Percent|Maximum|Cache hit percentage|No Dimensions|
1453-
|cache_used_percent|Cache used percentage|Percent|Maximum|Cache used percentage|No Dimensions|
1454-
|local_tempdb_usage_percent|Local tempdb percentage|Percent|Average|Local tempdb percentage|No Dimensions|
1455-
|app_cpu_billed|App CPU billed|Count|Total|App CPU billed|No Dimensions|
1456-
|app_cpu_percent|App CPU percentage|Percent|Average|App CPU percentage|No Dimensions|
1457-
|app_memory_percent|App memory used percentage|Percent|Average|App memory used percentage|No Dimensions|
1458-
|allocated_data_storage|Data space allocated|Bytes|Average|Data space allocated|No Dimensions|
1452+
|cache_hit_percent|Cache hit percentage|Percent|Maximum|Cache hit percentage. Applies only to data warehouses.|No Dimensions|
1453+
|cache_used_percent|Cache used percentage|Percent|Maximum|Cache used percentage. Applies only to data warehouses.|No Dimensions|
1454+
|local_tempdb_usage_percent|Local tempdb percentage|Percent|Average|Local tempdb percentage. Applies only to data warehouses.|No Dimensions|
1455+
|app_cpu_billed|App CPU billed|Count|Total|App CPU billed. Applies to serverless databases.|No Dimensions|
1456+
|app_cpu_percent|App CPU percentage|Percent|Average|App CPU percentage. Applies to serverless databases.|No Dimensions|
1457+
|app_memory_percent|App memory used percentage|Percent|Average|App memory used percentage. Applies to serverless databases.|No Dimensions|
1458+
|allocated_data_storage|Data space allocated|Bytes|Average|Data space allocated. Not applicable to data warehouses.|No Dimensions|
14591459

14601460
## Microsoft.Sql/servers/elasticPools
14611461

@@ -1464,17 +1464,17 @@ Azure Monitor provides several ways to interact with metrics, including charting
14641464
|cpu_percent|CPU percentage|Percent|Average|CPU percentage|No Dimensions|
14651465
|physical_data_read_percent|Data IO percentage|Percent|Average|Data IO percentage|No Dimensions|
14661466
|log_write_percent|Log IO percentage|Percent|Average|Log IO percentage|No Dimensions|
1467-
|dtu_consumption_percent|DTU percentage|Percent|Average|DTU percentage|No Dimensions|
1467+
|dtu_consumption_percent|DTU percentage|Percent|Average|DTU percentage. Applies to DTU-based elastic pools.|No Dimensions|
14681468
|storage_percent|Data space used percent||Percent|Average|Storage percentage|No Dimensions|
14691469
|workers_percent|Workers percentage|Percent|Average|Workers percentage|No Dimensions|
14701470
|sessions_percent|Sessions percentage|Percent|Average|Sessions percentage|No Dimensions|
1471-
|eDTU_limit|eDTU limit|Count|Average|eDTU limit|No Dimensions|
1471+
|eDTU_limit|eDTU limit|Count|Average|eDTU limit. Applies to DTU-based elastic pools.|No Dimensions|
14721472
|storage_limit|Data max size|Bytes|Average|Storage limit|No Dimensions|
1473-
|eDTU_used|eDTU used|Count|Average|eDTU used|No Dimensions|
1473+
|eDTU_used|eDTU used|Count|Average|eDTU used. Applies to DTU-based elastic pools.|No Dimensions|
14741474
|storage_used|Data space used|Bytes|Average|Storage used|No Dimensions|
14751475
|xtp_storage_percent|In-Memory OLTP storage percent|Percent|Average|In-Memory OLTP storage percent|No Dimensions|
1476-
|cpu_limit|CPU limit|Count|Average|CPU limit|No Dimensions|
1477-
|cpu_used|CPU used|Count|Average|CPU used|No Dimensions|
1476+
|cpu_limit|CPU limit|Count|Average|CPU limit. Applies to vCore-based elastic pools.|No Dimensions|
1477+
|cpu_used|CPU used|Count|Average|CPU used. Applies to vCore-based elastic pools.|No Dimensions|
14781478
|allocated_data_storage|Data space allocated|Bytes|Average|Data space allocated|No Dimensions|
14791479
|allocated_data_storage_percent|Data space allocated percent|Percent|Maximum|Data space allocated percent|No Dimensions|
14801480

‎articles/azure-netapp-files/azure-netapp-files-solution-architectures.md

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,32 @@ ms.workload: storage
1313
ms.tgt_pltfrm: na
1414
ms.devlang: na
1515
ms.topic: conceptual
16-
ms.date: 08/07/2019
16+
ms.date: 08/26/2019
1717
ms.author: b-juche
1818
---
1919
# Solution architectures using Azure NetApp Files
2020
This article provides references to best practices that can help you understand the solution architectures for using Azure NetApp Files.
2121

22-
## Solutions for Azure Kubernetes Service (AKS)
22+
## Azure Kubernetes Service (AKS) solutions
2323

24-
[Azure NetApp Files integration with AKS](https://github.com/andyzhangx/demo/tree/master/linux/nfs)
24+
* [Azure NetApp Files integration with AKS](https://github.com/andyzhangx/demo/tree/master/linux/nfs)
2525

26-
## Solutions for Oracle database
26+
## Oracle database solutions
2727

2828
* [Oracle on Azure deployment best practice guide using Azure NetApp Files](https://www.netapp.com/us/media/tr-4780.pdf)
2929
* [Oracle VM images and their deployment on Microsoft Azure: Shared storage configuration options](https://docs.microsoft.com/azure/virtual-machines/workloads/oracle/oracle-vm-solutions#shared-storage-configuration-options)
3030

31-
## Solutions for SAP applications
31+
## SAP application solutions
3232

3333
* [SAP applications on Microsoft Azure using Azure NetApp Files](https://www.netapp.com/us/media/tr-4746.pdf)
3434
* [High availability for SAP NetWeaver on Azure VMs on SUSE Linux Enterprise Server with Azure NetApp Files for SAP applications](https://docs.microsoft.com/azure/virtual-machines/workloads/sap/high-availability-guide-suse-netapp-files)
3535
* [Azure Virtual Machines high availability for SAP NetWeaver on Red Hat Enterprise Linux with Azure NetApp Files for SAP applications](https://docs.microsoft.com/azure/virtual-machines/workloads/sap/high-availability-guide-rhel-netapp-files)
3636

37-
## Talon solutions
37+
## Talon solutions
38+
39+
* [Globally distributed enterprise file sharing with Azure NetApp Files and Talon FAST™](https://www.talonstorage.com/products/azure-netapp-files)
40+
41+
## Windows Virtual Desktop/VDI solutions
42+
43+
* [Create an FSLogix profile container for a host pool using Azure NetApp Files](https://docs.microsoft.com/azure/virtual-desktop/create-fslogix-profile-container)
3844

39-
[Globally distributed enterprise file sharing with Azure NetApp Files and Talon FAST™](https://www.talonstorage.com/products/azure-netapp-files)

‎articles/azure-supportability/index.md

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)