Merge branch '4.10.0' into bug/7030-sanitize-csv-data-on-export

wazuh · Oct 2, 2024 · 3b690fd · 3b690fd
2 parents 86ac4a9 + d3f1dd5
commit 3b690fd
Show file tree

Hide file tree

Showing 6 changed files with 100 additions and 56 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to the Wazuh app project will be documented in this file.
 
 ## Wazuh v4.10.0 - OpenSearch Dashboards 2.16.0 - Revision 01
 
+## Fixed
+
+- 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)
+
 ### Added
 
 - Support for Wazuh 4.10.0
@@ -15,6 +19,7 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Update malware detection group values in data sources [#6963](https://github.com/wazuh/wazuh-dashboard-plugins/issues/6963)
 - Changed the registration id of the Settings application for compatibility with OpenSearch Dashboard 2.16.0 [#6938](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6938)
 - Changed Malware detection dashboard visualizations [#6964](https://github.com/wazuh/wazuh-dashboard-plugins/issues/6964)
+- Changed MITRE ATT&CK overview description [#7032](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7032)
 - Changed the agents summary in overview with no results to an agent deployment help message. [#7041](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7041)
 - Changed malware feature description [#7036](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7036)
 - Changed the font size of the kpi subtitles and the features descriptions [#7033](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7033)

diff --git a/plugins/main/README.md b/plugins/main/README.md
@@ -25,7 +25,7 @@ the Wazuh Indexer. The plugin provides the following capabilities:
     - CIS-CAT: Configuration assessment using Center of Internet Security scanner and SCAP checks.
   - Threat Detection and Response
     - Vulnerabilities: Discover what applications in your environment are affected by well-known vulnerabilities.
-    - MITRE ATT&CK: Security events from the knowledge base of adversary tactics and techniques based on real-world observations.
+    - MITRE ATT&CK: Explore security alerts mapped to adversary tactics and techniques for better threat understanding.
     - VirusTotal: Alerts resulting from VirusTotal analysis of suspicious files via an integration with their API.
     - Osquery: Osquery can be used to expose an operating system as a high-performance relational database.
     - Docker listener: Monitor and collect the activity from Docker containers such as creation, running, starting, stopping or pausing events.

diff --git a/plugins/main/common/wazuh-modules.ts b/plugins/main/common/wazuh-modules.ts
@@ -109,7 +109,7 @@ export const WAZUH_MODULES = {
     title: 'MITRE ATT&CK',
     appId: 'mitre-attack',
     description:
-      'Security events from the knowledge base of adversary tactics and techniques based on real-world observations',
+      'Explore security alerts mapped to adversary tactics and techniques for better threat understanding.',
   },
   syscollector: {
     title: 'Inventory data',

diff --git a/plugins/main/public/components/common/search-bar/search-bar.tsx b/plugins/main/public/components/common/search-bar/search-bar.tsx
@@ -6,6 +6,7 @@ import {
   SearchBarProps,
   Filter,
 } from '../../../../../../src/plugins/data/public';
+import '../../../../public/styles/media-queries.scss';
 
 export interface WzSearchBarProps extends SearchBarProps {
   fixedFilters?: Filter[];
@@ -85,14 +86,14 @@ export const WzSearchBar = ({
               </EuiFlexGroup>
             </EuiFlexItem>
           )}
-          <EuiFlexItem>
+          <EuiFlexItem className='overflow-hidden'>
             <EuiFlexGroup
               gutterSize='s'
               alignItems='center'
               responsive={false}
               wrap={true}
             >
-              <EuiFlexItem>
+              <EuiFlexItem className='overflow-hidden'>
                 <SearchBar
                   {...restProps}
                   showQueryBar={false}

diff --git a/plugins/main/public/styles/media-queries.scss b/plugins/main/public/styles/media-queries.scss
@@ -15,75 +15,113 @@
 /* -------------------------------------------------------------------------- */
 
 @-webkit-keyframes uil-ring-anim {
-    0% {
-        -webkit-transform: rotate(0deg);
-        transform: rotate(0deg);
-    }
-    100% {
-        -webkit-transform: rotate(360deg);
-        transform: rotate(360deg);
-    }
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
 }
 
 @-moz-keyframes uil-ring-anim {
-    0% {
-        -webkit-transform: rotate(0deg);
-        transform: rotate(0deg);
-    }
-    100% {
-        -webkit-transform: rotate(360deg);
-        transform: rotate(360deg);
-    }
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
 }
 
 @-webkit-keyframes uil-ring-anim {
-    0% {
-        -webkit-transform: rotate(0deg);
-        transform: rotate(0deg);
-    }
-    100% {
-        -webkit-transform: rotate(360deg);
-        transform: rotate(360deg);
-    }
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
 }
 
 @-o-keyframes uil-ring-anim {
-    0% {
-        -webkit-transform: rotate(0deg);
-        transform: rotate(0deg);
-    }
-    100% {
-        -webkit-transform: rotate(360deg);
-        transform: rotate(360deg);
-    }
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
 }
 
 @keyframes uil-ring-anim {
-    0% {
-        -webkit-transform: rotate(0deg);
-        transform: rotate(0deg);
-    }
-    100% {
-        -webkit-transform: rotate(360deg);
-        transform: rotate(360deg);
-    }
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
 }
 
-@media all and (-ms-high-contrast: none),
-(-ms-high-contrast: active) {
-    .no-legend svg {
-        padding-top: 10px;
-    }
+@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
+  .no-legend svg {
+    padding-top: 10px;
+  }
 }
 
-@supports (-ms-ime-align:auto) {
-    .no-legend svg {
-        padding-top: 10px;
-    }
+@supports (-ms-ime-align: auto) {
+  .no-legend svg {
+    padding-top: 10px;
+  }
 }
 
 @media (min-width: 960px) {
-    md-tooltip .md-content {
-        height: auto !important;
+  md-tooltip .md-content {
+    height: auto !important;
+  }
+}
+
+.wz-search-bar {
+  @media only screen and (min-width: 575px) and (max-width: 767px) {
+    .globalFilterGroup__filterBar {
+      margin-top: 0;
+    }
+  }
+
+  @media only screen and (min-width: 575px) and (max-width: 767px) {
+    .globalFilterGroup__wrapper-isVisible {
+      margin-top: 0;
+    }
+  }
+
+  @media only screen and (min-width: 575px) and (max-width: 767px) {
+    .euiFlexGroup--responsive > .euiFlexItem {
+      margin-bottom: 0 !important;
+    }
+  }
+
+  @media only screen and (min-width: 575px) and (max-width: 767px) {
+    .globalFilterGroup__wrapper-isVisible {
+      .euiFlexItem.euiFlexItem--flexGrowZero {
+        margin-bottom: 0px;
+      }
+    }
+  }
+
+  @media only screen and (min-width: 575px) and (max-width: 767px) {
+    .euiFlexGroup--responsive {
+      -webkit-flex-wrap: wrap;
+      flex-wrap: wrap;
+      margin-left: 0;
+      margin-right: 0;
+      margin-bottom: 6px;
+      margin-top: 10px;
     }
+  }
 }
diff --git a/plugins/main/public/utils/applications.ts b/plugins/main/public/utils/applications.ts
@@ -218,7 +218,7 @@ export const mitreAttack = {
   }),
   description: i18n.translate('wz-app-mitre-attack-description', {
     defaultMessage:
-      'Security events from the knowledge base of adversary tactics and techniques based on real-world observations.',
+      'Explore security alerts mapped to adversary tactics and techniques for better threat understanding.',
   }),
   euiIconType: 'grokApp',
   order: 302,