Skip to content

Commit ed53912

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into incGA
2 parents 747d43b + 84cf1c5 commit ed53912

File tree

15 files changed

+424
-134
lines changed

15 files changed

+424
-134
lines changed

articles/active-directory-domain-services/tutorial-configure-ldaps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ The certificate you request or create must meet the following requirements. Your
6666
* **Key usage** - The certificate must be configured for *digital signatures* and *key encipherment*.
6767
* **Certificate purpose** - The certificate must be valid for SSL server authentication.
6868

69-
In this tutorial, let's create a self-signed certificate for secure LDAP using the [New-SelfSignedCertificate][New-SelfSignedCertificate] cmdlet. Open a PowerShell window as **Administrator** and run the following commands. Replace the *$dnsName* variable with the DNS name used by your own managed domain, such as *aaddscontoso.com*:
69+
There are several tools available to create self-signed certificate such as OpenSSL, Keytool, MakeCert, [New-SelfSignedCertificate][New-SelfSignedCertificate] cmdlet etc. In this tutorial, let's create a self-signed certificate for secure LDAP using the [New-SelfSignedCertificate][New-SelfSignedCertificate] cmdlet. Open a PowerShell window as **Administrator** and run the following commands. Replace the *$dnsName* variable with the DNS name used by your own managed domain, such as *aaddscontoso.com*:
7070

