Flatten the structure of the integrations section

_partials/_grafana-connect.md

@@ -1,7 +1,10 @@
 ## Prerequisites
 
-* [Create a target $SERVICE_LONG][create-service]
-* Install [self-managed Grafana][grafana-self-managed], or sign up for [Grafana Cloud][grafana-cloud]
+import IntegrationPrereqs from "versionContent/_partials/_integration-prereqs.mdx";
+
+<IntegrationPrereqs />
+
+* Install [self-managed Grafana][grafana-self-managed], or sign up for [Grafana Cloud][grafana-cloud].
 
 ## Add your $SERVICE_LONG as a data source 
 

_partials/_integration-prereqs.md

@@ -0,0 +1,5 @@
+Before integrating with $CLOUD_LONG:
+
+* [Create a target $SERVICE_LONG][create-service].
+
+[create-service]: /getting-started/:currentVersion:/services/

mst/installation-mst.md

@@ -122,7 +122,7 @@ You can always [contact us][contact] if you need help working something out, or
 if you want to have a chat.
 
 [contact]: https://www.timescale.com/contact
-[install-psql]: /use-timescale/:currentVersion:/integrations/query-admin/about-psql/
+[install-psql]: /use-timescale/:currentVersion:/integrations/query-admin/psql/
 [mst-docs]: /mst/:currentVersion:/
 [tutorials]: /tutorials/:currentVersion:/
 [mst-signup]: https://www.timescale.com/mst-signup

mst/migrate-to-mst.md

@@ -129,7 +129,7 @@ them. The migration still occurs successfully.
 [install-mst]: /mst/:currentVersion:/installation-mst/#create-your-first-service
 [pg_dump]: https://www.postgresql.org/docs/current/app-pgdump.html
 [pg_restore]: https://www.postgresql.org/docs/current/app-pgrestore.html
-[psql]: /use-timescale/:currentVersion:/integrations/query-admin/about-psql/
+[psql]: /use-timescale/:currentVersion:/integrations/query-admin/psql/
 [upgrading-postgresql]: https://kb-managed.timescale.com/en/articles/5368016-perform-a-postgresql-major-version-upgrade
 [upgrading-postgresql-self-hosted]: /self-hosted/:currentVersion:/upgrades/upgrade-pg/
 [upgrading-timescaledb]: /self-hosted/:currentVersion:/upgrades/major-upgrade/

quick-start/ruby.md

@@ -720,7 +720,7 @@ page by page, or all pages together, and group by path or not:
 [add-performance]: #add-performance-and-path-attributes-to-pageload
 [explore]: #explore-aggregation-functions
 [install]: /getting-started/latest/
-[psql-install]: /use-timescale/:currentVersion:/integrations/query-admin/about-psql/
+[psql-install]: /use-timescale/:currentVersion:/integrations/query-admin/psql/
 [rails-guide]: https://guides.rubyonrails.org/getting_started.html
 [ab]: https://httpd.apache.org/docs/2.4/programs/ab.html
 [active-record-query]: https://guides.rubyonrails.org/active_record_querying.html

self-hosted/install/installation-macos.md

@@ -80,7 +80,7 @@ And that is it! You have TimescaleDB running on a database on a self-hosted inst
 For the latest functionality, install MacOS 14 Sanoma. The oldest supported version is macOS 10.15 Catalina
 
 [homebrew]: https://docs.brew.sh/Installation
-[install-psql]: /use-timescale/:currentVersion:/integrations/query-admin/about-psql/
+[install-psql]: /use-timescale/:currentVersion:/integrations/query-admin/psql/
 [macports]: https://guide.macports.org/#installing.macports
 [install-from-source]: /self-hosted/:currentVersion:/install/installation-source/
 [install-postgresql]: https://www.postgresql.org/download/macosx/

self-hosted/install/installation-source.md

@@ -73,7 +73,7 @@ And that is it! You have TimescaleDB running on a database on a self-hosted inst
 
 <WhereTo />
 
