Merge pull request #27 from wazuh/18-add-wazuh-metadata

Add Wazuh version and links
wazuh · Apr 27, 2023 · fc05131 · fc05131
2 parents 9e1c1ec + f94e06d
commit fc05131
Show file tree

Hide file tree

Showing 26 changed files with 119 additions and 17 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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.index}
           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/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';
diff --git 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<Props, State> {
         <EuiButtonEmpty href={opensearchDashboardsDocLink} target="_blank" size="xs" flush="left">
           <FormattedMessage
             id="core.ui.chrome.headerGlobalNav.helpMenuOpenSearchDashboardsDocumentationTitle"
-            defaultMessage="OpenSearch Dashboards documentation"
+            defaultMessage="Wazuh documentation"
           />
         </EuiButtonEmpty>
 

diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts
@@ -47,11 +47,17 @@ 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/`;
+    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_DOC_VERSION,
       links: {
+        wazuh: {
+          index: `${WAZUH_WEBSITE_DOCS}/index.html`,
+        },
         opensearch: {
           // https://opensearch.org/docs/latest/opensearch/index/
           introduction: `${OPENSEARCH_VERSIONED_DOCS}index/`,
@@ -552,7 +558,11 @@ export class DocLinksService {
 export interface DocLinksStart {
   readonly DOC_LINK_VERSION: string;
   readonly OPENSEARCH_WEBSITE_URL: string;
+  readonly WAZUH_DOC_VERSION: string;
   readonly links: {
+    readonly wazuh: {
+      readonly index: 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
@@ -45,6 +45,8 @@ const createSetupContractMock = () => {
     getInjectedVars: jest.fn(),
     getOpenSearchDashboardsBuildNumber: jest.fn(),
     getBranding: jest.fn(),
+    getWazuhVersion: jest.fn(),
+    getWazuhDocVersion: jest.fn(),
   };
   setupContract.getCspConfig.mockReturnValue({ warnLegacyBrowsers: true });
   setupContract.getOpenSearchDashboardsVersion.mockReturnValue('opensearchDashboardsVersion');
@@ -61,6 +63,8 @@ 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
@@ -53,6 +53,7 @@ export interface InjectedMetadataParams {
     version: string;
     buildNumber: number;
     branch: string;
+    wazuhVersion: string;
     basePath: string;
     serverBasePath: string;
     category?: AppCategory;
@@ -146,6 +147,14 @@ export class InjectedMetadataService {
       getBranding: () => {
         return this.state.branding;
       },
+
+      getWazuhVersion: () => {
+        return this.state.wazuhVersion;
+      },
+
+      getWazuhDocVersion: () => {
+        return this.state.wazuhVersion.slice(0, 3) || 'current';
+      },
     };
   }
 }
@@ -180,6 +189,8 @@ export interface InjectedMetadataSetup {
     [key: string]: unknown;
   };
   getBranding: () => Branding;
+  getWazuhVersion: () => string;
+  getWazuhDocVersion: () => string;
 }
 
 /** @internal */

diff --git 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
@@ -113,6 +113,7 @@ function pluginInitializerContextMock<T>(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
@@ -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
@@ -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
@@ -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
@@ -125,6 +125,9 @@ describe('PluginsService', () => {
         number: 100,
         sha: 'feature-v1-build-sha',
       },
+      wazuh: {
+        version: '4.x.x',
+      },
     };
 
     coreId = Symbol('core');