Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Logs onboarding] Align elastic-agent version with stackVersion #162622

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions x-pack/plugins/observability_onboarding/server/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ export class ObservabilityOnboardingPlugin
repository: getObservabilityOnboardingServerRouteRepository(),
plugins: resourcePlugins,
config,
kibanaVersion: this.initContext.env.packageInfo.version,
services: {
esLegacyConfigService: this.esLegacyConfigService,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [] },
Expand Down Expand Up @@ -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 =
Expand All @@ -59,7 +57,7 @@ const installShipperSetupRoute = createObservabilityOnboardingServerRoute({
return {
apiEndpoint,
scriptDownloadUrl,
elasticAgentVersion: ELASTIC_AGENT_VERSION,
elasticAgentVersion: kibanaVersion,
};
},
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ interface RegisterRoutes {
logger: Logger;
plugins: ObservabilityOnboardingRouteHandlerResources['plugins'];
config: ObservabilityOnboardingConfig;
kibanaVersion: string;
services: {
esLegacyConfigService: EsLegacyConfigService;
};
Expand All @@ -36,6 +37,7 @@ export function registerRoutes({
logger,
plugins,
config,
kibanaVersion,
services,
}: RegisterRoutes) {
const routes = Object.values(repository);
Expand Down Expand Up @@ -82,6 +84,7 @@ export function registerRoutes({
},
},
config,
kibanaVersion,
services,
})) as any;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ export interface ObservabilityOnboardingRouteHandlerResources {
start: () => Promise<CoreStart>;
};
config: ObservabilityOnboardingConfig;
kibanaVersion: string;
services: {
esLegacyConfigService: EsLegacyConfigService;
};
Expand Down