Fix Alerts Summary table truncated results

CHANGELOG.md

@@ -28,7 +28,7 @@ All notable changes to the Wazuh app project will be documented in this file.
 ### Changed
 
 - Changed the HTTP verb from `GET` to `POST` in the requests to login to the Wazuh API [#4103](https://github.com/wazuh/wazuh-kibana-app/pull/4103)
-- Improved alerts summary performance [#4376](https://github.com/wazuh/wazuh-kibana-app/pull/4376) [#5071](https://github.com/wazuh/wazuh-kibana-app/pull/5071)
+- Improved alerts summary performance [#4376](https://github.com/wazuh/wazuh-kibana-app/pull/4376) [#5071](https://github.com/wazuh/wazuh-kibana-app/pull/5071) [#5131](https://github.com/wazuh/wazuh-kibana-app/pull/5131)
 - Improved Agents Overview performance [#4363](https://github.com/wazuh/wazuh-kibana-app/pull/4363) [#5076](https://github.com/wazuh/wazuh-kibana-app/pull/5076)
 - Improved the message displayed when there is a versions mismatch between the Wazuh API and the Wazuh APP [#4529](https://github.com/wazuh/wazuh-kibana-app/pull/4529) [#4964](https://github.com/wazuh/wazuh-kibana-app/pull/4964)
 - Independently load each dashboard from the `Agents Overview` page [#4363](https://github.com/wazuh/wazuh-kibana-app/pull/4363)

server/controllers/wazuh-reporting.ts

@@ -30,14 +30,19 @@ import {
 import { createDirectoryIfNotExists, createDataDirectoryIfNotExists } from '../lib/filesystem';
 import { agentStatusLabelByAgentStatus } from '../../common/services/wz_agent_status';
 
+interface AgentsFilter {
+  query: any;
+  agentsText: string;
+}
+
 export class WazuhReportingCtrl {
   constructor() {}
   /**
    * This do format to filters
    * @param {String} filters E.g: cluster.name: wazuh AND rule.groups: vulnerability
    * @param {String} searchBar search term
    */
-  private sanitizeKibanaFilters(filters: any, searchBar?: string): [string, string] {
+  private sanitizeKibanaFilters(filters: any, searchBar?: string): [string, AgentsFilter] {
     log('reporting:sanitizeKibanaFilters', `Started to sanitize filters`, 'info');
     log(
       'reporting:sanitizeKibanaFilters',
@@ -46,12 +51,14 @@ export class WazuhReportingCtrl {
     );
     let str = '';
 
-    const agentsFilter: any = [];
+    const agentsFilter: AgentsFilter = { query: {}, agentsText: '' };
+    const agentsList: string[] = [];
 
     //separate agents filter
     filters = filters.filter((filter) => {
       if (filter.meta.controlledBy === AUTHORIZED_AGENTS) {
-        agentsFilter.push(filter);
+        agentsFilter.query = filter.query;
+        agentsList.push(filter);
         return false;
       }
       return filter;
@@ -81,15 +88,15 @@ export class WazuhReportingCtrl {
       str += ` AND (${ searchBar})`;
     }
 
-    const agentsFilterStr = agentsFilter.map((filter) => filter.meta.value).join(',');
+    agentsFilter.agentsText = agentsList.map((filter) => filter.meta.value).join(',');
 
     log(
       'reporting:sanitizeKibanaFilters',
-      `str: ${str}, agentsFilterStr: ${agentsFilterStr}`,
+      `str: ${str}, agentsFilterStr: ${agentsFilter.agentsText}`,
       'debug'
     );
 
-    return [str, agentsFilterStr];
+    return [str, agentsFilter];
   }
 
   /**
@@ -305,7 +312,7 @@ export class WazuhReportingCtrl {
 
       const [sanitizedFilters, agentsFilter] = filters
         ? this.sanitizeKibanaFilters(filters, searchBar)
-        : [false, false];
+        : [false, null];
 
       if (time && sanitizedFilters) {
         printer.addTimeRangeAndFilters(from, to, sanitizedFilters, browserTimezone);
@@ -321,6 +328,7 @@ export class WazuhReportingCtrl {
           new Date(from).getTime(),
           new Date(to).getTime(),
           sanitizedFilters,
+          agentsFilter,
           indexPatternTitle,
           agents
         );
@@ -333,8 +341,8 @@ export class WazuhReportingCtrl {
       }
 
       //add authorized agents
-      if (agentsFilter) {
-        printer.addAgentsFilters(agentsFilter);
+      if (agentsFilter?.agentsText) {
+        printer.addAgentsFilters(agentsFilter.agentsText);
       }
 
       await printer.print(context.wazuhEndpointParams.pathFilename);

server/lib/reporting/audit-request.ts

@@ -26,12 +26,13 @@ export const getTop3AgentsSudoNonSuccessful = async (
   gte,
   lte,
   filters,
+  allowedAgentsFilter,
   pattern = getSettingDefaultValue('pattern')
 ) => {
   try {
     const base = {};
 
-    Object.assign(base, Base(pattern, filters, gte, lte));
+    Object.assign(base, Base(pattern, filters, gte, lte, allowedAgentsFilter));
 
     Object.assign(base.aggs, {
       '3': {
@@ -93,12 +94,13 @@ export const getTop3AgentsFailedSyscalls = async (
   gte,
   lte,
   filters,
+  allowedAgentsFilter,
   pattern = getSettingDefaultValue('pattern')
 ) => {
   try {
     const base = {};
 
-    Object.assign(base, Base(pattern, filters, gte, lte));
+    Object.assign(base, Base(pattern, filters, gte, lte, allowedAgentsFilter));
 
     Object.assign(base.aggs, {
       '3': {
@@ -138,7 +140,7 @@ export const getTop3AgentsFailedSyscalls = async (
     const { buckets } = response.body.aggregations['3'];
 
     return buckets.map(bucket => {
-      try{
+      try {
         const agent = bucket.key;
         const syscall = {
           id: bucket['4'].buckets[0].key,
@@ -150,7 +152,7 @@ export const getTop3AgentsFailedSyscalls = async (
           agent,
           syscall
         };
-      }catch(error){
+      } catch (error) {
         return undefined;
       }
     }).filter(bucket => bucket);
@@ -172,12 +174,13 @@ export const getTopFailedSyscalls = async (
   gte,
   lte,
   filters,
+  allowedAgentsFilter,
   pattern = getSettingDefaultValue('pattern')
 ) => {
   try {
     const base = {};
 
-    Object.assign(base, Base(pattern, filters, gte, lte));
+    Object.assign(base, Base(pattern, filters, gte, lte, allowedAgentsFilter));
 
     Object.assign(base.aggs, {
       '2': {

server/lib/reporting/base-query.ts

@@ -9,10 +9,10 @@
  *
  * Find more information about this on the LICENSE file.
  */
-export function Base(pattern: string, filters: any, gte: number, lte: number) {
-  return {
+export function Base(pattern: string, filters: any, gte: number, lte: number, allowedAgentsFilter: any = null) {
+  const base = {
     // index: pattern,
-    
+
     from: 0,
     size: 500,
     aggs: {},
@@ -42,4 +42,12 @@ export function Base(pattern: string, filters: any, gte: number, lte: number) {
       }
     }
   };
+
+  //Add allowed agents filter
+  if(allowedAgentsFilter?.query?.bool){
+    base.query.bool.minimum_should_match = allowedAgentsFilter.query.bool.minimum_should_match;
+    base.query.bool.should = allowedAgentsFilter.query.bool.should;
+  }
+
+  return base;
 }