From 6009bd8287ebc011333c5cdeb7c1c8b117892a81 Mon Sep 17 00:00:00 2001 From: Peach Leach Date: Mon, 23 Feb 2026 13:26:43 -0500 Subject: [PATCH 01/15] Delete 5 pages --- src/current/_data/redirects.yml | 20 + .../v26.1/sidebar-data/cloud-deployments.json | 29 +- .../v26.1/sidebar-data/get-started.json | 7 - .../sidebar-data/self-hosted-deployments.json | 7 - .../cockroachcloud/learn-cockroachdb-sql.md | 380 ------------------ ...-local-cluster-with-kubernetes-insecure.md | 152 ------- ...estrate-a-local-cluster-with-kubernetes.md | 98 ----- src/current/v26.1/satori-integration.md | 34 -- .../security-reference/config-secure-hba.md | 130 ------ 9 files changed, 26 insertions(+), 831 deletions(-) delete mode 100644 src/current/cockroachcloud/learn-cockroachdb-sql.md delete mode 100644 src/current/v26.1/orchestrate-a-local-cluster-with-kubernetes-insecure.md delete mode 100644 src/current/v26.1/orchestrate-a-local-cluster-with-kubernetes.md delete mode 100644 src/current/v26.1/satori-integration.md delete mode 100644 src/current/v26.1/security-reference/config-secure-hba.md diff --git a/src/current/_data/redirects.yml b/src/current/_data/redirects.yml index 0e55102d46a..1658f0e17c2 100644 --- a/src/current/_data/redirects.yml +++ b/src/current/_data/redirects.yml @@ -1067,3 +1067,23 @@ - v24.3/cockroachdb-in-comparison.md - v25.1/cockroachdb-in-comparison.md +# page deletion project + +- destination: stable/sql-statements.md + sources: ['learn-cockroachdb-sql.md'] + versions: ['cockroachcloud'] + +- destination: cockroachcloud/client-certs-advanced.md + sources: ['security-reference/config-secure-hba.md'] + versions: ['v26.1'] + +- destination: cockroachcloud/security-overview.md + sources: ['satori-integration.md'] + versions: ['v26.1'] + +- destination: stable/cockroachdb-operator-overview.md + sources: ['orchestrate-a-local-cluster-with-kubernetes.md', 'orchestrate-a-local-cluster-with-kubernetes-insecure.md'] + versions: ['v26.1'] + + + diff --git a/src/current/_includes/v26.1/sidebar-data/cloud-deployments.json b/src/current/_includes/v26.1/sidebar-data/cloud-deployments.json index 88a04d9d0c2..1dc121e15f1 100644 --- a/src/current/_includes/v26.1/sidebar-data/cloud-deployments.json +++ b/src/current/_includes/v26.1/sidebar-data/cloud-deployments.json @@ -206,6 +206,12 @@ "/cockroachcloud/egress-private-endpoints.html" ] }, + { + "title": "HashiCorp Vault Integration", + "urls": [ + "/${VERSION}/hashicorp-integration.html" + ] + }, { "title": "Customer-Managed Encryption Keys (CMEK)", "items": [ @@ -362,29 +368,6 @@ } ] }, - { - "title": "Security Tutorials", - "items": [ - { - "title": "Configure SQL Authentication", - "urls": [ - "/${VERSION}/security-reference/config-secure-hba.html" - ] - }, - { - "title": "Satori", - "urls": [ - "/${VERSION}/satori-integration.html" - ] - }, - { - "title": "HashiCorp Vault", - "urls": [ - "/${VERSION}/hashicorp-integration.html" - ] - } - ] - } ] }, { diff --git a/src/current/_includes/v26.1/sidebar-data/get-started.json b/src/current/_includes/v26.1/sidebar-data/get-started.json index 4a48e9e48b5..00849bf8799 100644 --- a/src/current/_includes/v26.1/sidebar-data/get-started.json +++ b/src/current/_includes/v26.1/sidebar-data/get-started.json @@ -17,13 +17,6 @@ "/${VERSION}/install-cockroachdb-windows.html" ] }, - { - "title": "Learn CockroachDB SQL", - "urls": [ - "/cockroachcloud/learn-cockroachdb-sql.html", - "/${VERSION}/learn-cockroachdb-sql.html" - ] - }, { "title": "Develop with CockroachDB", "items": [ diff --git a/src/current/_includes/v26.1/sidebar-data/self-hosted-deployments.json b/src/current/_includes/v26.1/sidebar-data/self-hosted-deployments.json index c4b5c644b4f..ce7b94d0e95 100644 --- a/src/current/_includes/v26.1/sidebar-data/self-hosted-deployments.json +++ b/src/current/_includes/v26.1/sidebar-data/self-hosted-deployments.json @@ -24,13 +24,6 @@ "/${VERSION}/start-a-local-cluster.html" ] }, - { - "title": "Deploy in Kubernetes", - "urls": [ - "/${VERSION}/orchestrate-a-local-cluster-with-kubernetes.html", - "/${VERSION}/orchestrate-a-local-cluster-with-kubernetes-insecure.html" - ] - }, { "title": "Deploy in Docker", "urls": [ diff --git a/src/current/cockroachcloud/learn-cockroachdb-sql.md b/src/current/cockroachcloud/learn-cockroachdb-sql.md deleted file mode 100644 index 95377257065..00000000000 --- a/src/current/cockroachcloud/learn-cockroachdb-sql.md +++ /dev/null @@ -1,380 +0,0 @@ ---- -title: Learn CockroachDB SQL -summary: Learn some of the most essential CockroachDB SQL statements on a local cluster. -toc: true -docs_area: get_started ---- - -This tutorial walks you through some of the most important CockroachDB SQL statements. For a list of all supported SQL statements, see [SQL Statements]({% link {{site.current_cloud_version}}/sql-statements.md %}). - -{{site.data.alerts.callout_info}} -This tutorial requires a cluster deployed on {{ site.data.products.cloud }}. -{{site.data.alerts.end}} - -## Before you begin - -Make sure that you can connect the [`cockroach-sql`]({% link {{site.current_cloud_version}}/cockroach-sql-binary.md %}) client to a {{ site.data.products.cloud }} cluster. - -## Create a database - -Your CockroachDB {{ site.data.products.cloud }} cluster comes with a database called `defaultdb`. This is used for testing and some internal databases. - -To create a new database, use [`CREATE DATABASE`]({% link {{site.current_cloud_version}}/create-database.md %}) followed by a database name: - -{% include_cached copy-clipboard.html %} -~~~ sql -CREATE DATABASE bank; -~~~ - -Database names must follow [these identifier rules]({% link {{site.current_cloud_version}}/keywords-and-identifiers.md %}#identifiers). To avoid an error in case the database already exists, use the `IF NOT EXISTS` clause: - -{% include_cached copy-clipboard.html %} -~~~ sql -CREATE DATABASE IF NOT EXISTS bank; -~~~ - -## Show databases - -To see all databases, use the [`SHOW DATABASES`]({% link {{site.current_cloud_version}}/show-databases.md %}) statement or the `\l` [shell command]({% link {{site.current_cloud_version}}/cockroach-sql.md %}#commands): - -{% include_cached copy-clipboard.html %} -~~~ sql -SHOW DATABASES; -~~~ - -~~~ - database_name -+---------------+ - bank - defaultdb - postgres - system -(4 rows) -~~~ - -## Set the default database - -It's best to set the default database directly in your connection string. Refer to [Connect to your cluster]({% link cockroachcloud/connect-to-your-cluster.md %}#connect-to-your-cluster). - -{% include_cached copy-clipboard.html %} -~~~ sql -SET DATABASE = bank; -~~~ - -When working in the default database, you do not need to reference it explicitly in statements. To see which database is currently the default, use the `SHOW DATABASE` statement (note the singular form): - -{% include_cached copy-clipboard.html %} -~~~ sql -SHOW DATABASE; -~~~ - -~~~ - database -+----------+ - bank -(1 row) -~~~ - -## Create a table - -To create a table, use [`CREATE TABLE`]({% link {{site.current_cloud_version}}/create-table.md %}) followed by a table name, the column names, and the [data type]({% link {{site.current_cloud_version}}/data-types.md %}) and [constraint]({% link {{site.current_cloud_version}}/constraints.md %}), if any, for each column: - -{% include_cached copy-clipboard.html %} -~~~ sql -CREATE TABLE accounts (id INT8 PRIMARY KEY, balance DECIMAL); -~~~ - -Table and column names must follow [these rules]({% link {{site.current_cloud_version}}/keywords-and-identifiers.md %}#identifiers). Also, when you do not explicitly define a [primary key]({% link {{site.current_cloud_version}}/primary-key.md %}), CockroachDB will automatically add a hidden `rowid` column as the primary key. - -To avoid an error in case the table already exists, you can include `IF NOT EXISTS`: - -{% include_cached copy-clipboard.html %} -~~~ sql -CREATE TABLE IF NOT EXISTS accounts ( - id INT8 PRIMARY KEY, balance DECIMAL -); -~~~ - -To show all of the columns from a table, use the [`SHOW COLUMNS FROM `]({% link {{site.current_cloud_version}}/show-columns.md %}) statement or the `\d
` [shell command]({% link {{site.current_cloud_version}}/cockroach-sql.md %}#commands): - -{% include_cached copy-clipboard.html %} -~~~ sql -SHOW COLUMNS FROM accounts; -~~~ - -~~~ - column_name | data_type | is_nullable | column_default | generation_expression | indices | is_hidden -+-------------+-----------+-------------+----------------+-----------------------+-------------+-----------+ - id | INT | false | NULL | | {"primary"} | false - balance | DECIMAL | true | NULL | | {} | false -(2 rows) -~~~ - -## Show tables - -To see all tables in the active database, use the [`SHOW TABLES`]({% link {{site.current_cloud_version}}/show-tables.md %}) statement or the `\dt` [shell command]({% link {{site.current_cloud_version}}/cockroach-sql.md %}#commands): - -{% include_cached copy-clipboard.html %} -~~~ sql -SHOW TABLES; -~~~ - -~~~ - table_name -+------------+ - accounts -(1 row) -~~~ - -## Insert rows - -To insert a row into a table, use [`INSERT INTO`]({% link {{site.current_cloud_version}}/insert.md %}) followed by the table name and then the column values listed in the order in which the columns appear in the table: - -{% include_cached copy-clipboard.html %} -~~~ sql -INSERT INTO accounts VALUES (1, 10000.50); -~~~ - -If you want to pass column values in a different order, list the column names explicitly and provide the column values in the corresponding order: - -{% include_cached copy-clipboard.html %} -~~~ sql -INSERT INTO accounts (balance, id) VALUES (25000.00, 2); -~~~ - -To insert multiple rows into a table, use a comma-separated list of parentheses, each containing column values for one row: - -{% include_cached copy-clipboard.html %} -~~~ sql -INSERT INTO accounts VALUES (3, 8100.73), (4, 9400.10); -~~~ - -[Default values]({% link {{site.current_cloud_version}}/default-value.md %}) are used when you leave specific columns out of your statement, or when you explicitly request default values. For example, both of the following statements would create a row with `balance` filled with its default value, in this case `NULL`: - -{% include_cached copy-clipboard.html %} -~~~ sql -INSERT INTO accounts (id) VALUES (5); -~~~ - -{% include_cached copy-clipboard.html %} -~~~ sql -INSERT INTO accounts (id, balance) VALUES (6, DEFAULT); -~~~ - -{% include_cached copy-clipboard.html %} -~~~ sql -SELECT * FROM accounts WHERE id IN (5, 6); -~~~ - -~~~ - id | balance -+----+---------+ - 5 | NULL - 6 | NULL -(2 rows) -~~~ - -## Create an index - -[Indexes]({% link {{site.current_cloud_version}}/indexes.md %}) help locate data without having to look through every row of a table. They're automatically created for the [primary key]({% link {{site.current_cloud_version}}/primary-key.md %}) of a table and any columns with a [`UNIQUE` constraint]({% link {{site.current_cloud_version}}/unique.md %}). - -To create an index for non-unique columns, use [`CREATE INDEX`]({% link {{site.current_cloud_version}}/create-index.md %}) followed by an optional index name and an `ON` clause identifying the table and column(s) to index. For each column, you can choose whether to sort ascending (`ASC`) or descending (`DESC`). - -{% include_cached copy-clipboard.html %} -~~~ sql -CREATE INDEX balance_idx ON accounts (balance DESC); -~~~ - -You can create indexes during table creation as well; just include the `INDEX` keyword followed by an optional index name and the column(s) to index: - -{% include_cached copy-clipboard.html %} -~~~ sql -CREATE TABLE IF NOT EXISTS accounts ( - id INT8 PRIMARY KEY, balance DECIMAL, - INDEX balance_idx (balance) -); -~~~ - -## Show indexes - -To show the indexes on a table, use [`SHOW INDEX FROM`]({% link {{site.current_cloud_version}}/show-index.md %}) followed by the name of the table: - -{% include_cached copy-clipboard.html %} -~~~ sql -SHOW INDEX FROM accounts; -~~~ - -~~~ - table_name | index_name | non_unique | seq_in_index | column_name | direction | storing | implicit -+------------+-------------+------------+--------------+-------------+-----------+---------+----------+ - accounts | balance_idx | true | 1 | balance | DESC | false | false - accounts | balance_idx | true | 2 | id | ASC | false | true - accounts | primary | false | 1 | id | ASC | false | false - accounts | primary | false | 2 | balance | N/A | true | false -(4 rows) -~~~ - -## Query a table - -To query a table, use [`SELECT`]({% link {{site.current_cloud_version}}/select-clause.md %}) followed by a comma-separated list of the columns to be returned and the table from which to retrieve the data: - -{% include_cached copy-clipboard.html %} -~~~ sql -SELECT balance FROM accounts; -~~~ - -~~~ - balance -+----------+ - 10000.50 - 25000.00 - 8100.73 - 9400.10 - NULL - NULL -(6 rows) -~~~ - -To retrieve all columns, use the `*` wildcard: - -{% include_cached copy-clipboard.html %} -~~~ sql -SELECT * FROM accounts; -~~~ - -~~~ - id | balance -+----+----------+ - 1 | 10000.50 - 2 | 25000.00 - 3 | 8100.73 - 4 | 9400.10 - 5 | NULL - 6 | NULL -(6 rows) -~~~ - -To filter the results, add a [`WHERE` clause]({% link {{site.current_cloud_version}}/select-clause.md %}#where-clause) identifying the columns and values to filter on: - -{% include_cached copy-clipboard.html %} -~~~ sql -SELECT id, balance FROM accounts WHERE balance > 9000; -~~~ - -~~~ - id | balance -+----+----------+ - 2 | 25000.00 - 1 | 10000.50 - 4 | 9400.10 -(3 rows) -~~~ - -To sort the results, add an [`ORDER BY`]({% link {{site.current_cloud_version}}/order-by.md %}) clause identifying the columns to sort by. For each column, you can choose whether to sort ascending (`ASC`) or descending (`DESC`). - -{% include_cached copy-clipboard.html %} -~~~ sql -SELECT id, balance FROM accounts ORDER BY balance DESC; -~~~ - -~~~ - id | balance -+----+----------+ - 2 | 25000.00 - 1 | 10000.50 - 4 | 9400.10 - 3 | 8100.73 - 5 | NULL - 6 | NULL -(6 rows) -~~~ - -## Update rows - -To update rows in a table, use [`UPDATE`]({% link {{site.current_cloud_version}}/update.md %}) followed by the table name, a `SET` clause identifying the columns to update and their new values, and a [`WHERE` clause]({% link {{site.current_cloud_version}}/select-clause.md %}#where-clause) identifying the rows to update: - -{% include_cached copy-clipboard.html %} -~~~ sql -UPDATE - accounts -SET - balance = balance - 5.50 -WHERE - balance < 10000; -~~~ - -{% include_cached copy-clipboard.html %} -~~~ sql -SELECT * FROM accounts; -~~~ - -~~~ - id | balance -+----+----------+ - 1 | 10000.50 - 2 | 25000.00 - 3 | 8095.23 - 4 | 9394.60 - 5 | NULL - 6 | NULL -(6 rows) -~~~ - -If a table has a primary key, you can use that in the [`WHERE` clause]({% link {{site.current_cloud_version}}/select-clause.md %}#where-clause) to reliably update specific rows; otherwise, each row matching the [`WHERE` clause]({% link {{site.current_cloud_version}}/select-clause.md %}#where-clause) is updated. When there's no [`WHERE` clause]({% link {{site.current_cloud_version}}/select-clause.md %}#where-clause), all rows in the table are updated. - -## Delete rows - -To delete rows from a table, use [`DELETE FROM`]({% link {{site.current_cloud_version}}/delete.md %}) followed by the table name and a [`WHERE` clause]({% link {{site.current_cloud_version}}/select-clause.md %}#where-clause) identifying the rows to delete: - -{% include_cached copy-clipboard.html %} -~~~ sql -DELETE FROM accounts WHERE id in (5, 6); -~~~ - -{% include_cached copy-clipboard.html %} -~~~ sql -SELECT * FROM accounts; -~~~ - -~~~ - id | balance -+----+----------+ - 1 | 10000.50 - 2 | 25000.00 - 3 | 8095.23 - 4 | 9394.60 -(4 rows) -~~~ - -Just as with the `UPDATE` statement, if a table has a primary key, you can use that in the [`WHERE` clause]({% link {{site.current_cloud_version}}/select-clause.md %}#where-clause) to reliably delete specific rows; otherwise, each row matching the [`WHERE` clause]({% link {{site.current_cloud_version}}/select-clause.md %}#where-clause) is deleted. When there's no [`WHERE` clause]({% link {{site.current_cloud_version}}/select-clause.md %}#where-clause), all rows in the table are deleted. - -## Drop a table - -When you no longer need a table, use [`DROP TABLE`]({% link {{site.current_cloud_version}}/drop-table.md %}) followed by the table name to remove the table and all its data: - -{% include_cached copy-clipboard.html %} -~~~ sql -DROP TABLE accounts; -~~~ - -## Drop a database - -When you no longer need a database, use [`DROP DATABASE`]({% link {{site.current_cloud_version}}/drop-database.md %}) followed by the database name to remove the database and all its objects: - -{% include_cached copy-clipboard.html %} -~~~ sql -DROP DATABASE bank; -~~~ - -## See also - -- [Developer Guide Overview]({% link {{site.current_cloud_version}}/developer-guide-overview.md %}) -- [Deploy a Netlify App Built on CockroachDB]({% link {{site.current_cloud_version}}/deploy-app-netlify.md %}) -- [Deploy a Web App built on CockroachDB with Vercel]({% link {{site.current_cloud_version}}/deploy-app-vercel.md %}) -- [Build a Simple CRUD Node.js App with CockroachDB and the node-postgres Driver]({% link {{site.current_cloud_version}}/build-a-nodejs-app-with-cockroachdb.md %}) -- [Build a Simple CRUD Python App with CockroachDB and SQLAlchemy]({% link {{site.current_cloud_version}}/build-a-python-app-with-cockroachdb-sqlalchemy.md %}) -- [Build a Python App with CockroachDB and Django]({% link {{site.current_cloud_version}}/build-a-python-app-with-cockroachdb-django.md %}) -- [Build a Simple CRUD Go App with CockroachDB and the Go pgx Driver]({% link {{site.current_cloud_version}}/build-a-go-app-with-cockroachdb.md %}) -- [Connect to a {{site.data.products.standard}} cluster]({% link cockroachcloud/connect-to-your-cluster.md %}) -- [SQL FAQs]({% link {{site.current_cloud_version}}/drop-database.md %}) -- [SQL Statements]({% link {{site.current_cloud_version}}/sql-statements.md %}) diff --git a/src/current/v26.1/orchestrate-a-local-cluster-with-kubernetes-insecure.md b/src/current/v26.1/orchestrate-a-local-cluster-with-kubernetes-insecure.md deleted file mode 100644 index e3ca39b61db..00000000000 --- a/src/current/v26.1/orchestrate-a-local-cluster-with-kubernetes-insecure.md +++ /dev/null @@ -1,152 +0,0 @@ ---- -title: Orchestration with Kubernetes (Insecure) -summary: Orchestrate the deployment and management of a local cluster using Kubernetes. -toc: true -docs_area: deploy ---- - -{% include {{ page.version.version }}/filter-tabs/crdb-kubernetes.md %} - -On top of CockroachDB's built-in automation, you can use a third-party [orchestration]({% link {{ page.version.version }}/kubernetes-overview.md %}) system to simplify and automate even more of your operations, from deployment to scaling to overall cluster management. - -This page demonstrates a basic integration with the open-source [Kubernetes](http://kubernetes.io/) orchestration system. Using either the CockroachDB [Helm](https://helm.sh/) chart or a few configuration files, you'll quickly create a 3-node local cluster. You'll run some SQL commands against the cluster and then simulate node failure, watching how Kubernetes auto-restarts without the need for any manual intervention. You'll then scale the cluster with a single command before shutting the cluster down, again with a single command. - -{{site.data.alerts.callout_info}} -To orchestrate a physically distributed cluster in production, see [Orchestrated Deployments]({% link {{ page.version.version }}/kubernetes-overview.md %}). To deploy a 30-day free CockroachDB {{ site.data.products.advanced }} cluster instead of running CockroachDB yourself, see the [Quickstart]({% link cockroachcloud/quickstart.md %}). -{{site.data.alerts.end}} - -## Best practices - -{% include {{ page.version.version }}/orchestration/kubernetes-limitations.md %} - -{% include {{ page.version.version }}/orchestration/local-start-kubernetes.md %} - -## Step 2. Start CockroachDB - -To start your CockroachDB cluster, you can either use our StatefulSet configuration and related files directly, or you can use the [Helm](https://helm.sh/) package manager for Kubernetes to simplify the process. - -
- - -
- -
-{% include {{ page.version.version }}/orchestration/start-cockroachdb-local-insecure.md %} -
- -
-{% include {{ page.version.version }}/orchestration/start-cockroachdb-local-helm-insecure.md %} -
- -## Step 3. Use the built-in SQL client - -{% include {{ page.version.version }}/orchestration/test-cluster-insecure.md %} - -## Step 4. Access the DB Console - -{% include {{ page.version.version }}/orchestration/monitor-cluster.md %} - -## Step 5. Simulate node failure - -{% include {{ page.version.version }}/orchestration/kubernetes-simulate-failure.md %} - -## Step 6. Add nodes - -1. Use the `kubectl scale` command to add a pod for another CockroachDB node: - -
- - {% include_cached copy-clipboard.html %} - ~~~ shell - $ kubectl scale statefulset cockroachdb --replicas=4 - ~~~ - - ~~~ - statefulset "cockroachdb" scaled - ~~~ - -
- -
- - {% include_cached copy-clipboard.html %} - ~~~ shell - $ kubectl scale statefulset my-release-cockroachdb --replicas=4 - ~~~ - - ~~~ - statefulset "my-release-cockroachdb" scaled - ~~~ - -
- -1. Verify that the pod for a fourth node, `cockroachdb-3`, was added successfully: - - {% include_cached copy-clipboard.html %} - ~~~ shell - $ kubectl get pods - ~~~ - -
- ~~~ - NAME READY STATUS RESTARTS AGE - cockroachdb-0 1/1 Running 0 28m - cockroachdb-1 1/1 Running 0 27m - cockroachdb-2 1/1 Running 0 10m - cockroachdb-3 1/1 Running 0 5s - example-545f866f5-2gsrs 1/1 Running 0 25m - ~~~ -
- -
- ~~~ - NAME READY STATUS RESTARTS AGE - my-release-cockroachdb-0 1/1 Running 0 28m - my-release-cockroachdb-1 1/1 Running 0 27m - my-release-cockroachdb-2 1/1 Running 0 10m - my-release-cockroachdb-3 1/1 Running 0 5s - example-545f866f5-2gsrs 1/1 Running 0 25m - ~~~ -
- -## Step 7. Remove nodes - -{% include {{ page.version.version }}/orchestration/kubernetes-remove-nodes-insecure.md %} - -## Step 8. Stop the cluster - -- **If you plan to restart the cluster**, use the `minikube stop` command. This shuts down the minikube virtual machine but preserves all the resources you created: - - {% include_cached copy-clipboard.html %} - ~~~ shell - $ minikube stop - ~~~ - - ~~~ - Stopping local Kubernetes cluster... - Machine stopped. - ~~~ - - You can restore the cluster to its previous state with `minikube start`. - -- **If you do not plan to restart the cluster**, use the `minikube delete` command. This shuts down and deletes the minikube virtual machine and all the resources you created, including persistent volumes: - - {% include_cached copy-clipboard.html %} - ~~~ shell - $ minikube delete - ~~~ - - ~~~ - Deleting local Kubernetes cluster... - Machine deleted. - ~~~ - - {{site.data.alerts.callout_success}}To retain logs, copy them from each pod's stderr before deleting the cluster and all its resources. To access a pod's standard error stream, run kubectl logs <podname>.{{site.data.alerts.end}} - -## See also - -Explore other CockroachDB benefits and features: - -{% include {{ page.version.version }}/misc/explore-benefits-see-also.md %} - -You might also want to learn how to [orchestrate a production deployment of CockroachDB with Kubernetes]({% link {{ page.version.version }}/deploy-cockroachdb-with-kubernetes.md %}). diff --git a/src/current/v26.1/orchestrate-a-local-cluster-with-kubernetes.md b/src/current/v26.1/orchestrate-a-local-cluster-with-kubernetes.md deleted file mode 100644 index be89727fb2f..00000000000 --- a/src/current/v26.1/orchestrate-a-local-cluster-with-kubernetes.md +++ /dev/null @@ -1,98 +0,0 @@ ---- -title: Deploy a Local Cluster in Kubernetes -summary: Deploy a local 3-node CockroachDB cluster with Kubernetes. -toc: true -secure: true -docs_area: deploy ---- - -{% include {{ page.version.version }}/filter-tabs/crdb-kubernetes.md %} - -On top of CockroachDB's built-in automation, you can use a third-party [orchestration]({% link {{ page.version.version }}/kubernetes-overview.md %}) system to simplify and automate even more of your operations, from deployment to scaling to overall cluster management. - -This page demonstrates a basic integration with the open-source [Kubernetes](http://kubernetes.io/) orchestration system. Using either the CockroachDB [Helm](https://helm.sh/) chart or a few configuration files, you'll quickly create a 3-node local cluster. You'll run some SQL commands against the cluster and then simulate node failure, watching how Kubernetes auto-restarts without the need for any manual intervention. You'll then scale the cluster with a single command before shutting the cluster down, again with a single command. - -{{site.data.alerts.callout_info}} -To orchestrate a physically distributed cluster in production, see [Orchestrated Deployments]({% link {{ page.version.version }}/cockroachdb-operator-overview.md %}). To deploy a 30-day free CockroachDB {{ site.data.products.advanced }} cluster instead of running CockroachDB yourself, see the [Quickstart]({% link cockroachcloud/quickstart.md %}). -{{site.data.alerts.end}} - - -## Limitations - -{% include {{ page.version.version }}/orchestration/kubernetes-limitations.md %} - -{% include {{ page.version.version }}/orchestration/local-start-kubernetes.md %} - -## Step 2. Start CockroachDB - -Choose a way to deploy and maintain the CockroachDB cluster: - -- [{{ site.data.products.public-operator }}](https://github.com/cockroachdb/cockroach-operator) -- [Helm](https://helm.sh/) package manager -- Manually apply our StatefulSet configuration and related files - -
- - - -
- -
-{% include {{ page.version.version }}/orchestration/start-cockroachdb-operator-secure.md %} -
- -
-{% include {{ page.version.version }}/orchestration/start-cockroachdb-secure.md %} -
- -
-{% include {{ page.version.version }}/orchestration/start-cockroachdb-helm-secure.md %} -
- -## Step 3. Use the built-in SQL client - -{% include {{ page.version.version }}/orchestration/test-cluster-secure.md %} - -## Step 4. Access the DB Console - -{% include {{ page.version.version }}/orchestration/monitor-cluster.md %} - -## Step 5. Stop the cluster - -- **If you plan to restart the cluster**, use the `minikube stop` command. This shuts down the minikube virtual machine but preserves all the resources you created: - - {% include_cached copy-clipboard.html %} - ~~~ shell - minikube stop - ~~~ - - ~~~ - Stopping local Kubernetes cluster... - Machine stopped. - ~~~ - - You can restore the cluster to its previous state with `minikube start`. - -- **If you do not plan to restart the cluster**, use the `minikube delete` command. This shuts down and deletes the minikube virtual machine and all the resources you created, including persistent volumes: - - {% include_cached copy-clipboard.html %} - ~~~ shell - minikube delete - ~~~ - - ~~~ - Deleting local Kubernetes cluster... - Machine deleted. - ~~~ - - {{site.data.alerts.callout_success}} - To retain logs, copy them from each pod's `stderr` before deleting the cluster and all its resources. To access a pod's standard error stream, run `kubectl logs <podname>`. - {{site.data.alerts.end}} - -## See also - -Explore other CockroachDB benefits and features: - -{% include {{ page.version.version }}/misc/explore-benefits-see-also.md %} - -You might also want to learn how to [orchestrate a production deployment of CockroachDB with Kubernetes]({% link {{ page.version.version }}/deploy-cockroachdb-with-kubernetes.md %}). diff --git a/src/current/v26.1/satori-integration.md b/src/current/v26.1/satori-integration.md deleted file mode 100644 index a6613f2b13c..00000000000 --- a/src/current/v26.1/satori-integration.md +++ /dev/null @@ -1,34 +0,0 @@ ---- -title: Integrate CockroachDB with Satori -summary: Row or column-level access control and dynamic masking of data with Satori -toc: true -docs_area: reference.third_party_support ---- - -Satori offers tooling to extend CockroachDB's data security capabilities. Satori's Data Access Controller (DAC) can be used in concert with CockroachDB {{ site.data.products.advanced }} or CockroachDB {{ site.data.products.core }}. - -A Satori integration offers CockroachDB users the following enhanced data security capabilities at scale: - -## Fine-grained access control - -- SQL database access control at the level of specific rows and columns. -- "No-code" configuration of policy-based access. -- Support for both role-based access control (RBAC) and attribute-based access control (ABAC). - -Satori Documentation: [Fine-grained access control](https://satoricyber.com/fine-grained-access-control/) - -## Dynamic data masking - -- Defense-in-depth against data theft. -- Precise protection of personally identifiable information (PII), protected health information (PHI), or other confidential data. - -Satori Documentation: [Dynamic data masking](https://satoricyber.com/dynamic-data-masking/) - -## Data access auditing - -Satori Documentation: [Data Access auditing](https://satoricyber.com/data-access-auditing-monitoring/) - -- Enriched metadata and contextual information about data access events. -- Consolidation of SQL audit logs from multiple CockroachDB clusters to a single location. - -To learn more about integrating Satori with your CockroachDB deployment, reach out to the [CockroachDB support team](https://support.cockroachlabs.com). diff --git a/src/current/v26.1/security-reference/config-secure-hba.md b/src/current/v26.1/security-reference/config-secure-hba.md deleted file mode 100644 index 44da4cfa59a..00000000000 --- a/src/current/v26.1/security-reference/config-secure-hba.md +++ /dev/null @@ -1,130 +0,0 @@ ---- -title: Configure SQL Authentication for Hardened Serverless Cluster Security -summary: Configure SQL Authentication for Hardened Serverless Cluster Security -toc: true -docs_area: manage.security ---- - -CockroachDB allows fine-grained configuration of which database connect attempts it allows to proceed to the authentication stage, and which authentication methods it will accept, based on: - -- **Who** is making the attempt (SQL user). -- **Where** on the internet (IP Address) the attempt is coming from. - -This document describes the rationale for restricting database access to specific IP ranges as a security measure and then demonstrates the procedure using [authentication configuration]({% link {{ page.version.version }}/security-reference/authentication.md %}) to achieve that aim. - -## Why customize your authentication configuration? - -CockroachDB Cloud clusters include industry-standard security controls at the network and infrastructure levels, and CockroachDB {{ site.data.products.core }} may be deployed with any measure of network security one cares to put in place. Nevertheless, a hardened authentication configuration offers a powerful measure of [security in depth](https://wikipedia.org/wiki/Defense_in_depth_(computing)). - -Limiting allowed database connections to secure IP addresses reduces the risk that your cluster is compromised, because a potential attacker who acquires database credentials (e.g., username/password combinations or client [PKI certificates]({% link {{ page.version.version }}/security-reference/transport-layer-security.md %}#certificates-signing-trust-and-authority)) cannot use those credentials without also gaining infrastructure access. Infrastructure access can and should be protected with multifactor authentication and restricted to appropriate parties using infrastructure-level IAM. - -## Step 1: Provision and access your cluster - -[Create your own free CockroachDB {{ site.data.products.standard }} cluster]({% link cockroachcloud/create-your-cluster.md %}). - -From the CockroachDB Cloud Console, select your new cluster and click the **Connect** button to obtain your connection credentials from the **Connection Info** pane in the CockroachDB Cloud Console. - -You'll also need to download the cluster's [Certificate Authority certificate]({% link {{ page.version.version }}/security-reference/transport-layer-security.md %}#certificates-signing-trust-and-authority), so that your client can authenticate the database server as it connects. - -Open a SQL shell against your cluster. - -```shell -cockroach sql --url "postgresql://$USER:$PASSWORD@random-cluster-name-4300.6wr.cockroachlabs.cloud:26257/defaultdb?sslmode=verify-full&sslrootcert=root.crt" -# -# Welcome to the CockroachDB SQL shell. -# All statements must be terminated by a semicolon. -# To exit, type: \q. - -... - -docs-r-awesome@free-tier14.aws-us-east-1.cockroachlabs.cloud:26257/defaultdb> -``` - -## Step 2: Provision a secure jumpbox - -By default, anyone who knows the parameters in this command can access your database. Let's fix that by creating a **jumpbox**: a compute instance that will be used as secure, dedicated access point to our cluster. In this example, the jumpbox will be a Google Cloud compute instance (although you could as easily use an AWS EC2 instance) which allows us to protect access to the jumpbox with Google Cloud's native capacities to require two-factor authentication for SSH access to compute instances, and to limit that SSH access to precisely those users that require it. By limiting SQL access to those actors who have SSH access to the jumpbox, we can effectively enforce two-factor authentication for access to the database, as well as take advantage of other security measures available on Google Cloud compute instances, such as access logs. - -In the [Google Cloud Console Compute Instances](https://console.cloud.google.com/compute/instance) page, create a new instance called `roach-jump-box`. The jumpbox will need very little CPU or disk, so use a cheap instance such as an `e2-micro`. - -In the [Google Cloud Console VPC Network / External IP addresses page](https://console.cloud.google.com/networking/addresses), reserve a static IP. Name it `roach-jump-box`, and attach it to the compute instance. - -Keep the IP address handy! - -## Step 3: Tighten the authentication configuration - -Next, we'll configure our cluster to only allow SQL connection attempts from our jumpbox. This means that in order to access the cluster, someone will need not only the username and password (which could be guessed or stolen), but will also need access to the jumpbox. Manage permissions to access the jumpbox using Google Cloud's IAM, and make sure that users in your Google Cloud organization are required to use two-factor authentication. - -Returning to the SQL console, let's set our authentication configuration to limit access to the jumpbox. This configuration is accessed as a [cluster setting]({% link {{ page.version.version }}/cluster-settings.md %}). - - -Run `SHOW CLUSTER SETTING server.host_based_authentication.configuration;` to view your current authentication configuration, which should be in its default state, which displays as empty: - -```shell -cockroachlabs.cloud:26257/defaultdb> show cluster setting server.host_based_authentication.configuration; - server.host_based_authentication.configuration - -(1 row) - - -Time: 48ms total (execution 1ms / network 48ms) -``` - -Set the authentication configuration to the following value, which limits access to the jumpbox. Replace the IP address with your jumpbox's IP address: - -```shell -SET CLUSTER SETTING server.host_based_authentication.configuration TO ' -# TYPE DATABASE USER ADDRESS METHOD - host all all 35.184.229.244/32 password - host all all all reject -'; - -``` - -## Step 4: Confirm the IP restriction - -Exit the database shell by typing `\q`, and then try to re-establish the connection. This time the attempt will be rejected because we are not making the attempt from the sole allowed IP address. - -```shell - cockroach sql --url "postgresql://$USER:$PASSWORD@random-cluster-name-4300.6wr.cockroachlabs.cloud:26257/defaultdb?sslmode=verify-full&sslrootcert=root.crt" - -# -# Welcome to the CockroachDB SQL shell. -# All statements must be terminated by a semicolon. -# To exit, type: \q. -# -ERROR: authentication rejected by configuration -SQLSTATE: 28000 -Failed running "sql" -``` - -## Step 5: Access your cluster via the jumpbox - -Finally, let's attempt the connection from the jumpbox. You'll need to use `scp` to transfer the cluster's root [CA certificate]({% link {{ page.version.version }}/security-reference/transport-layer-security.md %}#certificates-signing-trust-and-authority) to the jumpbox, so that your client there can use it to authenticate the server. Then shell into the jumpbox with the `gcloud gcompute ssh` and run your connection command from inside the jumpbox. - -```shell -gcloud compute scp root.crt roach-jump-box:root.crt -gcloud compute ssh roach-jump-box - -docs-writer@roach-jump-box:~$ cockroach sql --url "postgresql://$USER:$PASSWORD@random-cluster-name-4300.6wr.cockroachlabs.cloud:26257/defaultdb?sslmode=verify-full&sslrootcert=root.crt" -# -# Welcome to the CockroachDB SQL shell. -... -``` - -## Step 6: Allow IP addresses for applications - -Of course, it's likely that an application will also need to access the database, in which case, you could add a new rule to allow an IP address to your configuration. You will then need to route the outgoing traffic from your applications through a specific IP. The preferred way is to use a [NAT gateway](https://cloud.google.com/nat/docs/overview), but a quick, lightweight solution is to attach an external IP to a compute instance with acts as a proxy. However, in this latter case the proxy as a bottleneck and single point of failure, so this is not suitable for high traffic or uptime-critical services. - -Further, we can fine-tune our configuration and improve the overall security and resilience of our system by restricting access from the given IP to the appropriate user. - -Each user's permissions should then be precisely configured using CockroachDB's system of [access grants]({% link {{ page.version.version }}/security-reference/authorization.md %}). Always keep in mind the [principle of least privilege](https://wikipedia.org/wiki/Principle_of_least_privilege), which is one of the golden rules of security! - -```shell -SET CLUSTER SETTING server.host_based_authentication.configuration TO ' -# TYPE DATABASE USER ADDRESS METHOD - host all ops_user 555.123.456.789/32 password - host all app_user 555.987.654.321/32 password - host all all all reject -'; - -``` From fed40c1c2abdd9c8621d6a3af23bdb12026648ca Mon Sep 17 00:00:00 2001 From: Peach Leach Date: Tue, 24 Feb 2026 13:05:13 -0500 Subject: [PATCH 02/15] trigger build From 132d884cb96b92030a7f7bfad127accbceb89c88 Mon Sep 17 00:00:00 2001 From: Peach Leach Date: Tue, 24 Feb 2026 13:11:57 -0500 Subject: [PATCH 03/15] Typo Removed one accidental comma that was wrecking the whole build --- src/current/_includes/v26.1/sidebar-data/cloud-deployments.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/current/_includes/v26.1/sidebar-data/cloud-deployments.json b/src/current/_includes/v26.1/sidebar-data/cloud-deployments.json index 1dc121e15f1..1084fff417e 100644 --- a/src/current/_includes/v26.1/sidebar-data/cloud-deployments.json +++ b/src/current/_includes/v26.1/sidebar-data/cloud-deployments.json @@ -367,7 +367,7 @@ ] } ] - }, + } ] }, { From a9c7f4f0336bbf50999b52915afbe81f8327cd49 Mon Sep 17 00:00:00 2001 From: Peach Leach Date: Tue, 24 Feb 2026 13:16:07 -0500 Subject: [PATCH 04/15] broken link --- src/current/v26.1/security-reference/authentication.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/current/v26.1/security-reference/authentication.md b/src/current/v26.1/security-reference/authentication.md index 82638080061..69be9c17f98 100644 --- a/src/current/v26.1/security-reference/authentication.md +++ b/src/current/v26.1/security-reference/authentication.md @@ -103,7 +103,7 @@ The default authentication configuration for CockroachDB {{ site.data.products.s host all all all password ``` -This is convenient for quick usage and experimentation, but is not suitable for clusters containing production data. It is a best practice to [configure SQL authentication for hardened CockroachDB cluster security]({% link {{ page.version.version }}/security-reference/config-secure-hba.md %}). +This is convenient for quick usage and experimentation, but is not suitable for clusters containing production data. It is a best practice to configure SQL authentication for hardened CockroachDB cluster security. ### CockroachDB {{ site.data.products.advanced }} From 29b1f476d6413cb8dd30bc17794ae94864f1ca0e Mon Sep 17 00:00:00 2001 From: Peach Leach Date: Tue, 24 Feb 2026 14:20:01 -0500 Subject: [PATCH 05/15] More broken links --- src/current/_includes/cockroachcloud/app/see-also-links.md | 1 - src/current/_includes/v26.1/misc/explore-benefits-see-also.md | 1 - 2 files changed, 2 deletions(-) diff --git a/src/current/_includes/cockroachcloud/app/see-also-links.md b/src/current/_includes/cockroachcloud/app/see-also-links.md index f20b6a7c753..62e9659d66f 100644 --- a/src/current/_includes/cockroachcloud/app/see-also-links.md +++ b/src/current/_includes/cockroachcloud/app/see-also-links.md @@ -5,4 +5,3 @@ You might also be interested in the following pages: - [CockroachDB Resilience]({% link {{site.current_cloud_version}}/demo-cockroachdb-resilience.md %}) - [Automatic Rebalancing]({% link {{site.current_cloud_version}}/demo-automatic-rebalancing.md %}) - [Cross-Cloud Migration]({% link {{site.current_cloud_version}}/demo-automatic-cloud-migration.md %}) -- [Automated Operations]({% link {{site.current_cloud_version}}/orchestrate-a-local-cluster-with-kubernetes-insecure.md %}) diff --git a/src/current/_includes/v26.1/misc/explore-benefits-see-also.md b/src/current/_includes/v26.1/misc/explore-benefits-see-also.md index 2ad7178c808..1bfb209ef23 100644 --- a/src/current/_includes/v26.1/misc/explore-benefits-see-also.md +++ b/src/current/_includes/v26.1/misc/explore-benefits-see-also.md @@ -3,5 +3,4 @@ - [Low Latency Multi-Region Deployment]({% link {{ page.version.version }}/demo-low-latency-multi-region-deployment.md %}) - [Serializable Transactions]({% link {{ page.version.version }}/demo-serializable.md %}) - [Cross-Cloud Migration]({% link {{ page.version.version }}/demo-automatic-cloud-migration.md %}) -- [Orchestration]({% link {{ page.version.version }}/orchestrate-a-local-cluster-with-kubernetes-insecure.md %}) - [JSON Support]({% link {{ page.version.version }}/demo-json-support.md %}) From 6079e89b2afed34ba0875ef3984c6d99a328d587 Mon Sep 17 00:00:00 2001 From: Peach Leach Date: Tue, 24 Feb 2026 14:34:05 -0500 Subject: [PATCH 06/15] Another broken link --- src/current/_includes/v26.1/app/see-also-links.md | 1 - 1 file changed, 1 deletion(-) diff --git a/src/current/_includes/v26.1/app/see-also-links.md b/src/current/_includes/v26.1/app/see-also-links.md index 805672736af..3181c43babe 100644 --- a/src/current/_includes/v26.1/app/see-also-links.md +++ b/src/current/_includes/v26.1/app/see-also-links.md @@ -6,4 +6,3 @@ You might also be interested in the following pages: - [CockroachDB Resilience]({% link {{ page.version.version }}/demo-cockroachdb-resilience.md %}) - [Replication & Rebalancing]({% link {{ page.version.version }}/demo-replication-and-rebalancing.md %}) - [Cross-Cloud Migration]({% link {{ page.version.version }}/demo-automatic-cloud-migration.md %}) -- [Automated Operations]({% link {{ page.version.version }}/orchestrate-a-local-cluster-with-kubernetes-insecure.md %}) From 8af4d90ffa38eb637509d79c73ccaf177b3e0461 Mon Sep 17 00:00:00 2001 From: Peach Leach Date: Tue, 24 Feb 2026 14:46:41 -0500 Subject: [PATCH 07/15] More broken links --- src/current/v26.1/cockroach-start-single-node.md | 1 - src/current/v26.1/install-cockroachdb-windows.md | 7 ------- 2 files changed, 8 deletions(-) diff --git a/src/current/v26.1/cockroach-start-single-node.md b/src/current/v26.1/cockroach-start-single-node.md index b68426c506d..58949bdc062 100644 --- a/src/current/v26.1/cockroach-start-single-node.md +++ b/src/current/v26.1/cockroach-start-single-node.md @@ -407,7 +407,6 @@ ALTER TABLE system.public.tenant_usage CONFIGURE ZONE USING gc.ttlseconds = 7200 - Running a local multi-node cluster: - [From Binary]({% link {{ page.version.version }}/start-a-local-cluster.md %}) - - [In Kubernetes]({% link {{ page.version.version }}/orchestrate-a-local-cluster-with-kubernetes.md %}) - [In Docker]({% link {{ page.version.version }}/start-a-local-cluster-in-docker-mac.md %}) - Running a distributed multi-node cluster: - [From Binary]({% link {{ page.version.version }}/manual-deployment.md %}) diff --git a/src/current/v26.1/install-cockroachdb-windows.md b/src/current/v26.1/install-cockroachdb-windows.md index 127f276f11e..6f9e6a07a8f 100644 --- a/src/current/v26.1/install-cockroachdb-windows.md +++ b/src/current/v26.1/install-cockroachdb-windows.md @@ -56,13 +56,6 @@ You can download and install CockroachDB for Windows in two ways. Either: -
-

