Add Serverless as dependency to existing plugins; wire up navigation …

…replacement

config/serverless.yml

@@ -0,0 +1,2 @@
+
+xpack.serverless.plugin.enabled: true

x-pack/plugins/serverless_observability/kibana.jsonc

@@ -13,6 +13,7 @@
       "observability"
     ],
     "requiredPlugins": [
+      "serverless",
       "observability"
     ],
     "optionalPlugins": [],

x-pack/plugins/serverless_observability/public/plugin.ts → x-pack/plugins/serverless_observability/public/plugin.tsx

@@ -5,27 +5,33 @@
  * 2.0.
  */
 
+import React from 'react';
 import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 import {
   ServerlessObservabilityPluginSetup,
   ServerlessObservabilityPluginStart,
-  AppPluginSetupDependencies,
+  ServerlessObservabilityPluginSetupDependencies,
+  ServerlessObservabilityPluginStartDependencies,
 } from './types';
 
 export class ServerlessObservabilityPlugin
   implements Plugin<ServerlessObservabilityPluginSetup, ServerlessObservabilityPluginStart>
 {
   public setup(
     _core: CoreSetup,
-    setupDeps: AppPluginSetupDependencies
+    setupDeps: ServerlessObservabilityPluginSetupDependencies
   ): ServerlessObservabilityPluginSetup {
     setupDeps.observability.navigation.setIsSidebarEnabled(false);
 
     // Return methods that should be available to other plugins
     return {};
   }
 
-  public start(_core: CoreStart): ServerlessObservabilityPluginStart {
+  public start(
+    _core: CoreStart,
+    { serverless }: ServerlessObservabilityPluginStartDependencies
+  ): ServerlessObservabilityPluginStart {
+    serverless.setServerlessNavigation(<h1 style={{ color: '#fff' }}>Observability</h1>);
     return {};
   }
 

x-pack/plugins/serverless_observability/public/types.ts

@@ -5,17 +5,24 @@
  * 2.0.
  */
 
-import { ObservabilityPublicSetup } from '@kbn/observability-plugin/public';
+import { ServerlessPluginSetup, ServerlessPluginStart } from '@kbn/serverless/public';
+import {
+  ObservabilityPublicSetup,
+  ObservabilityPublicStart,
+} from '@kbn/observability-plugin/public';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface ServerlessObservabilityPluginSetup {}
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface ServerlessObservabilityPluginStart {}
 
-export interface AppPluginSetupDependencies {
+export interface ServerlessObservabilityPluginSetupDependencies {
   observability: ObservabilityPublicSetup;
+  serverless: ServerlessPluginSetup;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface AppPluginStartDependencies {}
+export interface ServerlessObservabilityPluginStartDependencies {
+  observability: ObservabilityPublicStart;
+  serverless: ServerlessPluginStart;
+}

x-pack/plugins/serverless_observability/tsconfig.json

@@ -18,5 +18,6 @@
     "@kbn/core",
     "@kbn/config-schema",
     "@kbn/observability-plugin",
+    "@kbn/serverless",
   ]
 }

x-pack/plugins/serverless_security/kibana.jsonc

@@ -13,6 +13,7 @@
       "security"
     ],
     "requiredPlugins": [
+      "serverless",
       "security",
       "securitySolution"
     ],

x-pack/plugins/serverless_security/public/plugin.ts → x-pack/plugins/serverless_security/public/plugin.tsx

@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import React from 'react';
 import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 import {
   ServerlessSecurityPluginSetup,
@@ -32,8 +33,9 @@ export class ServerlessSecurityPlugin
 
   public start(
     _core: CoreStart,
-    _startDeps: ServerlessSecurityPluginStartDependencies
+    startDeps: ServerlessSecurityPluginStartDependencies
   ): ServerlessSecurityPluginStart {
+    startDeps.serverless.setServerlessNavigation(<h1 style={{ color: '#fff' }}>Security</h1>);
     return {};
   }
 

x-pack/plugins/serverless_security/public/types.ts

@@ -10,6 +10,7 @@ import {
   PluginSetup as SecuritySolutionPluginSetup,
   PluginStart as SecuritySolutionPluginStart,
 } from '@kbn/security-solution-plugin/public';
+import { ServerlessPluginSetup, ServerlessPluginStart } from '@kbn/serverless/public';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface ServerlessSecurityPluginSetup {}
@@ -20,9 +21,11 @@ export interface ServerlessSecurityPluginStart {}
 export interface ServerlessSecurityPluginSetupDependencies {
   security: SecurityPluginSetup;
   securitySolution: SecuritySolutionPluginSetup;
+  serverless: ServerlessPluginSetup;
 }
 
 export interface ServerlessSecurityPluginStartDependencies {
   security: SecurityPluginStart;
   securitySolution: SecuritySolutionPluginStart;
+  serverless: ServerlessPluginStart;
 }

x-pack/plugins/serverless_security/tsconfig.json

@@ -7,6 +7,7 @@
     "index.ts",
     "common/**/*.ts",
     "public/**/*.ts",
+    "public/**/*.tsx",
     "server/**/*.ts",
     "../../../typings/**/*"
   ],
@@ -18,5 +19,6 @@
     "@kbn/config-schema",
     "@kbn/security-plugin",
     "@kbn/security-solution-plugin",
+    "@kbn/serverless",
   ]
 }