diff --git a/docs/en/get-started/cloud-quick-start.md b/docs/en/get-started/cloud-quick-start.md index 7a56aa50d41..d99b7b1e0cd 100644 --- a/docs/en/get-started/cloud-quick-start.md +++ b/docs/en/get-started/cloud-quick-start.md @@ -173,7 +173,7 @@ You can also connect to your ClickHouse Cloud service using a command-line tool ![clickhouse client connection details](@site/docs/en/images/quickstart/CloudClickhouseClientDetails.png) -1. Install [ClickHouse](/docs/en/integrations/clickhouse-client-local.md). +1. Install [ClickHouse](/docs/en/integrations/sql-clients/sql-console). 2. Run the command, substituting your hostname, username, and password: ```bash diff --git a/docs/en/guides/inserting-data.md b/docs/en/guides/inserting-data.md index 1076f2a3a5f..757d0c9ba1b 100644 --- a/docs/en/guides/inserting-data.md +++ b/docs/en/guides/inserting-data.md @@ -118,7 +118,7 @@ Full details on configuring asynchronous inserts can be found [here](/en/optimiz ClickHouse has clients in the most popular programming languages. These are optimized to ensure that inserts are performed correctly and natively support asynchronous inserts either directly as in e.g. the [Go client](/en/integrations/go#async-insert), or indirectly when enabled in the query, user or connection level settings. -See [Clients and Drivers](../../en/integrations/sql-clients/clickhouse-client-local) for a full list of available ClickHouse clients and drivers. +See [Clients and Drivers](/docs/en/interfaces/cli) for a full list of available ClickHouse clients and drivers. ### Prefer the Native format diff --git a/docs/en/integrations/data-ingestion/insert-local-files.md b/docs/en/integrations/data-ingestion/insert-local-files.md index 4adf29eabaa..6a1e14ce991 100644 --- a/docs/en/integrations/data-ingestion/insert-local-files.md +++ b/docs/en/integrations/data-ingestion/insert-local-files.md @@ -110,7 +110,7 @@ cat comments.tsv | clickhouse-client \ " ``` -Visit the [docs page on `clickhouse-client`](/docs/en/integrations/sql-clients/clickhouse-client-local) for details on how to install `clickhouse-client` on your local operating system. +Visit the [docs page on `clickhouse-client`](/docs/en/interfaces/cli) for details on how to install `clickhouse-client` on your local operating system. ## Related Content diff --git a/docs/en/integrations/language-clients/java/jdbc-driver.md b/docs/en/integrations/language-clients/java/jdbc-driver.md index e2c2b1607c8..537e0ff058b 100644 --- a/docs/en/integrations/language-clients/java/jdbc-driver.md +++ b/docs/en/integrations/language-clients/java/jdbc-driver.md @@ -13,13 +13,13 @@ import CodeBlock from '@theme/CodeBlock'; # JDBC Driver -`clickhouse-jdbc` implements the standard JDBC interface. Being built on top of [clickhouse-client](/docs/en/integrations/clickhouse-client-local.md), it provides additional features like custom type mapping, transaction support, and standard synchronous `UPDATE` and `DELETE` statements, etc., so that it can be easily used with legacy applications and tools. +`clickhouse-jdbc` implements the standard JDBC interface. Being built on top of [clickhouse-client](/docs/en/integrations/sql-clients/sql-console), it provides additional features like custom type mapping, transaction support, and standard synchronous `UPDATE` and `DELETE` statements, etc., so that it can be easily used with legacy applications and tools. :::note Latest JDBC (0.7.1) version uses Client-V1 ::: -`clickhouse-jdbc` API is synchronous, and generally, it has more overheads(e.g., SQL parsing and type mapping/conversion, etc.). Consider [clickhouse-client](/docs/en/integrations/clickhouse-client-local.md) when performance is critical or if you prefer a more direct way to access ClickHouse. +`clickhouse-jdbc` API is synchronous, and generally, it has more overheads(e.g., SQL parsing and type mapping/conversion, etc.). Consider [clickhouse-client](/docs/en/integrations/sql-clients/sql-console) when performance is critical or if you prefer a more direct way to access ClickHouse. ## Environment requirements diff --git a/docs/en/migrations/bigquery/loading-data.md b/docs/en/migrations/bigquery/loading-data.md index bc1c7812765..04202dd6cbb 100644 --- a/docs/en/migrations/bigquery/loading-data.md +++ b/docs/en/migrations/bigquery/loading-data.md @@ -62,7 +62,7 @@ This approach has a number of advantages: ## 2. Importing data into ClickHouse from GCS -Once the export is complete, we can import this data into a ClickHouse table. You can use the [ClickHouse SQL console](/docs/en/integrations/sql-clients/sql-console) or [`clickhouse-client`](/docs/en/integrations/sql-clients/cli) to execute the commands below. +Once the export is complete, we can import this data into a ClickHouse table. You can use the [ClickHouse SQL console](/docs/en/integrations/sql-clients/sql-console) or [`clickhouse-client`](/docs/en/interfaces/cli) to execute the commands below. You must first [create your table](/docs/en/sql-reference/statements/create/table) in ClickHouse: diff --git a/docs/index.md b/docs/index.md index c52614e40d2..304a35b76da 100644 --- a/docs/index.md +++ b/docs/index.md @@ -85,7 +85,7 @@ export const ConnectToClickHouse = ({ children, color}) => {
- } link='/docs/en/integrations/sql-clients/clickhouse-client-local'>ClickHouse CLI + } link='/docs/en/interfaces/cli'>ClickHouse CLI } link='/docs/en/get-started/sql-console'>Cloud SQL Console Node.js
diff --git a/sidebars.js b/sidebars.js index 3b89650d386..9bdc51490f8 100644 --- a/sidebars.js +++ b/sidebars.js @@ -210,6 +210,16 @@ const sidebars = { "en/cloud/manage/service-types", "en/cloud/manage/integrations", "en/cloud/manage/backups", + { + type: "category", + label: "Monitoring", + collapsed: true, + collapsible: true, + items: [ + "en/integrations/prometheus", + + ], + }, { type: "category", label: "Billing", @@ -306,7 +316,7 @@ const sidebars = { }, { type: "category", - label: "Best Practices ", + label: "Best Practices", collapsed: false, collapsible: false, className: "top-nav-item", @@ -525,6 +535,55 @@ const sidebars = { ], integrations: [ + { + type: "category", + label: "All Integrations", + link: { + type: "doc", + id: "en/integrations/index", + }, + items: [] + }, + { + type: "category", + label: "Language Clients", + collapsed: false, + collapsible: false, + items: [ + "en/interfaces/cpp", + "en/integrations/language-clients/go/index", + "en/integrations/language-clients/js", + { + type: "category", + label: "Java", + collapsed: true, + collapsible: true, + items: [ + { + type: "doc", + label: "Overview", + id: "en/integrations/language-clients/java/index" + }, + // "en/integrations/language-clients/java/index", + "en/integrations/language-clients/java/client-v2", + "en/integrations/language-clients/java/client-v1", + "en/integrations/language-clients/java/jdbc-driver", + "en/integrations/language-clients/java/r2dbc" + ] + }, + "en/integrations/language-clients/python/index", + "en/integrations/language-clients/rust", + { + type: "category", + label: "Third-party Clients", + collapsed: true, + collapsible: true, + items: [ + "en/interfaces/third-party/client-libraries" + ], + }, + ], + }, { type: "category", label: "ClickPipes", @@ -562,13 +621,36 @@ const sidebars = { }, { type: "category", - label: "All Integrations", - link: { - type: "doc", - id: "en/integrations/index", - }, + label: "Native Clients & Interfaces", collapsed: false, collapsible: false, + items: [ + "en/interfaces/cli", + "en/integrations/sql-clients/sql-console", + { + type: "category", + label: "Drivers and Interfaces", + collapsed: true, + collapsible: true, + items: [ + "en/interfaces/overview", + "en/interfaces/http", + "en/interfaces/tcp", + "en/interfaces/jdbc", + "en/interfaces/mysql", + "en/interfaces/odbc", + "en/interfaces/postgresql", + "en/interfaces/prometheus", + "en/interfaces/grpc", + ], + }, + ], + }, + { + type: "category", + label: "Data Sources", + collapsed: false, + collapsible: true, items: [ { type: "category", @@ -581,6 +663,11 @@ const sidebars = { "en/integrations/data-ingestion/s3/performance" ], }, + { + type: "doc", + id: "en/integrations/data-ingestion/dbms/postgresql/index", + label: "PostgreSQL", + }, { type: "category", label: "Kafka", @@ -600,8 +687,6 @@ const sidebars = { "en/integrations/data-ingestion/kafka/kafka-table-engine-named-collections" ], }, - "en/integrations/data-ingestion/etl-tools/dbt/index", - "en/integrations/data-ingestion/etl-tools/fivetran/index", { type: "category", label: "Apache Spark", @@ -614,62 +699,104 @@ const sidebars = { "en/integrations/data-ingestion/apache-spark/spark-jdbc", ], }, - "en/integrations/data-ingestion/aws-glue/index", + { + type: "doc", + id: "en/integrations/data-ingestion/dbms/mysql/index", + label: "MySQL", + }, + { + type: "link", + label: "Cassandra", + href: "/en/sql-reference/dictionaries#cassandra", + }, + { + type: "link", + label: "Redis", + href: "/en/sql-reference/table-functions/redis", + }, + "en/engines/table-engines/integrations/rabbitmq", + "en/engines/table-engines/integrations/mongodb", + "en/integrations/data-ingestion/gcs/index", + "en/engines/table-engines/integrations/hive", + "en/engines/table-engines/integrations/hudi", + "en/engines/table-engines/integrations/iceberg", + "en/integrations/data-ingestion/s3-minio", + "en/sql-reference/table-functions/deltalake", + { + type: "link", + label: "RocksDB", + href: "/en/engines/table-engines/integrations/embedded-rocksdb" + }, + "en/integrations/data-visualization/splunk-and-clickhouse", + "en/engines/table-engines/integrations/sqlite", + "en/engines/table-engines/integrations/nats", + "en/integrations/data-ingestion/emqx/index", "en/integrations/data-ingestion/insert-local-files", "en/integrations/data-ingestion/dbms/jdbc-with-clickhouse", - "en/integrations/data-ingestion/dbms/odbc-with-clickhouse", + "en/integrations/data-ingestion/dbms/odbc-with-clickhouse" + ], + }, + { + type: "category", + label: "Data Visualization", + collapsed: true, + collapsible: true, + items: [ + "en/integrations/data-visualization", + "en/integrations/data-visualization/deepnote", + "en/integrations/data-visualization/astrato-and-clickhouse", + "en/integrations/data-visualization/draxlr-and-clickhouse", + "en/integrations/data-visualization/embeddable-and-clickhouse", + "en/integrations/data-visualization/explo-and-clickhouse", { type: "category", - label: "More...", + label: "Grafana", className: "top-nav-item", collapsed: true, collapsible: true, items: [ - "en/integrations/data-ingestion/etl-tools/airbyte-and-clickhouse", - "en/integrations/data-ingestion/etl-tools/apache-beam", - { - type: "link", - label: "Cassandra", - href: "/en/sql-reference/dictionaries#cassandra", - }, - "en/sql-reference/table-functions/deltalake", - "en/integrations/data-ingestion/etl-tools/dlt-and-clickhouse", - "en/integrations/deployment/easypanel/index", - "en/engines/table-engines/integrations/embedded-rocksdb", - "en/integrations/data-ingestion/emqx/index", - "en/integrations/data-ingestion/gcs/index", - "en/engines/table-engines/integrations/hive", - "en/engines/table-engines/integrations/hudi", - "en/engines/table-engines/integrations/iceberg", - "en/integrations/data-ingestion/s3-minio", - "en/engines/table-engines/integrations/mongodb", - "en/engines/table-engines/integrations/nats", - "en/integrations/data-ingestion/etl-tools/nifi-and-clickhouse", - "en/integrations/prometheus", - "en/engines/table-engines/integrations/rabbitmq", - { - type: "link", - label: "Redis", - href: "/en/sql-reference/dictionaries#redis", - }, - "en/integrations/data-visualization/splunk-and-clickhouse", - "en/engines/table-engines/integrations/sqlite", - "en/integrations/data-ingestion/etl-tools/vector-to-clickhouse", + "en/integrations/data-visualization/grafana/index", + "en/integrations/data-visualization/grafana/query-builder", + "en/integrations/data-visualization/grafana/config", + ], + }, + "en/integrations/data-visualization/hashboard-and-clickhouse", + "en/integrations/data-visualization/looker-and-clickhouse", + "en/integrations/data-visualization/looker-studio-and-clickhouse", + "en/integrations/data-visualization/metabase-and-clickhouse", + "en/integrations/data-visualization/mitzu-and-clickhouse", + "en/integrations/data-visualization/omni-and-clickhouse", + "en/integrations/data-visualization/powerbi-and-clickhouse", + "en/integrations/data-visualization/quicksight-and-clickhouse", + "en/integrations/data-visualization/rocketbi-and-clickhouse", + "en/integrations/data-visualization/superset-and-clickhouse", + { + type: "category", + label: "Tableau", + className: "top-nav-item", + collapsed: true, + collapsible: true, + items: [ + "en/integrations/data-visualization/tableau/tableau-and-clickhouse", + "en/integrations/data-visualization/tableau/tableau-online-and-clickhouse", + "en/integrations/data-visualization/tableau/tableau-connection-tips", + "en/integrations/data-visualization/tableau/tableau-analysis-tips", ], }, + "en/integrations/data-visualization/zingdata-and-clickhouse", ], }, { type: "category", label: "Data Formats", - collapsed: false, - collapsible: false, + collapsed: true, + collapsible: true, + link: { + type: "doc", + id: "en/integrations/data-ingestion/data-formats/intro", + }, items: [ - { - type: "doc", - id: "en/integrations/data-ingestion/data-formats/intro", - label: "Overview", - }, + "en/interfaces/schema-inference", "en/integrations/data-ingestion/data-formats/binary", "en/integrations/data-ingestion/data-formats/csv-tsv", { @@ -701,69 +828,26 @@ const sidebars = { }, { type: "category", - label: "Clients and Drivers", - collapsed: false, - collapsible: false, + label: "Data Ingestion", + collapsed: true, + collapsible: true, + items: [ + "en/integrations/data-ingestion/etl-tools/airbyte-and-clickhouse", + "en/integrations/data-ingestion/aws-glue/index", + "en/integrations/data-ingestion/etl-tools/apache-beam", + "en/integrations/data-ingestion/etl-tools/dbt/index", + "en/integrations/data-ingestion/etl-tools/fivetran/index", + "en/integrations/data-ingestion/etl-tools/nifi-and-clickhouse", + "en/integrations/data-ingestion/etl-tools/dlt-and-clickhouse", + "en/integrations/data-ingestion/etl-tools/vector-to-clickhouse", + ], + }, + { + type: "category", + label: "Tools", + collapsed: true, + collapsible: true, items: [ - "en/integrations/clickhouse-client-local", - "en/integrations/cli", - "en/operations/utilities/clickhouse-local", - "en/integrations/sql-clients/sql-console", - "en/getting-started/playground", - "en/integrations/language-clients/go/index", - "en/integrations/language-clients/js", - { - type: "category", - label: "Java", - collapsed: true, - collapsible: true, - items: [ - { - type: "doc", - label: "Overview", - id: "en/integrations/language-clients/java/index" - }, - // "en/integrations/language-clients/java/index", - "en/integrations/language-clients/java/client-v2", - "en/integrations/language-clients/java/client-v1", - "en/integrations/language-clients/java/jdbc-driver", - "en/integrations/language-clients/java/r2dbc" - ] - }, - "en/integrations/language-clients/python/index", - "en/integrations/language-clients/rust", - { - type: "category", - label: "Drivers and Interfaces", - collapsed: true, - collapsible: true, - items: [ - "en/interfaces/overview", - "en/interfaces/cli", - "en/interfaces/cpp", - "en/interfaces/http", - "en/interfaces/tcp", - "en/interfaces/jdbc", - "en/interfaces/mysql", - "en/interfaces/odbc", - "en/interfaces/postgresql", - "en/interfaces/prometheus", - "en/interfaces/schema-inference", - "en/interfaces/grpc", - { - type: "category", - label: "Third-party Interfaces", - collapsed: true, - collapsible: true, - items: [ - { - type: "autogenerated", - dirName: "en/interfaces/third-party", - }, - ], - }, - ], - }, { type: "category", label: "SQL Clients", @@ -780,60 +864,27 @@ const sidebars = { }, { type: "category", - label: "Business Intelligence", + label: "Data Integration", collapsed: true, collapsible: true, items: [ - "en/integrations/data-visualization", - "en/integrations/data-visualization/deepnote", - "en/integrations/data-visualization/astrato-and-clickhouse", - "en/integrations/data-visualization/draxlr-and-clickhouse", - "en/integrations/data-visualization/embeddable-and-clickhouse", - "en/integrations/data-visualization/explo-and-clickhouse", - { - type: "category", - label: "Grafana", - className: "top-nav-item", - collapsed: true, - collapsible: true, - items: [ - "en/integrations/data-visualization/grafana/index", - "en/integrations/data-visualization/grafana/query-builder", - "en/integrations/data-visualization/grafana/config", - ], - }, - "en/integrations/data-visualization/hashboard-and-clickhouse", - "en/integrations/data-visualization/looker-and-clickhouse", - "en/integrations/data-visualization/looker-studio-and-clickhouse", - "en/integrations/data-visualization/metabase-and-clickhouse", - "en/integrations/data-visualization/mitzu-and-clickhouse", - "en/integrations/data-visualization/omni-and-clickhouse", - "en/integrations/data-visualization/powerbi-and-clickhouse", - "en/integrations/data-visualization/quicksight-and-clickhouse", - "en/integrations/data-visualization/rocketbi-and-clickhouse", - "en/integrations/data-visualization/superset-and-clickhouse", - { - type: "category", - label: "Tableau", - className: "top-nav-item", - collapsed: true, - collapsible: true, - items: [ - "en/integrations/data-visualization/tableau/tableau-and-clickhouse", - "en/integrations/data-visualization/tableau/tableau-online-and-clickhouse", - "en/integrations/data-visualization/tableau/tableau-connection-tips", - "en/integrations/data-visualization/tableau/tableau-analysis-tips", - ], - }, - "en/integrations/data-visualization/zingdata-and-clickhouse", + "en/integrations/no-code/retool", + "en/integrations/deployment/easypanel/index" ], - }, - { + },{ type: "category", - label: "No-Code platforms", + label: "Misc", collapsed: true, collapsible: true, - items: ["en/integrations/no-code/retool"], + items: [ + "en/interfaces/third-party/gui", + "en/interfaces/third-party/proxy", + { + type: "doc", + id: "en/interfaces/third-party/integrations", + label: "Third-party Libraries", + }, + ], }, ], }, diff --git a/src/theme/Navbar/Content/index.js b/src/theme/Navbar/Content/index.js index ee84bb28fa4..e5a2f8ce684 100644 --- a/src/theme/Navbar/Content/index.js +++ b/src/theme/Navbar/Content/index.js @@ -210,25 +210,45 @@ const dropdownCategories = [{ description: 'Integrations, clients, and drivers to use with ClickHouse', link: '/docs/en/integrations', menuItems: [ + { + title: 'All Integrations', + description: 'Integrate ClickHouse with other databases and applications', + link: '/docs/en/integrations' + }, + { + title: 'Language Clients', + description: 'Use your favorite language to work with ClickHouse', + link: '/docs/en/integrations/go' + }, { title: 'ClickPipes', description: 'The easiest way to ingest data into ClickHouse', link: '/docs/en/integrations/clickpipes' }, + { + title: 'Native Clients & Interfaces', + description: 'Choose a client and interface to connect to ClickHouse', + link: '/docs/en/interfaces/cli' + }, + { + title: 'Data Sources', + description: 'Load data into ClickHouse from your prefered source', + link: '/docs/en/integrations/s3' + }, + { + title: 'Data Visualization', + description: 'Connect ClickHouse to your favorite visualization tool', + link: '/docs/en/integrations/data-visualization' + }, { title: 'Data Formats', description: 'Explore data formats supported by ClickHouse', link: '/docs/en/integrations/data-formats' }, { - title: 'All Integrations', - description: 'Integrate ClickHouse with other databases and applications', - link: '/docs/en/integrations' - }, - { - title: 'Clients and Drivers', - description: 'Choose a client or driver to connect to ClickHouse', - link: '/docs/en/integrations/sql-clients/clickhouse-client-local' + title: 'Data Ingestion', + description: 'Ingest data into ClickHouse with a range of ELT tools', + link: '/docs/en/integrations/airbyte' }, ] },