[Logs onboarding] Align elastic-agent version with stackVersion (elas…

…tic#162622) Closes elastic#159382. ### Changes - `kibanaVersion` is passed as a resources to the routes. - `elastic-agent` version is based on `kibanaVersion`. #### Before <img width="1073" alt="image" src="https://github.com/elastic/kibana/assets/1313018/00e291a2-3f8d-4d1d-9520-c0a29cc9454e"> #### After <img width="1115" alt="image" src="https://github.com/elastic/kibana/assets/1313018/dffcf95f-f3a2-46f0-bb78-daebe8597b89">
ThomThomson · Aug 1, 2023 · f417511 · f417511
1 parent aa1fb0b
commit f417511
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/x-pack/plugins/observability_onboarding/server/plugin.ts b/x-pack/plugins/observability_onboarding/server/plugin.ts
@@ -74,6 +74,7 @@ export class ObservabilityOnboardingPlugin
       repository: getObservabilityOnboardingServerRouteRepository(),
       plugins: resourcePlugins,
       config,
+      kibanaVersion: this.initContext.env.packageInfo.version,
       services: {
         esLegacyConfigService: this.esLegacyConfigService,
       },

diff --git a/x-pack/plugins/observability_onboarding/server/routes/custom_logs/route.ts b/x-pack/plugins/observability_onboarding/server/routes/custom_logs/route.ts
@@ -16,8 +16,6 @@ import { getHasLogs } from './get_has_logs';
 import { getObservabilityOnboardingState } from './get_observability_onboarding_state';
 import { saveObservabilityOnboardingState } from './save_observability_onboarding_state';
 
-const ELASTIC_AGENT_VERSION = '8.8.0'; // This should be defined from a source with the latest public release
-
 const logMonitoringPrivilegesRoute = createObservabilityOnboardingServerRoute({
   endpoint: 'GET /internal/observability_onboarding/custom_logs/privileges',
   options: { tags: [] },
@@ -46,7 +44,7 @@ const installShipperSetupRoute = createObservabilityOnboardingServerRoute({
     scriptDownloadUrl: string;
     elasticAgentVersion: string;
   }> {
-    const { core, plugins } = resources;
+    const { core, plugins, kibanaVersion } = resources;
     const coreStart = await core.start();
 
     const kibanaUrl =
@@ -59,7 +57,7 @@ const installShipperSetupRoute = createObservabilityOnboardingServerRoute({
     return {
       apiEndpoint,
       scriptDownloadUrl,
-      elasticAgentVersion: ELASTIC_AGENT_VERSION,
+      elasticAgentVersion: kibanaVersion,
     };
   },
 });

diff --git a/x-pack/plugins/observability_onboarding/server/routes/register_routes.ts b/x-pack/plugins/observability_onboarding/server/routes/register_routes.ts
@@ -25,6 +25,7 @@ interface RegisterRoutes {
   logger: Logger;
   plugins: ObservabilityOnboardingRouteHandlerResources['plugins'];
   config: ObservabilityOnboardingConfig;
+  kibanaVersion: string;
   services: {
     esLegacyConfigService: EsLegacyConfigService;
   };
@@ -36,6 +37,7 @@ export function registerRoutes({
   logger,
   plugins,
   config,
+  kibanaVersion,
   services,
 }: RegisterRoutes) {
   const routes = Object.values(repository);
@@ -82,6 +84,7 @@ export function registerRoutes({
               },
             },
             config,
+            kibanaVersion,
             services,
           })) as any;
 

diff --git a/x-pack/plugins/observability_onboarding/server/routes/types.ts b/x-pack/plugins/observability_onboarding/server/routes/types.ts
@@ -33,6 +33,7 @@ export interface ObservabilityOnboardingRouteHandlerResources {
     start: () => Promise<CoreStart>;
   };
   config: ObservabilityOnboardingConfig;
+  kibanaVersion: string;
   services: {
     esLegacyConfigService: EsLegacyConfigService;
   };