From 23ad7b836a2888b4780349a2cc8b69b9d6e3cd76 Mon Sep 17 00:00:00 2001 From: Joe Lodin Date: Thu, 8 May 2025 14:14:54 -0400 Subject: [PATCH 1/3] Docs changes for paid license support on Enterprise license management page --- .../_includes/common/license/evolving.md | 2 +- .../_includes/common/licensing-faqs.md | 15 +++++++--- .../v23.2/misc/install-next-steps.html | 29 ++++++++++--------- .../v24.1/misc/install-next-steps.html | 29 ++++++++++--------- .../v24.2/misc/install-next-steps.html | 29 ++++++++++--------- .../v24.3/misc/install-next-steps.html | 29 ++++++++++--------- .../v25.1/misc/install-next-steps.html | 29 ++++++++++--------- .../v25.2/misc/install-next-steps.html | 1 + .../start-a-local-cluster-in-docker-linux.md | 1 + .../start-a-local-cluster-in-docker-mac.md | 1 + ...start-a-local-cluster-in-docker-windows.md | 1 + src/current/v23.2/start-a-local-cluster.md | 1 + src/current/v24.1/install-cockroachdb-mac.md | 2 +- .../start-a-local-cluster-in-docker-linux.md | 1 + .../start-a-local-cluster-in-docker-mac.md | 1 + ...start-a-local-cluster-in-docker-windows.md | 1 + src/current/v24.1/start-a-local-cluster.md | 1 + src/current/v24.2/install-cockroachdb-mac.md | 2 +- src/current/v24.3/install-cockroachdb-mac.md | 2 +- .../start-a-local-cluster-in-docker-linux.md | 1 + .../start-a-local-cluster-in-docker-mac.md | 1 + ...start-a-local-cluster-in-docker-windows.md | 1 + src/current/v24.3/start-a-local-cluster.md | 1 + src/current/v25.1/install-cockroachdb-mac.md | 2 +- .../start-a-local-cluster-in-docker-linux.md | 1 + .../start-a-local-cluster-in-docker-mac.md | 1 + ...start-a-local-cluster-in-docker-windows.md | 1 + src/current/v25.1/start-a-local-cluster.md | 1 + src/current/v25.2/install-cockroachdb-mac.md | 2 +- .../start-a-local-cluster-in-docker-linux.md | 1 + .../start-a-local-cluster-in-docker-mac.md | 1 + ...start-a-local-cluster-in-docker-windows.md | 1 + src/current/v25.2/start-a-local-cluster.md | 1 + 33 files changed, 113 insertions(+), 80 deletions(-) diff --git a/src/current/_includes/common/license/evolving.md b/src/current/_includes/common/license/evolving.md index 9c49fc7b557..79bdd7dd8d3 100644 --- a/src/current/_includes/common/license/evolving.md +++ b/src/current/_includes/common/license/evolving.md @@ -1 +1 @@ -CockroachDB is evolving. In late 2024, we will retire our Core offering to consolidate on a single CockroachDB Enterprise offering under a new [license](https://www.cockroachlabs.com/cockroachdb-software-license/). CockroachDB Enterprise will be available at no charge for individual users and small businesses and will offer all users, free and paid, the full breadth of CockroachDB capabilities. See the [CockroachDB licensing update page](https://www.cockroachlabs.com/enterprise-license-update/) for details. +CockroachDB is evolving. In late 2024, we retired our Core offering to consolidate on a single CockroachDB Enterprise offering under a new [license](https://www.cockroachlabs.com/cockroachdb-software-license/). CockroachDB Enterprise is available at no charge for individual users and small businesses and offers all users, free and paid, the full breadth of CockroachDB capabilities. See the [CockroachDB licensing update page](https://www.cockroachlabs.com/enterprise-license-update/) for details. diff --git a/src/current/_includes/common/licensing-faqs.md b/src/current/_includes/common/licensing-faqs.md index c89b24ced25..feca06f2440 100644 --- a/src/current/_includes/common/licensing-faqs.md +++ b/src/current/_includes/common/licensing-faqs.md @@ -8,9 +8,10 @@ The table of licenses below refers to options for {{ site.data.products.core }} Type | Description -------------|------------ -**Enterprise** | This paid license allows usage of all CockroachDB features in accordance with the terms specified in the [CockroachDB Software License][csl]. License must be renewed annually or as negotiated. Support levels available include [Enterprise][support] or [Essential][support]. -**Enterprise Free** | Same functionality as **Enterprise**, but free of charge for businesses with less than $10M in annual revenue. Clusters will be [throttled](#throttling) after 7 days without sending [telemetry]({% link {{ page.version.version }}/telemetry.md %}). License must be renewed annually. Support level available is Community (i.e., [Docs]({% link {{ page.version.version }}/index.md %}), [Forum][forum], [Slack][slack]). -**Enterprise Trial** | A 30 day self-service trial license. [Telemetry]({% link {{ page.version.version }}/telemetry.md %}) is required during the trial. Clusters will be [throttled](#throttling) after 7 days without sending telemetry. Telemetry can be disabled once the cluster is upgraded to a paid **Enterprise** license. Support level available during trial is Community (i.e., [Docs]({% link {{ page.version.version }}/index.md %}), [Forum][forum], [Slack][slack]). +**Enterprise** | This paid license allows usage of all CockroachDB features in accordance with the terms specified in the [CockroachDB Software License][csl]. License must be renewed annually or as negotiated. Support levels available include [Enterprise][support] or [Essential][support]. The type of enterprise license may be set to **Production**, **Pre-production**, or **Development** depending on the environment in which CockroachDB is deployed. +**Free** | Same functionality as **Enterprise**, but free of charge for businesses with less than $10M in annual revenue. Clusters will be [throttled](#throttling) after 7 days without sending [telemetry]({% link {{ page.version.version }}/telemetry.md %}). License must be renewed annually. Support level available is Community (i.e., [Docs]({% link {{ page.version.version }}/index.md %}), [Forum][forum], [Slack][slack]). +**Trial** | A 30 day self-service trial license. [Telemetry]({% link {{ page.version.version }}/telemetry.md %}) is required during the trial. Clusters will be [throttled](#throttling) after 7 days without sending telemetry. Telemetry can be disabled once the cluster is upgraded to a paid **Enterprise** license. Support level available during trial is Community (i.e., [Docs]({% link {{ page.version.version }}/index.md %}), [Forum][forum], [Slack][slack]). +**Evaluation** | Same functionality as **Enterprise**, but may be provided by your sales team if needed for an extended evaluation period. Support level is equivalent to a enterprise license. Contact Sales if you want to try CockroachDB without telemetry requirements or if you require an extended trial period. @@ -23,7 +24,13 @@ Note that: ## Obtain a license -To obtain a paid **Enterprise** license, contact Sales. +To obtain a paid **Enterprise** license, contact Sales. Once a license is added to your account, it appears in the [CockroachDB {{ site.data.products.cloud }} Console][cloud-console] on the **Organization » Enterprise Licenses** page. This page is only accessible by users with **Organization Admin** permissions. + +[Sign up for a CockroachDB {{ site.data.products.cloud }} Console account](https://cockroachlabs.cloud/signup?experience=enterprise) if you do not already have one. + +{{site.data.alerts.callout_info}} +Enterprise licenses generated prior to May 15th 2025 are not visible in the **Enterprise Licenses** page. +{{site.data.alerts.end}} To obtain an **Enterprise Free** or **Enterprise Trial** license, take the following steps: diff --git a/src/current/_includes/v23.2/misc/install-next-steps.html b/src/current/_includes/v23.2/misc/install-next-steps.html index 3783b5fccb0..217fc6630b5 100644 --- a/src/current/_includes/v23.2/misc/install-next-steps.html +++ b/src/current/_includes/v23.2/misc/install-next-steps.html @@ -1,16 +1,17 @@ diff --git a/src/current/_includes/v24.1/misc/install-next-steps.html b/src/current/_includes/v24.1/misc/install-next-steps.html index 3783b5fccb0..217fc6630b5 100644 --- a/src/current/_includes/v24.1/misc/install-next-steps.html +++ b/src/current/_includes/v24.1/misc/install-next-steps.html @@ -1,16 +1,17 @@ diff --git a/src/current/_includes/v24.2/misc/install-next-steps.html b/src/current/_includes/v24.2/misc/install-next-steps.html index 3783b5fccb0..217fc6630b5 100644 --- a/src/current/_includes/v24.2/misc/install-next-steps.html +++ b/src/current/_includes/v24.2/misc/install-next-steps.html @@ -1,16 +1,17 @@ diff --git a/src/current/_includes/v24.3/misc/install-next-steps.html b/src/current/_includes/v24.3/misc/install-next-steps.html index 3783b5fccb0..217fc6630b5 100644 --- a/src/current/_includes/v24.3/misc/install-next-steps.html +++ b/src/current/_includes/v24.3/misc/install-next-steps.html @@ -1,16 +1,17 @@ diff --git a/src/current/_includes/v25.1/misc/install-next-steps.html b/src/current/_includes/v25.1/misc/install-next-steps.html index 3783b5fccb0..217fc6630b5 100644 --- a/src/current/_includes/v25.1/misc/install-next-steps.html +++ b/src/current/_includes/v25.1/misc/install-next-steps.html @@ -1,16 +1,17 @@ diff --git a/src/current/_includes/v25.2/misc/install-next-steps.html b/src/current/_includes/v25.2/misc/install-next-steps.html index 3783b5fccb0..32f77242643 100644 --- a/src/current/_includes/v25.2/misc/install-next-steps.html +++ b/src/current/_includes/v25.2/misc/install-next-steps.html @@ -1,6 +1,7 @@