Merge branch 'main' into f-gh-13120-sso-umbrella

command/agent/testdata/basic.hcl

@@ -134,6 +134,12 @@ server {
   enable_event_broker           = false
   event_buffer_size             = 200
 
+  plan_rejection_tracker {
+    enabled        = true
+    node_threshold = 100
+    node_window    = "41m"
+  }
+
   server_join {
     retry_join     = ["1.1.1.1", "2.2.2.2"]
     retry_max      = 3
@@ -229,6 +235,7 @@ consul {
   client_auto_join       = true
   auto_advertise         = true
   checks_use_advertise   = true
+  timeout                = "5s"
 }
 
 vault {