Adding optimizations for snapshot request

simianhacker · simianhacker · commit 06d1334299e8 · 2020-11-17T17:04:24.000-07:00
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_snaphot.ts b/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_snaphot.ts
@@ -44,7 +44,7 @@ export function useSnapshot(
     interval: '1m',
     to: currentTime,
     from: currentTime - 1200 * 1000,
-    lookbackSize: 20,
+    lookbackSize: 5,
   };
 
   const { error, loading, response, makeRequest } = useHTTPRequest<SnapshotNodeResponse>(
diff --git a/x-pack/plugins/infra/server/routes/metrics_explorer/lib/find_interval_for_metrics.ts b/x-pack/plugins/infra/server/routes/metrics_explorer/lib/find_interval_for_metrics.ts
@@ -34,7 +34,8 @@ export const findIntervalForMetrics = async (
 
   const modules = await Promise.all(
     fields.map(
-      async (field) => await getDatasetForField(client, field as string, options.indexPattern)
+      async (field) =>
+        await getDatasetForField(client, field as string, options.indexPattern, options.timerange)
     )
   );
 
diff --git a/x-pack/plugins/infra/server/routes/metrics_explorer/lib/get_dataset_for_field.ts b/x-pack/plugins/infra/server/routes/metrics_explorer/lib/get_dataset_for_field.ts
@@ -17,15 +17,31 @@ interface EventDatasetHit {
 export const getDatasetForField = async (
   client: ESSearchClient,
   field: string,
-  indexPattern: string
+  indexPattern: string,
+  timerange: { field: string; to: number; from: number }
 ) => {
   const params = {
     allowNoIndices: true,
     ignoreUnavailable: true,
     terminateAfter: 1,
     index: indexPattern,
     body: {
-      query: { exists: { field } },
+      query: {
+        bool: {
+          filter: [
+            { exists: { field } },
+            {
+              range: {
+                [timerange.field]: {
+                  gte: timerange.from,
+                  lte: timerange.to,
+                  format: 'epoch_millis',
+                },
+              },
+            },
+          ],
+        },
+      },
       size: 1,
       _source: ['event.dataset'],
     },
diff --git a/x-pack/plugins/infra/server/routes/snapshot/lib/create_timerange_with_interval.ts b/x-pack/plugins/infra/server/routes/snapshot/lib/create_timerange_with_interval.ts
@@ -75,7 +75,10 @@ const aggregationsToModules = async (
   const fields = await Promise.all(
     uniqueFields.map(
       async (field) =>
-        await getDatasetForField(client, field as string, options.sourceConfiguration.metricAlias)
+        await getDatasetForField(client, field as string, options.sourceConfiguration.metricAlias, {
+          ...options.timerange,
+          field: options.sourceConfiguration.fields.timestamp,
+        })
     )
   );
   return fields.filter((f) => f) as string[];
diff --git a/x-pack/plugins/infra/server/routes/snapshot/lib/get_nodes.ts b/x-pack/plugins/infra/server/routes/snapshot/lib/get_nodes.ts
@@ -23,12 +23,11 @@ export const getNodes = async (
     snapshotRequest
   );
   const metricsApiResponse = await queryAllData(client, metricsApiRequest);
-  return copyMissingMetrics(
-    transformMetricsApiResponseToSnapshotResponse(
-      metricsApiRequest,
-      snapshotRequest,
-      source,
-      metricsApiResponse
-    )
+  const snapshotResponse = transformMetricsApiResponseToSnapshotResponse(
+    metricsApiRequest,
+    snapshotRequest,
+    source,
+    metricsApiResponse
   );
+  return copyMissingMetrics(snapshotResponse);
 };

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,8 @@ export const findIntervalForMetrics = async (`
`34`	`34`
`35`	`35`	`const modules = await Promise.all(`
`36`	`36`	`fields.map(`
`37`		`- async (field) => await getDatasetForField(client, field as string, options.indexPattern)`
	`37`	`+ async (field) =>`
	`38`	`+ await getDatasetForField(client, field as string, options.indexPattern, options.timerange)`
`38`	`39`	`)`
`39`	`40`	`);`
`40`	`41`