From 8844b7c2a0ac99bd9fd2460d32746d3081862bed Mon Sep 17 00:00:00 2001
From: davidadeleon <56207066+davidadeleon@users.noreply.github.com>
Date: Fri, 11 Oct 2024 13:29:07 +0000
Subject: [PATCH] backport of commit ef967a0d8c3627d601190c443394240483091662

---
 .../docs/configuration/adaptive-overload-protection.mdx  | 9 +++++----
 website/data/docs-nav-data.json                          | 5 +++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/website/content/docs/configuration/adaptive-overload-protection.mdx b/website/content/docs/configuration/adaptive-overload-protection.mdx
index 295e5c1b3ffe..208413f7769f 100644
--- a/website/content/docs/configuration/adaptive-overload-protection.mdx
+++ b/website/content/docs/configuration/adaptive-overload-protection.mdx
@@ -10,7 +10,9 @@ description: |-
 
 @include 'alerts/enterprise-only.mdx'
 
-@include 'alerts/beta.mdx'
+<Note title="Enabled by default">
+  As of Vault 1.18.0, adaptive overload protection is enabled by default
+</Note>
 
 Configure the `adaptive_overload_protection` stanza to control overload
 protection features for your Vault server.
@@ -41,6 +43,5 @@ These parameters apply to the `adaptive_overload_protection` stanza in the Vault
 configuration file:
 
 - `disable_write_controller` `(bool: <optional>)`: Disables the adaptive write
-  overload controller. Defaults to `true` (controller disabled). Set
-  `disable_write_controller` to `false` to enable the write controller and opt
-  in to the beta functionality.
\ No newline at end of file
+  overload controller. Defaults to `false` (controller enabled). Set
+  `disable_write_controller` to `true` to disable the write controller.
diff --git a/website/data/docs-nav-data.json b/website/data/docs-nav-data.json
index 85d88840bbf1..dd4093cff3eb 100644
--- a/website/data/docs-nav-data.json
+++ b/website/data/docs-nav-data.json
@@ -578,6 +578,11 @@
       },
       {
         "title": "Adaptive overload protection",
+        "badge": {
+          "text": "ENTERPRISE",
+          "type": "outlined",
+          "color": "neutral"
+        },
         "path": "configuration/adaptive-overload-protection"
       },
       {