-[install-psql]: /use-timescale/:currentVersion:/integrations/query-admin/about-psql/
+[install-psql]: /use-timescale/:currentVersion:/integrations/query-admin/psql/
 [config]: /self-hosted/:currentVersion:/configuration/
 [postgres-download]: https://www.postgresql.org/download/
 [cmake-download]: https://cmake.org/download/

self-hosted/migration/entire-database.md

@@ -118,7 +118,7 @@ information about compression and decompression, see [Compression][compression].
 [migrate-separately]: /self-hosted/:currentVersion:/migration/schema-then-data/
 [pg_dump]: https://www.postgresql.org/docs/current/app-pgdump.html
 [pg_restore]: https://www.postgresql.org/docs/current/app-pgrestore.html
-[psql]: /use-timescale/:currentVersion:/integrations/query-admin/about-psql/
+[psql]: /use-timescale/:currentVersion:/integrations/query-admin/psql/
 [timescaledb_pre_restore]: /api/:currentVersion:/administration/#timescaledb_pre_restore
 [timescaledb_post_restore]: /api/:currentVersion:/administration/#timescaledb_post_restore
 [upgrading-postgresql-self-hosted]: /self-hosted/:currentVersion:/upgrades/upgrade-pg/

self-hosted/migration/schema-then-data.md

