Skip to content

Commit 25097b1

Browse files
updates per feedback (#63)
* updates per feedback * create project steps * add text to backup page
1 parent 1455442 commit 25097b1

File tree

10 files changed

+42
-28
lines changed

10 files changed

+42
-28
lines changed

snooty.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ fips = ":abbr:`FIPS (Federal Information Processing Standard)`"
5858
fqdn = ":abbr:`FQDN (fully qualified domain name)`"
5959
fts = "Atlas Search"
6060
gcp = ":abbr:`GCP (Google Cloud Platform)`"
61+
gaw = "GCP Assured Workloads"
6162
global-write-clusters = "Global Clusters"
6263
global-write-cluster = "Global Cluster"
6364
global-write = "Global Writes"

source/api.txt

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,13 @@ Datadog
133133
Cloud Backups
134134
~~~~~~~~~~~~~
135135

136-
|aws-fr-moderate| and |aws-fr-high| backups are not compatible
137-
with one another. If you create a backup from a |aws-fr-high|
138-
region-only project, you can only restore that data to a |aws-fr-high|
139-
region-only project. The same is true for |aws-fr-moderate| region-only
140-
projects.
136+
Restores between standard projects and Gov region-only projects are not allowed.
137+
If a backup is created from a cluster in a Gov region-only
138+
(|aws-fr-high| or |gaw|) project, the data can only be restored to a cluster
139+
in a Gov region-only project. The same restriction applies to standard projects,
140+
where backups in standard regions can only be restored to clusters in standard projects.
141+
142+
Cross-cloud restore is supported between |aws-fr-high| and |gaw| regions.
141143

142144
Shared-Tier Snapshots and Restore Jobs
143145
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -155,13 +157,17 @@ Network Peering
155157
- You can only peer |aws-fr-high| regions with MongoDB clusters in
156158
|aws-fr-high| regions. You can only peer |aws-fr-moderate| regions
157159
with MongoDB clusters in |aws-fr-moderate| regions.
160+
- You can only peer |gaw| regions with MongoDB clusters in
161+
|gaw| regions.
158162

159163
Private Endpoints
160164
~~~~~~~~~~~~~~~~~
161165

162166
- You can only link |aws-fr-high| regions with MongoDB clusters in
163167
|aws-fr-high| regions. You can only link |aws-fr-moderate| regions
164168
with MongoDB clusters in |aws-fr-moderate| regions.
169+
- You can only link |gaw| regions with MongoDB clusters in
170+
|gaw| regions.
165171

166172
Monitoring and Logs
167173
~~~~~~~~~~~~~~~~~~~
@@ -174,8 +180,8 @@ authentications.
174180
Encryption at Rest using Customer Key Management
175181
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
176182

177-
- You must use KMS keys in |aws-fr-high| regions to encrypt data in
178-
|aws-fr-high| region-only projects. You must use KMS keys in
183+
- You must use KMS keys in |aws-fr-high| and |gaw| regions to encrypt data in
184+
|aws-fr-high| and |gaw| region-only projects. You must use KMS keys in
179185
|aws-fr-moderate| regions to encrypt data in |aws-fr-moderate|
180186
region-only projects.
181187

source/billing.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ Purchase a Subscription
1919

2020
You can purchase a |cloudgov| subscription from:
2121

22-
- The |aws| Marketplace, or
22+
- The |aws| Marketplace
23+
- The Google Cloud Marketplace
24+
- :website:`MongoDB Sales </contact/atlas>`
2325

24-
- :website:`MongoDB Sales </contact/atlas>`.
2526

2627
Activate Your Subscription
2728
--------------------------

source/clusters/backup-restore-data.txt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,13 @@ backup to clusters in that project.
2525
|cloudgov-short| user roles are the same as
2626
:atlas:`Atlas User Roles </reference/user-roles/>`.
2727

28-
|aws-fr-moderate| and |aws-fr-high| backups are not compatible
29-
with one another. If you create a backup from a |aws-fr-high|
30-
region-only project, you can only restore that data to a |aws-fr-high|
31-
region-only project. The same is true for |aws-fr-moderate| region-only
32-
projects.
28+
Restores between standard projects and Gov region-only projects are not allowed.
29+
If a backup is created from a cluster in a Gov region-only
30+
(|aws-fr-high| or |gaw|) project, the data can only be restored to a cluster
31+
in a Gov region-only project. The same restriction applies to standard projects,
32+
where backups in standard regions can only be restored to clusters in standard projects.
33+
34+
Cross-cloud restore is supported between |aws-fr-high| and |gaw| regions.
3335

3436
For a list of regions by cloud provider, see :ref:`<supported-regions>`.
3537

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
|aws-fr-high|
2-
~~~~~~~~~~~~~
1+
|aws-fr-high| and |gaw| Regions
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
33

44
- Alerts come from ``[email protected]``.
55
- All other emails come from ``[email protected]``.
66

77
|aws-fr-moderate|
8-
~~~~~~~~~~~~~~~~~
8+
~~~~~~~~~~~~~~~~~~
99

1010
- Alerts come from ``[email protected]``.
1111
- All other emails come from ``[email protected]``.

source/includes/feature-matrix.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
-
2323
- :icon-fa5:`check`
2424

25-
* - GCP Assured Workloads
25+
* - |gaw|
2626
-
2727
- :icon-fa5:`check`
2828

source/includes/steps-create-new-project.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ content: |
2727
2828
a. Check :guilabel:`Designate as a Gov Cloud regions-only project` if
2929
you want to deploy clusters only to ``gov`` regions. Otherwise,
30-
you may deploy clusters only to standard regions.
30+
you may deploy |aws| clusters only to standard regions. You can't deploy
31+
clusters from other cloud providers in this project.
3132
3233
b. Click :guilabel:`Next`.
3334

source/overview/atlasgov-considerations.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,5 @@ communication.
109109
Support
110110
-------
111111

112-
Deployments in |aws-fr-high| regions benefit from additional support
112+
Deployments in |aws-fr-high| and |gaw| regions benefit from additional support
113113
guarantees. To learn more, see :ref:`support`.

source/security.txt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,23 @@ are available in |cloudgov-short| with some limitations.
4747
Encryption at Rest
4848
~~~~~~~~~~~~~~~~~~
4949

50-
- You must use KMS keys in |aws-fr-high| regions to encrypt data in
51-
|aws-fr-high| region-only projects. You must use KMS keys in
50+
- You must use KMS keys in |aws-fr-high| and |gaw| regions to encrypt data in
51+
|aws-fr-high| and |gaw| region-only projects. You must use KMS keys in
5252
|aws-fr-moderate| regions to encrypt data in |aws-fr-moderate|
5353
region-only projects.
5454

5555
See the |service| documentation to configure
56-
:atlas:`Customer Key Management with AWS KMS </security-aws-kms/>`.
56+
:atlas:`Customer Key Management with AWS KMS </security-aws-kms/>` and
57+
:atlas:`Manage Customer Keys with Google Cloud KMS </security-aws-kms/>`.
5758

5859
|vpc| Peering
5960
~~~~~~~~~~~~~~
6061

6162
- You can only peer |aws-fr-high| regions with MongoDB clusters in
6263
|aws-fr-high| regions. You can only peer |aws-fr-moderate| regions
6364
with MongoDB clusters in |aws-fr-moderate| regions.
64-
65-
- |aws| is the only supported cloud provider for |cloudgov-short|.
65+
- You can only peer |gaw| regions with MongoDB clusters in
66+
|gaw| regions.
6667

6768
See the |service| documentation to
6869
:atlas:`Set up a Network Peering Connection </security-vpc-peering/>`
@@ -73,6 +74,8 @@ Private Endpoints
7374
- You can only link |aws-fr-high| regions with MongoDB clusters in
7475
|aws-fr-high| regions. You can only link |aws-fr-moderate| regions
7576
with MongoDB clusters in |aws-fr-moderate| regions.
77+
- You can only link |gaw| regions with MongoDB clusters in
78+
|gaw| regions.
7679

7780
See the |service| documentation to
7881
:atlas:`Set up a Private Endpoint </security-private-endpoint/>`.

source/tutorial/create-account.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ invited by an active user. Invitations are sent by email.
1717

1818
You can purchase a |cloudgov| subscription from:
1919

20-
- The |aws| Marketplace, or
21-
22-
- :website:`MongoDB Sales </contact/atlas>`.
20+
- The |aws| Marketplace
21+
- The Google Cloud Marketplace
22+
- :website:`MongoDB Sales </contact/atlas>`
2323

2424
.. _register-account:
2525

0 commit comments

Comments
 (0)