diff --git a/website/content/docs/enterprise/admin-partitions.mdx b/website/content/docs/enterprise/admin-partitions.mdx index cad1c0563..9fda2d99e 100644 --- a/website/content/docs/enterprise/admin-partitions.mdx +++ b/website/content/docs/enterprise/admin-partitions.mdx @@ -10,7 +10,7 @@ description: Consul Enterprise enables you to create partitions that can be admi This feature requires version 1.11.0+ of HashiCorp Cloud Platform (HCP) or self-managed Consul Enterprise. Refer to the{' '} - enterprise feature matrix + enterprise feature matrix for additional information. diff --git a/website/content/docs/enterprise/audit-logging.mdx b/website/content/docs/enterprise/audit-logging.mdx index d196c814e..b3fdde334 100644 --- a/website/content/docs/enterprise/audit-logging.mdx +++ b/website/content/docs/enterprise/audit-logging.mdx @@ -11,7 +11,7 @@ description: >- This feature requires version 1.8.0+ of HashiCorp Cloud Platform (HCP) or self-managed Consul Enterprise. Refer to the{' '} - enterprise feature matrix + enterprise feature matrix for additional information. diff --git a/website/content/docs/enterprise/backups.mdx b/website/content/docs/enterprise/backups.mdx index 9a5cbc0b1..8fd76782f 100644 --- a/website/content/docs/enterprise/backups.mdx +++ b/website/content/docs/enterprise/backups.mdx @@ -13,7 +13,7 @@ description: >- This feature requires HashiCorp Cloud Platform (HCP) or self-managed Consul Enterprise. Refer to the{' '} - enterprise feature matrix + enterprise feature matrix for additional information. diff --git a/website/content/docs/enterprise/feature-availability.mdx b/website/content/docs/enterprise/feature-availability.mdx deleted file mode 100644 index f137e4503..000000000 --- a/website/content/docs/enterprise/feature-availability.mdx +++ /dev/null @@ -1,47 +0,0 @@ ---- -layout: docs -page_title: Consul Enterprise Feature Availability -description: >- - Consul Enterprise is offered in several forms that provide a different mix - of enterprise features. Choose the form that best suits the needs of your - organization. ---- - -# Consul Enterprise Feature Availability - -Consul Enterprise is offered in several forms that provide a different mix of enterprise features. -Choose the form that best suits the needs of your organization. - -Available enterprise features per Consul form and license include: - -| Feature | [HashiCorp Cloud Platform (HCP) Consul] | [Consul Enterprise] | Legacy Consul Enterprise (module-based) | -| ----------------------------------------------------------------------------------------------- | ------------------------------------------------------- | ------------------- | ------------------------------------------------- | -| Consul servers as a managed service | Yes | No (self-managed) | No (self-managed) | -| [Admin Partitions](/docs/enterprise/admin-partitions) | Standard tier and above | Yes | With Governance and Policy module | -| [Namespaces](/docs/enterprise/namespaces) | Standard tier and above | Yes | With Governance and Policy module | -| [Enhanced Read Scalability](/docs/enterprise/read-scale) | | Yes | With Global Visibility, Routing, and Scale module | -| [Redundancy Zones](/docs/enterprise/redundancy) | | Yes | With Global Visibility, Routing, and Scale module | -| [Automated Backups](/docs/enterprise/backups) | All tiers | Yes | Yes | -| [Automated Upgrades](/docs/enterprise/upgrades) | All tiers | Yes | Yes | -| [Network Infrastructure Automation with Consul-Terraform-Sync Enterprise](/docs/nia/enterprise) | | Yes | Yes | -| [Advanced Federation for Complex Network Topologies](/docs/enterprise/federation) | | Yes | With Global Visibility, Routing, and Scale module | -| [Network Segments](/docs/enterprise/network-segments) | | Yes | With Global Visibility, Routing, and Scale module | -| [OIDC Auth Method](/docs/acl/auth-methods/oidc) | | Yes | Yes | -| [Audit Logging](/docs/enterprise/audit-logging) | Standard tier and above | Yes | With Governance and Policy module | -| [Sentinel](/docs/enterprise/sentinel) | All tiers | Yes | With Governance and Policy module | - -[HashiCorp Cloud Platform (HCP) Consul]: https://cloud.hashicorp.com/products/consul -[Consul Enterprise]: https://www.hashicorp.com/products/consul/ - -## Gain Access to Enterprise Features - -### Self-Managed Consul - -To gain access to Consul Enterprise features in a self-managed installation, -[apply a purchased license](/docs/enterprise/license/overview) -to the Consul Enterprise binary that grants access to the desired features. - -### HCP Consul - -No action is required to gain access to Consul Enterprise features in a -HashiCorp Cloud Platform installation. diff --git a/website/content/docs/enterprise/federation.mdx b/website/content/docs/enterprise/federation.mdx index e7b934c69..cb39c33ac 100644 --- a/website/content/docs/enterprise/federation.mdx +++ b/website/content/docs/enterprise/federation.mdx @@ -13,7 +13,7 @@ description: >- This feature requires self-managed Consul Enterprise. Refer to the{' '} - enterprise feature matrix + enterprise feature matrix for additional information. diff --git a/website/content/docs/enterprise/index.mdx b/website/content/docs/enterprise/index.mdx index 56a15637a..db44606df 100644 --- a/website/content/docs/enterprise/index.mdx +++ b/website/content/docs/enterprise/index.mdx @@ -10,32 +10,71 @@ description: >- [Consul Enterprise](https://www.hashicorp.com/products/consul/) features address the organizational complexities of collaboration, operations, scale, and governance -and are [available in several forms of Consul Enterprise](/docs/enterprise/feature-availability). +and are [available in several forms of Consul Enterprise](#consul-enterprise-feature-availability). If you have purchased Consul Enterprise, refer to -[how to gain access to enterprise features](/docs/enterprise/feature-availability#gain-access-to-enterprise-features). +[how to gain access to enterprise features](#gain-access-to-enterprise-features). -Features include: +Enterprise features include: #### Multi-Tenancy -- [Admin Partitions](/docs/enterprise/admin-partitions) -- [Namespaces](/docs/enterprise/namespaces) - -#### Scalability -- [Enhanced Read Scalability](/docs/enterprise/read-scale) +- [Admin Partitions](/docs/enterprise/admin-partitions): define administrative boundaries between tenants within a single Consul datacenter +- [Namespaces](/docs/enterprise/namespaces): define resource boundaries within a single admin partition for further organizational flexibility #### Resiliency -- [Redundancy Zones](/docs/enterprise/redundancy) -- [Automated Backups](/docs/enterprise/backups) +- [Automated Backups](/docs/enterprise/backups): configure the automatic backup of Consul state +- [Redundancy Zones](/docs/enterprise/redundancy): deploy backup voting Consul servers to efficiently improve Consul fault tolerance + +#### Scalability +- [Read Replicas](/docs/enterprise/read-scale): deploy non-voting Consul servers to enhance the scalability of read requests #### Operational Simplification -- [Automated Upgrades](/docs/enterprise/upgrades) -- [Network Infrastructure Automation with Consul-Terraform-Sync Enterprise](/docs/nia/enterprise) +- [Automated Upgrades](/docs/enterprise/upgrades): ease upgrades by automating the transition from existing to newly deployed Consul servers +- [Consul-Terraform-Sync Enterprise](/docs/nia/enterprise): leverage the enhanced network infrastructure automation capabilities of the enterprise version of Consul-Terraform-Sync #### Complex Network Topology Support -- [Advanced Federation for Complex Network Topologies](/docs/enterprise/federation) -- [Network Segments](/docs/enterprise/network-segments) +- [Network Areas](/docs/enterprise/federation): support complex network topologies between federated Consul datacenters with pairwise federation rather than full mesh federation +- [Network Segments](/docs/enterprise/network-segments): support complex network topologies within a Consul datacenter by enforcing boundaries in Consul client gossip traffic #### Governance -- [OIDC Auth Method](/docs/security/acl/auth-methods/oidc) -- [Audit Logging](/docs/enterprise/audit-logging) -- [Sentinel](/docs/enterprise/sentinel) +- [OIDC Auth Method](/docs/security/acl/auth-methods/oidc): manage user access to Consul through an OIDC identity provider instead of Consul ACL tokens directly +- [Audit Logging](/docs/enterprise/audit-logging): understand Consul access and usage patterns by reviewing access to the Consul HTTP API +- [Sentinel for KV](/docs/enterprise/sentinel): policy-as-code framework for defining advanced key-value storage access control policies + +# Gain Access to Enterprise Features + +### Self-Managed Consul + +To gain access to Consul Enterprise features in a self-managed installation, +[apply a purchased license](/docs/enterprise/license/overview) +to the Consul Enterprise binary that grants access to the desired features. + +### HCP Consul + +No action is required to gain access to Consul Enterprise features in a +HashiCorp Cloud Platform installation. + +# Consul Enterprise Feature Availability + +Consul Enterprise is offered in several forms that provide a different mix of enterprise features. +Choose the form that best suits the needs of your organization. + +Available enterprise features per Consul form and license include: + +| Feature | [HashiCorp Cloud Platform (HCP) Consul] | [Consul Enterprise] | Legacy Consul Enterprise (module-based) | +| -------------------------------------------------------- | ------------------------------------------------------- | ------------------- | ------------------------------------------------- | +| Consul servers as a managed service | Yes | No (self-managed) | No (self-managed) | +| [Admin Partitions](/docs/enterprise/admin-partitions) | Standard tier and above | Yes | With Governance and Policy module | +| [Namespaces](/docs/enterprise/namespaces) | Standard tier and above | Yes | With Governance and Policy module | +| [Automated Backups](/docs/enterprise/backups) | All tiers | Yes | Yes | +| [Redundancy Zones](/docs/enterprise/redundancy) | | Yes | With Global Visibility, Routing, and Scale module | +| [Read Replicas](/docs/enterprise/read-scale) | | Yes | With Global Visibility, Routing, and Scale module | +| [Automated Upgrades](/docs/enterprise/upgrades) | All tiers | Yes | Yes | +| [Consul-Terraform-Sync Enterprise](/docs/nia/enterprise) | | Yes | Yes | +| [Network Areas](/docs/enterprise/federation) | | Yes | With Global Visibility, Routing, and Scale module | +| [Network Segments](/docs/enterprise/network-segments) | | Yes | With Global Visibility, Routing, and Scale module | +| [OIDC Auth Method](/docs/acl/auth-methods/oidc) | | Yes | Yes | +| [Audit Logging](/docs/enterprise/audit-logging) | Standard tier and above | Yes | With Governance and Policy module | +| [Sentinel for KV](/docs/enterprise/sentinel) | All tiers | Yes | With Governance and Policy module | + +[HashiCorp Cloud Platform (HCP) Consul]: https://cloud.hashicorp.com/products/consul +[Consul Enterprise]: https://www.hashicorp.com/products/consul/ diff --git a/website/content/docs/enterprise/namespaces.mdx b/website/content/docs/enterprise/namespaces.mdx index 289ca15f9..5d95f25da 100644 --- a/website/content/docs/enterprise/namespaces.mdx +++ b/website/content/docs/enterprise/namespaces.mdx @@ -10,7 +10,7 @@ description: Consul Enterprise enables data isolation with Namespaces. This feature requires version 1.7.0+ of HashiCorp Cloud Platform (HCP) or self-managed Consul Enterprise. Refer to the{' '} - enterprise feature matrix + enterprise feature matrix for additional information. diff --git a/website/content/docs/enterprise/network-segments.mdx b/website/content/docs/enterprise/network-segments.mdx index cd76f6bd6..7d928485c 100644 --- a/website/content/docs/enterprise/network-segments.mdx +++ b/website/content/docs/enterprise/network-segments.mdx @@ -12,7 +12,7 @@ description: |- This feature requires version 0.9.3+ of self-managed Consul Enterprise. Refer to the{' '} - enterprise feature matrix + enterprise feature matrix for additional information. diff --git a/website/content/docs/enterprise/read-scale.mdx b/website/content/docs/enterprise/read-scale.mdx index 95af48bdd..7655ab14c 100644 --- a/website/content/docs/enterprise/read-scale.mdx +++ b/website/content/docs/enterprise/read-scale.mdx @@ -12,7 +12,7 @@ description: >- This feature requires HashiCorp Cloud Platform (HCP) or self-managed Consul Enterprise. Refer to the{' '} - enterprise feature matrix + enterprise feature matrix for additional information. diff --git a/website/content/docs/enterprise/redundancy.mdx b/website/content/docs/enterprise/redundancy.mdx index 8cca81323..48231351f 100644 --- a/website/content/docs/enterprise/redundancy.mdx +++ b/website/content/docs/enterprise/redundancy.mdx @@ -12,7 +12,7 @@ description: >- This feature requires self-managed Consul Enterprise. Refer to the{' '} - enterprise feature matrix + enterprise feature matrix for additional information. diff --git a/website/content/docs/enterprise/sentinel.mdx b/website/content/docs/enterprise/sentinel.mdx index 05f436588..eb51d1088 100644 --- a/website/content/docs/enterprise/sentinel.mdx +++ b/website/content/docs/enterprise/sentinel.mdx @@ -13,7 +13,7 @@ description: >- This feature requires HashiCorp Cloud Platform (HCP) or self-managed Consul Enterprise. Refer to the{' '} - enterprise feature matrix + enterprise feature matrix for additional information. diff --git a/website/content/docs/enterprise/upgrades.mdx b/website/content/docs/enterprise/upgrades.mdx index d563886e6..cdacd789b 100644 --- a/website/content/docs/enterprise/upgrades.mdx +++ b/website/content/docs/enterprise/upgrades.mdx @@ -13,7 +13,7 @@ description: >- This feature requires HashiCorp Cloud Platform (HCP) or self-managed Consul Enterprise. Refer to the{' '} - enterprise feature matrix + enterprise feature matrix for additional information. diff --git a/website/content/docs/security/acl/auth-methods/oidc.mdx b/website/content/docs/security/acl/auth-methods/oidc.mdx index 4feb1fa4c..95fba6546 100644 --- a/website/content/docs/security/acl/auth-methods/oidc.mdx +++ b/website/content/docs/security/acl/auth-methods/oidc.mdx @@ -14,7 +14,7 @@ description: >- This feature requires version 1.8.0+ of self-managed Consul Enterprise. Refer to the{' '} - enterprise feature matrix + enterprise feature matrix for additional information. diff --git a/website/data/docs-nav-data.json b/website/data/docs-nav-data.json index 7fce6613e..52ef17c45 100644 --- a/website/data/docs-nav-data.json +++ b/website/data/docs-nav-data.json @@ -1060,10 +1060,6 @@ "title": "Sentinel", "path": "enterprise/sentinel" }, - { - "title": "Feature Availability", - "path": "enterprise/feature-availability" - }, { "title": "License", "routes": [