From 724f5e28e304c0fb9f4eb8d5c43b31fbb5a34949 Mon Sep 17 00:00:00 2001
From: Yulia Cech <yulia.cech@elastic.co>
Date: Mon, 6 Mar 2023 11:43:48 +0100
Subject: [PATCH 1/9] [Serverless] Add a config to disable Upgrade Assistant

---
 config/serverless.yml                             | 2 ++
 x-pack/plugins/upgrade_assistant/server/config.ts | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/config/serverless.yml b/config/serverless.yml
index 3ceed35abeeff..ffe0998840d02 100644
--- a/config/serverless.yml
+++ b/config/serverless.yml
@@ -1,3 +1,5 @@
 
 xpack.serverless.plugin.enabled: true
 xpack.fleet.enableExperimental: ['fleetServerStandalone']
+
+xpack.upgrade_assistant.enabled: false
diff --git a/x-pack/plugins/upgrade_assistant/server/config.ts b/x-pack/plugins/upgrade_assistant/server/config.ts
index 6202a6680708a..bf872f50b5222 100644
--- a/x-pack/plugins/upgrade_assistant/server/config.ts
+++ b/x-pack/plugins/upgrade_assistant/server/config.ts
@@ -12,6 +12,11 @@ import { PluginConfigDescriptor } from '@kbn/core/server';
 // even for minor releases.
 // -------------------------------
 const configSchema = schema.object({
+  /**
+   * Disables the plugin.
+   */
+  enabled: schema.boolean({ defaultValue: true }),
+
   featureSet: schema.object({
     /**
      * Ml Snapshot should only be enabled for major version upgrades. Currently this
@@ -39,6 +44,9 @@ const configSchema = schema.object({
      */
     reindexCorrectiveActions: schema.boolean({ defaultValue: false }),
   }),
+  /**
+   * This config allows to hide the UI without disabling the plugin.
+   */
   ui: schema.object({
     enabled: schema.boolean({ defaultValue: true }),
   }),

From 9a1b42d2b2f147aeb4af12d804a46a1c00d431a4 Mon Sep 17 00:00:00 2001
From: Yulia Cech <yulia.cech@elastic.co>
Date: Mon, 6 Mar 2023 13:31:16 +0100
Subject: [PATCH 2/9] [Serverless] Add a config to disable Rollup jobs

---
 config/serverless.yml                  | 1 +
 x-pack/plugins/rollup/server/config.ts | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/config/serverless.yml b/config/serverless.yml
index ffe0998840d02..33b7f6d1a19dd 100644
--- a/config/serverless.yml
+++ b/config/serverless.yml
@@ -3,3 +3,4 @@ xpack.serverless.plugin.enabled: true
 xpack.fleet.enableExperimental: ['fleetServerStandalone']
 
 xpack.upgrade_assistant.enabled: false
+xpack.rollup.enabled: false
diff --git a/x-pack/plugins/rollup/server/config.ts b/x-pack/plugins/rollup/server/config.ts
index 235202a23db24..953cd4b283f97 100644
--- a/x-pack/plugins/rollup/server/config.ts
+++ b/x-pack/plugins/rollup/server/config.ts
@@ -22,6 +22,11 @@ const schemaLatest = schema.object(
     ui: schema.object({
       enabled: schema.boolean({ defaultValue: true }),
     }),
+    /**
+     * Disables the plugin.
+     * Added back in 8.8.
+     */
+    enabled: schema.boolean({ defaultValue: true }),
   },
   { defaultValue: undefined }
 );

From c290858a9c58d4715eb272b6b477b395c0c48b64 Mon Sep 17 00:00:00 2001
From: Yulia Cech <yulia.cech@elastic.co>
Date: Mon, 6 Mar 2023 14:44:30 +0100
Subject: [PATCH 3/9] [Serverless] Move watcher config to the file
 serverless.yml

---
 config/serverless.oblt.yml     | 1 -
 config/serverless.security.yml | 1 -
 config/serverless.yml          | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/serverless.oblt.yml b/config/serverless.oblt.yml
index b35e67c81aee7..6023b65b82e82 100644
--- a/config/serverless.oblt.yml
+++ b/config/serverless.oblt.yml
@@ -3,7 +3,6 @@ xpack.canvas.enabled: false
 xpack.cloudSecurityPosture.enabled: false
 xpack.reporting.enabled: false
 xpack.securitySolution.enabled: false
-xpack.watcher.enabled: false
 
 xpack.serverless.observability.enabled: true
 
diff --git a/config/serverless.security.yml b/config/serverless.security.yml
index a5e1c170ddccd..241c87d23ab4d 100644
--- a/config/serverless.security.yml
+++ b/config/serverless.security.yml
@@ -3,7 +3,6 @@ xpack.canvas.enabled: false
 xpack.observability.enabled: false
 xpack.reporting.enabled: false
 xpack.uptime.enabled: false
-xpack.watcher.enabled: false
 
 xpack.serverless.security.enabled: true
 
diff --git a/config/serverless.yml b/config/serverless.yml
index 33b7f6d1a19dd..248724be3eb5a 100644
--- a/config/serverless.yml
+++ b/config/serverless.yml
@@ -4,3 +4,4 @@ xpack.fleet.enableExperimental: ['fleetServerStandalone']
 
 xpack.upgrade_assistant.enabled: false
 xpack.rollup.enabled: false
+xpack.watcher.enabled: false

From aad4053d65f9bfba184e2b12cd678c9819f73cba Mon Sep 17 00:00:00 2001
From: Yulia Cech <yulia.cech@elastic.co>
Date: Mon, 6 Mar 2023 15:01:57 +0100
Subject: [PATCH 4/9] [Serverless] Add a config to disable CCR

---
 config/serverless.yml                                     | 1 +
 x-pack/plugins/cross_cluster_replication/server/config.ts | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/config/serverless.yml b/config/serverless.yml
index 248724be3eb5a..d4c9085caae7a 100644
--- a/config/serverless.yml
+++ b/config/serverless.yml
@@ -5,3 +5,4 @@ xpack.fleet.enableExperimental: ['fleetServerStandalone']
 xpack.upgrade_assistant.enabled: false
 xpack.rollup.enabled: false
 xpack.watcher.enabled: false
+xpack.ccr.enabled: false
diff --git a/x-pack/plugins/cross_cluster_replication/server/config.ts b/x-pack/plugins/cross_cluster_replication/server/config.ts
index bac5f917f22a6..4cba6d0707abb 100644
--- a/x-pack/plugins/cross_cluster_replication/server/config.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/config.ts
@@ -22,6 +22,11 @@ const schemaLatest = schema.object(
     ui: schema.object({
       enabled: schema.boolean({ defaultValue: true }),
     }),
+    /**
+     * Disables the plugin.
+     * Added back in 8.8.
+     */
+    enabled: schema.boolean({ defaultValue: true }),
   },
   { defaultValue: undefined }
 );