Use Kubernetes

- -To orchestrate CockroachDB locally using [Kubernetes](https://kubernetes.io/), either with configuration files or the [Helm](https://helm.sh/) package manager, refer to [Orchestrate a local cluster with Kubernetes]({% link {{ page.version.version}}/orchestrate-a-local-cluster-with-kubernetes.md %}). - -
-

Use Docker

From eb0f4b00eea0df6de9b79faa709a71551f7fbcf2 Mon Sep 17 00:00:00 2001 From: Peach Leach Date: Tue, 24 Feb 2026 15:04:15 -0500 Subject: [PATCH 08/15] Broken links Also removed unnecessary note --- src/current/cockroachcloud/connect-to-a-basic-cluster.md | 2 +- src/current/cockroachcloud/connect-to-an-advanced-cluster.md | 2 +- src/current/cockroachcloud/connect-to-your-cluster.md | 2 +- src/current/cockroachcloud/create-a-basic-cluster.md | 2 +- src/current/cockroachcloud/quickstart-trial-cluster.md | 4 ++-- src/current/cockroachcloud/quickstart.md | 2 +- src/current/v26.1/learn-cockroachdb-sql.md | 4 ---- 7 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/current/cockroachcloud/connect-to-a-basic-cluster.md b/src/current/cockroachcloud/connect-to-a-basic-cluster.md index bd6efc33399..e1b62401595 100644 --- a/src/current/cockroachcloud/connect-to-a-basic-cluster.md +++ b/src/current/cockroachcloud/connect-to-a-basic-cluster.md @@ -109,7 +109,7 @@ You can connect to your cluster with any [supported version]({% link releases/re # ~~~ - You are now connected to the built-in SQL client, and can now run [CockroachDB SQL statements]({% link cockroachcloud/learn-cockroachdb-sql.md %}). + You are now connected to the built-in SQL client, and can now run [CockroachDB SQL statements]({% link {{site.current_cloud_version}}/sql-statements.md %}). diff --git a/src/current/cockroachcloud/connect-to-an-advanced-cluster.md b/src/current/cockroachcloud/connect-to-an-advanced-cluster.md index 14bd11ad054..baa48476b1e 100644 --- a/src/current/cockroachcloud/connect-to-an-advanced-cluster.md +++ b/src/current/cockroachcloud/connect-to-an-advanced-cluster.md @@ -180,7 +180,7 @@ To download a supported version of the SQL shell instead of the full binary, vis # ~~~ - You are now connected to the built-in SQL client, and can now run [CockroachDB SQL statements]({% link cockroachcloud/learn-cockroachdb-sql.md %}). + You are now connected to the built-in SQL client, and can now run [CockroachDB SQL statements]({% link {{site.current_cloud_version}}/sql-statements.md %}). diff --git a/src/current/cockroachcloud/connect-to-your-cluster.md b/src/current/cockroachcloud/connect-to-your-cluster.md index 46ac6dd812d..a55bd01675d 100644 --- a/src/current/cockroachcloud/connect-to-your-cluster.md +++ b/src/current/cockroachcloud/connect-to-your-cluster.md @@ -190,7 +190,7 @@ You can connect to your cluster with any [supported version]({% link releases/re # ~~~ - You are now connected to the built-in SQL client, and can now run [CockroachDB SQL statements]({% link cockroachcloud/learn-cockroachdb-sql.md %}). + You are now connected to the built-in SQL client, and can now run [CockroachDB SQL statements]({% link {{site.current_cloud_version}}/sql-statements.md %}). diff --git a/src/current/cockroachcloud/create-a-basic-cluster.md b/src/current/cockroachcloud/create-a-basic-cluster.md index e9fca9fe069..5a1cdbafae5 100644 --- a/src/current/cockroachcloud/create-a-basic-cluster.md +++ b/src/current/cockroachcloud/create-a-basic-cluster.md @@ -107,7 +107,7 @@ Click **Create cluster**. Your cluster will be created in a few seconds. - [Connect to your CockroachDB {{ site.data.products.basic }} cluster]({% link cockroachcloud/connect-to-your-cluster.md %}) - [Manage access]({% link cockroachcloud/managing-access.md %}) -- [Learn CockroachDB SQL]({% link cockroachcloud/learn-cockroachdb-sql.md %}). +- Learn [CockroachDB SQL]({% link {{site.current_cloud_version}}/sql-statements.md %}). - Explore our [example apps]({% link {{site.current_cloud_version}}/example-apps.md %}) for examples on how to build applications using your preferred driver or ORM and run it on CockroachDB. - [Migrate your existing data]({% link molt/migration-overview.md %}). - Build a simple CRUD application in [Go]({% link {{site.current_cloud_version}}/build-a-go-app-with-cockroachdb.md %}), [Java]({% link {{site.current_cloud_version}}/build-a-java-app-with-cockroachdb.md %}), [Node.js]({% link {{site.current_cloud_version}}/build-a-nodejs-app-with-cockroachdb.md %}), or [Python]({% link {{site.current_cloud_version}}/build-a-python-app-with-cockroachdb.md %}). diff --git a/src/current/cockroachcloud/quickstart-trial-cluster.md b/src/current/cockroachcloud/quickstart-trial-cluster.md index 7d0e932504e..3fe05c046dc 100644 --- a/src/current/cockroachcloud/quickstart-trial-cluster.md +++ b/src/current/cockroachcloud/quickstart-trial-cluster.md @@ -92,7 +92,7 @@ To download CockroachDB locally and configure it to connect to the cluster with # ~~~ -1. You can now run [CockroachDB SQL statements]({% link cockroachcloud/learn-cockroachdb-sql.md %}): +1. You can now run [CockroachDB SQL statements]({% link {{site.current_cloud_version}}/sql-statements.md %}): {% include_cached copy-clipboard.html %} ~~~ sql @@ -132,7 +132,7 @@ To download CockroachDB locally and configure it to connect to the cluster with Learn more: -- Use the [built-in SQL client]({% link {{site.current_cloud_version}}/cockroach-sql.md %}) to connect to your cluster and [learn CockroachDB SQL]({% link cockroachcloud/learn-cockroachdb-sql.md %}). +- Use the [built-in SQL client]({% link {{site.current_cloud_version}}/cockroach-sql.md %}) to connect to your cluster and learn [CockroachDB SQL]({% link {{site.current_cloud_version}}/sql-statements.md %}). - Build a ["Hello World" app with the Django framework]({% link {{site.current_cloud_version}}/build-a-python-app-with-cockroachdb-django.md %}), or [install a client driver]({% link {{site.current_cloud_version}}/install-client-drivers.md %}) for your favorite language. - Use a local cluster to [explore CockroachDB capabilities like fault tolerance and automated repair]({% link {{site.current_cloud_version}}/demo-cockroachdb-resilience.md %}). diff --git a/src/current/cockroachcloud/quickstart.md b/src/current/cockroachcloud/quickstart.md index 7cc8d755b86..7929a151d12 100644 --- a/src/current/cockroachcloud/quickstart.md +++ b/src/current/cockroachcloud/quickstart.md @@ -199,7 +199,7 @@ The code sample uses the connection string stored in the environment variable `D Now that you have a CockroachDB {{ site.data.products.standard }} cluster running, try out the following: - Build a simple CRUD application in [Go]({% link {{site.current_cloud_version}}/build-a-go-app-with-cockroachdb.md %}), [Java]({% link {{site.current_cloud_version}}/build-a-java-app-with-cockroachdb.md %}), [Node.js]({% link {{site.current_cloud_version}}/build-a-nodejs-app-with-cockroachdb.md %}), or [Python]({% link {{site.current_cloud_version}}/build-a-python-app-with-cockroachdb.md %}). -- [Learn CockroachDB SQL]({% link cockroachcloud/learn-cockroachdb-sql.md %}). +- Learn [CockroachDB SQL]({% link {{site.current_cloud_version}}/sql-statements.md %}). - [Create and manage SQL users]({% link cockroachcloud/managing-access.md %}). - Explore our [example apps]({% link {{site.current_cloud_version}}/example-apps.md %}) for examples on how to build applications using your preferred driver or ORM and run it on CockroachDB. - [Migrate your existing data]({% link molt/migration-overview.md %}). diff --git a/src/current/v26.1/learn-cockroachdb-sql.md b/src/current/v26.1/learn-cockroachdb-sql.md index 6b4fc2d82ac..959f8061f24 100644 --- a/src/current/v26.1/learn-cockroachdb-sql.md +++ b/src/current/v26.1/learn-cockroachdb-sql.md @@ -9,10 +9,6 @@ This tutorial guides you through some of the most essential CockroachDB SQL stat For a complete list of supported SQL statements and related details, see [SQL Statements]({% link {{ page.version.version }}/sql-statements.md %}). -{{site.data.alerts.callout_info}} -This tutorial is for {{site.data.products.core}} users. If you are working with a cluster in CockroachDB {{ site.data.products.cloud }}, refer to [CockroachDB {{ site.data.products.cloud }}: Learn CockroachDB SQL]({% link cockroachcloud/learn-cockroachdb-sql.md %}). -{{site.data.alerts.end}} - ## Start CockroachDB If you haven't already, [install CockroachDB]({% link {{ page.version.version }}/install-cockroachdb.md %}). From d0ab382bb084da4b753430bc77b6c0d13352509f Mon Sep 17 00:00:00 2001 From: Peach Leach Date: Tue, 24 Feb 2026 16:55:15 -0500 Subject: [PATCH 09/15] More notes removed --- src/current/v23.1/learn-cockroachdb-sql.md | 4 ---- src/current/v23.2/learn-cockroachdb-sql.md | 4 ---- src/current/v24.1/learn-cockroachdb-sql.md | 4 ---- src/current/v24.2/learn-cockroachdb-sql.md | 4 ---- src/current/v24.3/learn-cockroachdb-sql.md | 4 ---- src/current/v25.1/learn-cockroachdb-sql.md | 4 ---- src/current/v25.2/learn-cockroachdb-sql.md | 4 ---- src/current/v25.3/learn-cockroachdb-sql.md | 4 ---- src/current/v25.4/learn-cockroachdb-sql.md | 4 ---- 9 files changed, 36 deletions(-) diff --git a/src/current/v23.1/learn-cockroachdb-sql.md b/src/current/v23.1/learn-cockroachdb-sql.md index 6b4fc2d82ac..959f8061f24 100644 --- a/src/current/v23.1/learn-cockroachdb-sql.md +++ b/src/current/v23.1/learn-cockroachdb-sql.md @@ -9,10 +9,6 @@ This tutorial guides you through some of the most essential CockroachDB SQL stat For a complete list of supported SQL statements and related details, see [SQL Statements]({% link {{ page.version.version }}/sql-statements.md %}). -{{site.data.alerts.callout_info}} -This tutorial is for {{site.data.products.core}} users. If you are working with a cluster in CockroachDB {{ site.data.products.cloud }}, refer to [CockroachDB {{ site.data.products.cloud }}: Learn CockroachDB SQL]({% link cockroachcloud/learn-cockroachdb-sql.md %}). -{{site.data.alerts.end}} - ## Start CockroachDB If you haven't already, [install CockroachDB]({% link {{ page.version.version }}/install-cockroachdb.md %}). diff --git a/src/current/v23.2/learn-cockroachdb-sql.md b/src/current/v23.2/learn-cockroachdb-sql.md index 6b4fc2d82ac..959f8061f24 100644 --- a/src/current/v23.2/learn-cockroachdb-sql.md +++ b/src/current/v23.2/learn-cockroachdb-sql.md @@ -9,10 +9,6 @@ This tutorial guides you through some of the most essential CockroachDB SQL stat For a complete list of supported SQL statements and related details, see [SQL Statements]({% link {{ page.version.version }}/sql-statements.md %}). -{{site.data.alerts.callout_info}} -This tutorial is for {{site.data.products.core}} users. If you are working with a cluster in CockroachDB {{ site.data.products.cloud }}, refer to [CockroachDB {{ site.data.products.cloud }}: Learn CockroachDB SQL]({% link cockroachcloud/learn-cockroachdb-sql.md %}). -{{site.data.alerts.end}} - ## Start CockroachDB If you haven't already, [install CockroachDB]({% link {{ page.version.version }}/install-cockroachdb.md %}). diff --git a/src/current/v24.1/learn-cockroachdb-sql.md b/src/current/v24.1/learn-cockroachdb-sql.md index 6b4fc2d82ac..959f8061f24 100644 --- a/src/current/v24.1/learn-cockroachdb-sql.md +++ b/src/current/v24.1/learn-cockroachdb-sql.md @@ -9,10 +9,6 @@ This tutorial guides you through some of the most essential CockroachDB SQL stat For a complete list of supported SQL statements and related details, see [SQL Statements]({% link {{ page.version.version }}/sql-statements.md %}). -{{site.data.alerts.callout_info}} -This tutorial is for {{site.data.products.core}} users. If you are working with a cluster in CockroachDB {{ site.data.products.cloud }}, refer to [CockroachDB {{ site.data.products.cloud }}: Learn CockroachDB SQL]({% link cockroachcloud/learn-cockroachdb-sql.md %}). -{{site.data.alerts.end}} - ## Start CockroachDB If you haven't already, [install CockroachDB]({% link {{ page.version.version }}/install-cockroachdb.md %}). diff --git a/src/current/v24.2/learn-cockroachdb-sql.md b/src/current/v24.2/learn-cockroachdb-sql.md index 6b4fc2d82ac..959f8061f24 100644 --- a/src/current/v24.2/learn-cockroachdb-sql.md +++ b/src/current/v24.2/learn-cockroachdb-sql.md @@ -9,10 +9,6 @@ This tutorial guides you through some of the most essential CockroachDB SQL stat For a complete list of supported SQL statements and related details, see [SQL Statements]({% link {{ page.version.version }}/sql-statements.md %}). -{{site.data.alerts.callout_info}} -This tutorial is for {{site.data.products.core}} users. If you are working with a cluster in CockroachDB {{ site.data.products.cloud }}, refer to [CockroachDB {{ site.data.products.cloud }}: Learn CockroachDB SQL]({% link cockroachcloud/learn-cockroachdb-sql.md %}). -{{site.data.alerts.end}} - ## Start CockroachDB If you haven't already, [install CockroachDB]({% link {{ page.version.version }}/install-cockroachdb.md %}). diff --git a/src/current/v24.3/learn-cockroachdb-sql.md b/src/current/v24.3/learn-cockroachdb-sql.md index 6b4fc2d82ac..959f8061f24 100644 --- a/src/current/v24.3/learn-cockroachdb-sql.md +++ b/src/current/v24.3/learn-cockroachdb-sql.md @@ -9,10 +9,6 @@ This tutorial guides you through some of the most essential CockroachDB SQL stat For a complete list of supported SQL statements and related details, see [SQL Statements]({% link {{ page.version.version }}/sql-statements.md %}). -{{site.data.alerts.callout_info}} -This tutorial is for {{site.data.products.core}} users. If you are working with a cluster in CockroachDB {{ site.data.products.cloud }}, refer to [CockroachDB {{ site.data.products.cloud }}: Learn CockroachDB SQL]({% link cockroachcloud/learn-cockroachdb-sql.md %}). -{{site.data.alerts.end}} - ## Start CockroachDB If you haven't already, [install CockroachDB]({% link {{ page.version.version }}/install-cockroachdb.md %}). diff --git a/src/current/v25.1/learn-cockroachdb-sql.md b/src/current/v25.1/learn-cockroachdb-sql.md index 6b4fc2d82ac..959f8061f24 100644 --- a/src/current/v25.1/learn-cockroachdb-sql.md +++ b/src/current/v25.1/learn-cockroachdb-sql.md @@ -9,10 +9,6 @@ This tutorial guides you through some of the most essential CockroachDB SQL stat For a complete list of supported SQL statements and related details, see [SQL Statements]({% link {{ page.version.version }}/sql-statements.md %}). -{{site.data.alerts.callout_info}} -This tutorial is for {{site.data.products.core}} users. If you are working with a cluster in CockroachDB {{ site.data.products.cloud }}, refer to [CockroachDB {{ site.data.products.cloud }}: Learn CockroachDB SQL]({% link cockroachcloud/learn-cockroachdb-sql.md %}). -{{site.data.alerts.end}} - ## Start CockroachDB If you haven't already, [install CockroachDB]({% link {{ page.version.version }}/install-cockroachdb.md %}). diff --git a/src/current/v25.2/learn-cockroachdb-sql.md b/src/current/v25.2/learn-cockroachdb-sql.md index 6b4fc2d82ac..959f8061f24 100644 --- a/src/current/v25.2/learn-cockroachdb-sql.md +++ b/src/current/v25.2/learn-cockroachdb-sql.md @@ -9,10 +9,6 @@ This tutorial guides you through some of the most essential CockroachDB SQL stat For a complete list of supported SQL statements and related details, see [SQL Statements]({% link {{ page.version.version }}/sql-statements.md %}). -{{site.data.alerts.callout_info}} -This tutorial is for {{site.data.products.core}} users. If you are working with a cluster in CockroachDB {{ site.data.products.cloud }}, refer to [CockroachDB {{ site.data.products.cloud }}: Learn CockroachDB SQL]({% link cockroachcloud/learn-cockroachdb-sql.md %}). -{{site.data.alerts.end}} - ## Start CockroachDB If you haven't already, [install CockroachDB]({% link {{ page.version.version }}/install-cockroachdb.md %}). diff --git a/src/current/v25.3/learn-cockroachdb-sql.md b/src/current/v25.3/learn-cockroachdb-sql.md index 6b4fc2d82ac..959f8061f24 100644 --- a/src/current/v25.3/learn-cockroachdb-sql.md +++ b/src/current/v25.3/learn-cockroachdb-sql.md @@ -9,10 +9,6 @@ This tutorial guides you through some of the most essential CockroachDB SQL stat For a complete list of supported SQL statements and related details, see [SQL Statements]({% link {{ page.version.version }}/sql-statements.md %}). -{{site.data.alerts.callout_info}} -This tutorial is for {{site.data.products.core}} users. If you are working with a cluster in CockroachDB {{ site.data.products.cloud }}, refer to [CockroachDB {{ site.data.products.cloud }}: Learn CockroachDB SQL]({% link cockroachcloud/learn-cockroachdb-sql.md %}). -{{site.data.alerts.end}} - ## Start CockroachDB If you haven't already, [install CockroachDB]({% link {{ page.version.version }}/install-cockroachdb.md %}). diff --git a/src/current/v25.4/learn-cockroachdb-sql.md b/src/current/v25.4/learn-cockroachdb-sql.md index 6b4fc2d82ac..959f8061f24 100644 --- a/src/current/v25.4/learn-cockroachdb-sql.md +++ b/src/current/v25.4/learn-cockroachdb-sql.md @@ -9,10 +9,6 @@ This tutorial guides you through some of the most essential CockroachDB SQL stat For a complete list of supported SQL statements and related details, see [SQL Statements]({% link {{ page.version.version }}/sql-statements.md %}). -{{site.data.alerts.callout_info}} -This tutorial is for {{site.data.products.core}} users. If you are working with a cluster in CockroachDB {{ site.data.products.cloud }}, refer to [CockroachDB {{ site.data.products.cloud }}: Learn CockroachDB SQL]({% link cockroachcloud/learn-cockroachdb-sql.md %}). -{{site.data.alerts.end}} - ## Start CockroachDB If you haven't already, [install CockroachDB]({% link {{ page.version.version }}/install-cockroachdb.md %}). From a72e40947b3adc395b530527d40d65b5d11c9ae2 Mon Sep 17 00:00:00 2001 From: Peach Leach Date: Tue, 24 Feb 2026 17:08:49 -0500 Subject: [PATCH 10/15] Removing references to deleted pages --- src/current/_includes/v26.1/misc/tooling.md | 1 - src/current/cockroachcloud/pci-dss.md | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/current/_includes/v26.1/misc/tooling.md b/src/current/_includes/v26.1/misc/tooling.md index dcd24363435..e87891ad175 100644 --- a/src/current/_includes/v26.1/misc/tooling.md +++ b/src/current/_includes/v26.1/misc/tooling.md @@ -73,7 +73,6 @@ For a list of tools supported by the CockroachDB community, see [Third-Party Too | Tool | Support level | Integration | |-----+---------------+----------| -| [Satori](https://satoricyber.com/) | Partner supported | [Satori Integration]({% link {{ page.version.version }}/satori-integration.md %}) | | [HashiCorp Vault](https://www.vaultproject.io/) | Partner supported | [HashiCorp Vault Integration]({% link {{ page.version.version }}/hashicorp-integration.md %}) | ## Schema migration tools diff --git a/src/current/cockroachcloud/pci-dss.md b/src/current/cockroachcloud/pci-dss.md index 5afacad23e7..bbb63bde517 100644 --- a/src/current/cockroachcloud/pci-dss.md +++ b/src/current/cockroachcloud/pci-dss.md @@ -123,7 +123,7 @@ A CockroachDB {{ site.data.products.advanced }} cluster must have the following Cockroach Labs cannot provide specific advice about ensuring end-to-end compliance of your overall system with PCI DSS or how to implement a specific requirement across all operating environments. The following are additional guidelines for a cluster to be used in a PCI DSS compliant manner: -- Before you insert cardholder data into the cluster, protect it by a combination of encryption, hashing, masking, and truncation. For an example implementation, refer to [Integrate CockroachDB {{ site.data.products.advanced }} with Satori]({% link {{ site.current_cloud_version }}/satori-integration.md %}). +- Before you insert cardholder data into the cluster, protect it by a combination of encryption, hashing, masking, and truncation. - The cryptographic materials used to protect cardholder data must themselves be protected at rest and in transit, and access to the unencrypted key materials must be strictly limited only to approved individuals. - Within the cluster, restrict access to cardholder data in a manner consistent with the [principle of least privilege](https://wikipedia.org/wiki/Principle_of_least_privilege). Access to tables and views in the cluster that contain cardholder data must be restricted, and you are responsible to regularly test for compliance. Refer to [Authorization]({% link {{ site.current_cloud_version }}/authorization.md %}). - Protect networks that transmit cardholder data from malicious access over the public internet, and regularly test for compliance. For more information about protecting the cluster’s networks, refer to [Network Authorization]({% link cockroachcloud/network-authorization.md %}). @@ -133,7 +133,6 @@ Cockroach Labs cannot provide specific advice about ensuring end-to-end complian ## See also - [Authorization]({% link {{ site.current_cloud_version }}/authorization.md %}) -- [Integrate CockroachDB {{ site.data.products.advanced }} with Satori]({% link {{ site.current_cloud_version }}/satori-integration.md %}) - [CockroachDB Releases]({% link releases/index.md %}) - [CockroachDB {{ site.data.products.cloud }} Releases]({% link releases/cloud.md %}) - [Security and Audit Monitoring]({% link {{ site.current_cloud_version }}/logging-use-cases.md %}#security-and-audit-monitoring) From de208fc2de4eb08cf5d4bf3ba15bb8fbd264eecd Mon Sep 17 00:00:00 2001 From: Peach Leach Date: Wed, 25 Feb 2026 09:58:51 -0500 Subject: [PATCH 11/15] More broken links --- src/current/_data/cards.yml | 2 -- .../_includes/sidebar-data-cockroachcloud.json | 6 ------ .../_includes/v23.1/sidebar-data/get-started.json | 7 ------- .../_includes/v23.2/sidebar-data/get-started.json | 7 ------- .../_includes/v24.1/sidebar-data/get-started.json | 7 ------- .../_includes/v24.2/sidebar-data/get-started.json | 7 ------- .../_includes/v24.3/sidebar-data/get-started.json | 7 ------- .../_includes/v25.1/sidebar-data/get-started.json | 7 ------- .../_includes/v25.2/sidebar-data/get-started.json | 7 ------- .../_includes/v25.3/sidebar-data/get-started.json | 7 ------- .../_includes/v25.4/sidebar-data/get-started.json | 7 ------- src/current/v26.1/install-cockroachdb-linux.md | 12 ------------ src/current/v26.1/install-cockroachdb-mac.md | 6 ------ 13 files changed, 89 deletions(-) diff --git a/src/current/_data/cards.yml b/src/current/_data/cards.yml index 9a9709751da..3499409c638 100644 --- a/src/current/_data/cards.yml +++ b/src/current/_data/cards.yml @@ -17,8 +17,6 @@ develop: - link: "/PREFIX/developer-basics.html" title: "Developer basics" text: "A quick overview of key concepts developers need to know about CockroachDB." - - link: "cockroachcloud/learn-cockroachdb-sql.html" - title: "Learn CockroachDB SQL" text: "Submit SQL queries to retrieve data from your cluster." - link: "/PREFIX/schema-design-overview.html" title: "Design a schema" diff --git a/src/current/_includes/sidebar-data-cockroachcloud.json b/src/current/_includes/sidebar-data-cockroachcloud.json index f9c670a79ef..346b93e0f25 100644 --- a/src/current/_includes/sidebar-data-cockroachcloud.json +++ b/src/current/_includes/sidebar-data-cockroachcloud.json @@ -28,12 +28,6 @@ "/cockroachcloud/connect-to-your-cluster.html" ] }, - { - "title": "Learn CockroachDB SQL", - "urls": [ - "/cockroachcloud/learn-cockroachdb-sql.html" - ] - }, { "title": "Use the Cloud API", "urls": [ diff --git a/src/current/_includes/v23.1/sidebar-data/get-started.json b/src/current/_includes/v23.1/sidebar-data/get-started.json index f8aee043994..8820d982184 100644 --- a/src/current/_includes/v23.1/sidebar-data/get-started.json +++ b/src/current/_includes/v23.1/sidebar-data/get-started.json @@ -17,13 +17,6 @@ "/${VERSION}/install-cockroachdb-windows.html" ] }, - { - "title": "Learn CockroachDB SQL", - "urls": [ - "/cockroachcloud/learn-cockroachdb-sql.html", - "/${VERSION}/learn-cockroachdb-sql.html" - ] - }, { "title": "Develop with CockroachDB", "items": [ diff --git a/src/current/_includes/v23.2/sidebar-data/get-started.json b/src/current/_includes/v23.2/sidebar-data/get-started.json index f8aee043994..8820d982184 100644 --- a/src/current/_includes/v23.2/sidebar-data/get-started.json +++ b/src/current/_includes/v23.2/sidebar-data/get-started.json @@ -17,13 +17,6 @@ "/${VERSION}/install-cockroachdb-windows.html" ] }, - { - "title": "Learn CockroachDB SQL", - "urls": [ - "/cockroachcloud/learn-cockroachdb-sql.html", - "/${VERSION}/learn-cockroachdb-sql.html" - ] - }, { "title": "Develop with CockroachDB", "items": [ diff --git a/src/current/_includes/v24.1/sidebar-data/get-started.json b/src/current/_includes/v24.1/sidebar-data/get-started.json index f8aee043994..8820d982184 100644 --- a/src/current/_includes/v24.1/sidebar-data/get-started.json +++ b/src/current/_includes/v24.1/sidebar-data/get-started.json @@ -17,13 +17,6 @@ "/${VERSION}/install-cockroachdb-windows.html" ] }, - { - "title": "Learn CockroachDB SQL", - "urls": [ - "/cockroachcloud/learn-cockroachdb-sql.html", - "/${VERSION}/learn-cockroachdb-sql.html" - ] - }, { "title": "Develop with CockroachDB", "items": [ diff --git a/src/current/_includes/v24.2/sidebar-data/get-started.json b/src/current/_includes/v24.2/sidebar-data/get-started.json index 4a48e9e48b5..00849bf8799 100644 --- a/src/current/_includes/v24.2/sidebar-data/get-started.json +++ b/src/current/_includes/v24.2/sidebar-data/get-started.json @@ -17,13 +17,6 @@ "/${VERSION}/install-cockroachdb-windows.html" ] }, - { - "title": "Learn CockroachDB SQL", - "urls": [ - "/cockroachcloud/learn-cockroachdb-sql.html", - "/${VERSION}/learn-cockroachdb-sql.html" - ] - }, { "title": "Develop with CockroachDB", "items": [ diff --git a/src/current/_includes/v24.3/sidebar-data/get-started.json b/src/current/_includes/v24.3/sidebar-data/get-started.json index 4a48e9e48b5..00849bf8799 100644 --- a/src/current/_includes/v24.3/sidebar-data/get-started.json +++ b/src/current/_includes/v24.3/sidebar-data/get-started.json @@ -17,13 +17,6 @@ "/${VERSION}/install-cockroachdb-windows.html" ] }, - { - "title": "Learn CockroachDB SQL", - "urls": [ - "/cockroachcloud/learn-cockroachdb-sql.html", - "/${VERSION}/learn-cockroachdb-sql.html" - ] - }, { "title": "Develop with CockroachDB", "items": [ diff --git a/src/current/_includes/v25.1/sidebar-data/get-started.json b/src/current/_includes/v25.1/sidebar-data/get-started.json index 4a48e9e48b5..00849bf8799 100644 --- a/src/current/_includes/v25.1/sidebar-data/get-started.json +++ b/src/current/_includes/v25.1/sidebar-data/get-started.json @@ -17,13 +17,6 @@ "/${VERSION}/install-cockroachdb-windows.html" ] }, - { - "title": "Learn CockroachDB SQL", - "urls": [ - "/cockroachcloud/learn-cockroachdb-sql.html", - "/${VERSION}/learn-cockroachdb-sql.html" - ] - }, { "title": "Develop with CockroachDB", "items": [ diff --git a/src/current/_includes/v25.2/sidebar-data/get-started.json b/src/current/_includes/v25.2/sidebar-data/get-started.json index 4a48e9e48b5..00849bf8799 100644 --- a/src/current/_includes/v25.2/sidebar-data/get-started.json +++ b/src/current/_includes/v25.2/sidebar-data/get-started.json @@ -17,13 +17,6 @@ "/${VERSION}/install-cockroachdb-windows.html" ] }, - { - "title": "Learn CockroachDB SQL", - "urls": [ - "/cockroachcloud/learn-cockroachdb-sql.html", - "/${VERSION}/learn-cockroachdb-sql.html" - ] - }, { "title": "Develop with CockroachDB", "items": [ diff --git a/src/current/_includes/v25.3/sidebar-data/get-started.json b/src/current/_includes/v25.3/sidebar-data/get-started.json index 4a48e9e48b5..00849bf8799 100644 --- a/src/current/_includes/v25.3/sidebar-data/get-started.json +++ b/src/current/_includes/v25.3/sidebar-data/get-started.json @@ -17,13 +17,6 @@ "/${VERSION}/install-cockroachdb-windows.html" ] }, - { - "title": "Learn CockroachDB SQL", - "urls": [ - "/cockroachcloud/learn-cockroachdb-sql.html", - "/${VERSION}/learn-cockroachdb-sql.html" - ] - }, { "title": "Develop with CockroachDB", "items": [ diff --git a/src/current/_includes/v25.4/sidebar-data/get-started.json b/src/current/_includes/v25.4/sidebar-data/get-started.json index 4a48e9e48b5..00849bf8799 100644 --- a/src/current/_includes/v25.4/sidebar-data/get-started.json +++ b/src/current/_includes/v25.4/sidebar-data/get-started.json @@ -17,13 +17,6 @@ "/${VERSION}/install-cockroachdb-windows.html" ] }, - { - "title": "Learn CockroachDB SQL", - "urls": [ - "/cockroachcloud/learn-cockroachdb-sql.html", - "/${VERSION}/learn-cockroachdb-sql.html" - ] - }, { "title": "Develop with CockroachDB", "items": [ diff --git a/src/current/v26.1/install-cockroachdb-linux.md b/src/current/v26.1/install-cockroachdb-linux.md index 5d47aacc6cb..36c6f9599f1 100644 --- a/src/current/v26.1/install-cockroachdb-linux.md +++ b/src/current/v26.1/install-cockroachdb-linux.md @@ -113,18 +113,6 @@ true
-
-

Use Kubernetes

- -

To orchestrate CockroachDB using Kubernetes, either with configuration files or the Helm package manager, use the following tutorials:

- - -
-

Use Docker

diff --git a/src/current/v26.1/install-cockroachdb-mac.md b/src/current/v26.1/install-cockroachdb-mac.md index 19ea059cbf1..935e7d8a6c5 100644 --- a/src/current/v26.1/install-cockroachdb-mac.md +++ b/src/current/v26.1/install-cockroachdb-mac.md @@ -164,12 +164,6 @@ true
-
-

Use Kubernetes

- -

To orchestrate CockroachDB locally using Kubernetes, either with configuration files or the Helm package manager, see Orchestrate CockroachDB Locally with Minikube.

-
-

Use Docker

From 3867a6642088b562dfbbf7479acce5339196340b Mon Sep 17 00:00:00 2001 From: Peach Leach Date: Wed, 25 Feb 2026 11:01:06 -0500 Subject: [PATCH 12/15] Fixed bad redirects Fixed bad redirects (hopefully) --- src/current/_data/redirects.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/current/_data/redirects.yml b/src/current/_data/redirects.yml index 1658f0e17c2..3a2d40bc79c 100644 --- a/src/current/_data/redirects.yml +++ b/src/current/_data/redirects.yml @@ -1069,19 +1069,18 @@ # page deletion project -- destination: stable/sql-statements.md - sources: ['learn-cockroachdb-sql.md'] - versions: ['cockroachcloud'] +- destination: /docs/stable/sql-statements.md + sources: ['cockroachcloud/learn-cockroachdb-sql.md'] -- destination: cockroachcloud/client-certs-advanced.md +- destination: /docs/cockroachcloud/client-certs-advanced.md sources: ['security-reference/config-secure-hba.md'] versions: ['v26.1'] -- destination: cockroachcloud/security-overview.md +- destination: /docs/cockroachcloud/security-overview.md sources: ['satori-integration.md'] versions: ['v26.1'] -- destination: stable/cockroachdb-operator-overview.md +- destination: cockroachdb-operator-overview.md sources: ['orchestrate-a-local-cluster-with-kubernetes.md', 'orchestrate-a-local-cluster-with-kubernetes-insecure.md'] versions: ['v26.1'] From e8ec9086f4115ed1d4829a7d15c8ffcb1a5c20af Mon Sep 17 00:00:00 2001 From: Peach Leach Date: Wed, 25 Feb 2026 14:21:59 -0500 Subject: [PATCH 13/15] Still trying to fix redirects --- src/current/_data/redirects.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/current/_data/redirects.yml b/src/current/_data/redirects.yml index 3a2d40bc79c..55fa31f4501 100644 --- a/src/current/_data/redirects.yml +++ b/src/current/_data/redirects.yml @@ -1069,16 +1069,14 @@ # page deletion project -- destination: /docs/stable/sql-statements.md +- destination: stable/sql-statements.md sources: ['cockroachcloud/learn-cockroachdb-sql.md'] -- destination: /docs/cockroachcloud/client-certs-advanced.md - sources: ['security-reference/config-secure-hba.md'] - versions: ['v26.1'] +- destination: cockroachcloud/client-certs-advanced.md + sources: ['v26.1/security-reference/config-secure-hba.md', 'stable/security-reference/config-secure-hba.md'] -- destination: /docs/cockroachcloud/security-overview.md - sources: ['satori-integration.md'] - versions: ['v26.1'] +- destination: cockroachcloud/security-overview.md + sources: ['v26.1/satori-integration.md', 'stable/satori-integration.md'] - destination: cockroachdb-operator-overview.md sources: ['orchestrate-a-local-cluster-with-kubernetes.md', 'orchestrate-a-local-cluster-with-kubernetes-insecure.md'] From 72ddfa05301637e60dca9154f0b2ad75d01dca37 Mon Sep 17 00:00:00 2001 From: Peach Leach Date: Wed, 25 Feb 2026 14:32:09 -0500 Subject: [PATCH 14/15] Testing redirects --- src/current/_data/redirects.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/current/_data/redirects.yml b/src/current/_data/redirects.yml index 55fa31f4501..d0981c411a7 100644 --- a/src/current/_data/redirects.yml +++ b/src/current/_data/redirects.yml @@ -1073,7 +1073,8 @@ sources: ['cockroachcloud/learn-cockroachdb-sql.md'] - destination: cockroachcloud/client-certs-advanced.md - sources: ['v26.1/security-reference/config-secure-hba.md', 'stable/security-reference/config-secure-hba.md'] + sources: ['security-reference/config-secure-hba.md'] + versions: ['v26.1'] - destination: cockroachcloud/security-overview.md sources: ['v26.1/satori-integration.md', 'stable/satori-integration.md'] From 63ddb1d470e8a93f1bb65cdf1b581b58219dfc41 Mon Sep 17 00:00:00 2001 From: Peach Leach Date: Wed, 25 Feb 2026 14:33:14 -0500 Subject: [PATCH 15/15] Undo last commit --- src/current/_data/redirects.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/current/_data/redirects.yml b/src/current/_data/redirects.yml index d0981c411a7..55fa31f4501 100644 --- a/src/current/_data/redirects.yml +++ b/src/current/_data/redirects.yml @@ -1073,8 +1073,7 @@ sources: ['cockroachcloud/learn-cockroachdb-sql.md'] - destination: cockroachcloud/client-certs-advanced.md - sources: ['security-reference/config-secure-hba.md'] - versions: ['v26.1'] + sources: ['v26.1/security-reference/config-secure-hba.md', 'stable/security-reference/config-secure-hba.md'] - destination: cockroachcloud/security-overview.md sources: ['v26.1/satori-integration.md', 'stable/satori-integration.md']