From 7bc397a457e5f4fd2251ea049f1b51783b7706be Mon Sep 17 00:00:00 2001 From: Alex Ruiz Becerra Date: Mon, 20 Feb 2023 16:50:53 +0100 Subject: [PATCH 1/5] Add Wazuh metadata (version) to package.json --- package.json | 3 +++ .../src/__snapshots__/env.test.ts.snap | 8 +++++++ .../osd-config/src/config_service.test.ts | 6 +++++ packages/osd-config/src/env.test.ts | 24 +++++++++++++++++++ packages/osd-config/src/env.ts | 4 ++++ packages/osd-config/src/types.ts | 1 + src/core/public/chrome/chrome_service.tsx | 4 ++-- .../public/doc_links/doc_links_service.ts | 14 +++++++++++ .../injected_metadata_service.mock.ts | 2 ++ .../injected_metadata_service.ts | 6 +++++ src/core/public/mocks.ts | 2 ++ src/core/server/mocks.ts | 1 + .../discovery/plugin_manifest_parser.test.ts | 1 + .../discovery/plugins_discovery.test.ts | 3 +++ .../integration_tests/plugins_service.test.ts | 3 +++ .../server/plugins/plugins_service.test.ts | 3 +++ .../rendering_service.test.ts.snap | 10 ++++++++ .../server/rendering/rendering_service.tsx | 1 + src/core/server/rendering/types.ts | 1 + .../__snapshots__/template.test.tsx.snap | 20 ++++++++-------- .../server/rendering/views/template.test.tsx | 2 ++ .../routes/integration_tests/status.test.ts | 1 + 22 files changed, 108 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index b9cceb35cec3..b9cb6b110519 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,9 @@ "number": 8467, "sha": "6cb7fec4e154faa0a4a3fee4b33dfef91b9870d9" }, + "wazuh": { + "version": "4.4.0" + }, "homepage": "https://opensearch.org", "bugs": { "url": "http://github.com/opensearch-project/OpenSearch-Dashboards/issues" diff --git a/packages/osd-config/src/__snapshots__/env.test.ts.snap b/packages/osd-config/src/__snapshots__/env.test.ts.snap index 74a05672b5d0..798ab736ce57 100644 --- a/packages/osd-config/src/__snapshots__/env.test.ts.snap +++ b/packages/osd-config/src/__snapshots__/env.test.ts.snap @@ -34,6 +34,7 @@ Env { "buildSha": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "dist": false, "version": "v1", + "wazuhVersion": "4.x.x", }, "pluginSearchPaths": Array [ "/test/opensearchDashboardsRoot/src/plugins", @@ -77,6 +78,7 @@ Env { "buildSha": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "dist": false, "version": "v1", + "wazuhVersion": "4.x.x", }, "pluginSearchPaths": Array [ "/test/opensearchDashboardsRoot/src/plugins", @@ -119,6 +121,7 @@ Env { "buildSha": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "dist": false, "version": "some-version", + "wazuhVersion": "4.x.x", }, "pluginSearchPaths": Array [ "/test/opensearchDashboardsRoot/src/plugins", @@ -161,6 +164,7 @@ Env { "buildSha": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "dist": false, "version": "some-version", + "wazuhVersion": "4.x.x", }, "pluginSearchPaths": Array [ "/test/opensearchDashboardsRoot/src/plugins", @@ -203,6 +207,7 @@ Env { "buildSha": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "dist": false, "version": "some-version", + "wazuhVersion": "4.x.x", }, "pluginSearchPaths": Array [ "/test/opensearchDashboardsRoot/src/plugins", @@ -245,6 +250,7 @@ Env { "buildSha": "feature-v1-build-sha", "dist": true, "version": "v1", + "wazuhVersion": "4.x.x", }, "pluginSearchPaths": Array [ "/test/opensearchDashboardsRoot/src/plugins", @@ -287,6 +293,7 @@ Env { "buildSha": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "dist": false, "version": "v1", + "wazuhVersion": "4.x.x", }, "pluginSearchPaths": Array [ "/test/opensearchDashboardsRoot/src/plugins", @@ -329,6 +336,7 @@ Env { "buildSha": "feature-v1-build-sha", "dist": true, "version": "v1", + "wazuhVersion": "4.4.0", }, "pluginSearchPaths": Array [ "/some/home/dir/src/plugins", diff --git a/packages/osd-config/src/config_service.test.ts b/packages/osd-config/src/config_service.test.ts index 0ae49dab6015..14e012ddcaa3 100644 --- a/packages/osd-config/src/config_service.test.ts +++ b/packages/osd-config/src/config_service.test.ts @@ -48,6 +48,9 @@ const packageInfos: RawPackageInfo = { number: 42, sha: 'one', }, + wazuh: { + version: '4.4.0', + }, }; const emptyArgv = getEnvOptions(); const defaultEnv = new Env('/opensearch-dashboards', packageInfos, emptyArgv); @@ -270,6 +273,9 @@ test('correctly passes context', async () => { number: 100, sha: 'feature-v1-build-sha', }, + wazuh: { + version: '4.4.0', + }, }; const env = new Env('/opensearch-dashboards', mockPackage, getEnvOptions()); diff --git a/packages/osd-config/src/env.test.ts b/packages/osd-config/src/env.test.ts index 32febbc52eb0..b7cb3b473be1 100644 --- a/packages/osd-config/src/env.test.ts +++ b/packages/osd-config/src/env.test.ts @@ -42,6 +42,9 @@ const packageInfos: RawPackageInfo = { number: 42, sha: 'one', }, + wazuh: { + version: '4.4.0', + }, }; beforeEach(() => { @@ -52,6 +55,9 @@ test('correctly creates default environment in dev mode when isDevClusterMaster mockPackage.raw = { branch: 'some-branch', version: 'some-version', + wazuh: { + version: '4.x.x', + }, }; const defaultEnv = Env.createDefault( @@ -71,6 +77,9 @@ test('correctly creates default environment in dev mode when isDevClusterManager mockPackage.raw = { branch: 'some-branch', version: 'some-version', + wazuh: { + version: '4.x.x', + }, }; const defaultEnv = Env.createDefault( @@ -90,6 +99,9 @@ test('correctly creates default environment in dev mode when isDevClusterManager mockPackage.raw = { branch: 'some-branch', version: 'some-version', + wazuh: { + version: '4.x.x', + }, }; const defaultEnv = Env.createDefault( @@ -114,6 +126,9 @@ test('correctly creates default environment in prod distributable mode.', () => number: 100, sha: 'feature-v1-build-sha', }, + wazuh: { + version: '4.x.x', + }, }; const defaultEnv = Env.createDefault( @@ -136,6 +151,9 @@ test('correctly creates default environment in prod non-distributable mode.', () number: 100, sha: 'feature-v1-build-sha', }, + wazuh: { + version: '4.x.x', + }, }; const defaultEnv = Env.createDefault( @@ -158,6 +176,9 @@ test('correctly creates default environment if `--env.name` is supplied.', () => number: 100, sha: 'feature-v1-build-sha', }, + wazuh: { + version: '4.x.x', + }, }; const defaultDevEnv = Env.createDefault( @@ -191,6 +212,9 @@ test('correctly creates environment with constructor.', () => { number: 100, sha: 'feature-v1-build-sha', }, + wazuh: { + version: '4.4.0', + }, }, getEnvOptions({ cliArgs: { dev: false }, diff --git a/packages/osd-config/src/env.ts b/packages/osd-config/src/env.ts index e27498c341a0..e82355595e99 100644 --- a/packages/osd-config/src/env.ts +++ b/packages/osd-config/src/env.ts @@ -67,6 +67,9 @@ export interface RawPackageInfo { number: number; sha: string; }; + wazuh: { + version: string; + }; } export class Env { @@ -159,6 +162,7 @@ export class Env { : 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', version: pkg.version, dist: isOpenSearchDashboardsDistributable, + wazuhVersion: pkg.wazuh.version, }); } } diff --git a/packages/osd-config/src/types.ts b/packages/osd-config/src/types.ts index c4a82f68502b..1a0927770d08 100644 --- a/packages/osd-config/src/types.ts +++ b/packages/osd-config/src/types.ts @@ -37,6 +37,7 @@ export interface PackageInfo { buildNum: number; buildSha: string; dist: boolean; + wazuhVersion: string; } /** diff --git a/src/core/public/chrome/chrome_service.tsx b/src/core/public/chrome/chrome_service.tsx index da5cbda1c92a..2f669a5c3131 100644 --- a/src/core/public/chrome/chrome_service.tsx +++ b/src/core/public/chrome/chrome_service.tsx @@ -245,13 +245,13 @@ export class ChromeService { basePath={http.basePath} breadcrumbs$={breadcrumbs$.pipe(takeUntil(this.stop$))} customNavLink$={customNavLink$.pipe(takeUntil(this.stop$))} - opensearchDashboardsDocLink={docLinks.links.opensearchDashboards.introduction} + opensearchDashboardsDocLink={docLinks.links.wazuh.gettingStarted} forceAppSwitcherNavigation$={navLinks.getForceAppSwitcherNavigation$()} helpExtension$={helpExtension$.pipe(takeUntil(this.stop$))} helpSupportUrl$={helpSupportUrl$.pipe(takeUntil(this.stop$))} homeHref={http.basePath.prepend('/app/home')} isVisible$={this.isVisible$} - opensearchDashboardsVersion={injectedMetadata.getOpenSearchDashboardsVersion()} + opensearchDashboardsVersion={injectedMetadata.getWazuhVersion()} navLinks$={navLinks.getNavLinks$()} recentlyAccessed$={recentlyAccessed.get$()} navControlsLeft$={navControls.getLeft$()} diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts index 7ef85a3f1de1..62fad4a224c8 100644 --- a/src/core/public/doc_links/doc_links_service.ts +++ b/src/core/public/doc_links/doc_links_service.ts @@ -48,10 +48,20 @@ export class DocLinksService { const OPENSEARCH_VERSIONED_DOCS = `${OPENSEARCH_WEBSITE_DOCS}/opensearch/`; const OPENSEARCH_DASHBOARDS_VERSIONED_DOCS = `${OPENSEARCH_WEBSITE_DOCS}/dashboards/`; + // - Note .- Using the getting-started link instead of the index link + // because the index link is inconsistent with older versions. + // https://documentation.wazuh.com/current/getting-started/index.html + const WAZUH_LINK_VERSION = injectedMetadata.getWazuhVersion().slice(0, 3) || 'current'; + const WAZUH_WEBSITE_DOCS = `https://documentation.wazuh.com/${WAZUH_LINK_VERSION}/getting-started/index.html`; + return deepFreeze({ DOC_LINK_VERSION, OPENSEARCH_WEBSITE_URL, + WAZUH_LINK_VERSION, links: { + wazuh: { + gettingStarted: WAZUH_WEBSITE_DOCS, + }, opensearch: { // https://opensearch.org/docs/latest/opensearch/index/ introduction: `${OPENSEARCH_VERSIONED_DOCS}index/`, @@ -552,7 +562,11 @@ export class DocLinksService { export interface DocLinksStart { readonly DOC_LINK_VERSION: string; readonly OPENSEARCH_WEBSITE_URL: string; + readonly WAZUH_LINK_VERSION: string; readonly links: { + readonly wazuh: { + readonly gettingStarted: string; + }; readonly opensearch: { readonly introduction: string; readonly installation: { diff --git a/src/core/public/injected_metadata/injected_metadata_service.mock.ts b/src/core/public/injected_metadata/injected_metadata_service.mock.ts index c585c86ba603..1c275938525c 100644 --- a/src/core/public/injected_metadata/injected_metadata_service.mock.ts +++ b/src/core/public/injected_metadata/injected_metadata_service.mock.ts @@ -45,6 +45,7 @@ const createSetupContractMock = () => { getInjectedVars: jest.fn(), getOpenSearchDashboardsBuildNumber: jest.fn(), getBranding: jest.fn(), + getWazuhVersion: jest.fn(), }; setupContract.getCspConfig.mockReturnValue({ warnLegacyBrowsers: true }); setupContract.getOpenSearchDashboardsVersion.mockReturnValue('opensearchDashboardsVersion'); @@ -61,6 +62,7 @@ const createSetupContractMock = () => { }, } as any); setupContract.getPlugins.mockReturnValue([]); + setupContract.getWazuhVersion.mockReturnValue('4.x.x'); return setupContract; }; diff --git a/src/core/public/injected_metadata/injected_metadata_service.ts b/src/core/public/injected_metadata/injected_metadata_service.ts index 0bbf4549dd01..7341f10ed9ff 100644 --- a/src/core/public/injected_metadata/injected_metadata_service.ts +++ b/src/core/public/injected_metadata/injected_metadata_service.ts @@ -53,6 +53,7 @@ export interface InjectedMetadataParams { version: string; buildNumber: number; branch: string; + wazuhVersion: string; basePath: string; serverBasePath: string; category?: AppCategory; @@ -146,6 +147,10 @@ export class InjectedMetadataService { getBranding: () => { return this.state.branding; }, + + getWazuhVersion: () => { + return this.state.wazuhVersion; + }, }; } } @@ -180,6 +185,7 @@ export interface InjectedMetadataSetup { [key: string]: unknown; }; getBranding: () => Branding; + getWazuhVersion: () => string; } /** @internal */ diff --git a/src/core/public/mocks.ts b/src/core/public/mocks.ts index e863d627c801..98dc5a60e05e 100644 --- a/src/core/public/mocks.ts +++ b/src/core/public/mocks.ts @@ -126,6 +126,7 @@ function pluginInitializerContextMock() { buildNum: 100, buildSha: 'buildSha', dist: false, + wazuhVersion: 'wazuhVersion', }, }, config: { @@ -151,6 +152,7 @@ function createCoreContext(): CoreContext { buildNum: 100, buildSha: 'buildSha', dist: false, + wazuhVersion: 'wazuhVersion', }, }, }; diff --git a/src/core/server/mocks.ts b/src/core/server/mocks.ts index 3dd289669a01..4d19acf8d1c5 100644 --- a/src/core/server/mocks.ts +++ b/src/core/server/mocks.ts @@ -113,6 +113,7 @@ function pluginInitializerContextMock(config: T = {} as T) { buildNum: 100, buildSha: 'buildSha', dist: false, + wazuhVersion: 'wazuhVersion', }, instanceUuid: 'instance-uuid', }, diff --git a/src/core/server/plugins/discovery/plugin_manifest_parser.test.ts b/src/core/server/plugins/discovery/plugin_manifest_parser.test.ts index 6103b2d748b6..8d006710fffd 100644 --- a/src/core/server/plugins/discovery/plugin_manifest_parser.test.ts +++ b/src/core/server/plugins/discovery/plugin_manifest_parser.test.ts @@ -45,6 +45,7 @@ const packageInfo = { buildSha: '', version: '7.0.0-alpha1', dist: false, + wazuhVersion: '4.0.0', }; afterEach(() => { diff --git a/src/core/server/plugins/discovery/plugins_discovery.test.ts b/src/core/server/plugins/discovery/plugins_discovery.test.ts index 550acaf3f4f3..adf67dc7dfa5 100644 --- a/src/core/server/plugins/discovery/plugins_discovery.test.ts +++ b/src/core/server/plugins/discovery/plugins_discovery.test.ts @@ -82,6 +82,9 @@ const packageMock = { number: 1, sha: '', }, + wazuh: { + version: '4.x.x', + }, }; const manifestPath = (...pluginPath: string[]) => diff --git a/src/core/server/plugins/integration_tests/plugins_service.test.ts b/src/core/server/plugins/integration_tests/plugins_service.test.ts index 34310ea3de37..2fb87922b4a2 100644 --- a/src/core/server/plugins/integration_tests/plugins_service.test.ts +++ b/src/core/server/plugins/integration_tests/plugins_service.test.ts @@ -103,6 +103,9 @@ describe('PluginsService', () => { number: 100, sha: 'feature-v1-build-sha', }, + wazuh: { + version: '4.x.x', + }, }; const env = Env.createDefault(REPO_ROOT, getEnvOptions()); diff --git a/src/core/server/plugins/plugins_service.test.ts b/src/core/server/plugins/plugins_service.test.ts index b020e56539a7..54ad16012949 100644 --- a/src/core/server/plugins/plugins_service.test.ts +++ b/src/core/server/plugins/plugins_service.test.ts @@ -125,6 +125,9 @@ describe('PluginsService', () => { number: 100, sha: 'feature-v1-build-sha', }, + wazuh: { + version: '4.x.x', + }, }; coreId = Symbol('core'); diff --git a/src/core/server/rendering/__snapshots__/rendering_service.test.ts.snap b/src/core/server/rendering/__snapshots__/rendering_service.test.ts.snap index 6e936484c2db..1a03f0b49b91 100644 --- a/src/core/server/rendering/__snapshots__/rendering_service.test.ts.snap +++ b/src/core/server/rendering/__snapshots__/rendering_service.test.ts.snap @@ -30,6 +30,7 @@ Object { "buildSha": Any, "dist": Any, "version": Any, + "wazuhVersion": "4.4.0", }, }, "i18n": Object { @@ -49,6 +50,7 @@ Object { "uiPlugins": Array [], "vars": Object {}, "version": Any, + "wazuhVersion": "4.4.0", } `; @@ -82,6 +84,7 @@ Object { "buildSha": Any, "dist": Any, "version": Any, + "wazuhVersion": "4.4.0", }, }, "i18n": Object { @@ -101,6 +104,7 @@ Object { "uiPlugins": Array [], "vars": Object {}, "version": Any, + "wazuhVersion": "4.4.0", } `; @@ -134,6 +138,7 @@ Object { "buildSha": Any, "dist": Any, "version": Any, + "wazuhVersion": "4.4.0", }, }, "i18n": Object { @@ -157,6 +162,7 @@ Object { "uiPlugins": Array [], "vars": Object {}, "version": Any, + "wazuhVersion": "4.4.0", } `; @@ -190,6 +196,7 @@ Object { "buildSha": Any, "dist": Any, "version": Any, + "wazuhVersion": "4.4.0", }, }, "i18n": Object { @@ -209,6 +216,7 @@ Object { "uiPlugins": Array [], "vars": Object {}, "version": Any, + "wazuhVersion": "4.4.0", } `; @@ -242,6 +250,7 @@ Object { "buildSha": Any, "dist": Any, "version": Any, + "wazuhVersion": "4.4.0", }, }, "i18n": Object { @@ -261,5 +270,6 @@ Object { "uiPlugins": Array [], "vars": Object {}, "version": Any, + "wazuhVersion": "4.4.0", } `; diff --git a/src/core/server/rendering/rendering_service.tsx b/src/core/server/rendering/rendering_service.tsx index 2362be550078..0a47640ec605 100644 --- a/src/core/server/rendering/rendering_service.tsx +++ b/src/core/server/rendering/rendering_service.tsx @@ -115,6 +115,7 @@ export class RenderingService { version: env.packageInfo.version, buildNumber: env.packageInfo.buildNum, branch: env.packageInfo.branch, + wazuhVersion: env.packageInfo.wazuhVersion, basePath, serverBasePath, env, diff --git a/src/core/server/rendering/types.ts b/src/core/server/rendering/types.ts index 79b016329f76..fc6922de886c 100644 --- a/src/core/server/rendering/types.ts +++ b/src/core/server/rendering/types.ts @@ -50,6 +50,7 @@ export interface RenderingMetadata { version: string; buildNumber: number; branch: string; + wazuhVersion: string; basePath: string; serverBasePath: string; env: { diff --git a/src/core/server/rendering/views/__snapshots__/template.test.tsx.snap b/src/core/server/rendering/views/__snapshots__/template.test.tsx.snap index 12cea1e9b430..c19932bd37ad 100644 --- a/src/core/server/rendering/views/__snapshots__/template.test.tsx.snap +++ b/src/core/server/rendering/views/__snapshots__/template.test.tsx.snap @@ -64,7 +64,7 @@ Array [ data="{\\"strictCsp\\":true}" />, ,
, ,
, ,
, ,
, ,
, ,
, ,
, ,
, ,
, ,
{ buildSha: 'xsha', dist: true, version: '9.9.9-SNAPSHOT', + wazuhVersion: '4.2.0', }, serverName: 'xopensearchDashboards', uuid: 'xxxx-xxxxx', From c97bd49aafa20db4531381c35069553c4c13e58d Mon Sep 17 00:00:00 2001 From: Alex Ruiz Becerra Date: Mon, 20 Feb 2023 18:06:48 +0100 Subject: [PATCH 2/5] Refactor the generation of Wazuh doc links --- src/core/public/chrome/chrome_service.tsx | 2 +- src/core/public/doc_links/doc_links_service.ts | 16 ++++++---------- .../injected_metadata_service.mock.ts | 2 ++ .../injected_metadata_service.ts | 5 +++++ 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/core/public/chrome/chrome_service.tsx b/src/core/public/chrome/chrome_service.tsx index 2f669a5c3131..82790e842700 100644 --- a/src/core/public/chrome/chrome_service.tsx +++ b/src/core/public/chrome/chrome_service.tsx @@ -245,7 +245,7 @@ export class ChromeService { basePath={http.basePath} breadcrumbs$={breadcrumbs$.pipe(takeUntil(this.stop$))} customNavLink$={customNavLink$.pipe(takeUntil(this.stop$))} - opensearchDashboardsDocLink={docLinks.links.wazuh.gettingStarted} + opensearchDashboardsDocLink={docLinks.links.wazuh.index} forceAppSwitcherNavigation$={navLinks.getForceAppSwitcherNavigation$()} helpExtension$={helpExtension$.pipe(takeUntil(this.stop$))} helpSupportUrl$={helpSupportUrl$.pipe(takeUntil(this.stop$))} diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts index 62fad4a224c8..c7cb07de278e 100644 --- a/src/core/public/doc_links/doc_links_service.ts +++ b/src/core/public/doc_links/doc_links_service.ts @@ -47,20 +47,16 @@ export class DocLinksService { const OPENSEARCH_WEBSITE_DOCS = `${OPENSEARCH_WEBSITE_URL}docs/${DOC_LINK_VERSION}`; const OPENSEARCH_VERSIONED_DOCS = `${OPENSEARCH_WEBSITE_DOCS}/opensearch/`; const OPENSEARCH_DASHBOARDS_VERSIONED_DOCS = `${OPENSEARCH_WEBSITE_DOCS}/dashboards/`; - - // - Note .- Using the getting-started link instead of the index link - // because the index link is inconsistent with older versions. - // https://documentation.wazuh.com/current/getting-started/index.html - const WAZUH_LINK_VERSION = injectedMetadata.getWazuhVersion().slice(0, 3) || 'current'; - const WAZUH_WEBSITE_DOCS = `https://documentation.wazuh.com/${WAZUH_LINK_VERSION}/getting-started/index.html`; + const WAZUH_DOC_VERSION = injectedMetadata.getWazuhDocVersion(); + const WAZUH_WEBSITE_DOCS = `https://documentation.wazuh.com/${WAZUH_DOC_VERSION}`; return deepFreeze({ DOC_LINK_VERSION, OPENSEARCH_WEBSITE_URL, - WAZUH_LINK_VERSION, + WAZUH_DOC_VERSION, links: { wazuh: { - gettingStarted: WAZUH_WEBSITE_DOCS, + index: `${WAZUH_WEBSITE_DOCS}/index.html`, }, opensearch: { // https://opensearch.org/docs/latest/opensearch/index/ @@ -562,10 +558,10 @@ export class DocLinksService { export interface DocLinksStart { readonly DOC_LINK_VERSION: string; readonly OPENSEARCH_WEBSITE_URL: string; - readonly WAZUH_LINK_VERSION: string; + readonly WAZUH_DOC_VERSION: string; readonly links: { readonly wazuh: { - readonly gettingStarted: string; + readonly index: string; }; readonly opensearch: { readonly introduction: string; diff --git a/src/core/public/injected_metadata/injected_metadata_service.mock.ts b/src/core/public/injected_metadata/injected_metadata_service.mock.ts index 1c275938525c..62cfb6a689e3 100644 --- a/src/core/public/injected_metadata/injected_metadata_service.mock.ts +++ b/src/core/public/injected_metadata/injected_metadata_service.mock.ts @@ -46,6 +46,7 @@ const createSetupContractMock = () => { getOpenSearchDashboardsBuildNumber: jest.fn(), getBranding: jest.fn(), getWazuhVersion: jest.fn(), + getWazuhDocVersion: jest.fn(), }; setupContract.getCspConfig.mockReturnValue({ warnLegacyBrowsers: true }); setupContract.getOpenSearchDashboardsVersion.mockReturnValue('opensearchDashboardsVersion'); @@ -63,6 +64,7 @@ const createSetupContractMock = () => { } as any); setupContract.getPlugins.mockReturnValue([]); setupContract.getWazuhVersion.mockReturnValue('4.x.x'); + setupContract.getWazuhDocVersion.mockReturnValue('4.x'); return setupContract; }; diff --git a/src/core/public/injected_metadata/injected_metadata_service.ts b/src/core/public/injected_metadata/injected_metadata_service.ts index 7341f10ed9ff..7566dc31a435 100644 --- a/src/core/public/injected_metadata/injected_metadata_service.ts +++ b/src/core/public/injected_metadata/injected_metadata_service.ts @@ -151,6 +151,10 @@ export class InjectedMetadataService { getWazuhVersion: () => { return this.state.wazuhVersion; }, + + getWazuhDocVersion: () => { + return this.state.wazuhVersion.slice(0, 3) || 'current'; + }, }; } } @@ -186,6 +190,7 @@ export interface InjectedMetadataSetup { }; getBranding: () => Branding; getWazuhVersion: () => string; + getWazuhDocVersion: () => string; } /** @internal */ From 1bcad0aa5d89cf812bc49a181b3925e64af5f6de Mon Sep 17 00:00:00 2001 From: yenienserrano Date: Tue, 18 Apr 2023 12:52:09 +0200 Subject: [PATCH 3/5] Change support links --- src/core/public/chrome/constants.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/core/public/chrome/constants.ts b/src/core/public/chrome/constants.ts index 55b9cd31c1fa..2fa80237566e 100644 --- a/src/core/public/chrome/constants.ts +++ b/src/core/public/chrome/constants.ts @@ -28,7 +28,6 @@ * under the License. */ -export const OPENSEARCH_DASHBOARDS_FEEDBACK_LINK = 'https://github.com/opensearch-project'; -export const OPENSEARCH_DASHBOARDS_ASK_OPENSEARCH_LINK = 'https://github.com/opensearch-project'; -export const GITHUB_CREATE_ISSUE_LINK = - 'https://github.com/opensearch-project/OpenSearch-Dashboards/issues/new/choose'; +export const OPENSEARCH_DASHBOARDS_FEEDBACK_LINK = 'https://wazuh.com/community/join-us-on-slack'; +export const OPENSEARCH_DASHBOARDS_ASK_OPENSEARCH_LINK = OPENSEARCH_DASHBOARDS_FEEDBACK_LINK; +export const GITHUB_CREATE_ISSUE_LINK = 'https://github.com/wazuh/wazuh/issues/new/choose'; From cdcdd4116d2dd0bc04fbf482fb913b3aea702539 Mon Sep 17 00:00:00 2001 From: yenienserrano Date: Tue, 18 Apr 2023 13:03:11 +0200 Subject: [PATCH 4/5] Change Opensearch Dashboard documentation to Wazuh documentation --- src/core/public/chrome/ui/header/header_help_menu.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/public/chrome/ui/header/header_help_menu.tsx b/src/core/public/chrome/ui/header/header_help_menu.tsx index 6af111a4b8f1..ed5df621b424 100644 --- a/src/core/public/chrome/ui/header/header_help_menu.tsx +++ b/src/core/public/chrome/ui/header/header_help_menu.tsx @@ -206,7 +206,7 @@ class HeaderHelpMenuUI extends Component { From bc0c0fedf5f247d5d9b26ffee93d81a4291b3354 Mon Sep 17 00:00:00 2001 From: Alex Ruiz Becerra Date: Wed, 19 Apr 2023 16:55:07 +0200 Subject: [PATCH 5/5] Add Wazuh version to the production package.json --- src/dev/build/lib/config.ts | 1 + src/dev/build/tasks/create_package_json_task.ts | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/dev/build/lib/config.ts b/src/dev/build/lib/config.ts index 4f47a5ec8f50..9039d58048aa 100644 --- a/src/dev/build/lib/config.ts +++ b/src/dev/build/lib/config.ts @@ -54,6 +54,7 @@ interface Package { workspaces: { packages: string[]; }; + wazuh: { version: string }; [key: string]: unknown; } diff --git a/src/dev/build/tasks/create_package_json_task.ts b/src/dev/build/tasks/create_package_json_task.ts index 8f9b41738eea..7b8d2a311a0b 100644 --- a/src/dev/build/tasks/create_package_json_task.ts +++ b/src/dev/build/tasks/create_package_json_task.ts @@ -51,6 +51,9 @@ export const CreatePackageJson: Task = { distributable: true, release: config.isRelease, }, + wazuh: { + version: pkg.wazuh.version, + }, repository: pkg.repository, engines: { node: pkg.engines.node,