Skip to content

Commit fccbdbd

Browse files
jhlodinjhlodin
authored
Docs changes for paid license support on license management page (#19593)
* Docs changes for paid license support on Enterprise license management page * Update license management cutoff date * Remove evolving license note fix from PR
1 parent 12cf25d commit fccbdbd

33 files changed

+113
-80
lines changed

‎src/current/_includes/common/license/evolving.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +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.
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.

‎src/current/_includes/common/licensing-faqs.md

+11-4
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ The table of licenses below refers to options for {{ site.data.products.core }}
88

99
Type | Description
1010
-------------|------------
11-
**Enterprise** <a name="enterprise"></a> | 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].
12-
**Enterprise Free** <a name="enterprise-free"></a> | 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]).
13-
**Enterprise Trial** <a name="enterprise-trial"></a> | 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]).
11+
**Enterprise** <a name="enterprise"></a> | 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.
12+
**Free** <a name="enterprise-free"></a> | 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]).
13+
**Trial** <a name="enterprise-trial"></a> | 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]).
14+
**Evaluation** <a name="enterprise-evaluation"></a> | 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.
1415

1516
<a href="mailto:[email protected]">Contact Sales</a> if you want to try CockroachDB without telemetry requirements or if you require an extended trial period.
1617

@@ -23,7 +24,13 @@ Note that:
2324

2425
## Obtain a license
2526

