Merge branch 'main' into rule-schema-discriminated-union

elastic · Nov 27, 2023 · fd64136 · fd64136
2 parents f980f45 + 2cfc722
commit fd64136
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/x-pack/plugins/fleet/server/services/agents/agent_metrics.ts b/x-pack/plugins/fleet/server/services/agents/agent_metrics.ts
@@ -11,6 +11,8 @@ import type { Agent } from '../../types';
 import { appContextService } from '../app_context';
 import { DATA_TIERS } from '../../../common/constants';
 
+const AGGREGATION_MAX_SIZE = 1000;
+
 export async function fetchAndAssignAgentMetrics(esClient: ElasticsearchClient, agents: Agent[]) {
   try {
     return await _fetchAndAssignAgentMetrics(esClient, agents);
@@ -112,6 +114,7 @@ const aggregationQueryBuilder = (agentIds: string[]) => ({
     agents: {
       terms: {
         field: 'elastic_agent.id',
+        size: AGGREGATION_MAX_SIZE,
       },
       aggs: {
         sum_memory_size: {
@@ -127,6 +130,7 @@ const aggregationQueryBuilder = (agentIds: string[]) => ({
         processes: {
           terms: {
             field: 'elastic_agent.process',
+            size: AGGREGATION_MAX_SIZE,
             order: {
               _count: 'desc',
             },

diff --git a/...est/security_solution_cypress/cypress/e2e/investigations/timelines/search_or_filter.cy.ts b/...est/security_solution_cypress/cypress/e2e/investigations/timelines/search_or_filter.cy.ts
@@ -53,7 +53,8 @@ describe('Timeline search and filters', { tags: ['@ess', '@serverless'] }, () =>
     });
   });
 
-  describe('Update kqlMode for timeline', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/169882
+  describe.skip('Update kqlMode for timeline', () => {
     beforeEach(() => {
       login();
       visit(TIMELINES_URL);