Revert "First pass at removing hypershift"

This reverts commit 78222ca.

Author: Loquacity

getting-started/next-steps.md

@@ -11,12 +11,17 @@ content_group: Getting started
 
 To continue exploring Timescale, here are some things you might like to try:
 
+*   Migrate your existing data to Timescale using the
+    [hypershift migration tool][migrate-data].
 *   Write a program using a Timescale database backend in
     [your favorite programming language][connect-with-code].
+
+<!--- Commenting out until these are live
 *   Get your Timescale database integrated with a range of
     [third-party tools][integrations]
     for tasks like data ingestion, visualization, and logging.
 *   Extend your Timescale database with [PostgreSQL extensions][extensions].
+-->
 
 [connect-with-code]: /quick-start/:currentVersion:/
 [migrate-data]: /use-timescale/:currentVersion:/migration/

getting-started/time-series-data.md

@@ -8,6 +8,7 @@ layout_components: [next_prev_large]
 content_group: Getting started
 ---
 
+import HypershiftAlt from "versionContent/_partials/_hypershift-alternatively.mdx";
 import TimeseriesIntro from "versionContent/_partials/_timeseries-intro.mdx";
 
 # Time-series data
@@ -18,6 +19,8 @@ To explore Timescale's features, you need some sample data. This tutorial
 provides real-time stock trade data, also known as tick data, from
 [Twelve Data][twelve-data].
 
+<HypershiftAlt />
+
 ## About the dataset
 
 The dataset contains second-by-second stock-trade data for the top 100
@@ -35,6 +38,8 @@ Exchange (9:30&nbsp;AM - 4:00&nbsp;PM EST).
 To ingest data into the tables that you created, you need to download the
 dataset and copy the data to your database.
 
+<HypershiftAlt />
+
 <Procedure>
 
 ### Ingesting the dataset

mst/migrate-to-cloud.md

@@ -8,8 +8,7 @@ keywords: [data migration]
 # Migrate your Managed Service for TimescaleDB data to Timescale
 
 If you prefer Timescale's features, you can migrate your data from Managed
-Service for TimescaleDB to Timescale using the PostgreSQL `pg_backup` and
-`pg_restore` tools. To learn more about migration, see the
-[migration section][migration].
+Service for TimescaleDB to Timescale using the hypershift tool. To learn about
+hypershift, see the [migration section][migration].
 
 [migration]: /use-timescale/:currentVersion:/migration/

use-timescale/migration/pg-dump-and-restore.md renamed to self-hosted/backup-and-restore/pg-dump-and-restore.md

@@ -1,26 +1,21 @@
 ---
-title: Migrations using pg_dump and pg_restore
-excerpt: Migrate a hypertable or entire database with native PostgreSQL commands
-products: [cloud, self_hosted]
+title: Logical backups with pg_dump and pg_restore
+excerpt: Back up and restore a hypertable or entire database with native PostgreSQL commands
+products: [self_hosted]
 keywords: [backups, restore]
 tags: [recovery, logical backup, pg_dump, pg_restore]
 ---
 
 import ConsiderCloud from "versionContent/_partials/_consider-cloud.mdx";
 
-# Migrations using `pg_dump` and `pg_restore`
+# Logical backups with `pg_dump` and `pg_restore`
 
 You can backup and restore an entire database or individual hypertables using
 the native PostgreSQL [`pg_dump`][pg_dump] and [`pg_restore`][pg_restore]
 commands. This works even for compressed hypertables, without having to
-decompress the chunks before you begin. You can also use this method to migrate
-data from one database to another.
+decompress the chunks before you begin.
 