26-
To obtain a paid **Enterprise** license, <a href="mailto:[email protected]">contact Sales</a>.
27+
To obtain a paid **Enterprise** license, <a href="mailto:[email protected]">contact Sales</a>. Once a license is added to your account, it appears in the [CockroachDB {{ site.data.products.cloud }} Console][cloud-console] on the **Organization &raquo; Enterprise Licenses** page. This page is only accessible by users with **Organization Admin** permissions.
28+
29+
[Sign up for a CockroachDB {{ site.data.products.cloud }} Console account](https://cockroachlabs.cloud/signup?experience=enterprise) if you do not already have one.
30+
31+
{{site.data.alerts.callout_info}}
32+
Enterprise licenses generated prior to May 31st 2025 are not visible in the **Enterprise Licenses** page.
33+
{{site.data.alerts.end}}
2734

2835
To obtain an **Enterprise Free** or **Enterprise Trial** license, take the following steps:
2936

‎src/current/_includes/v23.2/misc/install-next-steps.html

+15-14
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
<ul>
2-
<li>If you&#39;re just getting started with CockroachDB:
3-
<ul>
4-
<li><a href="start-a-local-cluster.html">Start a cluster locally</a> and talk to it via the built-in SQL client</li>
5-
<li><a href="learn-cockroachdb-sql.html">Learn more about CockroachDB SQL</a></li>
6-
<li><a href="example-apps.html">Build a simple application</a> with CockroachDB using PostgreSQL-compatible client drivers and ORMs</li>
7-
<li><a href="demo-replication-and-rebalancing.html">Explore CockroachDB features</a> like automatic replication, rebalancing, and fault tolerance</li>
8-
</ul>
9-
</li>
10-
<li>If you&#39;re ready to run CockroachDB in production:
11-
<ul>
12-
<li>Review the <a href="recommended-production-settings.html">Production Checklist</a></li>
13-
<li><a href="manual-deployment.html">Deploy CockroachDB manually</a> or <a href="kubernetes-overview.html">use an orchestration system like Kubernetes</a></li>
14-
</ul>
15-
</li>
2+
<li>If you&#39;re just getting started with CockroachDB:
3+
<ul>
4+
<li><a href="https://cockroachlabs.cloud/signup?experience=enterprise">Create a CockroachDB Cloud account</a> where you can <a href="licensing-faqs.html">generate and manage licenses</a> for CockroachDB installations</li>
5+
<li><a href="start-a-local-cluster.html">Start a cluster locally</a> and talk to it via the built-in SQL client</li>
6+
<li><a href="learn-cockroachdb-sql.html">Learn more about CockroachDB SQL</a></li>
7+
<li><a href="example-apps.html">Build a simple application</a> with CockroachDB using PostgreSQL-compatible client drivers and ORMs</li>
8+
<li><a href="demo-replication-and-rebalancing.html">Explore CockroachDB features</a> like automatic replication, rebalancing, and fault tolerance</li>
9+
</ul>
10+
</li>
11+
<li>If you&#39;re ready to run CockroachDB in production:
12+
<ul>
13+
<li>Review the <a href="recommended-production-settings.html">Production Checklist</a></li>
14+
<li><a href="manual-deployment.html">Deploy CockroachDB manually</a> or <a href="kubernetes-overview.html">use an orchestration system like Kubernetes</a></li>
15+
</ul>
16+
</li>
1617
</ul>

‎src/current/_includes/v24.1/misc/install-next-steps.html

+15-14
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
<ul>
2-
<li>If you&#39;re just getting started with CockroachDB:
3-
<ul>
4-
<li><a href="start-a-local-cluster.html">Start a cluster locally</a> and talk to it via the built-in SQL client</li>
5-
<li><a href="learn-cockroachdb-sql.html">Learn more about CockroachDB SQL</a></li>
6-
<li><a href="example-apps.html">Build a simple application</a> with CockroachDB using PostgreSQL-compatible client drivers and ORMs</li>
7-
<li><a href="demo-replication-and-rebalancing.html">Explore CockroachDB features</a> like automatic replication, rebalancing, and fault tolerance</li>
8-
</ul>
9-
</li>
10-
<li>If you&#39;re ready to run CockroachDB in production:
11-
<ul>
12-
<li>Review the <a href="recommended-production-settings.html">Production Checklist</a></li>
13-
<li><a href="manual-deployment.html">Deploy CockroachDB manually</a> or <a href="kubernetes-overview.html">use an orchestration system like Kubernetes</a></li>
14-
</ul>
15-
</li>
2+
<li>If you&#39;re just getting started with CockroachDB:
3+
<ul>
4+
<li><a href="https://cockroachlabs.cloud/signup?experience=enterprise">Create a CockroachDB Cloud account</a> where you can <a href="licensing-faqs.html">generate and manage licenses</a> for CockroachDB installations</li>
5+
<li><a href="start-a-local-cluster.html">Start a cluster locally</a> and talk to it via the built-in SQL client</li>
6+
<li><a href="learn-cockroachdb-sql.html">Learn more about CockroachDB SQL</a></li>
7+
<li><a href="example-apps.html">Build a simple application</a> with CockroachDB using PostgreSQL-compatible client drivers and ORMs</li>
8+
<li><a href="demo-replication-and-rebalancing.html">Explore CockroachDB features</a> like automatic replication, rebalancing, and fault tolerance</li>
9+
</ul>
10+
</li>
11+
<li>If you&#39;re ready to run CockroachDB in production:
12+
<ul>
13+
<li>Review the <a href="recommended-production-settings.html">Production Checklist</a></li>
14+
<li><a href="manual-deployment.html">Deploy CockroachDB manually</a> or <a href="kubernetes-overview.html">use an orchestration system like Kubernetes</a></li>
15+
</ul>
16+
</li>
1617
</ul>

‎src/current/_includes/v24.2/misc/install-next-steps.html

+15-14
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
<ul>
2-
<li>If you&#39;re just getting started with CockroachDB:
3-
<ul>
4-
<li><a href="start-a-local-cluster.html">Start a cluster locally</a> and talk to it via the built-in SQL client</li>
5-
<li><a href="learn-cockroachdb-sql.html">Learn more about CockroachDB SQL</a></li>
6-
<li><a href="example-apps.html">Build a simple application</a> with CockroachDB using PostgreSQL-compatible client drivers and ORMs</li>
7-
<li><a href="demo-replication-and-rebalancing.html">Explore CockroachDB features</a> like automatic replication, rebalancing, and fault tolerance</li>
8-
</ul>
9-
</li>
10-
<li>If you&#39;re ready to run CockroachDB in production:
11-
<ul>
12-
<li>Review the <a href="recommended-production-settings.html">Production Checklist</a></li>
13-
<li><a href="manual-deployment.html">Deploy CockroachDB manually</a> or <a href="kubernetes-overview.html">use an orchestration system like Kubernetes</a></li>
14-
</ul>
15-
</li>
2+
<li>If you&#39;re just getting started with CockroachDB:
3+
<ul>
4+
<li><a href="https://cockroachlabs.cloud/signup?experience=enterprise">Create a CockroachDB Cloud account</a> where you can <a href="licensing-faqs.html">generate and manage licenses</a> for CockroachDB installations</li>
5+
<li><a href="start-a-local-cluster.html">Start a cluster locally</a> and talk to it via the built-in SQL client</li>
6+
<li><a href="learn-cockroachdb-sql.html">Learn more about CockroachDB SQL</a></li>
7+
<li><a href="example-apps.html">Build a simple application</a> with CockroachDB using PostgreSQL-compatible client drivers and ORMs</li>
8+
<li><a href="demo-replication-and-rebalancing.html">Explore CockroachDB features</a> like automatic replication, rebalancing, and fault tolerance</li>
9+
</ul>
10+
</li>
11+
<li>If you&#39;re ready to run CockroachDB in production:
12+
<ul>
13+
<li>Review the <a href="recommended-production-settings.html">Production Checklist</a></li>
14+
<li><a href="manual-deployment.html">Deploy CockroachDB manually</a> or <a href="kubernetes-overview.html">use an orchestration system like Kubernetes</a></li>
15+
</ul>
16+
</li>
1617
</ul>

‎src/current/_includes/v24.3/misc/install-next-steps.html

+15-14
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
<ul>
2-
<li>If you&#39;re just getting started with CockroachDB:
3-
<ul>
4-
<li><a href="start-a-local-cluster.html">Start a cluster locally</a> and talk to it via the built-in SQL client</li>
5-
<li><a href="learn-cockroachdb-sql.html">Learn more about CockroachDB SQL</a></li>
6-
<li><a href="example-apps.html">Build a simple application</a> with CockroachDB using PostgreSQL-compatible client drivers and ORMs</li>
7-
<li><a href="demo-replication-and-rebalancing.html">Explore CockroachDB features</a> like automatic replication, rebalancing, and fault tolerance</li>
8-
</ul>
9-
</li>
10-
<li>If you&#39;re ready to run CockroachDB in production:
11-
<ul>
12-
<li>Review the <a href="recommended-production-settings.html">Production Checklist</a></li>
13-
<li><a href="manual-deployment.html">Deploy CockroachDB manually</a> or <a href="kubernetes-overview.html">use an orchestration system like Kubernetes</a></li>
14-
</ul>
15-
</li>
2+
<li>If you&#39;re just getting started with CockroachDB:
3+
<ul>
4+
<li><a href="https://cockroachlabs.cloud/signup?experience=enterprise">Create a CockroachDB Cloud account</a> where you can <a href="licensing-faqs.html">generate and manage licenses</a> for CockroachDB installations</li>
5+
<li><a href="start-a-local-cluster.html">Start a cluster locally</a> and talk to it via the built-in SQL client</li>
6+
<li><a href="learn-cockroachdb-sql.html">Learn more about CockroachDB SQL</a></li>
7+
<li><a href="example-apps.html">Build a simple application</a> with CockroachDB using PostgreSQL-compatible client drivers and ORMs</li>
8+
<li><a href="demo-replication-and-rebalancing.html">Explore CockroachDB features</a> like automatic replication, rebalancing, and fault tolerance</li>
9+
</ul>
10+
</li>
11+
<li>If you&#39;re ready to run CockroachDB in production:
12+
<ul>
13+
<li>Review the <a href="recommended-production-settings.html">Production Checklist</a></li>
14+
<li><a href="manual-deployment.html">Deploy CockroachDB manually</a> or <a href="kubernetes-overview.html">use an orchestration system like Kubernetes</a></li>
15+
</ul>
16+
</li>
1617
</ul>

‎src/current/_includes/v25.1/misc/install-next-steps.html

+15-14
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
<ul>
2-
<li>If you&#39;re just getting started with CockroachDB:
3-
<ul>
4-
<li><a href="start-a-local-cluster.html">Start a cluster locally</a> and talk to it via the built-in SQL client</li>
5-
<li><a href="learn-cockroachdb-sql.html">Learn more about CockroachDB SQL</a></li>
6-
<li><a href="example-apps.html">Build a simple application</a> with CockroachDB using PostgreSQL-compatible client drivers and ORMs</li>
7-
<li><a href="demo-replication-and-rebalancing.html">Explore CockroachDB features</a> like automatic replication, rebalancing, and fault tolerance</li>
8-
</ul>
9-
</li>
10-
<li>If you&#39;re ready to run CockroachDB in production:
11-
<ul>
12-
<li>Review the <a href="recommended-production-settings.html">Production Checklist</a></li>
13-
<li><a href="manual-deployment.html">Deploy CockroachDB manually</a> or <a href="kubernetes-overview.html">use an orchestration system like Kubernetes</a></li>
14-
</ul>
15-
</li>
2+
<li>If you&#39;re just getting started with CockroachDB:
3+
<ul>
4+
<li><a href="https://cockroachlabs.cloud/signup?experience=enterprise">Create a CockroachDB Cloud account</a> where you can <a href="licensing-faqs.html">generate and manage licenses</a> for CockroachDB installations</li>
5+
<li><a href="start-a-local-cluster.html">Start a cluster locally</a> and talk to it via the built-in SQL client</li>
6+
<li><a href="learn-cockroachdb-sql.html">Learn more about CockroachDB SQL</a></li>
7+
<li><a href="example-apps.html">Build a simple application</a> with CockroachDB using PostgreSQL-compatible client drivers and ORMs</li>
8+
<li><a href="demo-replication-and-rebalancing.html">Explore CockroachDB features</a> like automatic replication, rebalancing, and fault tolerance</li>
9+
</ul>
10+
</li>
11+
<li>If you&#39;re ready to run CockroachDB in production:
12+
<ul>
13+
<li>Review the <a href="recommended-production-settings.html">Production Checklist</a></li>
14+
<li><a href="manual-deployment.html">Deploy CockroachDB manually</a> or <a href="kubernetes-overview.html">use an orchestration system like Kubernetes</a></li>
15+
</ul>
16+
</li>
1617
</ul>

‎src/current/_includes/v25.2/misc/install-next-steps.html

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<ul>
22
<li>If you&#39;re just getting started with CockroachDB:
33
<ul>
4+
<li><a href="https://cockroachlabs.cloud/signup?experience=enterprise">Create a CockroachDB Cloud account</a> where you can <a href="licensing-faqs.html">generate and manage licenses</a> for CockroachDB installations</li>
45
<li><a href="start-a-local-cluster.html">Start a cluster locally</a> and talk to it via the built-in SQL client</li>
56
<li><a href="learn-cockroachdb-sql.html">Learn more about CockroachDB SQL</a></li>
67
<li><a href="example-apps.html">Build a simple application</a> with CockroachDB using PostgreSQL-compatible client drivers and ORMs</li>

‎src/current/v23.2/start-a-local-cluster-in-docker-linux.md

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ Once you've [installed the official CockroachDB Docker image]({% link {{ page.ve
3434

3535
## What's next?
3636

37+
- [Create a CockroachDB Cloud account](https://cockroachlabs.cloud/signup?experience=enterprise) where you can [generate and manage licenses]({% link {{ page.version.version }}/licensing-faqs.md %}) for CockroachDB installations
3738
- Learn more about [CockroachDB SQL]({% link {{ page.version.version }}/learn-cockroachdb-sql.md %}) and the [built-in SQL client]({% link {{ page.version.version }}/cockroach-sql.md %})
3839
- [Install the client driver]({% link {{ page.version.version }}/install-client-drivers.md %}) for your preferred language
3940
- [Build an app with CockroachDB]({% link {{ page.version.version }}/example-apps.md %})

‎src/current/v23.2/start-a-local-cluster-in-docker-mac.md

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Once you've [installed the official CockroachDB Docker image]({% link {{ page.ve
3131

3232
## What's next?
3333

34+
- [Create a CockroachDB Cloud account](https://cockroachlabs.cloud/signup?experience=enterprise) where you can [generate and manage licenses]({% link {{ page.version.version }}/licensing-faqs.md %}) for CockroachDB installations
3435
- Learn more about [CockroachDB SQL]({% link {{ page.version.version }}/learn-cockroachdb-sql.md %}) and the [built-in SQL client]({% link {{ page.version.version }}/cockroach-sql.md %})
3536
- [Install the client driver]({% link {{ page.version.version }}/install-client-drivers.md %}) for your preferred language
3637
- [Build an app with CockroachDB]({% link {{ page.version.version }}/example-apps.md %})

‎src/current/v23.2/start-a-local-cluster-in-docker-windows.md

+1
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ The CockroachDB [DB Console]({% link {{ page.version.version }}/ui-overview.md %
363363
364364
## What's next?
365365
366+
- [Create a CockroachDB Cloud account](https://cockroachlabs.cloud/signup?experience=enterprise) where you can [generate and manage licenses]({% link {{ page.version.version }}/licensing-faqs.md %}) for CockroachDB installations
366367
- Learn more about [CockroachDB SQL]({% link {{ page.version.version }}/learn-cockroachdb-sql.md %}) and the [built-in SQL client]({% link {{ page.version.version }}/cockroach-sql.md %})
367368
- [Install the client driver]({% link {{ page.version.version }}/install-client-drivers.md %}) for your preferred language
368369
- [Build an app with CockroachDB]({% link {{ page.version.version }}/example-apps.md %})

‎src/current/v23.2/start-a-local-cluster.md

+1
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ Adding capacity is as simple as starting more nodes with `cockroach start`.
386386

387387
## What's next?
388388

389+
- [Create a CockroachDB Cloud account](https://cockroachlabs.cloud/signup?experience=enterprise) where you can [generate and manage licenses]({% link {{ page.version.version }}/licensing-faqs.md %}) for CockroachDB installations
389390
- [Install the client driver]({% link {{ page.version.version }}/install-client-drivers.md %}) for your preferred language
390391
- Learn more about [CockroachDB SQL]({% link {{ page.version.version }}/learn-cockroachdb-sql.md %}) and the [built-in SQL client]({% link {{ page.version.version }}/cockroach-sql.md %})
391392
- [Build an app with CockroachDB]({% link {{ page.version.version }}/example-apps.md %})

0 commit comments

Comments
 (0)