use last 48 intervals

elastic · Oct 19, 2021 · b7459e0 · b7459e0
1 parent ffad905
commit b7459e0
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/x-pack/plugins/uptime/common/runtime_types/ping/synthetics.ts b/x-pack/plugins/uptime/common/runtime_types/ping/synthetics.ts
@@ -22,6 +22,10 @@ export const JourneyStepType = t.intersection([
       name: t.string,
       status: t.string,
       type: t.string,
+      timespan: t.type({
+        gte: t.string,
+        lt: t.string,
+      }),
     }),
     synthetics: t.partial({
       error: t.partial({

diff --git a/...time/public/components/monitor/synthetics/waterfall/components/waterfall_marker_trend.tsx b/...time/public/components/monitor/synthetics/waterfall/components/waterfall_marker_trend.tsx
@@ -8,11 +8,34 @@ import React from 'react';
 
 import { EuiButton } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import moment from 'moment';
 import { useUptimeStartPlugins } from '../../../../../contexts/uptime_startup_plugins_context';
 import { useUptimeSettingsContext } from '../../../../../contexts/uptime_settings_context';
 import { AllSeries, createExploratoryViewUrl } from '../../../../../../../observability/public';
 import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
 import { useWaterfallContext } from '../context/waterfall_chart';
+import { JourneyStep } from '../../../../../../common/runtime_types';
+
+const getLast48Intervals = (activeStep: JourneyStep) => {
+  const { lt, gte } = activeStep.monitor.timespan!;
+  const inDays = moment(lt).diff(moment(gte), 'days');
+  if (inDays > 0) {
+    return { to: 'now', from: `now-${inDays * 48}d` };
+  }
+
+  const inHours = moment(lt).diff(moment(gte), 'hours');
+  if (inHours > 0) {
+    return { to: 'now', from: `now-${inHours * 48}h` };
+  }
+
+  const inMinutes = moment(lt).diff(moment(gte), 'minutes');
+  if (inMinutes > 0) {
+    return { to: 'now', from: `now-${inMinutes * 48}m` };
+  }
+
+  const inSeconds = moment(lt).diff(moment(gte), 'seconds');
+  return { to: 'now', from: `now-${inSeconds * 48}s` };
+};
 
 export function WaterfallMarkerTrend({ title, field }: { title: string; field: string }) {
   const { observability } = useUptimeStartPlugins();
@@ -31,7 +54,7 @@ export function WaterfallMarkerTrend({ title, field }: { title: string; field: s
     {
       name: `${title}(${activeStep.synthetics.step?.name!})`,
       selectedMetricField: field,
-      time: { from: 'now-1d', to: 'now' },
+      time: getLast48Intervals(activeStep),
       seriesType: 'area',
       dataType: 'synthetics',
       reportDefinitions: {