Initial commit of changes to note AWS Update (#873)

* Initial commit of changes to note AWS Update * Update Portal * Updated with Claire's feedback * Fix Refs * Change in Blogs to point to product page
citusdata · Aug 15, 2019 · 3dbd060 · 3dbd060
1 parent 69261fe
commit 3dbd060
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 51 deletions.
diff --git a/articles/aggregation.rst b/articles/aggregation.rst
@@ -39,7 +39,7 @@ like:
 
 Now let's walk through the steps of creating aggregations for a typical
 example of high-volume data: page views. We set up a `Citus Cloud
-<https://console.citusdata.com/users/sign_up>`__ formation consisting
+<https://www.citusdata.com/product/cloud/>`__ formation consisting
 of 4 workers with 4 cores each, and create a distributed `facts
 <http://databases.about.com/od/datamining/a/Facts-Vs-Dimensions.htm>`__
 table with several indexes:

diff --git a/articles/parallel_indexing.rst b/articles/parallel_indexing.rst
@@ -26,7 +26,7 @@ To show the benefits of parallel indexing, we’ll walk through a small
 example of indexing ~200k rows containing large JSON objects from the
 `GitHub archive <https://www.githubarchive.org/>`__. To run the
 examples, we set up a formation using `Citus
-Cloud <https://console.citusdata.com/users/sign_up>`__ consisting of four
+Cloud <https://www.citusdata.com/product/cloud/>`__ consisting of four
 worker nodes with four cores each, running PostgreSQL 9.6.
 
 You can download the sample data by running the following commands:

diff --git a/cloud/getting_started.rst b/cloud/getting_started.rst
@@ -3,16 +3,15 @@
 Get Started
 ###########
 
-Citus Cloud is a fully managed hosted version of Citus Enterprise edition on top of AWS. Citus Cloud comes with the benefit of Citus allowing you to easily scale out your memory and processing power, without having to worry about keeping it up and running.
-
-.. note::
-
-  We also offer a managed deployment on `Azure Database for PostgreSQL — Hyperscale (Citus) <https://docs.microsoft.com/azure/postgresql/>`_.
+.. NOTE::
+   Update: We are no longer onboarding new users to Citus Cloud on AWS. Of course, existing customers can continue to use Citus Cloud as they do today. If you’re new to Citus, the good news is, Citus is still available to you: as open source, as on-prem enterprise software, and in the cloud on Microsoft Azure, as a fully-integrated deployment option in Azure Database for PostgreSQL.
+
+Citus Cloud is a fully managed hosted version of Citus Enterprise edition on top of AWS. Citus Cloud comes with the benefit of Citus allowing you to easily scale out your memory and processing power, without having to worry about keeping it up and running. We also offer a managed deployment on `Azure Database for PostgreSQL — Hyperscale (Citus) <https://docs.microsoft.com/azure/postgresql/>`_.
 
 Provisioning
 ============
 
-Once you've created your account at `https://console.citusdata.com <https://console.citusdata.com>`_ you can provision your Citus cluster. When you login you'll be at the home of the dashboard, and from here you can click New Formation to begin your formation creation. 
+You can provision a new Citus cluster at `https://console.citusdata.com <https://console.citusdata.com>`_. When you login you'll be at the home of the dashboard, and from here you can click New Formation to begin your formation creation. 
 
 .. image:: ../images/cloud_provisioning.png
 
@@ -55,7 +54,7 @@ If there is an AWS region you do not see listed but would like for us to add sup
 Other infrastructure providers
 ------------------------------
 
-At this time we only support Citus Cloud on top of Amazon Web Services. We are continually exploring other infrastructure providers to make Citus Cloud available on. If you have immediate needs you could consider running Citus Community Edition or Citus Enterprise Edition. Or if you have questions about our timeline for other infrastructure providers please feel free to `reach out <https://www.citusdata.com/about/contact_us/>`_.
+At this time we only support Citus Cloud on top of Amazon Web Services and `Microsoft Azure <https://docs.microsoft.com/azure/postgresql/>`_. We are continually exploring other infrastructure providers to make Citus Cloud available on. If you have immediate needs you could consider running Citus Community Edition or Citus Enterprise Edition. Or if you have questions about our timeline for other infrastructure providers please feel free to `reach out <https://www.citusdata.com/about/contact_us/>`_.
 
 .. _connection:
 

diff --git a/conf.py b/conf.py
@@ -50,7 +50,7 @@
 from datetime import date
 # General information about the project.
 project = u'Citus Docs'
-copyright = u'%s, Citus Data' % date.today().year
+copyright = u'%s, Citus Data, a Microsoft Company' % date.today().year
 author = u'Citus Data'
 
 # The version info for the project you're documenting, acts as replacement for

diff --git a/extra/write_throughput_benchmark.rst b/extra/write_throughput_benchmark.rst
@@ -5,7 +5,7 @@
 Benchmark Setup with Citus and pgbench
 --------------------------------------
 
-In this section, we provide step by step instructions to benchmark Citus' write throughput. For these benchmark steps, we use `Citus Cloud <https://console.citusdata.com/users/sign_up>`_ to create test clusters, and a standard benchmarking tool called `pgbench  <https://www.postgresql.org/docs/current/static/pgbench.html>`_.
+In this section, we provide step by step instructions to benchmark Citus' write throughput. For these benchmark steps, we use `Citus Cloud <https://console.citusdata.com/>`_ to create test clusters, and a standard benchmarking tool called `pgbench  <https://www.postgresql.org/docs/current/static/pgbench.html>`_.
 
 If you're interested in general throughput numbers based on these tests, you can also find them in :ref:`scaling_data_ingestion`.
 

diff --git a/get_started/tutorial_multi_tenant.rst b/get_started/tutorial_multi_tenant.rst
@@ -9,11 +9,7 @@ use Citus to power your multi-tenant application.
 .. note::
 
     This tutorial assumes that you already have Citus installed and running. If you don't have Citus running,
-    you can:
-
-    * Provision a cluster using `Citus Cloud <https://console.citusdata.com/users/sign_up>`_, or
-
-    * Setup Citus locally using :ref:`single_machine_docker`.
+    you can setup Citus locally using one of the options from :ref:`development`.
 
 
 Data model and sample data
@@ -44,14 +40,6 @@ Creating tables
 
 To start, you can first connect to the Citus coordinator using psql.
 
-**If you are using Citus Cloud**, you can connect by specifying the connection string (URL in the formation details):
-
-.. code-block:: bash
-
-    psql connection-string
-
-Please note that certain shells may require you to quote the connection string when connecting to Citus Cloud. For example, :code:`psql "connection-string"`.
-
 **If you are using Docker**, you can connect by running psql with the docker exec command:
 
 ::

diff --git a/get_started/tutorial_realtime_analytics.rst b/get_started/tutorial_realtime_analytics.rst
@@ -8,11 +8,7 @@ In this tutorial, we will demonstrate how you can use Citus to ingest events dat
 .. note::
 
     This tutorial assumes that you already have Citus installed and running. If you don't have Citus running,
-    you can:
-
-    * Provision a cluster using `Citus Cloud <https://console.citusdata.com/users/sign_up>`_, or
-
-    * Setup Citus locally using :ref:`single_machine_docker`.
+    you can setup Citus locally using one of the options from :ref:`development`.
 
 
 Data model and sample data
@@ -39,14 +35,6 @@ Creating tables
 
 To start, you can first connect to the Citus coordinator using psql.
 
-**If you are using Citus Cloud**, you can connect by specifying the connection string (URL in the formation details):
-
-.. code-block:: bash
-
-    psql connection-string
-
-Please note that certain shells may require you to quote the connection string when connecting to Citus Cloud. For example, :code:`psql "connection-string"`.
-
 **If you are using Docker**, you can connect by running psql with the docker exec command:
 
 .. code-block:: bash

diff --git a/get_started/what_is_citus.rst b/get_started/what_is_citus.rst
@@ -11,7 +11,7 @@ Citus horizontally scales PostgreSQL across multiple machines using sharding and
 
 1. As `open source <https://www.citusdata.com/product/community>`_ to add to existing Postgres servers
 2. On-premise with additional `enterprise grade <https://www.citusdata.com/product/enterprise>`_ security and cluster management tools
-3. As a fully-managed database as a service on both Microsoft Azure and Amazon AWS. For info on these offerings, see `Azure Database for PostgreSQL — Hyperscale (Citus) <https://docs.microsoft.com/azure/postgresql/>`_ and `Citus Cloud on AWS <https://www.citusdata.com/product/cloud>`_
+3. In the Cloud, built into `Azure Database for PostgreSQL — Hyperscale (Citus) <https://docs.microsoft.com/azure/postgresql/>`_ a fully managed database as a service. (Citus Cloud on AWS is also available but is no longer onboarding new users.)
 
 .. _how_big:
 

diff --git a/installation/citus_cloud.rst b/installation/citus_cloud.rst
@@ -3,10 +3,10 @@
 Managed Deployment
 ==================
 
-In addition to installing Citus yourself, you can rent a fully managed
-instance. "Citus-as-a-Service" is an easy way to provision and monitor a
-high-availability cluster. We offer managed deployments on both the Microsoft
-Azure platform, and Amazon Web Services.
+In addition to installing Citus open source yourself, you can easily spin up a Citus server group in the cloud, too. Citus is available in the cloud, built-in to Azure Database for PostgreSQL.
+
+.. NOTE::
+   Update: We are no longer onboarding new users to Citus Cloud on AWS. The good news is, Citus is still available to you: as open source, as on-prem enterprise software, and in the cloud on Microsoft Azure, as a fully-integrated deployment option in Azure Database for PostgreSQL.
 
 Learn more:
 

diff --git a/portals/citus_cloud.rst b/portals/citus_cloud.rst
@@ -5,7 +5,10 @@
 Citus Cloud
 ###########
 
-Citus Cloud is a fully managed hosted version of Citus Enterprise edition on top of AWS. It goes way beyond the functionality of the Citus extension itself. Cloud does failovers in a way that’s transparent to the application, elastically scales up and scales out, takes automatic backups for disaster recovery, has monitoring and alarms built in, and provides patches and upgrades with no downtime.
+.. NOTE::
+   Update: We are no longer onboarding new users to Citus Cloud on AWS. The good news is, Citus is still available to you: as open source, as on-prem enterprise software, and in the cloud on Microsoft Azure, as a fully-integrated deployment option in Azure Database for PostgreSQL.
+
+Citus Cloud is a fully managed hosted version of Citus Enterprise edition on top of AWS. It goes way beyond the functionality of the Citus extension itself. Cloud does failovers in a way that’s transparent to the application, elastically scales up and scales out, takes automatic backups for disaster recovery, has monitoring and alarms built in, and provides patches and upgrades with no downtime. We also offer a managed deployment on `Azure Database for PostgreSQL — Hyperscale (Citus) <https://docs.microsoft.com/azure/postgresql/>`_.
 
 * First you'll want to get an account and :ref:`Provision <cloud_overview>` a database.
 * Once a Cloud database is provisioned, read :ref:`connection`  to connect your application and REPL to it.

diff --git a/use_cases/multi_tenant.rst b/use_cases/multi_tenant.rst
@@ -186,17 +186,12 @@ Try it Yourself
 
 .. note::
 
-  This guide is designed so you can follow along in your own Citus database. Use one of these alternatives to spin up a database:
+  This guide is designed so you can follow along in your own Citus database. This tutorial assumes that you already have Citus installed and running.
+  If you don't have Citus running, you can setup Citus locally using one of the options from :ref:`development`.
 
-  * Run Citus locally using :ref:`single_machine_docker`, or
-  * `Sign up <https://console.citusdata.com/users/sign_up>`_ for Citus Cloud and provision a cluster.
-
-  You'll run the SQL commands using psql:
+  You'll run the SQL commands using psql and connect to the Coordinator node:
 
   * **Docker**: :code:`docker exec -it citus_master psql -U postgres`
-  * **Cloud**: :code:`psql "connection-string"` where the connection string for your formation is available in the Cloud Console.
-
-  In either case psql will be connected to the coordinator node for the cluster.
 
 At this point feel free to follow along in your own Citus cluster by `downloading <https://examples.citusdata.com/mt_ref_arch/schema.sql>`_ and executing the SQL to create the schema. Once the schema is ready, we can tell Citus to create shards on the workers. From the coordinator node, run: