From c4147948abae63c712bd2f2a9c2cbbddf8a744d2 Mon Sep 17 00:00:00 2001
From: Clint Andrew Hall <clint@clintandrewhall.com>
Date: Sat, 18 Mar 2023 16:37:32 -0400
Subject: [PATCH 1/5] Add ability to disable certain plugins for Serverless.

---
 config/serverless.yml                             | 15 +++++++++++++++
 x-pack/plugins/apm/server/index.ts                |  1 +
 .../cross_cluster_replication/server/config.ts    |  5 +++++
 .../__mocks__/kea_logic/kibana_logic.mock.ts      |  9 +++++----
 .../public/applications/index.test.tsx            |  1 +
 x-pack/plugins/enterprise_search/server/index.ts  |  1 +
 x-pack/plugins/fleet/common/authz.ts              |  2 +-
 x-pack/plugins/fleet/server/config.ts             |  1 +
 .../index_lifecycle_management/server/config.ts   |  5 +++++
 .../plugins/license_management/server/config.ts   |  5 +++++
 x-pack/plugins/observability/server/index.ts      |  1 +
 x-pack/plugins/remote_clusters/server/config.ts   |  5 +++++
 x-pack/plugins/rollup/server/config.ts            |  5 +++++
 .../security_solution/server/config.mock.ts       |  1 +
 x-pack/plugins/security_solution/server/config.ts |  1 +
 x-pack/plugins/snapshot_restore/server/config.ts  |  5 +++++
 x-pack/plugins/synthetics/common/config.ts        |  1 +
 x-pack/plugins/synthetics/kibana.jsonc            |  4 +++-
 .../lib/adapters/framework/adapter_types.ts       |  3 ++-
 .../get_service_locations.test.ts                 |  3 +++
 .../synthetics_private_location.ts                |  2 +-
 .../synthetics_service/synthetics_service.test.ts |  8 +++++++-
 x-pack/plugins/upgrade_assistant/server/config.ts |  8 ++++++++
 x-pack/plugins/watcher/server/index.ts            |  8 ++++++++
 24 files changed, 91 insertions(+), 9 deletions(-)

diff --git a/config/serverless.yml b/config/serverless.yml
index d38863072d8a0..e65b15f064328 100644
--- a/config/serverless.yml
+++ b/config/serverless.yml
@@ -1,2 +1,17 @@
+newsfeed.enabled: false
 xpack.fleet.enableExperimental: ['fleetServerStandalone']
 xpack.fleet.internal.disableILMPolicies: true
+
+# Management team plugins
+xpack.upgrade_assistant.enabled: false
+xpack.rollup.enabled: false
+xpack.watcher.enabled: false
+xpack.ccr.enabled: false
+xpack.ilm.enabled: false
+xpack.remote_clusters.enabled: false
+xpack.snapshot_restore.enabled: false
+xpack.license_management.enabled: false
+
+# Other disabled plugins
+xpack.canvas.enabled: false
+xpack.reporting.enabled: false
diff --git a/x-pack/plugins/apm/server/index.ts b/x-pack/plugins/apm/server/index.ts
index bfd7f1c19e376..d13bc2e708efe 100644
--- a/x-pack/plugins/apm/server/index.ts
+++ b/x-pack/plugins/apm/server/index.ts
@@ -56,6 +56,7 @@ const configSchema = schema.object({
   latestAgentVersionsUrl: schema.string({
     defaultValue: 'https://apm-agent-versions.elastic.co/versions.json',
   }),
+  enabled: schema.boolean({ defaultValue: true }),
 });
 
 // plugin config
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 }
 );
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts
index 5cfd5e7029459..d79ebb3530ce2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts
@@ -24,17 +24,18 @@ export const mockKibanaValues = {
     ),
   } as unknown as ApplicationStart,
   capabilities: {} as Capabilities,
-  config: { host: 'http://localhost:3002' },
   charts: chartPluginMock.createStartContract(),
   cloud: {
     ...cloudMock.createSetup(),
-    isCloudEnabled: false,
     deployment_url: 'https://cloud.elastic.co/deployments/some-id',
+    isCloudEnabled: false,
   },
+  config: { host: 'http://localhost:3002' },
   data: dataPluginMock.createStartContract(),
   guidedOnboarding: {},
   history: mockHistory,
   isCloud: false,
+  isSidebarEnabled: true,
   lens: {
     EmbeddableComponent: jest.fn(),
     stateHelperApi: jest.fn().mockResolvedValue({
@@ -50,12 +51,12 @@ export const mockKibanaValues = {
     hasNativeConnectors: true,
     hasWebCrawler: true,
   },
-  uiSettings: uiSettingsServiceMock.createStartContract(),
+  renderHeaderActions: jest.fn(),
   security: securityMock.createStart(),
   setBreadcrumbs: jest.fn(),
   setChromeIsVisible: jest.fn(),
   setDocTitle: jest.fn(),
-  renderHeaderActions: jest.fn(),
+  uiSettings: uiSettingsServiceMock.createStartContract(),
 };
 
 jest.mock('../../shared/kibana', () => ({
diff --git a/x-pack/plugins/enterprise_search/public/applications/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/index.test.tsx
index c9d14e6d67006..6c0ccf66176e5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/index.test.tsx
@@ -37,6 +37,7 @@ describe('renderApp', () => {
       licensing: licensingMock.createStart(),
       security: securityMock.createStart(),
     },
+    isSidebarEnabled: true,
   } as any;
   const pluginData = {
     config: {},
diff --git a/x-pack/plugins/enterprise_search/server/index.ts b/x-pack/plugins/enterprise_search/server/index.ts
index 19019841976d4..b4c86696c4858 100644
--- a/x-pack/plugins/enterprise_search/server/index.ts
+++ b/x-pack/plugins/enterprise_search/server/index.ts
@@ -19,6 +19,7 @@ export const configSchema = schema.object({
   accessCheckTimeoutWarning: schema.number({ defaultValue: 300 }),
   canDeployEntSearch: schema.boolean({ defaultValue: true }),
   customHeaders: schema.maybe(schema.object({}, { unknowns: 'allow' })),
+  enabled: schema.boolean({ defaultValue: true }),
   hasConnectors: schema.boolean({ defaultValue: true }),
   hasDefaultIngestPipeline: schema.boolean({ defaultValue: true }),
   hasNativeConnectors: schema.boolean({ defaultValue: true }),
diff --git a/x-pack/plugins/fleet/common/authz.ts b/x-pack/plugins/fleet/common/authz.ts
index 83d337c00368b..3fbfd614d8038 100644
--- a/x-pack/plugins/fleet/common/authz.ts
+++ b/x-pack/plugins/fleet/common/authz.ts
@@ -107,7 +107,7 @@ export function calculatePackagePrivilegesFromCapabilities(
       return {
         ...acc,
         [privilege]: {
-          executePackageAction: capabilities.siem[privilegeName] || false,
+          executePackageAction: (capabilities.siem && capabilities.siem[privilegeName]) || false,
         },
       };
     },
diff --git a/x-pack/plugins/fleet/server/config.ts b/x-pack/plugins/fleet/server/config.ts
index 267d9873aaa2d..a370c0825664c 100644
--- a/x-pack/plugins/fleet/server/config.ts
+++ b/x-pack/plugins/fleet/server/config.ts
@@ -166,6 +166,7 @@ export const config: PluginConfigDescriptor = {
         }),
       })
     ),
+    enabled: schema.boolean({ defaultValue: true }),
   }),
 };
 
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 }
 );
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 }
 );
diff --git a/x-pack/plugins/observability/server/index.ts b/x-pack/plugins/observability/server/index.ts
index fea9b0ab14195..33ef9d2c62d4d 100644
--- a/x-pack/plugins/observability/server/index.ts
+++ b/x-pack/plugins/observability/server/index.ts
@@ -41,6 +41,7 @@ const configSchema = schema.object({
       }),
     }),
   }),
+  enabled: schema.boolean({ defaultValue: true }),
 });
 
 export const config: PluginConfigDescriptor = {
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 }
 );
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 }
 );
diff --git a/x-pack/plugins/security_solution/server/config.mock.ts b/x-pack/plugins/security_solution/server/config.mock.ts
index c1faa6f401a1d..6fcaa94629643 100644
--- a/x-pack/plugins/security_solution/server/config.mock.ts
+++ b/x-pack/plugins/security_solution/server/config.mock.ts
@@ -31,6 +31,7 @@ export const createMockConfig = (): ConfigType => {
     alertIgnoreFields: [],
 
     experimentalFeatures: parseExperimentalConfigValue(enableExperimental),
+    enabled: true,
   };
 };
 
