Compatibility with Opensearch Dashboard 2.17.1

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to the Wazuh app project will be documented in this file.
 
-## Wazuh v5.0.0 - OpenSearch Dashboards 2.16.0 - Revision 00
+## Wazuh v5.0.0 - OpenSearch Dashboards 2.17.1 - Revision 00
 
 ### Added
 

docker/imposter/wazuh-config.yml

@@ -1,6 +1,6 @@
 ---
 plugin: openapi
-specFile: https://raw.githubusercontent.com/wazuh/wazuh/master/api/api/spec/spec.yaml
+specFile: https://raw.githubusercontent.com/wazuh/wazuh/v4.9.1/api/api/spec/spec.yaml
 system:
   stores:
     # this store is preloaded from file

docker/osd-dev/dev.sh

@@ -19,6 +19,7 @@ os_versions=(
   '2.14.0'
   '2.15.0'
   '2.16.0'
+  '2.17.1'
 )
 
 osd_versions=(
@@ -40,6 +41,8 @@ osd_versions=(
   '2.14.0'
   '2.15.0'
   '2.16.0'
+  '2.17.1'
+  '2.17.1.arm'
 )
 
 wzs_version=(

docker/osd-dev/dev.yml

@@ -239,10 +239,9 @@ services:
       - ${OSD_PORT}:5601
     environment:
       - 'LOGS=/proc/1/fd/1'
-    entrypoint: ['tail', '-f', '/dev/null']
     volumes:
       - osd_cache:/home/node/.cache
-      - '${SRC}/main:/home/node/kbn/plugins/wazuh'
+      - '${SRC}/main:/home/node/kbn/plugins/main'
       - '${SRC}/wazuh-core:/home/node/kbn/plugins/wazuh-core'
       - '${SRC}/wazuh-check-updates:/home/node/kbn/plugins/wazuh-check-updates'
       - '${SRC}/wazuh-engine:/home/node/kbn/plugins/wazuh-engine'

plugins/main/package.json

@@ -3,7 +3,7 @@
   "version": "5.0.0",
   "revision": "00",
   "pluginPlatform": {
-    "version": "2.16.0"
+    "version": "2.17.1"
   },
   "description": "Wazuh dashboard",
   "keywords": [

plugins/main/public/components/agents/stats/__snapshots__/table.test.tsx.snap

@@ -445,6 +445,7 @@ exports[`AgentStatTable component Renders correctly to match the snapshot 1`] =
                 >
                   <EuiButtonContent
                     className="euiButtonEmpty__content"
+                    iconGap="m"
                     iconSide="left"
                     iconSize="m"
                     iconType="importAction"

plugins/main/public/components/common/form/__snapshots__/index.test.tsx.snap

@@ -376,7 +376,7 @@ exports[`[component] InputForm Renders correctly to match the snapshot: Input: s
 exports[`[component] InputForm Renders correctly to match the snapshot: Input: switch 1`] = `
 <div>
   <div
-    class="euiSwitch"
+    class="euiSwitch euiSwitch--primary"
   >
     <button
       aria-checked="true"

plugins/main/public/components/common/tables/__snapshots__/table-default.test.tsx.snap

@@ -208,6 +208,7 @@ exports[`Table Default component renders correctly to match the snapshot 1`] = `
                                 >
                                   <EuiButtonContent
                                     className="euiButtonEmpty__content"
+                                    iconGap="m"
                                     iconSide="right"
                                     iconSize="s"
                                     iconType="arrowDown"

plugins/main/public/components/common/tables/__snapshots__/table-with-search-bar.test.tsx.snap

@@ -505,6 +505,7 @@ exports[`Table With Search Bar component renders correctly to match the snapshot
                                         >
                                           <EuiButtonContent
                                             className="euiButtonEmpty__content"
+                                            iconGap="m"
                                             iconSide="left"
                                             iconSize="m"
                                             textProps={
@@ -716,6 +717,7 @@ exports[`Table With Search Bar component renders correctly to match the snapshot
                                 >
                                   <EuiButtonContent
                                     className="euiButtonEmpty__content"
+                                    iconGap="m"
                                     iconSide="right"
                                     iconSize="s"
                                     iconType="arrowDown"

plugins/main/public/components/common/tables/__snapshots__/table-wz-api.test.tsx.snap

@@ -324,6 +324,7 @@ exports[`Table WZ API component renders correctly to match the snapshot 1`] = `
                                           >
                                             <EuiButtonContent
                                               className="euiButtonEmpty__content"
+                                              iconGap="m"
                                               iconSide="right"
                                               iconSize="s"
                                               iconType="arrowDown"

plugins/main/public/components/common/tables/components/__snapshots__/export-table-csv.test.tsx.snap

@@ -26,6 +26,7 @@ exports[`Export Table Csv component renders correctly to match the snapshot 1`]
         >
           <EuiButtonContent
             className="euiButtonEmpty__content"
+            iconGap="m"
             iconSide="left"
             iconSize="m"
             iconType="importAction"

plugins/main/public/controllers/management/components/management/configuration/office365/components/SubscriptionTab/__snapshots__/SubscriptionTab.test.tsx.snap

@@ -134,6 +134,7 @@ exports[`SubscriptionTab component renders correctly to match the snapshot 1`] =
                             >
                               <EuiButtonContent
                                 className="euiButtonEmpty__content"
+                                iconGap="m"
                                 iconSide="left"
                                 iconSize="m"
                                 iconType="questionInCircle"

plugins/main/public/controllers/management/components/management/configuration/office365/components/api-auth-tab/__snapshots__/api-auth-tab.test.tsx.snap

@@ -139,6 +139,7 @@ exports[`ApiAuthTab component renders correctly to match the snapshot 1`] = `
                             >
                               <EuiButtonContent
                                 className="euiButtonEmpty__content"
+                                iconGap="m"
                                 iconSide="left"
                                 iconSize="m"
                                 iconType="questionInCircle"
@@ -336,6 +337,7 @@ exports[`ApiAuthTab component renders correctly to match the snapshot 1`] = `
                         >
                           <EuiButtonContent
                             className="euiButtonEmpty__content"
+                            iconGap="m"
                             iconSide="left"
                             iconSize="m"
                             textProps={
@@ -373,6 +375,7 @@ exports[`ApiAuthTab component renders correctly to match the snapshot 1`] = `
                         >
                           <EuiButtonContent
                             className="euiButtonEmpty__content"
+                            iconGap="m"
                             iconSide="left"
                             iconSize="m"
                             textProps={

plugins/main/public/controllers/management/components/management/configuration/office365/components/general-tab/__snapshots__/general-tab.test.tsx.snap

@@ -153,6 +153,7 @@ exports[`GeneralTab component renders correctly to match the snapshot 1`] = `
                             >
                               <EuiButtonContent
                                 className="euiButtonEmpty__content"
+                                iconGap="m"
                                 iconSide="left"
                                 iconSize="m"
                                 iconType="questionInCircle"

plugins/wazuh-check-updates/package.json

@@ -3,7 +3,7 @@
   "version": "5.0.0",
   "revision": "00",
   "pluginPlatform": {
-    "version": "2.16.0"
+    "version": "2.17.1"
   },
   "description": "Wazuh Check Updates",
   "private": true,

plugins/wazuh-core/package.json

@@ -3,7 +3,7 @@
   "version": "5.0.0",
   "revision": "00",
   "pluginPlatform": {
-    "version": "2.16.0"
+    "version": "2.17.1"
   },
   "description": "Wazuh Core",
   "private": true,

plugins/wazuh-engine/common/types.ts

@@ -0,0 +1,6 @@
+export enum API_UPDATES_STATUS {
+  UP_TO_DATE = 'upToDate',
+  AVAILABLE_UPDATES = 'availableUpdates',
+  DISABLED = 'disabled',
+  ERROR = 'error',
+}

plugins/wazuh-engine/package.json

@@ -3,7 +3,7 @@
   "version": "5.0.0",
   "revision": "00",
   "pluginPlatform": {
-    "version": "2.16.0"
+    "version": "2.17.1"
   },
   "description": "Wazuh Engine",
   "private": true,
@@ -22,4 +22,4 @@
     "@testing-library/user-event": "^14.5.0",
     "@types/": "testing-library/user-event"
   }
-}
+}

plugins/wazuh-engine/server/plugin-services.ts

@@ -1,7 +1,14 @@
-import { CoreStart } from 'opensearch-dashboards/server';
+import {
+  CoreStart,
+  ISavedObjectsRepository,
+} from 'opensearch-dashboards/server';
 import { createGetterSetter } from '../../../src/plugins/opensearch_dashboards_utils/common';
 import { WazuhCorePluginStart } from '../../wazuh-core/server';
 
+export const [getInternalSavedObjectsClient, setInternalSavedObjectsClient] =
+  createGetterSetter<ISavedObjectsRepository>('SavedObjectsRepository');
 export const [getCore, setCore] = createGetterSetter<CoreStart>('Core');
 export const [getWazuhCore, setWazuhCore] =
   createGetterSetter<WazuhCorePluginStart>('WazuhCore');
+export const [getWazuhCheckUpdatesServices, setWazuhCheckUpdatesServices] =
+  createGetterSetter<any>('WazuhCheckUpdatesServices');

plugins/wazuh-engine/server/services/saved-object/get-saved-object.test.ts

@@ -1,10 +1,14 @@
 import {
   getInternalSavedObjectsClient,
-  getWazuhCore,
   getWazuhCheckUpdatesServices,
 } from '../../plugin-services';
 import { getSavedObject } from './get-saved-object';
 
+jest.mock('../../plugin-services', () => ({
+  getInternalSavedObjectsClient: jest.fn(),
+  getWazuhCheckUpdatesServices: jest.fn(),
+}));
+
 const mockedGetInternalObjectsClient =
   getInternalSavedObjectsClient as jest.Mock;
 const mockedGetWazuhCheckUpdatesServices =

plugins/wazuh-engine/server/services/saved-object/set-saved-object.test.ts

@@ -1,15 +1,18 @@
 import {
   getInternalSavedObjectsClient,
-  getWazuhCore,
   getWazuhCheckUpdatesServices,
 } from '../../plugin-services';
 import { setSavedObject } from './set-saved-object';
 
+jest.mock('../../plugin-services', () => ({
+  getInternalSavedObjectsClient: jest.fn(),
+  getWazuhCheckUpdatesServices: jest.fn(),
+}));
+
 const mockedGetInternalObjectsClient =
   getInternalSavedObjectsClient as jest.Mock;
 const mockedGetWazuhCheckUpdatesServices =
   getWazuhCheckUpdatesServices as jest.Mock;
-jest.mock('../../plugin-services');
 
 describe('setSavedObject function', () => {
   afterEach(() => {

plugins/wazuh-engine/server/services/updates/get-updates.test.ts

@@ -8,16 +8,25 @@ import { API_UPDATES_STATUS } from '../../../common/types';
 import { getUpdates } from './get-updates';
 import { SAVED_OBJECT_UPDATES } from '../../../common/constants';
 
-const mockedGetSavedObject = getSavedObject as jest.Mock;
-jest.mock('../saved-object/get-saved-object');
+jest.mock('../../plugin-services', () => ({
+  getInternalSavedObjectsClient: jest.fn(),
+  getWazuhCheckUpdatesServices: jest.fn(),
+  getWazuhCore: jest.fn(),
+}));
+
+jest.mock('../saved-object/get-saved-object', () => ({
+  getSavedObject: jest.fn(),
+}));
+jest.mock('../saved-object/set-saved-object', () => ({
+  setSavedObject: jest.fn(),
+}));
 
+const mockedGetSavedObject = getSavedObject as jest.Mock;
 const mockedSetSavedObject = setSavedObject as jest.Mock;
-jest.mock('../saved-object/set-saved-object');
 
 const mockedGetWazuhCore = getWazuhCore as jest.Mock;
 const mockedGetWazuhCheckUpdatesServices =
   getWazuhCheckUpdatesServices as jest.Mock;
-jest.mock('../../plugin-services');
 
 describe('getUpdates function', () => {
   afterEach(() => {

plugins/wazuh-engine/server/services/user-preferences/get-user-preferences.test.ts

@@ -6,13 +6,17 @@ import {
   getWazuhCheckUpdatesServices,
 } from '../../plugin-services';
 
+jest.mock('../../plugin-services', () => ({
+  getInternalSavedObjectsClient: jest.fn(),
+  getWazuhCheckUpdatesServices: jest.fn(),
+}));
+
 const mockedGetSavedObject = getSavedObject as jest.Mock;
 jest.mock('../saved-object/get-saved-object');
 
 const mockedGetWazuhCore = getWazuhCore as jest.Mock;
 const mockedGetWazuhCheckUpdatesServices =
   getWazuhCheckUpdatesServices as jest.Mock;
-jest.mock('../../plugin-services');
 
 describe('getUserPreferences function', () => {
   afterEach(() => {

plugins/wazuh-engine/server/services/user-preferences/update-user-preferences.test.ts

@@ -2,21 +2,26 @@ import { updateUserPreferences } from '.';
 import { getSavedObject } from '../saved-object/get-saved-object';
 import { setSavedObject } from '../saved-object/set-saved-object';
 import { SAVED_OBJECT_USER_PREFERENCES } from '../../../common/constants';
-import {
-  getWazuhCore,
-  getWazuhCheckUpdatesServices,
-} from '../../plugin-services';
+import { getWazuhCheckUpdatesServices } from '../../plugin-services';
 
-const mockedGetSavedObject = getSavedObject as jest.Mock;
-jest.mock('../saved-object/get-saved-object');
+jest.mock('../saved-object/set-saved-object', () => ({
+  setSavedObject: jest.fn(),
+}));
+
+jest.mock('../saved-object/get-saved-object', () => ({
+  getSavedObject: jest.fn(),
+}));
 
+jest.mock('../../plugin-services', () => ({
+  getInternalSavedObjectsClient: jest.fn(),
+  getWazuhCheckUpdatesServices: jest.fn(),
+}));
+
+const mockedGetSavedObject = getSavedObject as jest.Mock;
 const mockedSetSavedObject = setSavedObject as jest.Mock;
-jest.mock('../saved-object/set-saved-object');
 
-const mockedGetWazuhCore = getWazuhCore as jest.Mock;
 const mockedGetWazuhCheckUpdatesServices =
   getWazuhCheckUpdatesServices as jest.Mock;
-jest.mock('../../plugin-services');
 
 describe('updateUserPreferences function', () => {
   afterEach(() => {

plugins/wazuh-fleet/package.json

@@ -3,7 +3,7 @@
   "version": "5.0.0",
   "revision": "00",
   "pluginPlatform": {
-    "version": "2.16.0"
+    "version": "2.17.1"
   },
   "description": "Wazuh Fleet",
   "private": true,
@@ -22,8 +22,16 @@
     "md5": "^2.3.0"
   },
   "devDependencies": {
+    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/react": "^13.0.0",
     "@testing-library/user-event": "^14.5.0",
     "@types/": "testing-library/user-event",
-    "@types/md5": "^2.3.2"
+    "@types/jest": "^29.5.14",
+    "@types/md5": "^2.3.2",
+    "@types/react": "^18.3.12",
+    "@types/react-dom": "^18.3.1",
+    "jest": "^29.7.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   }
-}
+}