Skip to content

Commit 1c7bf04

Browse files
authored
Merge pull request #108178 from ajlam/master
Refresh MariaDB docs
2 parents b57928d + 07a6cdb commit 1c7bf04

23 files changed

+66
-69
lines changed

articles/mariadb/concept-reserved-pricing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: kummanish
55
ms.author: manishku
66
ms.service: mariadb
77
ms.topic: conceptual
8-
ms.date: 12/02/2019
8+
ms.date: 3/18/2020
99
---
1010

1111
# Prepay for Azure Database for MariaDB compute resources with reserved capacity
@@ -46,8 +46,8 @@ The following table describes required fields.
4646
| Field | Description |
4747
| :------------ | :------- |
4848
| Subscription | The subscription used to pay for the Azure Database for MariaDB reserved capacity reservation. The payment method on the subscription is charged the upfront costs for the Azure Database for MariaDB reserved capacity reservation. The subscription type must be an enterprise agreement (offer numbers: MS-AZR-0017P or MS-AZR-0148P) or an individual agreement with pay-as-you-go pricing (offer numbers: MS-AZR-0003P or MS-AZR-0023P). For an enterprise subscription, the charges are deducted from the enrollment's monetary commitment balance or charged as overage. For an individual subscription with pay-as-you-go pricing, the charges are billed to the credit card or invoice payment method on the subscription.
49-
| Scope | The vCore reservations scope can cover one subscription or multiple subscriptions (shared scope). If you select: </br></br> **Shared**, the vCore reservation discount is applied to Azure Database for MariaDB servers running in any subscriptions within your billing context. For enterprise customers, the shared scope is the enrollment and includes all subscriptions within the enrollment. For Pay-As-You-Go customers, the shared scope is all Pay-As-You-Go subscriptions created by the account administrator.</br></br> **Single subscription**, the vCore reservation discount is applied to Azure Database for MariaDB servers in this subscription. </br></br> **Single resource group**, the reservation discount is applied to Azure Database for MariaDB servers in the selected subscription and the selected resource group within that subscription.
50-
| Region | The Azure region thats covered by the Azure Database for MariaDB reserved capacity reservation.
49+
| Scope | The vCore reservation's scope can cover one subscription or multiple subscriptions (shared scope). If you select: </br></br> **Shared**, the vCore reservation discount is applied to Azure Database for MariaDB servers running in any subscriptions within your billing context. For enterprise customers, the shared scope is the enrollment and includes all subscriptions within the enrollment. For Pay-As-You-Go customers, the shared scope is all Pay-As-You-Go subscriptions created by the account administrator.</br></br> **Single subscription**, the vCore reservation discount is applied to Azure Database for MariaDB servers in this subscription. </br></br> **Single resource group**, the reservation discount is applied to Azure Database for MariaDB servers in the selected subscription and the selected resource group within that subscription.
50+
| Region | The Azure region that's covered by the Azure Database for MariaDB reserved capacity reservation.
5151
| Deployment Type | The Azure Database for MariaDB resource type that you want to buy the reservation for.
5252
| Performance Tier | The service tier for the Azure Database for MariaDB servers.
5353
| Term | One year

articles/mariadb/concepts-audit-logs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: ajlam
55
ms.author: andrela
66
ms.service: mariadb
77
ms.topic: conceptual
8-
ms.date: 12/09/2019
8+
ms.date: 3/18/2020
99
---
1010

1111
# Audit Logs in Azure Database for MariaDB

articles/mariadb/concepts-backup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: ajlam
55
ms.author: andrela
66
ms.service: mariadb
77
ms.topic: conceptual
8-
ms.date: 02/25/2020
8+
ms.date: 3/18/2020
99
---
1010

1111
# Backup and restore in Azure Database for MariaDB

articles/mariadb/concepts-business-continuity.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: ajlam
55
ms.author: andrela
66
ms.service: mariadb
77
ms.topic: conceptual
8-
ms.date: 12/02/2019
8+
ms.date: 3/18/2020
99
---
1010

1111
# Understand business continuity in Azure Database for MariaDB
@@ -28,7 +28,7 @@ The following table compares the ERT and RPO for the available features:
2828
2929
## Recover a server after a user or application error
3030

31-
You can use the services backups to recover a server from various disruptive events. A user may accidentally delete some data, inadvertently drop an important table, or even drop an entire database. An application might accidentally overwrite good data with bad data due to an application defect, and so on.
31+
You can use the service's backups to recover a server from various disruptive events. A user may accidentally delete some data, inadvertently drop an important table, or even drop an entire database. An application might accidentally overwrite good data with bad data due to an application defect, and so on.
3232