diff --git a/x-pack/plugins/security_solution/server/config.ts b/x-pack/plugins/security_solution/server/config.ts
index 26f1be4f014b3..a0283858590cb 100644
--- a/x-pack/plugins/security_solution/server/config.ts
+++ b/x-pack/plugins/security_solution/server/config.ts
@@ -122,6 +122,7 @@ export const configSchema = schema.object({
    * the package is not already installed.
    */
   prebuiltRulesPackageVersion: schema.maybe(schema.string()),
+  enabled: schema.boolean({ defaultValue: true }),
 });
 
 export type ConfigSchema = TypeOf<typeof configSchema>;
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 }
 );
diff --git a/x-pack/plugins/synthetics/common/config.ts b/x-pack/plugins/synthetics/common/config.ts
index c9c48e5878391..9da43f8bf9a08 100644
--- a/x-pack/plugins/synthetics/common/config.ts
+++ b/x-pack/plugins/synthetics/common/config.ts
@@ -23,6 +23,7 @@ const serviceConfig = schema.object({
 const uptimeConfig = schema.object({
   index: schema.maybe(schema.string()),
   service: schema.maybe(serviceConfig),
+  enabled: schema.boolean({ defaultValue: true }),
 });
 
 export const config: PluginConfigDescriptor = {
diff --git a/x-pack/plugins/synthetics/kibana.jsonc b/x-pack/plugins/synthetics/kibana.jsonc
index a70202e3126a1..1cc3b45f4637d 100644
--- a/x-pack/plugins/synthetics/kibana.jsonc
+++ b/x-pack/plugins/synthetics/kibana.jsonc
@@ -12,6 +12,8 @@
       "actions",
       "alerting",
       "cases",
+      "data",
+      "fleet",
       "embeddable",
       "discover",
       "dataViews",
@@ -44,4 +46,4 @@
       "indexLifecycleManagement"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/x-pack/plugins/synthetics/server/legacy_uptime/lib/adapters/framework/adapter_types.ts b/x-pack/plugins/synthetics/server/legacy_uptime/lib/adapters/framework/adapter_types.ts
index ba1779d1c69f1..ecbf655e651ed 100644
--- a/x-pack/plugins/synthetics/server/legacy_uptime/lib/adapters/framework/adapter_types.ts
+++ b/x-pack/plugins/synthetics/server/legacy_uptime/lib/adapters/framework/adapter_types.ts
@@ -28,7 +28,7 @@ import { MlPluginSetup as MlSetup } from '@kbn/ml-plugin/server';
 import { RuleRegistryPluginSetupContract } from '@kbn/rule-registry-plugin/server';
 import { SecurityPluginStart } from '@kbn/security-plugin/server';
 import { CloudSetup } from '@kbn/cloud-plugin/server';
-import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
+import { SpacesPluginSetup, SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import { FleetStartContract } from '@kbn/fleet-plugin/server';
 import { BfetchServerSetup } from '@kbn/bfetch-plugin/server';
 import { UptimeEsClient } from '../../lib';
@@ -76,6 +76,7 @@ export interface UptimeCorePluginsSetup {
   usageCollection: UsageCollectionSetup;
   ml: MlSetup;
   cloud?: CloudSetup;
+  spaces: SpacesPluginSetup;
   ruleRegistry: RuleRegistryPluginSetupContract;
   encryptedSavedObjects: EncryptedSavedObjectsPluginSetup;
   taskManager: TaskManagerSetupContract;
diff --git a/x-pack/plugins/synthetics/server/synthetics_service/get_service_locations.test.ts b/x-pack/plugins/synthetics/server/synthetics_service/get_service_locations.test.ts
index 1fed640bcb4e8..58faf6ba14877 100644
--- a/x-pack/plugins/synthetics/server/synthetics_service/get_service_locations.test.ts
+++ b/x-pack/plugins/synthetics/server/synthetics_service/get_service_locations.test.ts
@@ -50,6 +50,7 @@ describe('getServiceLocations', function () {
             manifestUrl: 'http://local.dev',
             showExperimentalLocations: false,
           },
+          enabled: true,
         },
         // @ts-ignore
         logger: {
@@ -101,6 +102,7 @@ describe('getServiceLocations', function () {
             manifestUrl: 'http://local.dev',
             showExperimentalLocations: false,
           },
+          enabled: true,
         },
         // @ts-ignore
         logger: {
@@ -138,6 +140,7 @@ describe('getServiceLocations', function () {
             manifestUrl: 'http://local.dev',
             showExperimentalLocations: true,
           },
+          enabled: true,
         },
         // @ts-ignore
         logger: {
diff --git a/x-pack/plugins/synthetics/server/synthetics_service/private_location/synthetics_private_location.ts b/x-pack/plugins/synthetics/server/synthetics_service/private_location/synthetics_private_location.ts
index 7ead29564e7ed..57e5bfc7724d9 100644
--- a/x-pack/plugins/synthetics/server/synthetics_service/private_location/synthetics_private_location.ts
+++ b/x-pack/plugins/synthetics/server/synthetics_service/private_location/synthetics_private_location.ts
@@ -364,7 +364,7 @@ export class SyntheticsPrivateLocation {
       }
     );
 
-    return agentPolicies.items;
+    return agentPolicies.items || [];
   }
 }
 
diff --git a/x-pack/plugins/synthetics/server/synthetics_service/synthetics_service.test.ts b/x-pack/plugins/synthetics/server/synthetics_service/synthetics_service.test.ts
index 35e31add55aa0..86933fc51e4fd 100644
--- a/x-pack/plugins/synthetics/server/synthetics_service/synthetics_service.test.ts
+++ b/x-pack/plugins/synthetics/server/synthetics_service/synthetics_service.test.ts
@@ -80,6 +80,7 @@ describe('SyntheticsService', () => {
         password: '12345',
         manifestUrl: 'http://localhost:8080/api/manifest',
       },
+      enabled: true,
     },
     coreStart: mockCoreStart,
     encryptedSavedObjects: mockEncryptedSO(),
@@ -101,7 +102,11 @@ describe('SyntheticsService', () => {
       };
     });
     serverMock.config = {
-      service: { devUrl: 'http://localhost', manifestUrl: 'https://test-manifest.com' },
+      service: {
+        devUrl: 'http://localhost',
+        manifestUrl: 'https://test-manifest.com',
+      },
+      enabled: true,
     };
     if (serverMock.savedObjectsClient) {
       serverMock.savedObjectsClient.find = jest.fn().mockResolvedValue({
@@ -165,6 +170,7 @@ describe('SyntheticsService', () => {
         username: 'dev',
         password: '12345',
       },
+      enabled: true,
     };
     const service = new SyntheticsService(serverMock);
 
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 }),
   }),
diff --git a/x-pack/plugins/watcher/server/index.ts b/x-pack/plugins/watcher/server/index.ts
index 0aba44ed82838..36453f571f162 100644
--- a/x-pack/plugins/watcher/server/index.ts
+++ b/x-pack/plugins/watcher/server/index.ts
@@ -6,6 +6,14 @@
  */
 
 import { PluginInitializerContext } from '@kbn/core/server';
+import { schema } from '@kbn/config-schema';
+
 import { WatcherServerPlugin } from './plugin';
 
 export const plugin = (ctx: PluginInitializerContext) => new WatcherServerPlugin(ctx);
+
+export const config = {
+  schema: schema.object({
+    enabled: schema.boolean({ defaultValue: true }),
+  }),
+};

From e06626846f8513de17482d16583aeb76c53f95f7 Mon Sep 17 00:00:00 2001
From: Clint Andrew Hall <clint@clintandrewhall.com>
Date: Tue, 25 Apr 2023 23:29:02 -0400
Subject: [PATCH 2/5] Addressing feedback

---
 .../legacy_uptime/lib/adapters/framework/adapter_types.ts      | 3 +--
 .../private_location/synthetics_private_location.ts            | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/synthetics/server/legacy_uptime/lib/adapters/framework/adapter_types.ts b/x-pack/plugins/synthetics/server/legacy_uptime/lib/adapters/framework/adapter_types.ts
index ecbf655e651ed..ba1779d1c69f1 100644
--- a/x-pack/plugins/synthetics/server/legacy_uptime/lib/adapters/framework/adapter_types.ts
+++ b/x-pack/plugins/synthetics/server/legacy_uptime/lib/adapters/framework/adapter_types.ts
@@ -28,7 +28,7 @@ import { MlPluginSetup as MlSetup } from '@kbn/ml-plugin/server';
 import { RuleRegistryPluginSetupContract } from '@kbn/rule-registry-plugin/server';
 import { SecurityPluginStart } from '@kbn/security-plugin/server';
 import { CloudSetup } from '@kbn/cloud-plugin/server';
-import { SpacesPluginSetup, SpacesPluginStart } from '@kbn/spaces-plugin/server';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import { FleetStartContract } from '@kbn/fleet-plugin/server';
 import { BfetchServerSetup } from '@kbn/bfetch-plugin/server';
 import { UptimeEsClient } from '../../lib';
@@ -76,7 +76,6 @@ export interface UptimeCorePluginsSetup {
   usageCollection: UsageCollectionSetup;
   ml: MlSetup;
   cloud?: CloudSetup;
-  spaces: SpacesPluginSetup;
   ruleRegistry: RuleRegistryPluginSetupContract;
   encryptedSavedObjects: EncryptedSavedObjectsPluginSetup;
   taskManager: TaskManagerSetupContract;
diff --git a/x-pack/plugins/synthetics/server/synthetics_service/private_location/synthetics_private_location.ts b/x-pack/plugins/synthetics/server/synthetics_service/private_location/synthetics_private_location.ts
index 57e5bfc7724d9..7ead29564e7ed 100644
--- a/x-pack/plugins/synthetics/server/synthetics_service/private_location/synthetics_private_location.ts
+++ b/x-pack/plugins/synthetics/server/synthetics_service/private_location/synthetics_private_location.ts
@@ -364,7 +364,7 @@ export class SyntheticsPrivateLocation {
       }
     );
 
-    return agentPolicies.items || [];
+    return agentPolicies.items;
   }
 }
 

From 7dda804c6b3f832a16e8438d4fe8b103b261f33e Mon Sep 17 00:00:00 2001
From: Clint Andrew Hall <clint@clintandrewhall.com>
Date: Wed, 26 Apr 2023 00:30:03 -0400
Subject: [PATCH 3/5] Fix test

---
 .../public/applications/shared/kibana/kibana_logic.ts          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts b/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts
index 2a400ce2d0269..37ef982c73407 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts
@@ -67,12 +67,13 @@ export const KibanaLogic = kea<MakeLogicType<KibanaValues>>({
   reducers: ({ props }) => ({
     application: [props.application || {}, {}],
     capabilities: [props.capabilities || {}, {}],
-    config: [props.config || {}, {}],
     charts: [props.charts, {}],
     cloud: [props.cloud || {}, {}],
+    config: [props.config || {}, {}],
     data: [props.data, {}],
     guidedOnboarding: [props.guidedOnboarding, {}],
     history: [props.history, {}],
+    isSidebarEnabled: [props.isSidebarEnabled, true],
     lens: [props.lens, {}],
     navigateToUrl: [
       (url: string, options?: CreateHrefOptions) => {

From 698f170a17c84c47db826ec8494fb8441903787c Mon Sep 17 00:00:00 2001
From: Clint Andrew Hall <clint@clintandrewhall.com>
Date: Wed, 26 Apr 2023 10:14:35 -0400
Subject: [PATCH 4/5] Fix errant inclusion of isSidebarEnabled

---
 .../public/applications/shared/kibana/kibana_logic.ts            | 1 -
 1 file changed, 1 deletion(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts b/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts
index 37ef982c73407..b7d264ba43e99 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts
@@ -73,7 +73,6 @@ export const KibanaLogic = kea<MakeLogicType<KibanaValues>>({
     data: [props.data, {}],
     guidedOnboarding: [props.guidedOnboarding, {}],
     history: [props.history, {}],
-    isSidebarEnabled: [props.isSidebarEnabled, true],
     lens: [props.lens, {}],
     navigateToUrl: [
       (url: string, options?: CreateHrefOptions) => {

From 2692c90f3ee796d8e8182c3848753785fadb70af Mon Sep 17 00:00:00 2001
From: Clint Andrew Hall <clint@clintandrewhall.com>
Date: Wed, 26 Apr 2023 11:09:38 -0400
Subject: [PATCH 5/5] Remove other errant isSidebarEnabled inclusion

---
 .../public/applications/__mocks__/kea_logic/kibana_logic.mock.ts | 1 -
 .../plugins/enterprise_search/public/applications/index.test.tsx | 1 -
 2 files changed, 2 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts
index d79ebb3530ce2..9c1b0575694c4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts
@@ -35,7 +35,6 @@ export const mockKibanaValues = {
   guidedOnboarding: {},
   history: mockHistory,
   isCloud: false,
-  isSidebarEnabled: true,
   lens: {
     EmbeddableComponent: jest.fn(),
     stateHelperApi: jest.fn().mockResolvedValue({
diff --git a/x-pack/plugins/enterprise_search/public/applications/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/index.test.tsx
index 6c0ccf66176e5..c9d14e6d67006 100644
--- a/x-pack/plugins/enterprise_search/public/applications/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/index.test.tsx
@@ -37,7 +37,6 @@ describe('renderApp', () => {
       licensing: licensingMock.createStart(),
       security: securityMock.createStart(),
     },
-    isSidebarEnabled: true,
   } as any;
   const pluginData = {
     config: {},