From c4720e3b3d6c196536465b76686e65f5c82fd625 Mon Sep 17 00:00:00 2001
From: Chris Cowan <chris@chriscowan.us>
Date: Mon, 2 Mar 2020 15:04:52 -0700
Subject: [PATCH] [Metrics UI] Ensure inventory view buckets never drop below
 60 seconds (#58503) (#58898)

* [Metrics UI] Ensure inventory view buckets never drop below 60 seconds

* Fixing tests

* Fixing tests... again

* Fixing tests... rounding issue?

* Trying to fix the tests... again

* updating test for custom metric

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../create_timerange_with_interval.ts         |  6 +++--
 .../test/api_integration/apis/infra/waffle.ts | 24 +++++++++----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/x-pack/plugins/infra/server/lib/snapshot/create_timerange_with_interval.ts b/x-pack/plugins/infra/server/lib/snapshot/create_timerange_with_interval.ts
index 6f036475a1e1c..cf2b1e59b2a22 100644
--- a/x-pack/plugins/infra/server/lib/snapshot/create_timerange_with_interval.ts
+++ b/x-pack/plugins/infra/server/lib/snapshot/create_timerange_with_interval.ts
@@ -21,7 +21,7 @@ export const createTimeRangeWithInterval = async (
 ): Promise<InfraTimerangeInput> => {
   const aggregations = getMetricsAggregations(options);
   const modules = await aggregationsToModules(framework, requestContext, aggregations, options);
-  const interval =
+  const interval = Math.max(
     (await calculateMetricInterval(
       framework,
       requestContext,
@@ -32,7 +32,9 @@ export const createTimeRangeWithInterval = async (
       },
       modules,
       options.nodeType
-    )) || 60000;
+    )) || 60,
+    60
+  );
   return {
     interval: `${interval}s`,
     from: options.timerange.to - interval * 5000, // We need at least 5 buckets worth of data
diff --git a/x-pack/test/api_integration/apis/infra/waffle.ts b/x-pack/test/api_integration/apis/infra/waffle.ts
index 3413fc283556c..26d8c9d265a6a 100644
--- a/x-pack/test/api_integration/apis/infra/waffle.ts
+++ b/x-pack/test/api_integration/apis/infra/waffle.ts
@@ -192,9 +192,9 @@ export default function({ getService }: FtrProviderContext) {
             expect(firstNode).to.have.property('metric');
             expect(firstNode.metric).to.eql({
               name: 'cpu',
-              value: 0.009285714285714286,
-              max: 0.009285714285714286,
-              avg: 0.0015476190476190477,
+              value: 0.0032,
+              max: 0.0038333333333333336,
+              avg: 0.0027944444444444444,
             });
           }
         });
@@ -231,9 +231,9 @@ export default function({ getService }: FtrProviderContext) {
           expect(firstNode).to.have.property('metric');
           expect(firstNode.metric).to.eql({
             name: 'custom',
-            value: 0.0041964285714285714,
-            max: 0.0041964285714285714,
-            avg: 0.0006994047619047619,
+            value: 0.0016,
+            max: 0.0018333333333333333,
+            avg: 0.0013666666666666669,
           });
         }
       });
@@ -320,9 +320,9 @@ export default function({ getService }: FtrProviderContext) {
             expect(firstNode).to.have.property('metric');
             expect(firstNode.metric).to.eql({
               name: 'cpu',
-              value: 0.009285714285714286,
-              max: 0.009285714285714286,
-              avg: 0.0015476190476190477,
+              value: 0.0032,
+              max: 0.0038333333333333336,
+              avg: 0.0027944444444444444,
             });
             const secondNode = nodes[1];
             expect(secondNode).to.have.property('path');
@@ -332,9 +332,9 @@ export default function({ getService }: FtrProviderContext) {
             expect(secondNode).to.have.property('metric');
             expect(secondNode.metric).to.eql({
               name: 'cpu',
-              value: 0.009285714285714286,
-              max: 0.009285714285714286,
-              avg: 0.0015476190476190477,
+              value: 0.0032,
+              max: 0.0038333333333333336,
+              avg: 0.0027944444444444444,
             });
           }
         });