-
Notifications
You must be signed in to change notification settings - Fork 470
Docs changes for paid license support on license management page #19593
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
Open
jhlodin
wants to merge
1
commit into
main
Choose a base branch
from
jl/doc-12054
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,9 +8,10 @@ The table of licenses below refers to options for {{ site.data.products.core }} | |
|
|
||
| Type | Description | ||
| -------------|------------ | ||
| **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]. | ||
| **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]). | ||
| **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]). | ||
| **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. | ||
| **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]). | ||
| **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]). | ||
| **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. | ||
|
|
||
| <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. | ||
|
|
||
|
|
@@ -23,7 +24,13 @@ Note that: | |
|
|
||
| ## Obtain a license | ||
|
|
||
| To obtain a paid **Enterprise** license, <a href="mailto:[email protected]">contact Sales</a>. | ||
| 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 » 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: | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,17 @@ | ||
| <ul> | ||
| <li>If you're just getting started with CockroachDB: | ||
| <ul> | ||
| <li><a href="start-a-local-cluster.html">Start a cluster locally</a> and talk to it via the built-in SQL client</li> | ||
| <li><a href="learn-cockroachdb-sql.html">Learn more about CockroachDB SQL</a></li> | ||
| <li><a href="example-apps.html">Build a simple application</a> with CockroachDB using PostgreSQL-compatible client drivers and ORMs</li> | ||
| <li><a href="demo-replication-and-rebalancing.html">Explore CockroachDB features</a> like automatic replication, rebalancing, and fault tolerance</li> | ||
| </ul> | ||
| </li> | ||
| <li>If you're ready to run CockroachDB in production: | ||
| <ul> | ||
| <li>Review the <a href="recommended-production-settings.html">Production Checklist</a></li> | ||
| <li><a href="manual-deployment.html">Deploy CockroachDB manually</a> or <a href="kubernetes-overview.html">use an orchestration system like Kubernetes</a></li> | ||
| </ul> | ||
| </li> | ||
| <li>If you're just getting started with CockroachDB: | ||
| <ul> | ||
| <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> | ||
| <li><a href="start-a-local-cluster.html">Start a cluster locally</a> and talk to it via the built-in SQL client</li> | ||
| <li><a href="learn-cockroachdb-sql.html">Learn more about CockroachDB SQL</a></li> | ||
| <li><a href="example-apps.html">Build a simple application</a> with CockroachDB using PostgreSQL-compatible client drivers and ORMs</li> | ||
| <li><a href="demo-replication-and-rebalancing.html">Explore CockroachDB features</a> like automatic replication, rebalancing, and fault tolerance</li> | ||
| </ul> | ||
| </li> | ||
| <li>If you're ready to run CockroachDB in production: | ||
| <ul> | ||
| <li>Review the <a href="recommended-production-settings.html">Production Checklist</a></li> | ||
| <li><a href="manual-deployment.html">Deploy CockroachDB manually</a> or <a href="kubernetes-overview.html">use an orchestration system like Kubernetes</a></li> | ||
| </ul> | ||
| </li> | ||
| </ul> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,17 @@ | ||
| <ul> | ||
| <li>If you're just getting started with CockroachDB: | ||
| <ul> | ||
| <li><a href="start-a-local-cluster.html">Start a cluster locally</a> and talk to it via the built-in SQL client</li> | ||
| <li><a href="learn-cockroachdb-sql.html">Learn more about CockroachDB SQL</a></li> | ||
| <li><a href="example-apps.html">Build a simple application</a> with CockroachDB using PostgreSQL-compatible client drivers and ORMs</li> | ||
| <li><a href="demo-replication-and-rebalancing.html">Explore CockroachDB features</a> like automatic replication, rebalancing, and fault tolerance</li> | ||
| </ul> | ||
| </li> | ||
| <li>If you're ready to run CockroachDB in production: | ||
| <ul> | ||
| <li>Review the <a href="recommended-production-settings.html">Production Checklist</a></li> | ||
| <li><a href="manual-deployment.html">Deploy CockroachDB manually</a> or <a href="kubernetes-overview.html">use an orchestration system like Kubernetes</a></li> | ||
| </ul> | ||
| </li> | ||
| <li>If you're just getting started with CockroachDB: | ||
| <ul> | ||
| <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> | ||
| <li><a href="start-a-local-cluster.html">Start a cluster locally</a> and talk to it via the built-in SQL client</li> | ||
| <li><a href="learn-cockroachdb-sql.html">Learn more about CockroachDB SQL</a></li> | ||
| <li><a href="example-apps.html">Build a simple application</a> with CockroachDB using PostgreSQL-compatible client drivers and ORMs</li> | ||
| <li><a href="demo-replication-and-rebalancing.html">Explore CockroachDB features</a> like automatic replication, rebalancing, and fault tolerance</li> | ||
| </ul> | ||
| </li> | ||
| <li>If you're ready to run CockroachDB in production: | ||
| <ul> | ||
| <li>Review the <a href="recommended-production-settings.html">Production Checklist</a></li> | ||
| <li><a href="manual-deployment.html">Deploy CockroachDB manually</a> or <a href="kubernetes-overview.html">use an orchestration system like Kubernetes</a></li> | ||
| </ul> | ||
| </li> | ||
| </ul> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,17 @@ | ||
| <ul> | ||
| <li>If you're just getting started with CockroachDB: | ||
| <ul> | ||
| <li><a href="start-a-local-cluster.html">Start a cluster locally</a> and talk to it via the built-in SQL client</li> | ||
| <li><a href="learn-cockroachdb-sql.html">Learn more about CockroachDB SQL</a></li> | ||
| <li><a href="example-apps.html">Build a simple application</a> with CockroachDB using PostgreSQL-compatible client drivers and ORMs</li> | ||
| <li><a href="demo-replication-and-rebalancing.html">Explore CockroachDB features</a> like automatic replication, rebalancing, and fault tolerance</li> | ||
| </ul> | ||
| </li> | ||
| <li>If you're ready to run CockroachDB in production: | ||
| <ul> | ||
| <li>Review the <a href="recommended-production-settings.html">Production Checklist</a></li> | ||
| <li><a href="manual-deployment.html">Deploy CockroachDB manually</a> or <a href="kubernetes-overview.html">use an orchestration system like Kubernetes</a></li> | ||
| </ul> | ||
| </li> | ||
| <li>If you're just getting started with CockroachDB: | ||
| <ul> | ||
| <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> | ||
| <li><a href="start-a-local-cluster.html">Start a cluster locally</a> and talk to it via the built-in SQL client</li> | ||
| <li><a href="learn-cockroachdb-sql.html">Learn more about CockroachDB SQL</a></li> | ||
| <li><a href="example-apps.html">Build a simple application</a> with CockroachDB using PostgreSQL-compatible client drivers and ORMs</li> | ||
| <li><a href="demo-replication-and-rebalancing.html">Explore CockroachDB features</a> like automatic replication, rebalancing, and fault tolerance</li> | ||
| </ul> | ||
| </li> | ||
| <li>If you're ready to run CockroachDB in production: | ||
| <ul> | ||
| <li>Review the <a href="recommended-production-settings.html">Production Checklist</a></li> | ||
| <li><a href="manual-deployment.html">Deploy CockroachDB manually</a> or <a href="kubernetes-overview.html">use an orchestration system like Kubernetes</a></li> | ||
| </ul> | ||
| </li> | ||
| </ul> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,17 @@ | ||
| <ul> | ||
| <li>If you're just getting started with CockroachDB: | ||
| <ul> | ||
| <li><a href="start-a-local-cluster.html">Start a cluster locally</a> and talk to it via the built-in SQL client</li> | ||
| <li><a href="learn-cockroachdb-sql.html">Learn more about CockroachDB SQL</a></li> | ||
| <li><a href="example-apps.html">Build a simple application</a> with CockroachDB using PostgreSQL-compatible client drivers and ORMs</li> | ||
| <li><a href="demo-replication-and-rebalancing.html">Explore CockroachDB features</a> like automatic replication, rebalancing, and fault tolerance</li> | ||
| </ul> | ||
| </li> | ||
| <li>If you're ready to run CockroachDB in production: | ||
| <ul> | ||
| <li>Review the <a href="recommended-production-settings.html">Production Checklist</a></li> | ||
| <li><a href="manual-deployment.html">Deploy CockroachDB manually</a> or <a href="kubernetes-overview.html">use an orchestration system like Kubernetes</a></li> | ||
| </ul> | ||
| </li> | ||
| <li>If you're just getting started with CockroachDB: | ||
| <ul> | ||
| <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> | ||
| <li><a href="start-a-local-cluster.html">Start a cluster locally</a> and talk to it via the built-in SQL client</li> | ||
| <li><a href="learn-cockroachdb-sql.html">Learn more about CockroachDB SQL</a></li> | ||
| <li><a href="example-apps.html">Build a simple application</a> with CockroachDB using PostgreSQL-compatible client drivers and ORMs</li> | ||
| <li><a href="demo-replication-and-rebalancing.html">Explore CockroachDB features</a> like automatic replication, rebalancing, and fault tolerance</li> | ||
| </ul> | ||
| </li> | ||
| <li>If you're ready to run CockroachDB in production: | ||
| <ul> | ||
| <li>Review the <a href="recommended-production-settings.html">Production Checklist</a></li> | ||
| <li><a href="manual-deployment.html">Deploy CockroachDB manually</a> or <a href="kubernetes-overview.html">use an orchestration system like Kubernetes</a></li> | ||
| </ul> | ||
| </li> | ||
| </ul> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,17 @@ | ||
| <ul> | ||
| <li>If you're just getting started with CockroachDB: | ||
| <ul> | ||
| <li><a href="start-a-local-cluster.html">Start a cluster locally</a> and talk to it via the built-in SQL client</li> | ||
| <li><a href="learn-cockroachdb-sql.html">Learn more about CockroachDB SQL</a></li> | ||
| <li><a href="example-apps.html">Build a simple application</a> with CockroachDB using PostgreSQL-compatible client drivers and ORMs</li> | ||
| <li><a href="demo-replication-and-rebalancing.html">Explore CockroachDB features</a> like automatic replication, rebalancing, and fault tolerance</li> | ||
| </ul> | ||
| </li> | ||
| <li>If you're ready to run CockroachDB in production: | ||
| <ul> | ||
| <li>Review the <a href="recommended-production-settings.html">Production Checklist</a></li> | ||
| <li><a href="manual-deployment.html">Deploy CockroachDB manually</a> or <a href="kubernetes-overview.html">use an orchestration system like Kubernetes</a></li> | ||
| </ul> | ||
| </li> | ||
| <li>If you're just getting started with CockroachDB: | ||
| <ul> | ||
| <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> | ||
| <li><a href="start-a-local-cluster.html">Start a cluster locally</a> and talk to it via the built-in SQL client</li> | ||
| <li><a href="learn-cockroachdb-sql.html">Learn more about CockroachDB SQL</a></li> | ||
| <li><a href="example-apps.html">Build a simple application</a> with CockroachDB using PostgreSQL-compatible client drivers and ORMs</li> | ||
| <li><a href="demo-replication-and-rebalancing.html">Explore CockroachDB features</a> like automatic replication, rebalancing, and fault tolerance</li> | ||
| </ul> | ||
| </li> | ||
| <li>If you're ready to run CockroachDB in production: | ||
| <ul> | ||
| <li>Review the <a href="recommended-production-settings.html">Production Checklist</a></li> | ||
| <li><a href="manual-deployment.html">Deploy CockroachDB manually</a> or <a href="kubernetes-overview.html">use an orchestration system like Kubernetes</a></li> | ||
| </ul> | ||
| </li> | ||
| </ul> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Date to be confirmed by @jaiayu
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jhlodin let's say May 31, 2025. In reality, it will probably be a little sooner, but I think that's okay!