7171
```powershell
7272
# Define your own DNS name used by your Azure AD DS managed domain
@@ -140,7 +140,7 @@ Before you can use the digital certificate created in the previous step with you
140140
1. As this certificate is used to decrypt data, you should carefully control access. A password can be used to protect the use of the certificate. Without the correct password, the certificate can't be applied to a service.
141141

142142
On the **Security** page, choose the option for **Password** to protect the *.PFX* certificate file. Enter and confirm a password, then select **Next**. This password is used in the next section to enable secure LDAP for your Azure AD DS managed domain.
143-
1. On the **File to Export** page, specify the file name and location where you'd like to export the certificate, such as *C:\Users\accountname\azure-ad-ds.pfx*.
143+
1. On the **File to Export** page, specify the file name and location where you'd like to export the certificate, such as *C:\Users\accountname\azure-ad-ds.pfx*. Keep a note of the password and location of the *.PFX* file as this information would be required in next steps.
144144
1. On the review page, select **Finish** to export the certificate to a *.PFX* certificate file. A confirmation dialog is displayed when the certificate has been successfully exported.
145145
1. Leave the MMC open for use in the following section.
146146

articles/cosmos-db/sql-query-st-distance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.author: girobins
99
ms.custom: query-reference
1010
---
1111
# ST_DISTANCE (Azure Cosmos DB)
12-
Returns the distance between the two GeoJSON Point, Polygon, or LineString expressions.
12+
Returns the distance between the two GeoJSON Point, Polygon, MultiPolygon or LineString expressions. To learn more, see the [Geospatial and GeoJSON location data](sql-query-geospatial-intro.md) article.
1313

1414
## Syntax
1515

articles/expressroute/expressroute-locations-providers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ The following table shows connectivity locations and the service providers for e
7676
| **Amsterdam2** | [Interxion AMS8](https://www.interxion.com/Locations/amsterdam/schiphol/) | 1 | West Europe | 10G, 100G | CenturyLink Cloud Connect, Colt, DE-CIX, euNetworks, Interxion, Orange, Vodafone |
7777
| **Atlanta** | [Equinix AT2](https://www.equinix.com/locations/americas-colocation/united-states-colocation/atlanta-data-centers/at2/) | 1 | n/a | n/a | Equinix, Megaport |
7878
| **Auckland** | [Vocus Group NZ Albany](https://www.vocus.co.nz/business/cloud-data-centres) | 2 | n/a | 10G | Devoli, Kordia, Megaport, Spark NZ, Vocus Group NZ |
79-
| **Bangkok** | [AIS](http://business.ais.co.th/solution/microsoft-azure.html?category=cloud) | 2 | n/a | 10G | AIS |
79+
| **Bangkok** | [AIS](https://business.ais.co.th/solution/en/azure-expressroute.html) | 2 | n/a | 10G | AIS |
8080
| **Busan** | [LG CNS](https://www.lgcns.com/datacenter) | 2 | Korea South | n/a | LG CNS |
8181
| **Canberra** | [CDC](https://cdcdatacentres.com.au/content/about-cdc) | 1 | Australia Central | 10G, 100G | CDC |
8282
| **Canberra2** | [CDC](https://cdcdatacentres.com.au/content/about-cdc) | 1 | Australia Central 2| 10G, 100G | CDC |

articles/expressroute/expressroute-locations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ The following table shows locations by service provider. If you want to view ava
7474
| --- | --- | --- | --- |
7575
| **[AARNet](https://www.aarnet.edu.au/network-and-services/connectivity-services/azure-expressroute)** |Supported |Supported |Melbourne, Sydney |
7676
| **[Airtel](https://www.airtel.in/business/#/)** | Supported | Supported | Chennai2, Mumbai2 |
77-
| **[AIS](http://business.ais.co.th/solution/microsoft-azure.html?category=cloud)** | Supported | Supported | Bangkok |
77+
| **[AIS](https://business.ais.co.th/solution/en/azure-expressroute.html)** | Supported | Supported | Bangkok |
7878
| **[Aryaka Networks](https://www.aryaka.com/)** |Supported |Supported |Amsterdam, Chicago, Dallas, Hong Kong SAR, Sao Paulo, Seattle, Silicon Valley, Singapore, Tokyo, Washington DC |
7979
| **[Ascenty Data Centers](https://www.ascenty.com/en/cloud/microsoft-express-route)** |Supported |Supported |Sao Paulo |
8080
| **[AT&T NetBond](https://www.synaptic.att.com/clouduser/html/productdetail/ATT_NetBond.htm)** |Supported |Supported |Amsterdam, Chicago, Dallas, London, Silicon Valley, Singapore, Sydney, Tokyo, Toronto, Washington DC |

articles/mariadb/concepts-limits.md

Lines changed: 125 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,32 @@ author: ajlam
55
ms.author: andrela
66
ms.service: mariadb
77
ms.topic: conceptual
8-
ms.date: 12/09/2019
8+
ms.date: 3/9/2020
99
---
1010
# Limitations in Azure Database for MariaDB
1111
The following sections describe capacity, storage engine support, privilege support, data manipulation statement support, and functional limits in the database service.
1212

13-
## Maximum connections
14-
The maximum number of connections per pricing tier and vCores are as follows:
15-
16-
|**Pricing Tier**|**vCore(s)**| **Max Connections**|
17-
|---|---|---|
18-
|Basic| 1| 50|
19-
|Basic| 2| 100|
20-
|General Purpose| 2| 600|
21-
|General Purpose| 4| 1250|
22-
|General Purpose| 8| 2500|
23-
|General Purpose| 16| 5000|
24-
|General Purpose| 32| 10000|
25-
|General Purpose| 64| 20000|
26-
|Memory Optimized| 2| 800|
27-
|Memory Optimized| 4| 2500|
28-
|Memory Optimized| 8| 5000|
29-
|Memory Optimized| 16| 10000|
30-
|Memory Optimized| 32| 20000|
13+
## Server parameters
14+
15+
The minimum and maximum values of several popular server parameters are determined by the pricing tier and vCores. Refer to the below tables for limits.
16+
17+
### max_connections
18+
19+
|**Pricing Tier**|**vCore(s)**|**Default value**|**Min value**|**Max value**|
20+
|---|---|---|---|---|
21+
|Basic|1|50|10|50|
22+
|Basic|2|100|10|100|
23+
|General Purpose|2|300|10|600|
24+
|General Purpose|4|625|10|1250|
25+
|General Purpose|8|1250|10|2500|
26+
|General Purpose|16|2500|10|5000|
27+
|General Purpose|32|5000|10|10000|
28+
|General Purpose|64|10000|10|20000|
29+
|Memory Optimized|2|600|10|800|
30+
|Memory Optimized|4|1250|10|2500|
31+
|Memory Optimized|8|2500|10|5000|
32+
|Memory Optimized|16|5000|10|10000|
33+
|Memory Optimized|32|10000|10|20000|
3134

3235
When connections exceed the limit, you may receive the following error:
3336
> ERROR 1040 (08004): Too many connections
@@ -37,6 +40,108 @@ When connections exceed the limit, you may receive the following error:
3740
3841
Creating new client connections to MariaDB takes time and once established, these connections occupy database resources, even when idle. Most applications request many short-lived connections, which compounds this situation. The result is fewer resources available for your actual workload leading to decreased performance. A connection pooler that decreases idle connections and reuses existing connections will help avoid this. To learn about setting up ProxySQL, visit our [blog post](https://techcommunity.microsoft.com/t5/azure-database-for-mysql/load-balance-read-replicas-using-proxysql-in-azure-database-for/ba-p/880042).
3942

43+
## query_cache_size
44+
45+
The query cache is turned off by default. To enable the query cache, configure the `query_cache_type` parameter.
46+
47+
Review the [MariaDB documentation](https://mariadb.com/kb/en/server-system-variables/#query_cache_size) to learn more about this parameter.
48+
49+
|**Pricing Tier**|**vCore(s)**|**Default value**|**Min value**|**Max value**|
50+
|---|---|---|---|---|
51+
|Basic|1|Not configurable in Basic tier|N/A|N/A|
52+
|Basic|2|Not configurable in Basic tier|N/A|N/A|
53+
|General Purpose|2|0|0|16777216|
54+
|General Purpose|4|0|0|33554432|
55+
|General Purpose|8|0|0|67108864|
56+
|General Purpose|16|0|0|134217728|
57+
|General Purpose|32|0|0|134217728|
58+
|General Purpose|64|0|0|134217728|
59+
|Memory Optimized|2|0|0|33554432|
60+
|Memory Optimized|4|0|0|67108864|
61+
|Memory Optimized|8|0|0|134217728|
62+
|Memory Optimized|16|0|0|134217728|
63+
|Memory Optimized|32|0|0|134217728|
64+
65+
## sort_buffer_size
66+
67+
Review the [MariaDB documentation](https://mariadb.com/kb/en/server-system-variables/#sort_buffer_size) to learn more about this parameter.
68+
69+
|**Pricing Tier**|**vCore(s)**|**Default value**|**Min value**|**Max value**|
70+
|---|---|---|---|---|
71+
|Basic|1|Not configurable in Basic tier|N/A|N/A|
72+
|Basic|2|Not configurable in Basic tier|N/A|N/A|
73+
|General Purpose|2|524288|32768|4194304|
74+
|General Purpose|4|524288|32768|8388608|
75+
|General Purpose|8|524288|32768|16777216|
76+
|General Purpose|16|524288|32768|33554432|
77+
|General Purpose|32|524288|32768|33554432|
78+
|General Purpose|64|524288|32768|33554432|
79+
|Memory Optimized|2|524288|32768|8388608|
80+
|Memory Optimized|4|524288|32768|16777216|
81+
|Memory Optimized|8|524288|32768|33554432|
82+
|Memory Optimized|16|524288|32768|33554432|
83+
|Memory Optimized|32|524288|32768|33554432|
84+
85+
## join_buffer_size
86+
87+
Review the [MariaDB documentation](https://mariadb.com/kb/en/server-system-variables/#join_buffer_size) to learn more about this parameter.
88+
89+
|**Pricing Tier**|**vCore(s)**|**Default value**|**Min value**|**Max value**|
90+
|---|---|---|---|---|
91+
|Basic|1|Not configurable in Basic tier|N/A|N/A|
92+
|Basic|2|Not configurable in Basic tier|N/A|N/A|
93+
|General Purpose|2|262144|128|268435455|
94+
|General Purpose|4|262144|128|536870912|
95+
|General Purpose|8|262144|128|1073741824|
96+
|General Purpose|16|262144|128|2147483648|
97+
|General Purpose|32|262144|128|4294967295|
98+
|General Purpose|64|262144|128|4294967295|
99+
|Memory Optimized|2|262144|128|536870912|
100+
|Memory Optimized|4|262144|128|1073741824|
101+
|Memory Optimized|8|262144|128|2147483648|
102+
|Memory Optimized|16|262144|128|4294967295|
103+
|Memory Optimized|32|262144|128|4294967295|
104+
105+
## max_heap_table_size
106+
107+
Review the [MariaDB documentation](https://mariadb.com/kb/en/server-system-variables/#max_heap_table_size) to learn more about this parameter.
108+
109+
|**Pricing Tier**|**vCore(s)**|**Default value**|**Min value**|**Max value**|
110+
|---|---|---|---|---|
111+
|Basic|1|Not configurable in Basic tier|N/A|N/A|
112+
|Basic|2|Not configurable in Basic tier|N/A|N/A|
113+
|General Purpose|2|16777216|16384|268435455|
114+
|General Purpose|4|16777216|16384|536870912|
115+
|General Purpose|8|16777216|16384|1073741824|
116+
|General Purpose|16|16777216|16384|2147483648|
117+
|General Purpose|32|16777216|16384|4294967295|
118+
|General Purpose|64|16777216|16384|4294967295|
119+
|Memory Optimized|2|16777216|16384|536870912|
120+
|Memory Optimized|4|16777216|16384|1073741824|
121+
|Memory Optimized|8|16777216|16384|2147483648|
122+
|Memory Optimized|16|16777216|16384|4294967295|
123+
|Memory Optimized|32|16777216|16384|4294967295|
124+
125+
## tmp_table_size
126+
127+
Review the [MariaDB documentation](https://mariadb.com/kb/en/server-system-variables/#tmp_table_size) to learn more about this parameter.
128+
129+
|**Pricing Tier**|**vCore(s)**|**Default value**|**Min value**|**Max value**|
130+
|---|---|---|---|---|
131+
|Basic|1|Not configurable in Basic tier|N/A|N/A|
132+
|Basic|2|Not configurable in Basic tier|N/A|N/A|
133+
|General Purpose|2|16777216|1024|67108864|
134+
|General Purpose|4|16777216|1024|134217728|
135+
|General Purpose|8|16777216|1024|268435456|
136+
|General Purpose|16|16777216|1024|536870912|
137+
|General Purpose|32|16777216|1024|1073741824|
138+
|General Purpose|64|16777216|1024|1073741824|
139+
|Memory Optimized|2|16777216|1024|134217728|
140+
|Memory Optimized|4|16777216|1024|268435456|
141+
|Memory Optimized|8|16777216|1024|536870912|
142+
|Memory Optimized|16|16777216|1024|1073741824|
143+
|Memory Optimized|32|16777216|1024|1073741824|
144+
40145
## Storage engine support
41146

42147
### Supported
@@ -92,5 +197,5 @@ Requires super privileges to create and is restricted. If importing data using a
92197
- MariaDB server instance displays the incorrect server version after connection is established. To get the correct server instance engine version, use the `select version();` command.
93198

94199
## Next steps
95-
- [Whats available in each service tier](concepts-pricing-tiers.md)
200+
- [What's available in each service tier](concepts-pricing-tiers.md)
96201
- [Supported MariaDB database versions](concepts-supported-versions.md)

articles/media-services/latest/manage-streaming-endpoints-howto.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ Review:
3939
## Use the Azure portal
4040

4141
1. Sign in at the [Azure portal](https://portal.azure.com/).
42+
1. Navigate to your Azure Media Services account.
4243
1. On the left, select **Streaming Endpoints**.
4344
1. Select the streaming endpoint you want to start, click **Start**.
4445

@@ -52,7 +53,7 @@ if (streamingEndpoint.resourceState() != StreamingEndpointResourceState.RUNNING)
5253
}
5354
```
5455

