Merge branch '4.4-2.4-wzd' into fix/support-171-agents-inventory-sear…

…ch-q-parameter
wazuh · Mar 30, 2023 · faf7dcd · faf7dcd
2 parents 4f8d376 + 28fb593
commit faf7dcd
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +2,13 @@
 
 All notable changes to the Wazuh app project will be documented in this file.
 
-## Unreleased
+## Wazuh v4.4.1 - OpenSearch Dashboards 2.6.0 - Revision 00
 
 ### Fixed
 
 - Fixed the search in the agent inventory data tables [#5196](https://github.com/wazuh/wazuh-kibana-app/pull/5196)
+- Fixed a visual error in the 'About' section. [#5337](https://github.com/wazuh/wazuh-kibana-app/pull/5337)
+- Fixed the `Anomaly and malware detection` link. [#5329](https://github.com/wazuh/wazuh-kibana-app/pull/5329)
 
 ## Wazuh v4.4.0 - OpenSearch Dashboards 2.4.0 - Revision 06
 

diff --git a/...ontrollers/management/components/management/configuration/policy-monitoring/help-links.js b/...ontrollers/management/components/management/configuration/policy-monitoring/help-links.js
@@ -14,8 +14,8 @@ import { webDocumentationLink } from "../../../../../../../common/services/web_d
 
 export default [
   {
-    text: 'Anomaly and malware detection',
-    href: webDocumentationLink('user-manual/capabilities/anomalies-detection/index.html')
+    text: 'Malware detection',
+    href: webDocumentationLink('user-manual/capabilities/malware-detection/index.html')
   },
   {
     text: 'Monitoring security policies',

diff --git a/public/styles/layout.scss b/public/styles/layout.scss
@@ -97,6 +97,10 @@ html{
   margin-left: 16px;
 }
 
+.wz-margin-left-40 {
+  margin-left: 40px;
+}
+
 .no-margin-left {
   margin-left: 0px;
 }
@@ -232,7 +236,7 @@ html{
   width: 100%;
 }
 
-.wz-mitre-width { 
+.wz-mitre-width {
   width: calc(100% - 35px);
 }
 

diff --git a/public/templates/settings/settings.html b/public/templates/settings/settings.html
@@ -1,31 +1,55 @@
 <!-- head -->
 <div ng-cloak ng-controller="settingsController as ctrl">
   <div ng-show="ctrl.load" style="padding: 16px">
-    <react-component name="EuiProgress" props="{size: 'xs', color: 'primary'}"></react-component>
+    <react-component
+      name="EuiProgress"
+      props="{size: 'xs', color: 'primary'}"
+    ></react-component>
   </div>
 
   <div
     ng-if="!ctrl.load && ctrl.settingsTabsProps && !ctrl.apiIsDown && ctrl.apiTableProps.apiEntries.length"
     class="wz-margin-top-16 md-margin-h"
   >
-    <react-component name="Tabs" props="ctrl.settingsTabsProps"></react-component>
+    <react-component
+      name="Tabs"
+      props="ctrl.settingsTabsProps"
+    ></react-component>
   </div>
   <!-- end head -->
   <!-- api -->
   <div ng-if="ctrl.tab === 'api' && !ctrl.load">
     <!-- API table section-->
     <div ng-if="ctrl.apiEntries.length && !ctrl.addingApi && !ctrl.apiIsDown">
-      <react-component name="ApiTable" props="ctrl.apiTableProps"></react-component>
+      <react-component
+        name="ApiTable"
+        props="ctrl.apiTableProps"
+      ></react-component>
     </div>
 
     <!-- Add API section-->
-    <div layout="row" layout-padding ng-if="!ctrl.apiEntries.length || ctrl.addingApi">
-      <react-component flex name="AddApi" props="ctrl.addApiProps"></react-component>
+    <div
+      layout="row"
+      layout-padding
+      ng-if="!ctrl.apiEntries.length || ctrl.addingApi"
+    >
+      <react-component
+        flex
+        name="AddApi"
+        props="ctrl.addApiProps"
+      ></react-component>
     </div>
 
     <!-- API is down section-->
-    <div layout="column" layout-padding ng-if="ctrl.apiIsDown && !ctrl.addingApi">
-      <react-component name="ApiIsDown" props="ctrl.apiIsDownProps"></react-component>
+    <div
+      layout="column"
+      layout-padding
+      ng-if="ctrl.apiIsDown && !ctrl.addingApi"
+    >
+      <react-component
+        name="ApiIsDown"
+        props="ctrl.apiIsDownProps"
+      ></react-component>
     </div>
   </div>
   <!-- End API configuration card section -->
@@ -45,7 +69,10 @@
   <!-- end configuration -->
   <!-- logs -->
   <div ng-if="ctrl.tab === 'logs' && !ctrl.load">
-    <react-component name="SettingsLogs" props="ctrl.settingsLogsProps"></react-component>
+    <react-component
+      name="SettingsLogs"
+      props="ctrl.settingsLogsProps"
+    ></react-component>
   </div>
   <!-- end logs -->
   <!-- miscellaneous -->
@@ -55,19 +82,23 @@
   <!-- end miscellaneous -->
   <!-- about -->
   <div ng-if="ctrl.tab === 'about' && !ctrl.load">
-    <div class="euiPage euiPageBody">
+    <div class="euiPage euiPage--paddingMedium euiPageBody">
       <!-- App information section -->
       <div ng-if="!ctrl.load">
         <div class="euiCallOut euiCallOut--primary" style="display: flex">
           <div class="wz-text-truncatable" flex>
-            App version: <span class="wz-text-bold">{{ctrl.appInfo["app-version"]}}</span>
+            App version:
+            <span class="wz-text-bold">{{ctrl.appInfo["app-version"]}}</span>
           </div>
           <div class="wz-text-truncatable" flex>
-            App revision: <span class="wz-text-bold">{{ctrl.appInfo["revision"]}}</span>
+            App revision:
+            <span class="wz-text-bold">{{ctrl.appInfo["revision"]}}</span>
           </div>
           <div class="wz-text-truncatable" flex>
             Install date:
-            <span class="wz-text-bold">{{ctrl.appInfo["installationDate"] | date : "medium"}}</span>
+            <span class="wz-text-bold"
+              >{{ctrl.appInfo["installationDate"] | date : "medium"}}</span
+            >
           </div>
         </div>
       </div>
@@ -96,10 +127,11 @@ <h2 class="euiTitle euiTitle--medium">
             <div class="euiSpacer euiSpacer--l"></div>
             <div class="euiText euiText--medium">
               <p>
-                {{ctrl.pluginAppName}} provides management and monitoring capabilities, giving users
-                control over the Wazuh infrastructure. You can monitor your agents
-                status and configuration, query and visualize your alert data and monitor manager
-                rules and configuration.
+                {{ctrl.pluginAppName}} provides management and monitoring
+                capabilities, giving users control over the Wazuh
+                infrastructure. You can monitor your agents status and
+                configuration, query and visualize your alert data and monitor
+                manager rules and configuration.
               </p>
             </div>
           </div>
@@ -121,7 +153,10 @@ <h2 class="euiTitle euiTitle--medium">Community</h2>
             </div>
             <div class="euiSpacer euiSpacer--m"></div>
             <div class="euiText euiText--medium">
-              <p>Enjoy your Wazuh experience and please don't hesitate to give us your feedback.</p>
+              <p>
+                Enjoy your Wazuh experience and please don't hesitate to give us
+                your feedback.
+              </p>
             </div>
             <div class="euiSpacer euiSpacer--l"></div>
             <div layout="row" class="layout-align-center-center" flex>
@@ -130,12 +165,12 @@ <h2 class="euiTitle euiTitle--medium">Community</h2>
                 props="{iconType:'logoSlack', iconSize:'xxl', href: 'https://wazuh.com/community/join-us-on-slack/', target: '_blank', 'aria-label': 'Wazuh Slack'}"
               ></react-component>
               <react-component
-                class="wz-margin-left-16"
+                class="wz-margin-left-40"
                 name="EuiButtonIcon"
                 props="{iconType: googleGroupsSVG, iconSize:'xxl', href: 'https://groups.google.com/forum/#!forum/wazuh', target: '_blank', 'aria-label': 'Wazuh forum'}"
               ></react-component>
               <react-component
-                class="wz-margin-left-16"
+                class="wz-margin-left-40"
                 name="EuiButtonIcon"
                 props="{iconType:'logoGithub', iconSize:'xxl', href: 'https://github.com/wazuh/wazuh-kibana-app', target: '_blank', 'aria-label': 'Wazuh dashboard Github'}"
               ></react-component>