3333
You can perform a point-in-time-restore to create a copy of your server to a known good point in time. This point in time must be within the backup retention period you have configured for your server. After the data is restored to the new server, you can either replace the original server with the newly restored server or copy the needed data from the restored server into the original server.
3434

articles/mariadb/concepts-compatibility.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: ajlam
55
ms.author: andrela
66
ms.service: mariadb
77
ms.topic: conceptual
8-
ms.date: 12/02/2019
8+
ms.date: 3/18/2020
99
---
1010
# MariaDB drivers and management tools compatible with Azure Database for MariaDB
1111

articles/mariadb/concepts-connectivity-architecture.md

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: kummanish
55
ms.author: manishku
66
ms.service: mariadb
77
ms.topic: conceptual
8-
ms.date: 12/02/2019
8+
ms.date: 3/18/2020
99
---
1010

1111
# Connectivity architecture in Azure Database for MariaDB
@@ -25,43 +25,43 @@ The following table lists the primary and secondary IPs of the Azure Database fo
2525

2626
| **Region Name** | **Gateway IP Addresses** |
2727
|:----------------|:-------------|
28-
| Australia Central| 20.36.105.0 |
29-
| Australia Central2 | 20.36.113.0 |
30-
| Australia East | 13.75.149.87, 40.79.161.1 |
31-
| Australia South East |191.239.192.109, 13.73.109.251 |
32-
| Brazil South | 104.41.11.5, 191.233.201.8, 191.233.200.16 |
33-
| Canada Central |40.85.224.249 |
34-
| Canada East | 40.86.226.166 |
35-
| Central US | 23.99.160.139, 13.67.215.62 |
36-
| China East 2 | 40.73.82.1 |
37-
| China North 2 | 40.73.50.0 |
38-
| East Asia | 191.234.2.139, 52.175.33.150, 13.75.33.20, 13.75.33.21 |
39-
| East US | 40.121.158.30, 191.238.6.43 |
40-
| East US 2 |40.79.84.180, 191.239.224.107, 52.177.185.181 |
41-
| France Central | 40.79.137.0, 40.79.129.1 |
42-
| Germany Central | 51.4.144.100 |
43-
| Germany North East | 51.5.144.179 |
44-
| India Central | 104.211.96.159 |
45-
| India South | 104.211.224.146 |
46-
| India West | 104.211.160.80 |
47-
| Japan East | 13.78.61.196, 191.237.240.43 |
48-
| Japan West | 104.214.148.156, 191.238.68.11, 40.74.96.6, 40.74.96.7 |
49-
| Korea Central | 52.231.32.42 |
50-
| Korea South | 52.231.200.86 |
51-
| North Central US | 23.96.178.199, 23.98.55.75, 52.162.104.35, 52.162.104.36 |
52-
| North Europe | 40.113.93.91, 191.235.193.75 |
53-
| South Africa North | 102.133.152.0 |
54-
| South Africa West | 102.133.24.0 |
55-
| South Central US |13.66.62.124, 23.98.162.75, 20.45.120.0, 104.214.16.39 |
56-
| South East Asia | 104.43.15.0, 23.100.117.95, 40.78.233.2, 23.98.80.12 |
57-
| UAE Central | 20.37.72.64 |
58-
| UAE North | 65.52.248.0 |
59-
| UK South | 51.140.184.11 |
60-
| UK West | 51.141.8.11 |
61-
| West Central US | 13.78.145.25 |
62-
| West Europe | 40.68.37.158, 191.237.232.75 |
63-
| West US | 104.42.238.205, 23.99.34.75 |
64-
| West US 2 | 13.66.226.202 |
28+
| Australia Central| 20.36.105.0 |
29+
| Australia Central2 | 20.36.113.0 |
30+
| Australia East | 13.75.149.87, 40.79.161.1 |
31+
| Australia South East |191.239.192.109, 13.73.109.251 |
32+
| Brazil South | 104.41.11.5, 191.233.201.8, 191.233.200.16 |
33+
| Canada Central |40.85.224.249 |
34+
| Canada East | 40.86.226.166 |
35+
| Central US | 23.99.160.139, 13.67.215.62 |
36+
| China East 2 | 40.73.82.1 |
37+
| China North 2 | 40.73.50.0 |
38+
| East Asia | 191.234.2.139, 52.175.33.150, 13.75.33.20, 13.75.33.21 |
39+
| East US | 40.121.158.30, 191.238.6.43 |
40+
| East US 2 |40.79.84.180, 191.239.224.107, 52.177.185.181 |
41+
| France Central | 40.79.137.0, 40.79.129.1 |
42+
| Germany Central | 51.4.144.100 |
43+
| Germany North East | 51.5.144.179 |
44+
| India Central | 104.211.96.159 |
45+
| India South | 104.211.224.146 |
46+
| India West | 104.211.160.80 |
47+
| Japan East | 13.78.61.196, 191.237.240.43 |
48+
| Japan West | 104.214.148.156, 191.238.68.11, 40.74.96.6, 40.74.96.7 |
49+
| Korea Central | 52.231.32.42 |
50+
| Korea South | 52.231.200.86 |
51+
| North Central US | 23.96.178.199, 23.98.55.75, 52.162.104.35, 52.162.104.36 |
52+
| North Europe | 40.113.93.91, 191.235.193.75 |
53+
| South Africa North | 102.133.152.0 |
54+
| South Africa West | 102.133.24.0 |
55+
| South Central US |13.66.62.124, 23.98.162.75, 20.45.120.0, 104.214.16.39 |
56+
| South East Asia | 104.43.15.0, 23.100.117.95, 40.78.233.2, 23.98.80.12 |
57+
| UAE Central | 20.37.72.64 |
58+
| UAE North | 65.52.248.0 |
59+
| UK South | 51.140.184.11 |
60+
| UK West | 51.141.8.11 |
61+
| West Central US | 13.78.145.25 |
62+
| West Europe | 40.68.37.158, 191.237.232.75 |
63+
| West US | 104.42.238.205, 23.99.34.75 |
64+
| West US 2 | 13.66.226.202 |
6565
||||
6666

