Skip to content

Commit 409becb

Browse files
hc-github-team-consul-coreDavid Yu
andauthored
Backport of docs - remove Sentinel from enterprise features list into release/1.16.x (#18182)
* resolve conflicts --------- Co-authored-by: David Yu <[email protected]>
1 parent 9b3bbcc commit 409becb

File tree

5 files changed

+31
-39
lines changed

5 files changed

+31
-39
lines changed

website/content/docs/dynamic-app-config/kv.mdx

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,24 @@ and when recursively searching within the data store. We also recommend that
6161
you avoid the use of `*`, `?`, `'`, and `%` because they can cause issues when
6262
using the API and in shell scripts.
6363

64+
## Using Sentinel to apply policies for Consul KV
65+
66+
<EnterpriseAlert>
67+
68+
This feature requires
69+
HashiCorp Cloud Platform (HCP) or self-managed Consul Enterprise.
70+
71+
</EnterpriseAlert>
72+
73+
You can also use Sentinel as a Policy-as-code framework for defining advanced key-value storage access control policies. Sentinel policies extend the ACL system in Consul beyond static "read", "write",
74+
and "deny" policies to support full conditional logic and integration with
75+
external systems. Reference the [Sentinel documentation](https://docs.hashicorp.com/sentinel/concepts) for high-level Sentinel concepts.
76+
77+
To get started with Sentinel in Consul,
78+
refer to the [Sentinel documentation](https://docs.hashicorp.com/sentinel/consul) or
79+
[Consul documentation](/consul/docs/agent/sentinel).
80+
81+
6482
## Extending Consul KV
6583

6684
### Consul Template

website/content/docs/enterprise/index.mdx

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ The following features are [available in several forms of Consul Enterprise](#co
2020

2121
- [Admin Partitions](/consul/docs/enterprise/admin-partitions): Define administrative boundaries between tenants within a single Consul datacenter
2222
- [Namespaces](/consul/docs/enterprise/namespaces): Define resource boundaries within a single admin partition for further organizational flexibility
23-
- [Sameness Groups](/consul/docs/connect/config-entries/samenes-group): Define partitions and cluster peers as members of a group with identical services
23+
- [Sameness Groups](/consul/docs/connect/config-entries/sameness-group): Define partitions and cluster peers as members of a group with identical services
2424

2525
### Resiliency
2626

2727
- [Automated Backups](/consul/docs/enterprise/backups): Configure the automatic backup of Consul state
2828
- [Redundancy Zones](/consul/docs/enterprise/redundancy): Deploy backup voting Consul servers to efficiently improve Consul fault tolerance
29+
- [Server request rate limits per source IP](/consul/docs/agent/limits/usage/limit-request-rates-from-ips): Limit gRPC and RPC traffic to servers for source IP addresses.
2930

3031
### Scalability
3132

@@ -45,7 +46,6 @@ The following features are [available in several forms of Consul Enterprise](#co
4546

4647
- [OIDC Auth Method](/consul/docs/security/acl/auth-methods/oidc): Manage user access to Consul through an OIDC identity provider instead of Consul ACL tokens directly
4748
- [Audit Logging](/consul/docs/enterprise/audit-logging): Understand Consul access and usage patterns by reviewing access to the Consul HTTP API
48-
- [Sentinel for KV](/consul/docs/enterprise/sentinel): Policy-as-code framework for defining advanced key-value storage access control policies
4949

5050
### Regulatory compliance
5151

@@ -102,8 +102,7 @@ Available Enterprise features per Consul form and license include:
102102
| [OIDC Auth Method](/consul/docs/security/acl/auth-methods/oidc) | No | Yes | Yes |
103103
| [Redundancy Zones](/consul/docs/enterprise/redundancy) | Not applicable | Yes | With Global Visibility, Routing, and Scale module |
104104
| [Sameness Groups](/consul/docs/connect/config-entries/samenes-group) | No | Yes | N/A |
105-
| [Sentinel for KV](/consul/docs/enterprise/sentinel) | All tiers | Yes | With Governance and Policy module |
106-
| [Server request rate limits per source IP](/consul/docs/v1.16.x/agent/limits/usage/limit-request-rates-from-ips) | All tiers | Yes | With Governance and Policy module |
105+
| [Server request rate limits per source IP](/consul/docs/agent/limits/usage/limit-request-rates-from-ips) | All tiers | Yes | With Governance and Policy module |
107106

108107

109108
[HashiCorp Cloud Platform (HCP) Consul]: https://cloud.hashicorp.com/products/consul
@@ -131,8 +130,7 @@ Consul Enterprise feature availability can change depending on your server and c
131130
| [OIDC Auth Method](/consul/docs/security/acl/auth-methods/oidc) | &#9989; | &#9989; | &#9989; |
132131
| [Redundancy Zones](/consul/docs/enterprise/redundancy) | &#9989; | &#9989; | &#9989; |
133132
| [Sameness Groups](/consul/docs/connect/config-entries/samenes-group) | &#9989; | &#9989; | &#9989; |
134-
| [Sentinel ](/consul/docs/enterprise/sentinel) | &#9989; | &#9989; | &#9989; |
135-
| [Server request rate limits per source IP](/consul/docs/v1.16.x/agent/limits/usage/limit-request-rates-from-ips) | &#9989; | &#9989; | &#9989; |
133+
| [Server request rate limits per source IP](/consul/docs/agent/limits/usage/limit-request-rates-from-ips) | &#9989; | &#9989; | &#9989; |
136134

137135
</Tab>
138136

@@ -152,8 +150,7 @@ Consul Enterprise feature availability can change depending on your server and c
152150
| [OIDC Auth Method](/consul/docs/security/acl/auth-methods/oidc) | &#9989; | &#9989; | &#9989; |
153151
| [Redundancy Zones](/consul/docs/enterprise/redundancy) | &#10060; | &#10060; | &#10060; |
154152
| [Sameness Groups](/consul/docs/connect/config-entries/samenes-group) | &#9989; | &#9989; | &#9989; |
155-
| [Sentinel ](/consul/docs/enterprise/sentinel) | &#9989; | &#9989; | &#9989; |
156-
| [Server request rate limits per source IP](/consul/docs/v1.16.x/agent/limits/usage/limit-request-rates-from-ips) | &#9989; | &#9989; | &#9989; |
153+
| [Server request rate limits per source IP](/consul/docs/agent/limits/usage/limit-request-rates-from-ips) | &#9989; | &#9989; | &#9989; |
157154

158155
</Tab>
159156

@@ -173,8 +170,7 @@ Consul Enterprise feature availability can change depending on your server and c
173170
| [OIDC Auth Method](/consul/docs/security/acl/auth-methods/oidc) | &#10060; | &#10060; | &#10060; |
174171
| [Redundancy Zones](/consul/docs/enterprise/redundancy) | n/a | n/a | n/a |
175172
| [Sameness Groups](/consul/docs/connect/config-entries/samenes-group) | &#9989; | &#9989; | &#9989; |
176-
| [Sentinel ](/consul/docs/enterprise/sentinel) | &#9989; | &#9989; | &#9989; |
177-
| [Server request rate limits per source IP](/consul/docs/v1.16.x/agent/limits/usage/limit-request-rates-from-ips) | &#9989; | &#9989; | &#9989; |
173+
| [Server request rate limits per source IP](/consul/docs/agent/limits/usage/limit-request-rates-from-ips) | &#9989; | &#9989; | &#9989; |
178174

179175
</Tab>
180-
</Tabs>
176+
</Tabs>

website/content/docs/enterprise/sentinel.mdx

Lines changed: 0 additions & 24 deletions
This file was deleted.

website/data/docs-nav-data.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1707,10 +1707,6 @@
17071707
"title": "NIA with TFE",
17081708
"href": "/docs/nia/enterprise"
17091709
},
1710-
{
1711-
"title": "Sentinel",
1712-
"path": "enterprise/sentinel"
1713-
},
17141710
{
17151711
"title": "License",
17161712
"routes": [

website/redirects.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,10 @@ module.exports = [
6060
'/consul/docs/connect/cluster-peering/usage/establish-cluster-peering',
6161
permanent: true,
6262
},
63+
{
64+
source: '/consul/docs/enterprise/sentinel',
65+
destination:
66+
'/consul/docs/dynamic-app-config/kv#using-sentinel-to-apply-policies-for-consul-kv',
67+
permanent: true,
68+
},
6369
]

0 commit comments

Comments
 (0)