From 76b7be7809eeaf4660a023fcc7d19049b5e8062d Mon Sep 17 00:00:00 2001 From: Joe Lodin Date: Mon, 15 Sep 2025 15:04:51 -0400 Subject: [PATCH 1/3] Warn readers that deleted clusters cannot be restored --- src/current/cockroachcloud/advanced-cluster-management.md | 2 +- src/current/cockroachcloud/basic-cluster-management.md | 2 +- src/current/cockroachcloud/cloud-api.md | 4 +++- src/current/cockroachcloud/cluster-management.md | 2 +- src/current/cockroachcloud/free-trial.md | 2 +- .../cockroachcloud/provision-a-cluster-with-terraform.md | 4 ++++ 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/current/cockroachcloud/advanced-cluster-management.md b/src/current/cockroachcloud/advanced-cluster-management.md index 111506b746f..fe9b4d171d3 100644 --- a/src/current/cockroachcloud/advanced-cluster-management.md +++ b/src/current/cockroachcloud/advanced-cluster-management.md @@ -180,7 +180,7 @@ You can also check the status of these features on the [**PCI ready**]({% link c ## Delete cluster {{site.data.alerts.callout_danger}} -Deleting a cluster will delete all cluster data. +Deleting a cluster will delete all cluster data. Deleted clusters can not be restored. {{site.data.alerts.end}} {{site.data.alerts.callout_info}} diff --git a/src/current/cockroachcloud/basic-cluster-management.md b/src/current/cockroachcloud/basic-cluster-management.md index 856abeda926..2b4ca340270 100644 --- a/src/current/cockroachcloud/basic-cluster-management.md +++ b/src/current/cockroachcloud/basic-cluster-management.md @@ -115,7 +115,7 @@ Deleting a cluster will delete all cluster data. {{site.data.alerts.end}} {{site.data.alerts.callout_info}} -Free CockroachDB {{ site.data.products.basic }} clusters are subject to deletion after 6 months of no activity. +Free CockroachDB {{ site.data.products.basic }} clusters are subject to deletion after 6 months of no activity. Deleted clusters can not be restored. {{site.data.alerts.end}} Proceed with the following steps only if you are sure you want to delete a cluster: diff --git a/src/current/cockroachcloud/cloud-api.md b/src/current/cockroachcloud/cloud-api.md index be9d98c5caf..b8eab881647 100644 --- a/src/current/cockroachcloud/cloud-api.md +++ b/src/current/cockroachcloud/cloud-api.md @@ -664,7 +664,9 @@ To delete a cluster, send a `DELETE` request to the `/v1/clusters/{cluster_id}` The service account associated with the secret key must have the Cluster Admin or Cluster Creator [role]({% link cockroachcloud/authorization.md %}#organization-user-roles). {{site.data.alerts.end}} -Sending a `DELETE` request permanently deletes the cluster and all the data within the cluster. +{{site.data.alerts.callout_danger}} +Sending a `DELETE` request permanently deletes the cluster and all the data within the cluster. Deleted clusters can not be restored. +{{site.data.alerts.end}} {% include_cached copy-clipboard.html %} ~~~ shell diff --git a/src/current/cockroachcloud/cluster-management.md b/src/current/cockroachcloud/cluster-management.md index 74d228fe493..7ae941e8105 100644 --- a/src/current/cockroachcloud/cluster-management.md +++ b/src/current/cockroachcloud/cluster-management.md @@ -132,7 +132,7 @@ To help prevent a cluster from being deleted by mistake, you can enable _deletio ## Delete cluster {{site.data.alerts.callout_danger}} -Deleting a cluster will delete all cluster data. +Deleting a cluster will delete all cluster data. Deleted clusters can not be restored. {{site.data.alerts.end}} {{site.data.alerts.callout_info}} diff --git a/src/current/cockroachcloud/free-trial.md b/src/current/cockroachcloud/free-trial.md index 85d7f293796..ea2c3632b51 100644 --- a/src/current/cockroachcloud/free-trial.md +++ b/src/current/cockroachcloud/free-trial.md @@ -65,7 +65,7 @@ If the trial ends and a payment method has not been provided, a 30 day grace per The cluster will be fully restored if a payment method is added. Any charges accrued during the grace period will be billed to the payment method. {{site.data.alerts.callout_danger}} -If the end of the grace period is reached and no payment method has been added, all clusters in the organization are deleted. +If the end of the grace period is reached and no payment method has been added, all clusters in the organization are deleted. Deleted clusters can not be restored. {{site.data.alerts.end}} ## Get started diff --git a/src/current/cockroachcloud/provision-a-cluster-with-terraform.md b/src/current/cockroachcloud/provision-a-cluster-with-terraform.md index 94d5296d3de..6b55a70b079 100644 --- a/src/current/cockroachcloud/provision-a-cluster-with-terraform.md +++ b/src/current/cockroachcloud/provision-a-cluster-with-terraform.md @@ -273,6 +273,10 @@ To change a cluster's plan from CockroachDB {{ site.data.products.standard }} to ## Delete a cluster +{{site.data.alerts.callout_danger}} +Sending a `destory` command permanently deletes the cluster and all the data within the cluster. Deleted clusters can not be restored. +{{site.data.alerts.end}} + If you want to delete a cluster managed by Terraform, run the following command: {% include_cached copy-clipboard.html %} From 5604324faa232539c58a6cde1dc5f6401abd01fc Mon Sep 17 00:00:00 2001 From: Joe Lodin Date: Mon, 15 Sep 2025 15:52:18 -0400 Subject: [PATCH 2/3] Add non-payment section --- src/current/_includes/cockroachcloud/non-payment.md | 1 + src/current/cockroachcloud/billing-management.md | 4 ++++ src/current/cockroachcloud/costs.md | 4 ++++ 3 files changed, 9 insertions(+) create mode 100644 src/current/_includes/cockroachcloud/non-payment.md diff --git a/src/current/_includes/cockroachcloud/non-payment.md b/src/current/_includes/cockroachcloud/non-payment.md new file mode 100644 index 00000000000..6932f1428dc --- /dev/null +++ b/src/current/_includes/cockroachcloud/non-payment.md @@ -0,0 +1 @@ +If a {{ site.data.products.cloud }} organization with billing configured lapses in payment, notices are sent by email to all users with the [Organization Admin]({% link cockroachcloud/authorization.md %}#organization-admin) or [Billing Coordinator]({% link cockroachcloud/authorization.md %}#billing-coordinator) role. After multiple notices are sent with acknowledgement or change in billing, all clusters in the organization are deleted including data. Deleted clusters cannot be restored. \ No newline at end of file diff --git a/src/current/cockroachcloud/billing-management.md b/src/current/cockroachcloud/billing-management.md index f007470cdf0..7b117d42cd5 100644 --- a/src/current/cockroachcloud/billing-management.md +++ b/src/current/cockroachcloud/billing-management.md @@ -152,3 +152,7 @@ You can export invoice data in CSV or PDF format. From the **Invoices** tab, on - The PDF renders invoice information from the Console into a traditional invoice format. This format includes the high level information from the Console, a summary of total usage, the organization's billing address, and a CockroachDB letterhead. If you're using [folders]({% link cockroachcloud/folders.md %}) to organize your clusters, the full path for each cluster is provided under the **Cluster path** column. + +## Non-payment + +{% include cockroachcloud/non-payment.md %} diff --git a/src/current/cockroachcloud/costs.md b/src/current/cockroachcloud/costs.md index 82b55c85511..d720d606d78 100644 --- a/src/current/cockroachcloud/costs.md +++ b/src/current/cockroachcloud/costs.md @@ -309,6 +309,10 @@ In CockroachDB {{ site.data.products.advanced }}, CDC is billed monthly based on +## Non-payment + +{% include cockroachcloud/non-payment.md %} + ## Learn more - [Plan a CockroachDB {{ site.data.products.basic }} cluster]({% link cockroachcloud/plan-your-cluster-basic.md %}) From 177c9969dcc6f3d5fb15bb107b8eed9fa96690e7 Mon Sep 17 00:00:00 2001 From: Joe Lodin Date: Thu, 18 Sep 2025 16:18:14 -0400 Subject: [PATCH 3/3] Update warning with Joel's feedback --- src/current/_includes/cockroachcloud/non-payment.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/current/_includes/cockroachcloud/non-payment.md b/src/current/_includes/cockroachcloud/non-payment.md index 6932f1428dc..b7a8ccf58b0 100644 --- a/src/current/_includes/cockroachcloud/non-payment.md +++ b/src/current/_includes/cockroachcloud/non-payment.md @@ -1 +1,3 @@ -If a {{ site.data.products.cloud }} organization with billing configured lapses in payment, notices are sent by email to all users with the [Organization Admin]({% link cockroachcloud/authorization.md %}#organization-admin) or [Billing Coordinator]({% link cockroachcloud/authorization.md %}#billing-coordinator) role. After multiple notices are sent with acknowledgement or change in billing, all clusters in the organization are deleted including data. Deleted clusters cannot be restored. \ No newline at end of file +If a {{ site.data.products.cloud }} organization with billing configured lapses in payment, non-payment reminders are sent the **Billing contact info** designated in the {{ site.data.products.cloud }} Console under **Billing** > **Settings**. By default this billing contact is set to the original Organization Admin of the {{ site.data.products.cloud }} organization. + +After sending multiple payment failure reminders with no acknowledgement or change in billing, all clusters in the organization are deleted including data. Deleted clusters cannot be restored. \ No newline at end of file