merge: merge 4.11.0 into 4.12.0

wazuh · Jan 10, 2025 · bad946b · bad946b
2 parents f482c38 + 21207c4
commit bad946b
Show file tree

Hide file tree

Showing 9 changed files with 392 additions and 157 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,7 +30,13 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Refined the layout of the agent details view [#7193](https://github.com/wazuh/wazuh-dashboard-plugins/issues/7193)
 - Changed the width of the command column, relocate argvs column and change the width of the rest of the columns in the table processes. [#7195](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7195)
 
-## Wazuh v4.10.0 - OpenSearch Dashboards 2.16.0 - Revision 06
+## Wazuh v4.10.1 - OpenSearch Dashboards 2.16.0 - Revision 00
+
+### Added
+
+- Support for Wazuh 4.10.1
+
+## Wazuh v4.10.0 - OpenSearch Dashboards 2.16.0 - Revision 08
 
 ### Added
 
@@ -74,12 +80,13 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Fixed the Mitre ATT&CK exception in the agent view, the redirections of ID, Tactics, Dashboard Icon and Event Icon in the drop-down menu and the card not displaying information when the flyout was opened [#7116](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7116)
 - Fixed the filter are displayed cropped on screens of 575px to 767px in vulnerability detection module [#7047](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7047)
 - Fixed ability to filter from files inventory details flyout of File Integrity Monitoring [#7119](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7119) [#7163](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7163)
-- Fixed endpoint group module name and indexer management order [#7150](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7150)
+- Fixed endpoint group module name and indexer management order [#7161](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7161)
 - Fixed Invalid date filter applied on FIM details flyout [#7160](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7160)
 - Fixed the check updates UI was displayed despite it could be configured as disabled [#7156](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7156)
 - Fixed filter by value in document details in safari [#7151](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7151)
 - Fixed error message to prevent pass no strings to the wazuh logger [#7167](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7167)
 - Fixed the rendering of the `data.vunerability.reference` in the table and flyout [#7177](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7177)
+- Fixed incorrect or empty Wazuh API version displayed after upgrade [#440](https://github.com/wazuh/wazuh-dashboard/issues/440)
 
 ### Removed
 

diff --git a/...ns/main/public/components/common/tables/__snapshots__/table-with-search-bar.test.tsx.snap b/...ns/main/public/components/common/tables/__snapshots__/table-with-search-bar.test.tsx.snap
@@ -110,7 +110,7 @@ exports[`Table With Search Bar component renders correctly to match the snapshot
               <EuiSpacer />
               <div>
                 <EuiLink
-                  href="https://documentation.wazuh.com/4.10/user-manual/wazuh-dashboard/queries.html"
+                  href="https://documentation.wazuh.com/4.11/user-manual/wazuh-dashboard/queries.html"
                   rel="noopener noreferrer"
                   target="__blank"
                 >
@@ -179,7 +179,7 @@ exports[`Table With Search Bar component renders correctly to match the snapshot
                   <EuiSpacer />
                   <div>
                     <EuiLink
-                      href="https://documentation.wazuh.com/4.10/user-manual/wazuh-dashboard/queries.html"
+                      href="https://documentation.wazuh.com/4.11/user-manual/wazuh-dashboard/queries.html"
                       rel="noopener noreferrer"
                       target="__blank"
                     >
@@ -259,7 +259,7 @@ exports[`Table With Search Bar component renders correctly to match the snapshot
                             <EuiSpacer />
                             <div>
                               <EuiLink
-                                href="https://documentation.wazuh.com/4.10/user-manual/wazuh-dashboard/queries.html"
+                                href="https://documentation.wazuh.com/4.11/user-manual/wazuh-dashboard/queries.html"
                                 rel="noopener noreferrer"
                                 target="__blank"
                               >
@@ -369,7 +369,7 @@ exports[`Table With Search Bar component renders correctly to match the snapshot
                                       <EuiSpacer />
                                       <div>
                                         <EuiLink
-                                          href="https://documentation.wazuh.com/4.10/user-manual/wazuh-dashboard/queries.html"
+                                          href="https://documentation.wazuh.com/4.11/user-manual/wazuh-dashboard/queries.html"
                                           rel="noopener noreferrer"
                                           target="__blank"
                                         >
@@ -435,7 +435,7 @@ exports[`Table With Search Bar component renders correctly to match the snapshot
                                         <EuiSpacer />
                                         <div>
                                           <EuiLink
-                                            href="https://documentation.wazuh.com/4.10/user-manual/wazuh-dashboard/queries.html"
+                                            href="https://documentation.wazuh.com/4.11/user-manual/wazuh-dashboard/queries.html"
                                             rel="noopener noreferrer"
                                             target="__blank"
                                           >

diff --git a/...guration/office365/components/SubscriptionTab/__snapshots__/SubscriptionTab.test.tsx.snap b/...guration/office365/components/SubscriptionTab/__snapshots__/SubscriptionTab.test.tsx.snap
@@ -36,11 +36,11 @@ exports[`SubscriptionTab component renders correctly to match the snapshot 1`] =
     help={
       Array [
         Object {
-          "href": "https://documentation.wazuh.com/4.10/cloud-security/office365/index.html",
+          "href": "https://documentation.wazuh.com/4.11/cloud-security/office365/index.html",
           "text": "Monitoring Office 365",
         },
         Object {
-          "href": "https://documentation.wazuh.com/4.10/user-manual/reference/ossec-conf/office365-module.html",
+          "href": "https://documentation.wazuh.com/4.11/user-manual/reference/ossec-conf/office365-module.html",
           "text": "Configuration options for the module",
         },
       ]
@@ -87,11 +87,11 @@ exports[`SubscriptionTab component renders correctly to match the snapshot 1`] =
                     links={
                       Array [
                         Object {
-                          "href": "https://documentation.wazuh.com/4.10/cloud-security/office365/index.html",
+                          "href": "https://documentation.wazuh.com/4.11/cloud-security/office365/index.html",
                           "text": "Monitoring Office 365",
                         },
                         Object {
-                          "href": "https://documentation.wazuh.com/4.10/user-manual/reference/ossec-conf/office365-module.html",
+                          "href": "https://documentation.wazuh.com/4.11/user-manual/reference/ossec-conf/office365-module.html",
                           "text": "Configuration options for the module",
                         },
                       ]

diff --git a/.../configuration/office365/components/api-auth-tab/__snapshots__/api-auth-tab.test.tsx.snap b/.../configuration/office365/components/api-auth-tab/__snapshots__/api-auth-tab.test.tsx.snap
@@ -41,11 +41,11 @@ exports[`ApiAuthTab component renders correctly to match the snapshot 1`] = `
     help={
       Array [
         Object {
-          "href": "https://documentation.wazuh.com/4.10/cloud-security/office365/index.html",
+          "href": "https://documentation.wazuh.com/4.11/cloud-security/office365/index.html",
           "text": "Monitoring Office 365",
         },
         Object {
-          "href": "https://documentation.wazuh.com/4.10/user-manual/reference/ossec-conf/office365-module.html",
+          "href": "https://documentation.wazuh.com/4.11/user-manual/reference/ossec-conf/office365-module.html",
           "text": "Configuration options for the module",
         },
       ]
@@ -92,11 +92,11 @@ exports[`ApiAuthTab component renders correctly to match the snapshot 1`] = `
                     links={
                       Array [
                         Object {
-                          "href": "https://documentation.wazuh.com/4.10/cloud-security/office365/index.html",
+                          "href": "https://documentation.wazuh.com/4.11/cloud-security/office365/index.html",
                           "text": "Monitoring Office 365",
                         },
                         Object {
-                          "href": "https://documentation.wazuh.com/4.10/user-manual/reference/ossec-conf/office365-module.html",
+                          "href": "https://documentation.wazuh.com/4.11/user-manual/reference/ossec-conf/office365-module.html",
                           "text": "Configuration options for the module",
                         },
                       ]

diff --git a/...nt/configuration/office365/components/general-tab/__snapshots__/general-tab.test.tsx.snap b/...nt/configuration/office365/components/general-tab/__snapshots__/general-tab.test.tsx.snap
@@ -37,11 +37,11 @@ exports[`GeneralTab component renders correctly to match the snapshot 1`] = `
     help={
       Array [
         Object {
-          "href": "https://documentation.wazuh.com/4.10/cloud-security/office365/index.html",
+          "href": "https://documentation.wazuh.com/4.11/cloud-security/office365/index.html",
           "text": "Monitoring Office 365",
         },
         Object {
-          "href": "https://documentation.wazuh.com/4.10/user-manual/reference/ossec-conf/office365-module.html",
+          "href": "https://documentation.wazuh.com/4.11/user-manual/reference/ossec-conf/office365-module.html",
           "text": "Configuration options for the module",
         },
       ]
@@ -106,11 +106,11 @@ exports[`GeneralTab component renders correctly to match the snapshot 1`] = `
                     links={
                       Array [
                         Object {
-                          "href": "https://documentation.wazuh.com/4.10/cloud-security/office365/index.html",
+                          "href": "https://documentation.wazuh.com/4.11/cloud-security/office365/index.html",
                           "text": "Monitoring Office 365",
                         },
                         Object {
-                          "href": "https://documentation.wazuh.com/4.10/user-manual/reference/ossec-conf/office365-module.html",
+                          "href": "https://documentation.wazuh.com/4.11/user-manual/reference/ossec-conf/office365-module.html",
                           "text": "Configuration options for the module",
                         },
                       ]

diff --git a/plugins/wazuh-check-updates/server/plugin-services.ts b/plugins/wazuh-check-updates/server/plugin-services.ts
@@ -1,6 +1,7 @@
 import {
   CoreStart,
   ISavedObjectsRepository,
+  Logger,
 } from 'opensearch-dashboards/server';
 import { createGetterSetter } from '../../../src/plugins/opensearch_dashboards_utils/common';
 import { WazuhCorePluginStart } from '../../wazuh-core/server';
@@ -11,4 +12,4 @@ export const [getCore, setCore] = createGetterSetter<CoreStart>('Core');
 export const [getWazuhCore, setWazuhCore] =
   createGetterSetter<WazuhCorePluginStart>('WazuhCore');
 export const [getWazuhCheckUpdatesServices, setWazuhCheckUpdatesServices] =
-  createGetterSetter<any>('WazuhCheckUpdatesServices');
+  createGetterSetter<{ logger: Logger }>('WazuhCheckUpdatesServices');