6767
## Next steps

articles/mariadb/concepts-connectivity.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: jan-eng
66
ms.author: janeng
77
ms.service: mariadb
88
ms.topic: conceptual
9-
ms.date: 12/02/2019
9+
ms.date: 3/18/2020
1010
---
1111

1212
# Handling of transient connectivity errors for Azure Database for MariaDB
@@ -31,7 +31,7 @@ The first and second case are fairly straight forward to handle. Try to open the
3131
* For each following retry, the increase the wait exponentially, up to 60 seconds.
3232
* Set a max number of retries at which point your application considers the operation failed.
3333

34-
When a connection with an active transaction fails, it is more difficult to handle the recovery correctly. There are two cases: If the transaction was read-only in nature, it is safe to reopen the connection and to retry the transaction. If however if the transaction was also writing to the database, you must determine if the transaction was rolled back, or if it succeeded before the transient error happened. In that case, you might just not have received the commit acknowledgement from the database server.
34+
When a connection with an active transaction fails, it is more difficult to handle the recovery correctly. There are two cases: If the transaction was read-only in nature, it is safe to reopen the connection and to retry the transaction. If however if the transaction was also writing to the database, you must determine if the transaction was rolled back, or if it succeeded before the transient error happened. In that case, you might not have received the commit acknowledgment from the database server.
3535

3636
One way of doing this, is to generate a unique ID on the client that is used for all the retries. You pass this unique ID as part of the transaction to the server and to store it in a column with a unique constraint. This way you can safely retry the transaction. It will succeed if the previous transaction was rolled back and the client generated unique ID does not yet exist in the system. It will fail indicating a duplicate key violation if the unique ID was previously stored because the previous transaction completed successfully.
3737

articles/mariadb/concepts-data-access-and-security-threat-protection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: ajlam
55
ms.author: andrela
66
ms.service: mariadb
77
ms.topic: conceptual
8-
ms.date: 12/02/2019
8+
ms.date: 3/18/2020
99
---
1010
# Azure Database for MariaDB Advanced Threat Protection
1111

articles/mariadb/concepts-data-access-security-vnet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: ajlam
55
ms.author: andrela
66
ms.service: mariadb
77
ms.topic: conceptual
8-
ms.date: 12/02/2019
8+
ms.date: 3/18/2020
99
---
1010
# Use Virtual Network service endpoints and rules for Azure Database for MariaDB
1111

articles/mariadb/concepts-data-in-replication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: ajlam
55
ms.author: andrela
66
ms.service: mariadb
77
ms.topic: conceptual
8-
ms.date: 12/02/2019
8+
ms.date: 3/18/2020
99
---
1010

1111
# Replicate data into Azure Database for MariaDB

0 commit comments

Comments
 (0)