CR feedback

elastic · Oct 2, 2020 · 509be7e · 509be7e
1 parent f08e5f6
commit 509be7e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/x-pack/plugins/monitoring/server/alerts/memory_usage_alert.ts b/x-pack/plugins/monitoring/server/alerts/memory_usage_alert.ts
@@ -25,6 +25,7 @@ import { RawAlertInstance } from '../../../alerts/common';
 import { CommonAlertFilter, CommonAlertParams, CommonAlertParamDetail } from '../../common/types';
 import { AlertingDefaults, createLink } from './alerts_common';
 import { appendMetricbeatIndex } from '../lib/alerts/append_mb_index';
+import { parseDuration } from '../../../alerts/common/parse_duration';
 
 interface ParamDetails {
   [key: string]: CommonAlertParamDetail;
@@ -54,7 +55,7 @@ export class MemoryUsageAlert extends BaseAlert {
   public label = MemoryUsageAlert.LABEL;
 
   protected defaultParams = {
-    threshold: 90,
+    threshold: 85,
     duration: '5m',
   };
 
@@ -86,11 +87,16 @@ export class MemoryUsageAlert extends BaseAlert {
       esIndexPattern = getCcsIndexPattern(esIndexPattern, availableCcs);
     }
     const { duration, threshold } = params;
+    const parsedDuration = parseDuration(duration as string);
+    const endMs = +new Date();
+    const startMs = endMs - parsedDuration;
+
     const stats = await fetchMemoryUsageNodeStats(
       callCluster,
       clusters,
       esIndexPattern,
-      duration as string,
+      startMs,
+      endMs,
       this.config.ui.max_bucket_size
     );
 

diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_memory_usage_node_stats.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_memory_usage_node_stats.ts
@@ -11,7 +11,8 @@ export async function fetchMemoryUsageNodeStats(
   callCluster: any,
   clusters: AlertCluster[],
   index: string,
-  duration: string,
+  startMs: number,
+  endMs: number,
   size: number
 ): Promise<AlertMemoryUsageNodeStats[]> {
   const clustersIds = clusters.map((cluster) => cluster.clusterUuid);
@@ -36,7 +37,9 @@ export async function fetchMemoryUsageNodeStats(
             {
               range: {
                 timestamp: {
-                  gte: `now-${duration}`,
+                  format: 'epoch_millis',
+                  gte: startMs,
+                  lte: endMs,
                 },
               },
             },