[Uptime] Update duration chart query filters (#63620)

* updated duration query * updated snapshot * update fixtures Co-authored-by: Elastic Machine <[email protected]>
elastic · Apr 16, 2020 · a3f4acf · a3f4acf
1 parent 5ffdeb6
commit a3f4acf
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 324 deletions.
diff --git a/x-pack/legacy/plugins/uptime/common/types/index.ts b/x-pack/legacy/plugins/uptime/common/types/index.ts
@@ -34,10 +34,4 @@ export interface LocationDurationLine {
 export interface MonitorDurationResult {
   /** The average values for the monitor duration. */
   locationDurationLines: LocationDurationLine[];
-  /** The counts of up/down checks for the monitor. */
-  status: StatusData[];
-  /** The maximum status doc count in this chart. */
-  statusMaxCount: number;
-  /** The maximum duration value in this chart. */
-  durationMaxValue: number;
 }
diff --git a/...acy/plugins/uptime/public/components/functional/charts/__tests__/duration_charts.test.tsx b/...acy/plugins/uptime/public/components/functional/charts/__tests__/duration_charts.test.tsx
@@ -43,21 +43,6 @@ describe('MonitorCharts component', () => {
           ],
         },
       ],
-      status: [
-        { x: 1548697620000, up: 74, down: null, total: 74 },
-        { x: 1548697920000, up: 75, down: null, total: 75 },
-        { x: 1548698220000, up: 75, down: null, total: 75 },
-        { x: 1548698520000, up: 73, down: null, total: 73 },
-        { x: 1548698820000, up: 75, down: null, total: 75 },
-        { x: 1548699120000, up: 74, down: null, total: 74 },
-        { x: 1548699420000, up: 75, down: null, total: 75 },
-        { x: 1548699720000, up: 75, down: null, total: 75 },
-        { x: 1548700020000, up: 75, down: null, total: 75 },
-        { x: 1548700320000, up: 75, down: null, total: 75 },
-        { x: 1548700620000, up: 75, down: null, total: 75 },
-      ],
-      statusMaxCount: 75,
-      durationMaxValue: 6669234,
     },
   };
 

diff --git a/x-pack/legacy/plugins/uptime/public/state/api/ml_anomaly.ts b/x-pack/legacy/plugins/uptime/public/state/api/ml_anomaly.ts
@@ -48,11 +48,8 @@ export const createMLJob = async ({
     query: {
       bool: {
         filter: [
-          {
-            term: {
-              'monitor.id': lowerCaseMonitorId,
-            },
-          },
+          { term: { 'monitor.id': lowerCaseMonitorId } },
+          { range: { 'monitor.duration.us': { gt: 0 } } },
         ],
       },
     },

diff --git a/...lugins/uptime/server/lib/requests/__tests__/__snapshots__/get_monitor_charts.test.ts.snap b/...lugins/uptime/server/lib/requests/__tests__/__snapshots__/get_monitor_charts.test.ts.snap
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_duration.ts b/x-pack/plugins/uptime/server/lib/requests/get_monitor_duration.ts
@@ -20,26 +20,6 @@ export interface GetMonitorChartsParams {
   dateEnd: string;
 }
 
-const formatStatusBuckets = (time: any, buckets: any, docCount: any) => {
-  let up = null;
-  let down = null;
-
-  buckets.forEach((bucket: any) => {
-    if (bucket.key === 'up') {
-      up = bucket.doc_count;
-    } else if (bucket.key === 'down') {
-      down = bucket.doc_count;
-    }
-  });
-
-  return {
-    x: time,
-    up,
-    down,
-    total: docCount,
-  };
-};
-
 /**
  * Fetches data used to populate monitor charts
  */
@@ -55,7 +35,7 @@ export const getMonitorDurationChart: UMElasticsearchQueryFn<
           filter: [
             { range: { '@timestamp': { gte: dateStart, lte: dateEnd } } },
             { term: { 'monitor.id': monitorId } },
-            { term: { 'monitor.status': 'up' } },
+            { range: { 'monitor.duration.us': { gt: 0 } } },
           ],
         },
       },
@@ -73,7 +53,6 @@ export const getMonitorDurationChart: UMElasticsearchQueryFn<
                 missing: 'N/A',
               },
               aggs: {
-                status: { terms: { field: 'monitor.status', size: 2, shard_size: 2 } },
                 duration: { stats: { field: 'monitor.duration.us' } },
               },
             },
@@ -94,15 +73,10 @@ export const getMonitorDurationChart: UMElasticsearchQueryFn<
    *
    * The third list is for an area chart expressing a range, and it requires an (x,y,y0) structure,
    * where y0 is the min value for the point and y is the max.
-   *
-   * Additionally, we supply the maximum value for duration and status, so the corresponding charts know
-   * what the domain size should be.
    */
+
   const monitorChartsData: MonitorDurationResult = {
     locationDurationLines: [],
-    status: [],
-    durationMaxValue: 0,
-    statusMaxCount: 0,
   };
 
   /**
@@ -119,9 +93,9 @@ export const getMonitorDurationChart: UMElasticsearchQueryFn<
   // a set of all the locations found for this result
   const resultLocations = new Set<string>();
   const linesByLocation: { [key: string]: LocationDurationLine } = {};
+
   dateHistogramBuckets.forEach(dateHistogramBucket => {
     const x = dateHistogramBucket.key;
-    const docCount = dateHistogramBucket?.doc_count ?? 0;
     // a set of all the locations for the current bucket
     const bucketLocations = new Set<string>();
 
@@ -161,10 +135,6 @@ export const getMonitorDurationChart: UMElasticsearchQueryFn<
         }
       });
     }
-
-    monitorChartsData.status.push(
-      formatStatusBuckets(x, dateHistogramBucket?.status?.buckets ?? [], docCount)
-    );
   });
 
   return monitorChartsData;