55-
The samples [in this repository](https://docs.microsoft.com/samples/azure-samples/media-services-v3-dotnet/azure-media-services-v3-samples-using-net/) shows how to start the default streaming endpoint with .NET.
56+
See the complete [Java code sample](https://github.com/Azure-Samples/media-services-v3-java/blob/master/DynamicPackagingVODContent/StreamHLSAndDASH/src/main/java/sample/StreamHLSAndDASH.java#L128).
5657

5758
## Use the .NET SDK
5859

@@ -67,7 +68,7 @@ if (streamingEndpoint != null)
6768
}
6869
```
6970

70-
The samples [in this repository](https://docs.microsoft.com/samples/azure-samples/media-services-v3-java/azure-media-services-v3-samples-using-java/) shows how to start the default streaming endpoint with Java.
71+
See the complete [.NET code sample](https://github.com/Azure-Samples/media-services-v3-dotnet/blob/master/DynamicPackagingVODContent/StreamHLSAndDASH/Program.cs#L112).
7172

7273
## Use CLI
7374

@@ -93,7 +94,7 @@ For more information, see:
9394
* The [start a StreamingEndpoint](https://docs.microsoft.com/rest/api/media/streamingendpoints/start) reference documentation.
9495
* Starting a streaming endpoint is an asynchronous operation.
9596

96-
For details on how to monitor a long-running operations see[Long-running operations](media-services-apis-overview.md)
97+
For details on how to monitor a long-running operations see [Long-running operations](media-services-apis-overview.md)
9798
* This [Postman collection](https://github.com/Azure-Samples/media-services-v3-rest-postman/blob/master/Postman/Media%20Services%20v3.postman_collection.json) contains examples of multiple REST operations including on how to start a streaming endpoint.
9899

99100
## Next steps

0 commit comments

Comments
 (0)