From 2a6a1145abcee4602ac12fb5f1aafdf35ed21234 Mon Sep 17 00:00:00 2001
From: Yulia Cech <yulia.cech@elastic.co>
Date: Mon, 6 Mar 2023 16:36:58 +0100
Subject: [PATCH 5/9] [Serverless] Add a config to disable ILM

---
 config/serverless.yml                                      | 1 +
 x-pack/plugins/index_lifecycle_management/server/config.ts | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/config/serverless.yml b/config/serverless.yml
index d4c9085caae7a..c563d15165468 100644
--- a/config/serverless.yml
+++ b/config/serverless.yml
@@ -6,3 +6,4 @@ xpack.upgrade_assistant.enabled: false
 xpack.rollup.enabled: false
 xpack.watcher.enabled: false
 xpack.ccr.enabled: false
+xpack.ilm.enabled: false
diff --git a/x-pack/plugins/index_lifecycle_management/server/config.ts b/x-pack/plugins/index_lifecycle_management/server/config.ts
index 737cc6a472c7a..7fdec20bbb050 100644
--- a/x-pack/plugins/index_lifecycle_management/server/config.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/config.ts
@@ -24,6 +24,11 @@ const schemaLatest = schema.object(
     }),
     // Cloud requires the ability to hide internal node attributes from users.
     filteredNodeAttributes: schema.arrayOf(schema.string(), { defaultValue: [] }),
+    /**
+     * Disables the plugin.
+     * Added back in 8.8.
+     */
+    enabled: schema.boolean({ defaultValue: true }),
   },
   { defaultValue: undefined }
 );

From 807e11a3d56664b74f744a6fa42e302df0fee198 Mon Sep 17 00:00:00 2001
From: Yulia Cech <yulia.cech@elastic.co>
Date: Mon, 6 Mar 2023 17:22:14 +0100
Subject: [PATCH 6/9] [Serverless] Add a config to disable Remote clusters

---
 config/serverless.yml                           | 1 +
 x-pack/plugins/remote_clusters/server/config.ts | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/config/serverless.yml b/config/serverless.yml
index c563d15165468..f157e53412324 100644
--- a/config/serverless.yml
+++ b/config/serverless.yml
@@ -7,3 +7,4 @@ xpack.rollup.enabled: false
 xpack.watcher.enabled: false
 xpack.ccr.enabled: false
 xpack.ilm.enabled: false