@@ -210,7 +210,7 @@ the [compression section](https://docs.timescale.com/use-timescale/latest/compre
 [install-selfhosted]: /self-hosted/:currentVersion:/install/
 [pg_dump]: https://www.postgresql.org/docs/current/app-pgdump.html
 [pg_restore]: https://www.postgresql.org/docs/current/app-pgrestore.html
-[psql]: /use-timescale/:currentVersion:/integrations/query-admin/about-psql/
+[psql]: /use-timescale/:currentVersion:/integrations/query-admin/psql/
 [timescaledb-parallel-copy]: https://github.com/timescale/timescaledb-parallel-copy
 [upgrading-postgresql]: https://kb-managed.timescale.com/en/articles/5368016-perform-a-postgresql-major-version-upgrade
 [upgrading-postgresql-self-hosted]: /self-hosted/:currentVersion:/upgrades/upgrade-pg/

tutorials/OLD-financial-candlestick-tick-data/index.md

@@ -73,4 +73,4 @@ Follow this tutorial and see how to set up your TimescaleDB database to consume
 [create]: /tutorials/:currentVersion:/financial-candlestick-tick-data/create-candlestick-aggregates
 [query]: /tutorials/:currentVersion:/financial-candlestick-tick-data/query-candlestick-views
 [manage]: /tutorials/:currentVersion:/financial-candlestick-tick-data/advanced-data-management
-[psql]: /use-timescale/:currentVersion:/integrations/query-admin/about-psql/
+[psql]: /use-timescale/:currentVersion:/integrations/query-admin/psql/

use-timescale/ingest-data/ingest-telegraf.md

@@ -157,6 +157,6 @@ see the [PostgreQL output plugin][output-plugin].
 [output-plugin]: https://github.com/influxdata/telegraf/blob/release-1.24/plugins/outputs/postgresql/README.md
 [install-telegraf]: https://docs.influxdata.com/telegraf/v1.21/introduction/installation/
 [create-service]: /getting-started/latest/
-[connect-timescaledb]: /use-timescale/:currentVersion:/integrations/query-admin/about-connecting/
-[grafana]: /use-timescale/:currentVersion:/integrations/observability-alerting/grafana/
+[connect-timescaledb]: /use-timescale/:currentVersion:/integrations/about-connecting/
+[grafana]: /use-timescale/:currentVersion:/integrations/grafana/
 [about-hypertables]: /use-timescale/:currentVersion:/hypertables/about-hypertables/

use-timescale/integrations/query-admin/about-connecting.md → use-timescale/integrations/about-connecting.md

@@ -85,5 +85,5 @@ for accessing your database, and add additional authentication requirements.
 
 </Tabs>
 
-[about-psql]: /use-timescale/:currentVersion:/integrations/query-admin/about-psql/
+[about-psql]: /use-timescale/:currentVersion:/integrations/query-admin/psql/
 [tsc-portal]: https://console.cloud.timescale.com/

use-timescale/integrations/query-admin/azure-data-studio.md → use-timescale/integrations/azure-data-studio.md

@@ -7,8 +7,7 @@ keywords: [connect]
 
 # Connect to Timescale using Azure Data Studio
 
-Azure Data Studio is a cross-platform database tool for data professionals using
-on-premises and cloud data platforms on Windows, macOS, and Linux.
+Azure Data Studio is an open-source, cross-platform hybrid data analytics tool designed to simplify the data landscape.
 
 ## Before you begin
 

use-timescale/integrations/query-admin/dbeaver.md → use-timescale/integrations/dbeaver.md

@@ -7,9 +7,7 @@ keywords: [connect]
 
 # Connect to Timescale using DBeaver
 
-[DBeaver][dbeaver] is a free and open source database tool that is available for
-Microsoft Windows, Apple macOS, and many Linux versions. DBeaver provides a
-powerful SQL editor, administration features, ability to migrate data and
+[DBeaver][dbeaver] is a free cross-platform database tool for developers, database administrators, analysts, and everyone working with data. DBeaver provides a powerful SQL editor, administration features, ability to migrate data and
 schema, and the ability to monitor database connection sessions. You can connect
 to Timescale hosted on your local machine or on a remote server or a Timescale
 service.

use-timescale/integrations/observability-alerting/grafana.md → use-timescale/integrations/grafana.md

@@ -9,7 +9,7 @@ import GrafanaConnect from "versionContent/_partials/_grafana-connect.mdx";
 
 # Integrate Grafana and Timescale Cloud
 
-You can use [Grafana](https://grafana.com/docs/) to monitor, visualize and perform analytics on data stored in your $SERVICE_LONG. 
+[Grafana](https://grafana.com/docs/) is an open-source analytics and monitoring solution. You can use it to monitor, visualize, and perform analytics on data stored in your $SERVICE_LONG. 
 
 This page shows you how to connect Grafana with a $SERVICE_LONG, create a dashboard and panel, then visualize geospatial data.
 

use-timescale/integrations/index.md

@@ -6,35 +6,47 @@ keywords: [integrations]
 tags: [integrations]
 ---
 
+# $CLOUD_LONG Integrations
 
-# Integrate tooling with Timescale Cloud
-
-You can integrate your Timescale database with third-party solutions to expand
-and extend what you can do with your data.
-
-|[Query and administration][query-admin]|[Configuration and deployment][config-deploy]|[Observability and alerting][observability-alerting]|
-|-|-|-|
-|[PopSQL][popsql]|
-|[psql][psql]|[Terraform][terraform]|[Grafana][grafana]|
-|[DBeaver][dbeaver]||[Tableau][tableau]|
-|[Azure Data Studio][ads]|
-|[pgAdmin][pgadmin]|
-|[qStudio][qstudio]|
-
-
-
-[query-admin]: /use-timescale/:currentVersion:/integrations/query-admin/
-[observability-alerting]: /use-timescale/:currentVersion:/integrations/observability-alerting/
-[data-ingest]: /use-timescale/:currentVersion:/integrations/data-ingest/
-[config-deploy]: /use-timescale/:currentVersion:/integrations/config-deploy/
-[psql]: /use-timescale/:currentVersion:/integrations/query-admin/psql/
-[dbeaver]: /use-timescale/:currentVersion:/integrations/query-admin/dbeaver/
-[ads]: /use-timescale/:currentVersion:/integrations/query-admin/azure-data-studio/
-[pgadmin]: /use-timescale/:currentVersion:/integrations/query-admin/pgadmin/
-[qstudio]: /use-timescale/:currentVersion:/integrations/query-admin/qstudio/
-[grafana]: /use-timescale/:currentVersion:/integrations/observability-alerting/grafana/
-[telegraf]: /use-timescale/:currentVersion:/integrations/data-ingest/telegraf/
-[tableau]: /use-timescale/:currentVersion:/integrations/observability-alerting/tableau/
-[terraform]: /use-timescale/:currentVersion:/integrations/config-deploy/terraform/
-[popsql]: /getting-started/:currentVersion:/run-queries-from-console/#data-mode
+You can integrate your $SERVICE_LONG with third-party solutions to expand and extend what you can do with your data.
 
+## Integrates with PostgreSQL? Integrates with your $SERVICE_SHORT!
+
+A $SERVICE_LONG is a PostgreSQL database instance extended with additional capabilities. This means that any third-party solution that you can integrate with PostgreSQL, you can also integrate with $CLOUD_LONG. See the full list of PostgreSQL integrations [here][postgresql-integrations].
+
+Some of the most in-demand integrations for $CLOUD_LONG are listed below, with links to detailed integration steps. 
+
+## Query and administration
+
+|      Name                | Description                                                                                                                                  |
+|:------------------------:|----------------------------------------------------------------------------------------------------------------------------------------------|
+| [Azure Data Studio][ads] | An open-source, cross-platform hybrid data analytics tool designed to simplify the data landscape.                                           |
+|    [DBeaver][dbeaver]    | A free cross-platform database tool for developers, database administrators, analysts, and everyone working with data.                       |
+|    [pgAdmin][pgadmin]    | A feature-rich open-source administration and development platform for PostgreSQL.                                                           |
+|       [psql][psql]       | A terminal-based front-end to PostgreSQL that enables you to type in queries interactively, issue them to Postgres, and see the query results. |
+|    [qStudio][qstudio]    | A modern free SQL editor that provides syntax highlighting, code-completion, excel export, charting, and much more.                          |
+
+
+## Observability and alerting
+
+|            Name             | Description                                                                                |
+|:---------------------------:|--------------------------------------------------------------------------------------------|
+|     [Grafana][grafana]      | An open-source analytics and monitoring solution.                       |
+|     [Tableau][tableau]      | A popular analytics platform that helps you gain greater intelligence about your business. |
+
+
+## Configuration and deployment 
+
+|            Name             | Description                                                                                                                 |
+|:---------------------------:|-----------------------------------------------------------------------------------------------------------------------------|
+| [Terraform][terraform]      | An infrastructure-as-code tool that enables you to safely and predictably provision and manage infrastructure in any cloud. |
+
+[psql]: /use-timescale/:currentVersion:/psql/
+[qstudio]: /use-timescale/:currentVersion:/integrations/qstudio/
+[dbeaver]: /use-timescale/:currentVersion:/integrations/dbeaver/
+[ads]: /use-timescale/:currentVersion:/integrations/azure-data-studio/
+[pgadmin]: /use-timescale/:currentVersion:/integrations/pgadmin/
+[grafana]: /use-timescale/:currentVersion:/integrations/grafana/
+[tableau]: /use-timescale/:currentVersion:/integrations/tableau/
+[terraform]: /use-timescale/:currentVersion:/integrations/terraform
+[postgresql-integrations]: https://slashdot.org/software/p/PostgreSQL/integrations/

use-timescale/integrations/query-admin/pgadmin.md → use-timescale/integrations/pgadmin.md

@@ -7,8 +7,7 @@ keywords: [connect]
 
 # Connect to Timescale using pgAdmin
 
-The `pgAdmin` tool is a database administration tool that can be run on the
-desktop, or in your browser. It is available for Chrome, Firefox, Edge, and
+The `pgAdmin` tool is a feature-rich open-source administration and development platform for PostgreSQL. It is available for Chrome, Firefox, Edge, and
 Safari browsers, or can be installed on Microsoft Windows, Apple macOS, or
 various Linux flavors.