github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Onboarding] Fix bash script URL in the quickstart snippet (#183596)

Browse source 
Fixes https://github.com/elastic/kibana/issues/183594

Add logic to take into account absolute CDN URLs when generating bash
script download link.
This commit is contained in:
Mykola Harmash 2024-05-17 12:15:36 +02:00 • committed by GitHub
parent b0f8ee7f5e
commit 297b5bd557
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
x-pack/plugins/observability_solution/observability_onboarding/server/routes/logs/route.ts
View file

@ -58,12 +58,12 @@ const installShipperSetupRoute = createObservabilityOnboardingServerRoute({
core.setup.http.basePath.publicBaseUrl ?? // priority given to server.publicBaseUrl
plugins.cloud?.setup?.kibanaUrl ?? // then cloud id
getFallbackKibanaUrl(coreStart); // falls back to local network binding
const installScriptPath = coreStart.http.staticAssets.getPluginAssetHref(
'standalone_agent_setup.sh'
);
const scriptDownloadUrl = new URL(
coreStart.http.staticAssets.getPluginAssetHref('standalone_agent_setup.sh'),
kibanaUrl
).toString();
const scriptDownloadUrl = `${kibanaUrl}${installScriptPath}`;
const apiEndpoint = `${kibanaUrl}/internal/observability_onboarding`;
const apiEndpoint = new URL(`${kibanaUrl}/internal/observability_onboarding`).toString();
return {
apiEndpoint,

4
x-pack/test/observability_onboarding_api_integration/configs/index.ts
View file

@ -8,11 +8,11 @@
import { mapValues } from 'lodash';
import { createTestConfig, CreateTestConfig } from '../common/config';
export const MOCKED_PUBLIC_BASE_URL = 'http://mockedPublicBaseUrl';
export const MOCKED_PUBLIC_BASE_URL = 'http://mockedpublicbaseurl';
// my.mocked.domain$myMockedEsUr$myKibanaMockedUrl
export const MOCKED_ENCODED_CLOUD_ID =
'bXkubW9ja2VkLmRvbWFpbiRteU1vY2tlZEVzVXJsJG15TW9ja2VkS2liYW5hVXJs';
export const MOCKED_KIBANA_URL = 'https://myMockedKibanaUrl.my.mocked.domain:443';
export const MOCKED_KIBANA_URL = 'https://mymockedkibanaurl.my.mocked.domain';
export const observabilityOnboardingDebugLogger = {
name: 'plugins.observabilityOnboarding',

6
x-pack/test/observability_onboarding_api_integration/tests/logs/environment.spec.ts
View file

@ -29,7 +29,8 @@ export default function ApiTest({ getService }: FtrProviderContext) {
);
expect(request.body.scriptDownloadUrl).to.match(
new RegExp(
`${MOCKED_PUBLIC_BASE_URL}/.+?/plugins/observabilityOnboarding/assets/standalone_agent_setup.sh`
`${MOCKED_PUBLIC_BASE_URL}/.+?/plugins/observabilityOnboarding/assets/standalone_agent_setup.sh`,
'i'
)
);
});
@ -45,7 +46,8 @@ export default function ApiTest({ getService }: FtrProviderContext) {
);
expect(request.body.scriptDownloadUrl).to.match(
new RegExp(
`${MOCKED_KIBANA_URL}/.+?/plugins/observabilityOnboarding/assets/standalone_agent_setup.sh`
`${MOCKED_KIBANA_URL}/.+?/plugins/observabilityOnboarding/assets/standalone_agent_setup.sh`,
'i'
)
);
});