+xpack.remote_clusters.enabled: false
diff --git a/x-pack/plugins/remote_clusters/server/config.ts b/x-pack/plugins/remote_clusters/server/config.ts
index 32db006e8171a..4f6c56191cd89 100644
--- a/x-pack/plugins/remote_clusters/server/config.ts
+++ b/x-pack/plugins/remote_clusters/server/config.ts
@@ -22,6 +22,11 @@ const schemaLatest = schema.object(
     ui: schema.object({
       enabled: schema.boolean({ defaultValue: true }),
     }),
+    /**
+     * Disables the plugin.
+     * Added back in 8.8.
+     */
+    enabled: schema.boolean({ defaultValue: true }),
   },
   { defaultValue: undefined }
 );

From 101bfe6e1219352e2318e85d8ce32f524de66e46 Mon Sep 17 00:00:00 2001
From: Yulia Cech <yulia.cech@elastic.co>
Date: Mon, 6 Mar 2023 17:53:23 +0100
Subject: [PATCH 7/9] [Serverless] Add a config to disable Snapshot & Restore

---
 config/serverless.yml                            | 1 +
 x-pack/plugins/snapshot_restore/server/config.ts | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/config/serverless.yml b/config/serverless.yml
index f157e53412324..d0eeb84c4c551 100644
--- a/config/serverless.yml
+++ b/config/serverless.yml
@@ -8,3 +8,4 @@ xpack.watcher.enabled: false
 xpack.ccr.enabled: false
 xpack.ilm.enabled: false
 xpack.remote_clusters.enabled: false
+xpack.snapshot_restore.enabled: false
diff --git a/x-pack/plugins/snapshot_restore/server/config.ts b/x-pack/plugins/snapshot_restore/server/config.ts
index d259b6674391a..e2452e5b58e54 100644
--- a/x-pack/plugins/snapshot_restore/server/config.ts
+++ b/x-pack/plugins/snapshot_restore/server/config.ts
@@ -25,6 +25,11 @@ const schemaLatest = schema.object(
     slm_ui: schema.object({
       enabled: schema.boolean({ defaultValue: true }),
     }),
+    /**
+     * Disables the plugin.
+     * Added back in 8.8.
+     */
+    enabled: schema.boolean({ defaultValue: true }),
   },
   { defaultValue: undefined }
 );

From 81648a34576d740e298080c7347c2c3d45682ca6 Mon Sep 17 00:00:00 2001
From: Yulia Cech <yulia.cech@elastic.co>
Date: Thu, 9 Mar 2023 17:45:34 +0100
Subject: [PATCH 8/9] [Serverless] Add a config to disable License Management

---
 config/serverless.yml                              | 1 +
 x-pack/plugins/license_management/server/config.ts | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/config/serverless.yml b/config/serverless.yml
index d0eeb84c4c551..ec4f5ab51d430 100644
--- a/config/serverless.yml
+++ b/config/serverless.yml
@@ -9,3 +9,4 @@ xpack.ccr.enabled: false
 xpack.ilm.enabled: false
 xpack.remote_clusters.enabled: false
 xpack.snapshot_restore.enabled: false
+xpack.license_management.enabled: false
diff --git a/x-pack/plugins/license_management/server/config.ts b/x-pack/plugins/license_management/server/config.ts
index 42beba0ea5c09..23449bc19e793 100644
--- a/x-pack/plugins/license_management/server/config.ts
+++ b/x-pack/plugins/license_management/server/config.ts
@@ -22,6 +22,11 @@ const schemaLatest = schema.object(
     ui: schema.object({
       enabled: schema.boolean({ defaultValue: true }),
     }),
+    /**
+     * Disables the plugin.
+     * Added back in 8.8.
+     */
+    enabled: schema.boolean({ defaultValue: true }),
   },
   { defaultValue: undefined }
 );

From 590003fda754c0b3e27cc9957e0d1ead6e57f1c9 Mon Sep 17 00:00:00 2001
From: Yulia Cech <yulia.cech@elastic.co>
Date: Fri, 10 Mar 2023 14:32:39 +0100
Subject: [PATCH 9/9] [Serverless] Add a comment

---
 config/serverless.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/serverless.yml b/config/serverless.yml
index ec4f5ab51d430..c232a15421f2d 100644
--- a/config/serverless.yml
+++ b/config/serverless.yml
@@ -2,6 +2,7 @@
 xpack.serverless.plugin.enabled: true
 xpack.fleet.enableExperimental: ['fleetServerStandalone']
 
+# Management team plugins
 xpack.upgrade_assistant.enabled: false
 xpack.rollup.enabled: false
 xpack.watcher.enabled: false