-<Highlight type="note">
-Timescale handles backups automatically by default. You do not need to manually
-back up your content. For more information about backups in Timescale, see the
-[backup and restore section](https://docs.timescale.com/use-timescale/latest/backup-restore-cloud/).
-</Highlight>
+<ConsiderCloud />
 
 Upgrades between different versions of TimescaleDB can be done in place; you
 don't need to backup and restore your data. See
@@ -29,8 +24,8 @@ the [upgrading instructions][timescaledb-upgrade].
 <Highlight type="warning">
 If you are using this `pg_dump` backup method regularly, make sure you keep
 track of which versions of PostgreSQL and TimescaleDB you are running. For more
-information, see the
-[Troubleshooting section](https://docs.timescale.com/self-hosted/latest/self-hosted/backup-and-restore/troubleshooting/).
+information, see "Versions are mismatched when dumping and restoring a database"
+in the [Troubleshooting section](https://docs.timescale.com/self-hosted/latest/self-hosted/backup-and-restore/troubleshooting/).
 </Highlight>
 
 ## Back up your entire database

self-hosted/migration/index.md

@@ -2,7 +2,7 @@
 title: Migrate your PostgreSQL database to self-hosted TimescaleDB
 excerpt: Migrate an existing PostgreSQL database to Timescale
 products: [self_hosted]
-keywords: [data migration, self_hosted, postgresql, RDS]
+keywords: [data migration, self_hosted, postgresql, hypershift, RDS]
 tags: [ingest, migrate, RDS]
 ---
 
@@ -35,6 +35,10 @@ There are several methods for migrating your data:
     discovery, validation, and creation. Outflux works with earlier versions of
     InfluxDB. It does not work with InfluxDB version 2 and later.
 
+Additionally, the hypershift tool can be used to migrate most PostgreSQL
+databases to self-hosted TimescaleDB. For more information about hypershift, see
+the [hypershift documentation][hypershift].
+
 ## Choose a migration method
 
 Which method you choose depends on your database size, network upload and
@@ -48,7 +52,10 @@ data egressed, even if the migration fails.
 </Highlight>
 
 If your database is smaller than 100&nbsp;GB, choose to migrate your entire
-database at once. You can also migrate larger databases using this method, but
+database at once. If your source database is PostgreSQL, use the hypershift
+tool to avoid having to dump your data to a directory before restoring it.
+
+You can also migrate larger databases using this method, but
 the copying process must keep running, potentially over days or weeks. If the
 copy is interrupted, the process needs to be restarted. If you think an
 interruption in the copy is possible, choose to migrate your schema and data
@@ -79,3 +86,4 @@ backfill your data with one of the two migration methods.
 [migrate-separately]: /self-hosted/:currentVersion:/migration/schema-then-data/
 [migrate-same-db]: /self-hosted/:currentVersion:/migration/same-db/
 [outflux]: /self-hosted/:currentVersion:/migration/migrate-influxdb/
+[hypershift]: /use-timescale/:currentVersion:/migration/

use-timescale/migration/OLD_hypershift-content/OLD_index.md

@@ -2,18 +2,33 @@
 title: Migrate your data to Timescale
 excerpt: Migrate existing database to Timescale
 products: [cloud]
-keywords: [data migration, postgresql, RDS]
+keywords: [data migration, postgresql, hypershift, RDS]
 tags: [ingest, migrate, RDS]
 ---
 
 # Migrate your data to Timescale
 
-You can migrate data from another database into Timescale using the PostgreSQL
-`pg_dump` and `pg_restore` commands. You can also use these tools to migrate
-your data from Managed Service for TimescaleDB, from a self-hosted Timescale
-instance, or from another PostgreSQL database, including Amazon RDS.
+You can migrate data from another database into Timescale
+using Timescale Hypershift. You can also use hypershift to migrate your data
+from Managed Service for TimescaleDB, from a self-hosted Timescale instance, or
+from another PostgreSQL database, including Amazon RDS.
+
+*   [Understand how hypershift works][about-hypershift] before you begin using it.
+*   [Migrate your data with hypershift][migrate-hypershift].
+*   [Configure hypershift][configure-hypershift].
 
 If you want to import data from another format, such as a `.csv` file, into a
 new Timescale service, see the [data ingest section][data-ingest].
 
+If you want to migrate existing data into a self-hosted Timescale installation,
+see the [self-hosted data migration section][self-hosted-migration].
+
+If you want to migrate existing data into Managed Service for TimescaleDB, see
+the [Managed Service for TimescaleDB migration section][mst-migration].
+
 [data-ingest]: /use-timescale/:currentVersion:/ingest-data/
+[self-hosted-migration]: /self-hosted/:currentVersion:/migration/
+[mst-migration]: /mst/:currentVersion:/migrate-to-mst/
+[about-hypershift]: /use-timescale/:currentVersion:/migration/about-hypershift/
+[migrate-hypershift]: /use-timescale/:currentVersion:/migration/migrate-hypershift/
+[configure-hypershift]: /use-timescale/:currentVersion:/migration/hypershift-config/