Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecate trial #17955

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/current/_data/cloud_releases.csv
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,4 @@ date,sha
2023-09-27,null
2023-09-29,null
2023-10-02,null
2023-10-04,null
2023-10-23,null
2 changes: 1 addition & 1 deletion src/current/_includes/releases/cloud/2021-02-09.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ New CockroachCloud clusters will now run CockroachDB [v20.2.4]({% link releases/

- You can now [restore databases and tables](https://www.cockroachlabs.com/docs/cockroachcloud/use-managed-service-backups) from backups of CockroachCloud clusters. This feature is only available to clusters running the paid version of CockroachCloud.
- [reCAPTCHA](https://www.google.com/recaptcha/about/) has been added to the sign up process for new users signing up with an email and password. Some users may need to complete an image challenge.
- An email will now be sent to [org admins](https://www.cockroachlabs.com/docs/cockroachcloud/authorization#org-administrator-legacy) when a [30-day free trial of CockroachDB {{ site.data.products.cloud }}](https://www.cockroachlabs.com/docs/cockroachcloud/quickstart-trial-cluster) is nearing its end and once it has expired.
- An email will now be sent to [Org Administrators](https://www.cockroachlabs.com/docs/cockroachcloud/authorization#org-administrator) when a [30-day free trial of CockroachDB {{ site.data.products.cloud }}](https://www.cockroachlabs.com/docs/cockroachcloud/quickstart-dedicated) is nearing its end and when it expires.
5 changes: 5 additions & 0 deletions src/current/_includes/releases/cloud/2023-10-23.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## October 16, 2023

<h3 id="2023-10-16-general-changes"> General changes </h3>

- Free trials of CockroachDB {{ site.data.products.dedicated }} can no longer be created from within the {{ site.data.products.cloud }} Console. To request a trial cluster, contact your Cockroach Labs account team.
2 changes: 1 addition & 1 deletion src/current/_includes/sidebar-data-v20.2.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"is_top_level": true,
"urls": [
"/cockroachcloud/quickstart.html",
"/cockroachcloud/quickstart-trial-cluster.html"
"/cockroachcloud/quickstart-dedicated.html"
]
},
{% include_cached sidebar-data-cockroachcloud.json %},
Expand Down
2 changes: 1 addition & 1 deletion src/current/_includes/sidebar-data-v21.1.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"is_top_level": true,
"urls": [
"/cockroachcloud/quickstart.html",
"/cockroachcloud/quickstart-trial-cluster.html"
"/cockroachcloud/quickstart-dedicated.html"
]
},
{% include_cached sidebar-data-cockroachcloud.json %},
Expand Down
2 changes: 1 addition & 1 deletion src/current/_includes/v21.2/sidebar-data/deploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
{
"title": "Quickstart with CockroachDB Dedicated",
"urls": [
"/cockroachcloud/quickstart-trial-cluster.html"
"/cockroachcloud/quickstart-dedicated.html"
]
},
{
Expand Down
6 changes: 1 addition & 5 deletions src/current/cockroachcloud/create-your-cluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This page walks you through the process of creating a CockroachDB {{ site.data.p
Only [CockroachDB {{ site.data.products.cloud }} Org Administrators]({% link cockroachcloud/authorization.md %}#org-administrator-legacy) or users with Cluster Creator / Cluster Admin roles assigned at organization scope can create clusters. If you are a Developer and need to create a cluster, contact your CockroachDB {{ site.data.products.cloud }} Administrator.

{{site.data.alerts.callout_success}}
To create and connect to a 30-day free CockroachDB {{ site.data.products.dedicated }} cluster and run your first query, see the [Quickstart]({% link cockroachcloud/quickstart-trial-cluster.md %}).
To create and connect to CockroachDB {{ site.data.products.dedicated }} cluster and run your first query, refer to the [Quickstart]({% link cockroachcloud/quickstart-dedicated.md %}).
{{site.data.alerts.end}}

## Step 1. Start the cluster creation process
Expand Down Expand Up @@ -146,10 +146,6 @@ Otherwise, to enable VPC peering:
You will be billed monthly.

1. Add your preferred [payment method]({% link cockroachcloud/billing-management.md %}).
1. [If applicable]({% link cockroachcloud/frequently-asked-questions.md %}#how-do-cockroachdb-dedicated-free-trials-work), the 30-day trial code is pre-applied to your cluster.
{{site.data.alerts.callout_info}}
Make sure that you [delete your trial cluster]({% link cockroachcloud/cluster-management.md %}#delete-cluster) before the trial expires. Your credit card will be charged after the trial ends. You can check the validity of the code on the [Billing]({% link cockroachcloud/billing-management.md %}) page.
{{site.data.alerts.end}}
1. Click **Create cluster**.

Your cluster will be created in approximately 20-30 minutes.
Expand Down
14 changes: 1 addition & 13 deletions src/current/cockroachcloud/frequently-asked-questions.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,9 @@ CockroachDB {{ site.data.products.dedicated }} provides fully-managed, single-te

CockroachDB {{ site.data.products.dedicated }} advanced clusters have access to features required for [PCI readiness]({% link cockroachcloud/pci-dss.md %}) in addition to all CockroachDB {{ site.data.products.dedicated }} standard features. You must be a contract customer to create a CockroachDB {{ site.data.products.dedicated }} advanced cluster. For more information, [contact us](https://www.cockroachlabs.com/contact-sales/).

### How do CockroachDB {{ site.data.products.dedicated }} free trials work?

CockroachDB {{ site.data.products.dedicated }} offers a 30-day free trial. Free trials require a credit card so we can validate that you are not a bot and provide a seamless transition into production. Free trials apply when you:

- Create the first cluster in your organization
- Select 9 or fewer nodes (we recommend starting with 3 so you can try scaling)
- Select up to 4 vCPUs of compute and 150 GiB of storage (the trial code will not apply to larger clusters)
- Select a single region or 3 regions
- Don't remove the pre-applied trial code at check out

Once the 30-day period is over, your cluster can be scaled beyond the trial period hardware limitations. You can create other paid clusters at any time. If Cockroach Labs has provided you with additional codes, you can use those on applicable clusters. For extended trial options, [contact us](https://www.cockroachlabs.com/contact-sales/).

### How do I connect to my cluster?

To connect to a cluster, you need to authorize your network, create a SQL user, download the CA certificate, and then generate a connection string or parameters. You can use this information to connect to your cluster through the CockroachDB SQL client or a PostgreSQL-compatible driver or ORM. For more details, see [Connect to Your CockroachDB {{ site.data.products.dedicated }} Cluster]({% link cockroachcloud/connect-to-your-cluster.md %}).
To connect to a cluster, you need to authorize your network, create a SQL user, download the CA certificate, and then generate a connection string or parameters. To connect to your cluster through the CockroachDB SQL client or a PostgreSQL-compatible driver or ORM using this information, refer to [Connect to Your CockroachDB {{ site.data.products.dedicated }} Cluster]({% link cockroachcloud/connect-to-your-cluster.md %}).

## Security

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The steps below use sample data from the [`tpcc` workload](https://www.cockroach
These instructions assume you already have the following:

- A [CockroachDB {{ site.data.products.serverless }} cluster]({% link cockroachcloud/quickstart.md %}) from which you want to migrate data.
- A [paid CockroachDB {{ site.data.products.dedicated }} cluster]({% link cockroachcloud/quickstart-trial-cluster.md %}). Your first paid CockroachDB {{ site.data.products.dedicated }} cluster is free for a 30-day trial.
- A [paid CockroachDB {{ site.data.products.dedicated }} cluster]({% link cockroachcloud/quickstart-dedicated.md %}).
- [Cloud storage](https://www.cockroachlabs.com/docs/{{site.current_cloud_version}}/use-cloud-storage).

## Step 1. Export data to cloud storage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,44 +5,29 @@ toc: true
docs_area: get_started
---

This page shows you how to deploy a CockroachDB cluster on CockroachDB {{ site.data.products.dedicated }} (free for a 30-day trial for your first cluster), connect to it using a sample workload, and run your first query.
This page shows you how to deploy a CockroachDB cluster on CockroachDB {{ site.data.products.dedicated }}, connect to it using a sample workload, and run your first query.

To run CockroachDB on your local machine instead, see [Start a Local Cluster](quickstart.html?filters=local).
To run CockroachDB on your local machine instead, refer to [Start a Local Cluster](quickstart.html?filters=local).

## Step 1. Create a free trial cluster
## Step 1. Create a cluster

For this tutorial, you will create a 3-node GCP cluster in the `us-west2` region.

1. If you haven't already, <a href="https://cockroachlabs.cloud/signup?referralId=docs_quickstart_trial" rel="noopener" target="_blank">sign up for a CockroachDB {{ site.data.products.cloud }} account</a>.
1. If you haven't already, <a href="https://cockroachlabs.cloud/signup?referralId=docs_quickstart_dedicated" rel="noopener" target="_blank">sign up for a CockroachDB {{ site.data.products.cloud }} account</a>.
1. [Log in](https://cockroachlabs.cloud/) to your CockroachDB {{ site.data.products.cloud }} account.
1. On the **Overview** page, click **Create Cluster**.
1. On the **Create Cluster** page, select **Dedicated standard**.

{{site.data.alerts.callout_info}}
Free trials do not apply to **Dedicated advanced** clusters.
{{site.data.alerts.end}}

1. For **Cloud provider**, select **Google Cloud**.
1. For **Regions & nodes**, use the default selection of `California (us-west)` region and 3 nodes.

{{site.data.alerts.callout_info}}
You can also select 3 regions with 3 nodes per region if you want to create a [multi-region]({% link cockroachcloud/plan-your-cluster.md %}#multi-region-clusters) trial cluster.
To create a [multi-region]({% link cockroachcloud/plan-your-cluster.md %}#multi-region-clusters) cluster instead of a single-region cluster, select three regions and specify three nodes per region.
{{site.data.alerts.end}}

1. Under **Hardware per node**, select 2vCPU for **Compute** and a 35 GiB disk for **Storage**.

{{site.data.alerts.callout_info}}
You can select up to 9 nodes, 4 vCPUs of compute, and 150 GiB of storage. The trial code will not apply to larger clusters.
{{site.data.alerts.end}}

1. Name the cluster. The cluster name must be 6-20 characters in length, and can include lowercase letters, numbers, and dashes (but no leading or trailing dashes).
1. Click **Next**.
1. On the **Summary** page, enter your credit card details.

{{site.data.alerts.callout_info}}
You will not be charged until after your free trial expires in 30 days.
{{site.data.alerts.end}}

1. Click **Create cluster**.

Your cluster will be created in approximately 20-30 minutes. Watch [this video](https://www.youtube.com/watch?v=XJZD1rorEQE) while you wait to get a preview of how you'll connect to your cluster.
Expand Down
10 changes: 5 additions & 5 deletions src/current/cockroachcloud/quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,9 @@ Now that you have a free CockroachDB {{ site.data.products.serverless }} cluster
- Explore our [example apps](https://www.cockroachlabs.com/docs/{{site.current_cloud_version}}/example-apps) for examples on how to build applications using your preferred driver or ORM and run it on CockroachDB.
- [Migrate your existing data](https://www.cockroachlabs.com/docs/{{site.current_cloud_version}}/migration-overview).

This page highlights just one way you can get started with CockroachDB. For information on other options that are available when creating a CockroachDB cluster, see the following:
This page shows how to get started with CockroachDB by creating a small, simple CockroachDB {{ site.data.products.serverless }} cluster. For comprehensive information about creating and customizing a cluster, refer to:

- To create a Self-Hosted cluster, see [Start a Local Cluster](https://www.cockroachlabs.com/docs/{{site.current_cloud_version}}/start-a-local-cluster).
- To create a CockroachDB {{ site.data.products.dedicated }} cluster, see [Quickstart with CockroachDB {{ site.data.products.dedicated }}]({% link cockroachcloud/quickstart-trial-cluster.md %}).
- To create a CockroachDB {{ site.data.products.serverless }} cluster with other configurations (e.g., a different cloud provider, region, or monthly budget), see [Create a CockroachDB {{ site.data.products.serverless }} Cluster]({% link cockroachcloud/create-a-serverless-cluster.md %}).
- To connect to a CockroachDB {{ site.data.products.serverless }} cluster with other options (e.g., a different SQL user) and connection methods (with an application or [CockroachDB compatible tool](https://www.cockroachlabs.com/docs/{{site.current_cloud_version}}/third-party-database-tools)), see [Connect to a CockroachDB {{ site.data.products.serverless }} Cluster]({% link cockroachcloud/connect-to-a-serverless-cluster.md %}).
- [Start a Local Cluster](https://www.cockroachlabs.com/docs/{{site.current_cloud_version}}/start-a-local-cluster).
- [Quickstart with CockroachDB {{ site.data.products.dedicated }}]({% link cockroachcloud/quickstart-dedicated.md %}).
- [Create a CockroachDB {{ site.data.products.serverless }} Cluster]({% link cockroachcloud/create-a-serverless-cluster.md %}).
- To connect to a CockroachDB {{ site.data.products.serverless }} cluster with other options or connection methods (such as with a different SQL user, from within an application, or using a [CockroachDB-compatible tool](https://www.cockroachlabs.com/docs/{{site.current_cloud_version}}/third-party-database-tools)), refer to [Connect to a CockroachDB {{ site.data.products.serverless }} Cluster]({% link cockroachcloud/connect-to-a-serverless-cluster.md %}).
2 changes: 1 addition & 1 deletion src/current/update-links.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ sed -i '' -E 's/"..\/releases\/release-support-policy.html/"https:\/\/www.cockro
sed -i '' -E 's/"..\/releases\/\{\{ page.version.version \}\}.html#\{\{ r.release_name | replace: '.', '-' \}\}/"https:\/\/www.cockroachlabs.com\/docs\/releases\/\{\{ page.version.version \}\}#\{\{ r.release_name | replace: '.', '-' \}\}/g' v23.1/fips.md
sed -i '' -E 's/"..\/cockroachcloud\/quickstart.html/"https:\/\/www.cockroachlabs.com\/docs\/cockroachcloud\/quickstart/g' v23.1/choose-a-deployment-option.md
sed -i '' -E 's/"..\/cockroachcloud\/serverless-faqs.html#what-is-a-request-unit/"https:\/\/www.cockroachlabs.com\/docs\/cockroachcloud\/serverless-faqs#what-is-a-request-unit/g' v23.1/choose-a-deployment-option.md
sed -i '' -E 's/"..\/cockroachcloud\/quickstart-trial-cluster.html/"https:\/\/www.cockroachlabs.com\/docs\/cockroachcloud\/quickstart-trial-cluster/g' v23.1/choose-a-deployment-option.md
sed -i '' -E 's/"..\/cockroachcloud\/quickstart-dedicated.html/"https:\/\/www.cockroachlabs.com\/docs\/cockroachcloud\/quickstart-dedicated/g' v23.1/choose-a-deployment-option.md
sed -i '' -E 's/"..\/releases\/\{\{page.version.version\}\}.html/"https:\/\/www.cockroachlabs.com\/docs\/releases\/\{\{page.version.version\}\}/g' v23.1/install-cockroachdb-windows.md
sed -i '' -E 's/"..\/tutorials\/demo-spatial-tutorial-interactive.html/"https:\/\/www.cockroachlabs.com\/docs\/tutorials\/demo-spatial-tutorial-interactive/g' v23.1/spatial-tutorial.md
sed -i '' -E 's/"..\/releases\/\{\{page.version.version\}\}.html/"https:\/\/www.cockroachlabs.com\/docs\/releases\/\{\{page.version.version\}\}/g' v23.1/install-cockroachdb-mac.md
Expand Down
2 changes: 1 addition & 1 deletion src/current/v21.1/frequently-asked-questions.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ Yes. The CockroachDB {{ site.data.products.dedicated }} offering is currently in
- Upgrades to the latest stable release of CockroachDB
- Monitoring to provide SLA-level support

For more details, see the [CockroachDB {{ site.data.products.dedicated }}](../cockroachcloud/quickstart-trial-cluster.html) docs.
For more details, refer to [CockroachDB {{ site.data.products.dedicated }}](../cockroachcloud/quickstart-dedicated.html).

## Why did Cockroach Labs change the license for CockroachDB?

Expand Down
14 changes: 5 additions & 9 deletions src/current/v21.1/movr-flask-deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ In addition to the requirements listed in [Setting Up a Virtual Environment for

## Multi-region database deployment

In production, you want to start a secure CockroachDB cluster, with nodes on machines located in different areas of the world. To deploy CockroachDB in multiple regions, we recommend using [CockroachDB {{ site.data.products.dedicated }}](../cockroachcloud/quickstart-trial-cluster.html).
In production, you want to start a secure CockroachDB cluster, with nodes on machines located in different areas of the world. To deploy CockroachDB in multiple regions, we recommend using [CockroachDB {{ site.data.products.dedicated }}](../cockroachcloud/quickstart-dedicated.html).

{{site.data.alerts.callout_info}}
You can also deploy CockroachDB manually. For instructions, see the [Manual Deployment](manual-deployment.html) page of the Cockroach Labs documentation site.
Expand All @@ -35,18 +35,14 @@ You can also deploy CockroachDB manually. For instructions, see the [Manual Depl
1. On the **Overview** page, select **Create Cluster**.

1. On the **Create new cluster** page:
- For **Plan**, select CockroachDB {{ site.data.products.dedicated }}. You won't be charged for the first 30 days of service.
- For **Plan**, select CockroachDB {{ site.data.products.dedicated }}.
- For **Cloud Provider**, select Google Cloud.
- For **Regions & nodes**, add "us-east1", "us-west1", and "europe-west1", with 3 nodes in each region.
- Leave the **Hardware** and **Cluster name** as their default values.
- For **Additional settings**, turn on VPC peering, with the default IP range.
- Use the default values for **Hardware** and **Cluster name**.
- For **Additional settings**, enable VPC peering and use the default IP range.

1. Select **Next**, and on the **Summary** page, enter your credit card details.

{{site.data.alerts.callout_info}}
You will not be charged until after your free trial expires in 30 days.
{{site.data.alerts.end}}

1. Select **Create cluster**.

Your cluster will be created in approximately 20-30 minutes. Watch [this video](https://www.youtube.com/watch?v=XJZD1rorEQE) while you wait to get a preview of how you'll connect to your cluster.
Expand Down Expand Up @@ -234,7 +230,7 @@ Some time after you have deployed your application, you will likely need to push
## See also

<!-- [MovR (live demo)](https://movr.cloud)-->
- [CockroachDB {{ site.data.products.dedicated }} documentation](../cockroachcloud/quickstart-trial-cluster.html)
- [CockroachDB {{ site.data.products.dedicated }} documentation](../cockroachcloud/quickstart-dedicated.html)
- [Google Cloud Platform documentation](https://cloud.google.com/docs/)
- [Docker documentation](https://docs.docker.com/)
- [Kubernetes documentation](https://kubernetes.io/docs/home/)
2 changes: 1 addition & 1 deletion src/current/v21.2/architecture/glossary.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Term | Definition
**region** | A logical identification of how nodes and data are clustered around [geographical locations](../multiregion-overview.html). A _cluster region_ is the set of locations where cluster nodes are running. A _database region_ is the subset of cluster regions database data should be restricted to.
**availability zone** | A part of a data center that is considered to form a unit with regards to failures and fault tolerance. There can be multiple nodes in a single availability zone, however Cockroach Labs recommends that you to place different replicas of your data in different availability zones.
**[CockroachDB {{ site.data.products.serverless }}](../../cockroachcloud/quickstart.html)** | A fully managed, multi-tenant CockroachDB deployment, in a single region and cloud (AWS or GCP). Delivers an instant, autoscaling database and offers a generous free tier and consumption based billing once free limits are exceeded.
**[CockroachDB {{ site.data.products.dedicated }}](../../cockroachcloud/quickstart-trial-cluster.html)** | A fully managed, single tenant CockroachDB deployment in a single region or multi-region cloud (AWS or GCP).
**[CockroachDB {{ site.data.products.dedicated }}](../../cockroachcloud/quickstart-dedicated.html)** | A fully-managed single-tenant CockroachDB deployment in a single region or multiple regions.
**[CockroachDB Self-Hosted](../start-a-local-cluster.html)** | A full featured, self-managed CockroachDB deployment.

For more information on deployment options and guidelines on how to choose a deployment option, see [How to Choose a Deployment Option](../choose-a-deployment-option.html).
Expand Down
Loading
Loading