From c17e28bfc0c0b228a82e67a8e39b554465db60b2 Mon Sep 17 00:00:00 2001 From: Amruta Ranade Date: Tue, 1 Aug 2023 12:56:25 -0400 Subject: [PATCH 1/3] Updated deployment options page with Dedicated advanced content --- src/current/_data/products.yml | 2 + .../v23.1/choose-a-deployment-option.md | 38 +++++++++++++------ 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/src/current/_data/products.yml b/src/current/_data/products.yml index 4215cef329d..b4b1eab15b8 100644 --- a/src/current/_data/products.yml +++ b/src/current/_data/products.yml @@ -2,6 +2,8 @@ serverless: CockroachDB Serverless dedicated: CockroachDB Dedicated +dedicated-advanced: CockroachDB Dedicated advanced + core: CockroachDB Self-Hosted # tbd enterprise: Enterprise diff --git a/src/current/v23.1/choose-a-deployment-option.md b/src/current/v23.1/choose-a-deployment-option.md index 4f151033f82..db81d907dc4 100644 --- a/src/current/v23.1/choose-a-deployment-option.md +++ b/src/current/v23.1/choose-a-deployment-option.md @@ -20,9 +20,9 @@ Cockroach Labs offers three ways to deploy CockroachDB: two managed services&mda
  • Applications that will only need to be deployed in a single region.
  • Applications with explicit budget constraints.
    • - + + {{ site.data.products.serverless }}: 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. + - + + {{ site.data.products.dedicated }}: A fully managed, single tenant CockroachDB deployment in a single region or multi-region cloud (AWS or GCP). + + + + + + {{ site.data.products.dedicated-advanced }}: A fully managed, single tenant, PCI-ready CockroachDB deployment in a single region or multi-region cloud (AWS or GCP). + + @@ -62,9 +78,9 @@ Cockroach Labs offers three ways to deploy CockroachDB: two managed services&mda
  • Applications that need to run in a cloud not supported by Dedicated services.
  • Applications that require real-time integration with other systems.
    • - + + CockroachDB Self-Hosted: A full featured, self-managed CockroachDB deployment. + From 77f2fd5adbc7c6778f7661d6873c3ec7a420af40 Mon Sep 17 00:00:00 2001 From: Amruta Ranade Date: Wed, 2 Aug 2023 15:13:20 -0400 Subject: [PATCH 2/3] Fixed broken links --- src/current/v23.1/choose-a-deployment-option.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/current/v23.1/choose-a-deployment-option.md b/src/current/v23.1/choose-a-deployment-option.md index db81d907dc4..0fbd8d04db2 100644 --- a/src/current/v23.1/choose-a-deployment-option.md +++ b/src/current/v23.1/choose-a-deployment-option.md @@ -57,15 +57,15 @@ Cockroach Labs offers three ways to deploy CockroachDB: two managed services&mda
  • Applications that require PCI-readiness.
    • - {{ site.data.products.dedicated-advanced }}: A fully managed, single tenant, PCI-ready CockroachDB deployment in a single region or multi-region cloud (AWS or GCP). + {{ site.data.products.dedicated-advanced }}: A fully managed, single tenant, PCI-ready CockroachDB deployment in a single region or multi-region cloud (AWS or GCP). From 9662d0f7ab3407a32cbe2dfe4fc43cafbf05bfd7 Mon Sep 17 00:00:00 2001 From: Amruta Ranade Date: Mon, 14 Aug 2023 12:31:54 -0400 Subject: [PATCH 3/3] Specified cluster and org info --- src/current/v23.1/choose-a-deployment-option.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/current/v23.1/choose-a-deployment-option.md b/src/current/v23.1/choose-a-deployment-option.md index 0fbd8d04db2..989337aa22f 100644 --- a/src/current/v23.1/choose-a-deployment-option.md +++ b/src/current/v23.1/choose-a-deployment-option.md @@ -61,10 +61,10 @@ Cockroach Labs offers three ways to deploy CockroachDB: two managed services&mda
    • All CockroachDB Dedicated features.
      • -
    • Audit log: Configurable cluster log export to AWS CloudWatch or GCP Cloud Logging using the Cloud API.
      • +
    • Audit log: Configurable cluster and organization log export to AWS CloudWatch or GCP Cloud Logging using the Cloud API.
    • Customer-Managed Encryption Keys (CMEK): Data protection at rest using a cryptographic key hosted in a supported cloud provider key-management system (KMS).
    • Egress Perimeter Controls: Allowlist configuration to ensure that the data is sent to a secure location.
      • -
    • Single Sign-On (SSO): Authentication enforcement using a centralized identity managed by an IdP.
      • +
    • Single Sign-On (SSO): Authentication enforcement using a centralized identity managed by an IdP for clusters and organizations.
    • Network security: VPC peering or AWS PrivateLink for enhanced network security and lower network latency.