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 {

command/agent/testdata/basic.json

@@ -161,6 +161,7 @@
       "server_serf_check_name": "nomad-server-serf-health-check",
       "server_service_name": "nomad",
       "ssl": true,
+      "timeout": "5s",
       "token": "token1",
       "verify_ssl": true
     }
@@ -280,6 +281,11 @@
       "node_gc_threshold": "12h",
       "non_voting_server": true,
       "num_schedulers": 2,
+      "plan_rejection_tracker": {
+        "enabled": true,
+        "node_threshold": 100,
+        "node_window": "41m"
+      },
       "raft_protocol": 3,
       "raft_multiplier": 4,
       "redundancy_zone": "foo",

command/agent/testdata/sample0.json

@@ -55,6 +55,10 @@
     "bootstrap_expect": 3,
     "enabled": true,
     "encrypt": "sHck3WL6cxuhuY7Mso9BHA==",
+    "plan_rejection_tracker": {
+      "node_threshold": 100,
+      "node_window": "31m"
+    },
     "retry_join": [
       "10.0.0.101",
       "10.0.0.102",

command/agent/testdata/sample1/sample0.json

@@ -20,6 +20,10 @@
     "bootstrap_expect": 3,
     "enabled": true,
     "encrypt": "sHck3WL6cxuhuY7Mso9BHA==",
+    "plan_rejection_tracker": {
+      "node_threshold": 100,
+      "node_window": "31m"
+    },
     "retry_join": [
       "10.0.0.101",
       "10.0.0.102",