Fixed pipeline and terms aggs. Added timeShift arg.

elastic · Sep 12, 2022 · 3e39342 · 3e39342
1 parent f98f3c9
commit 3e39342
Show file tree

Hide file tree

Showing 32 changed files with 322 additions and 411 deletions.
diff --git a/...s/vis_types/timeseries/public/convert_to_lens/lib/configurations/xy/configuration.test.ts b/...s/vis_types/timeseries/public/convert_to_lens/lib/configurations/xy/configuration.test.ts
@@ -28,6 +28,8 @@ describe('getConfigurationForTimeseries', () => {
       },
       yLeftExtent: { mode: 'full' },
       yRightExtent: { mode: 'full' },
+      yLeftScale: 'linear',
+      yRightScale: 'linear',
     });
   });
 });

diff --git a/...lugins/vis_types/timeseries/public/convert_to_lens/lib/configurations/xy/configuration.ts b/...lugins/vis_types/timeseries/public/convert_to_lens/lib/configurations/xy/configuration.ts
@@ -33,6 +33,8 @@ export const getConfigurationForTimeseries = (
     },
     yLeftExtent: extents.yLeftExtent,
     yRightExtent: extents.yRightExtent,
+    yLeftScale: model.axis_scale === 'log' ? 'log' : 'linear',
+    yRightScale: model.axis_scale === 'log' ? 'log' : 'linear',
   };
 };
 

diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/column.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/column.ts
@@ -34,7 +34,7 @@ const isSupportedFormat = (format: string) => ['bytes', 'number', 'percent'].inc
 export const getFormat = (series: Series): FormatParams => {
   let suffix;
 
-  if (!series.formatter) {
+  if (!series.formatter || series.formatter === 'default') {
     return {};
   }
 
@@ -44,10 +44,12 @@ export const getFormat = (series: Series): FormatParams => {
 
   // not supported formatters should be converted to number
   if (!isSupportedFormat(series.formatter)) {
-    return { format: { id: DATA_FORMATTERS.NUMBER, ...(suffix && { params: { suffix } }) } };
+    return {
+      format: { id: DATA_FORMATTERS.NUMBER, ...(suffix && { params: { suffix, decimals: 2 } }) },
+    };
   }
 
-  return { format: { id: series.formatter, ...(suffix && { params: { suffix } }) } };
+  return { format: { id: series.formatter, ...(suffix && { params: { suffix, decimals: 2 } }) } };
 };
 
 export const createColumn = (
@@ -63,6 +65,7 @@ export const createColumn = (
   isSplit,
   reducedTimeRange,
   filter: series.filter,
+  timeShift: series.offset_time,
   timeScale: getTimeScale(metric),
   meta: { metricId: metric.id },
 });

diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/cumulative_sum.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/cumulative_sum.ts
@@ -7,7 +7,7 @@
  */
 
 import { METRIC_TYPES } from '@kbn/data-plugin/public';
-import { SUPPORTED_METRICS, getParentPipelineSeriesFormula } from '../metrics';
+import { SUPPORTED_METRICS, getPipelineSeriesFormula } from '../metrics';
 import { createFormulaColumn } from './formula';
 import { computeParentPipelineColumns } from './parent_pipeline';
 import { CommonColumnsConverterArgs } from './types';
@@ -33,9 +33,10 @@ export const convertToCumulativeSumColumns = (
   // and everything else as formula
   if (pipelineAgg.name !== 'count' && pipelineAgg.name !== 'sum') {
     const metaValue = Number(meta?.replace(']', ''));
-    formula = getParentPipelineSeriesFormula(metrics, subFunctionMetric, pipelineAgg, metric.type, {
+    formula = getPipelineSeriesFormula(metric, metrics, subFunctionMetric, {
       metaValue,
       reducedTimeRange,
+      timeShift: series.offset_time,
     });
     if (!formula) {
       return null;

diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/filter_ratio.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/filter_ratio.ts
@@ -15,7 +15,10 @@ export const convertFilterRatioToFormulaColumn = (
   reducedTimeRange?: string
 ): FormulaColumn | null => {
   const metric = metrics[metrics.length - 1];
-  const formula = getFilterRatioFormula(metric, reducedTimeRange);
+  const formula = getFilterRatioFormula(metric, {
+    reducedTimeRange,
+    timeShift: series.offset_time,
+  });
 
   if (!formula) {
     return null;

diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/formula.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/formula.ts
@@ -11,8 +11,9 @@ import { FormulaParams } from '@kbn/visualizations-plugin/common/convert_to_lens
 import { CommonColumnConverterArgs, CommonColumnsConverterArgs, FormulaColumn } from './types';
 import { TSVB_METRIC_TYPES } from '../../../../common/enums';
 import type { Metric } from '../../../../common/types';
-import { getFormulaEquivalent, getSiblingPipelineSeriesFormula } from '../metrics';
+import { getFormulaEquivalent, getPipelineSeriesFormula } from '../metrics';
 import { createColumn, getFormat } from './column';
+import { AdditionalFormulaArgs } from '../../types';
 
 type OtherFormulaAggregations =
   | typeof TSVB_METRIC_TYPES.POSITIVE_ONLY
@@ -43,15 +44,15 @@ const convertFormulaScriptForPercentileAggs = (
   variables: Exclude<Metric['variables'], undefined>,
   metric: Metric,
   allAggMetrics: Metric[],
-  reducedTimeRange?: string
+  additionalArgs: AdditionalFormulaArgs
 ) => {
   variables.forEach((variable) => {
     const [_, meta] = variable?.field?.split('[') ?? [];
     const metaValue = Number(meta?.replace(']', ''));
     if (!metaValue) {
       return;
     }
-    const script = getFormulaEquivalent(metric, allAggMetrics, { metaValue, reducedTimeRange });
+    const script = getFormulaEquivalent(metric, allAggMetrics, { metaValue, ...additionalArgs });
     if (!script) {
       return;
     }
@@ -65,9 +66,9 @@ const convertFormulaScriptForAggs = (
   variables: Exclude<Metric['variables'], undefined>,
   metric: Metric,
   allAggMetrics: Metric[],
-  reducedTimeRange?: string
+  additionalArgs: AdditionalFormulaArgs
 ) => {
-  const script = getFormulaEquivalent(metric, allAggMetrics, { reducedTimeRange });
+  const script = getFormulaEquivalent(metric, allAggMetrics, { ...additionalArgs });
   if (!script) {
     return null;
   }
@@ -107,21 +108,15 @@ export const convertMathToFormulaColumn = (
 
     // should treat percentiles differently
     if (notMathMetric.type === 'percentile' || notMathMetric.type === 'percentile_rank') {
-      script = convertFormulaScriptForPercentileAggs(
-        script!,
-        variables,
-        notMathMetric,
-        metrics,
-        reducedTimeRange
-      );
+      script = convertFormulaScriptForPercentileAggs(script!, variables, notMathMetric, metrics, {
+        reducedTimeRange,
+        timeShift: series.offset_time,
+      });
     } else {
-      script = convertFormulaScriptForAggs(
-        script!,
-        variables,
-        notMathMetric,
-        metrics,
-        reducedTimeRange
-      );
+      script = convertFormulaScriptForAggs(script!, variables, notMathMetric, metrics, {
+        reducedTimeRange,
+        timeShift: series.offset_time,
+      });
     }
   }
 
@@ -143,8 +138,19 @@ export const convertOtherAggsToFormulaColumn = (
   reducedTimeRange?: string
 ): FormulaColumn | null => {
   const metric = metrics[metrics.length - 1];
+  const [fieldId, meta] = metric?.field?.split('[') ?? [];
+  const subFunctionMetric = metrics.find(({ id }) => id === fieldId);
+  const metaValue = meta ? Number(meta?.replace(']', '')) : undefined;
+
+  if (!subFunctionMetric) {
+    return null;
+  }
 
-  const formula = getSiblingPipelineSeriesFormula(aggregation, metric, metrics, reducedTimeRange);
+  const formula = getPipelineSeriesFormula(metric, metrics, subFunctionMetric, {
+    metaValue,
+    reducedTimeRange,
+    timeShift: series.offset_time,
+  });
   if (!formula) {
     return null;
   }

diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/index.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/index.ts
@@ -20,7 +20,7 @@ export { convertToLastValueColumn } from './last_value';
 export { convertToStaticValueColumn } from './static_value';
 export { convertToFiltersColumn } from './filters';
 export { convertToDateHistogramColumn } from './date_histogram';
-export { converToTermsColumn } from './terms';
+export { convertToTermsColumn } from './terms';
 export { convertToCounterRateColumn } from './counter_rate';
 export { convertToStandartDeviationColumn } from './std_deviation';
 

diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/parent_pipeline.test.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/parent_pipeline.test.ts
@@ -467,16 +467,16 @@ describe('convertParentPipelineAggToColumns', () => {
           series,
           metrics: [
             { id, field, type: METRIC_TYPES.MAX },
-            { id: id1, field: `${id}[75]`, type: METRIC_TYPES.AVG },
-            { id: id2, field: `${id1}[50]`, type: TSVB_METRIC_TYPES.MOVING_AVERAGE },
+            { id: id1, field: `${id}`, type: METRIC_TYPES.DERIVATIVE },
+            { id: id2, field: `${id1}`, type: TSVB_METRIC_TYPES.MOVING_AVERAGE },
           ],
           dataView,
         },
       ],
       {
         meta: { metricId: 'some-id-2' },
         operationType: 'formula',
-        params: { formula: 'moving_average(average(max(bytes)))' },
+        params: { formula: 'moving_average(differences(max(bytes)), window=5)' },
       },
     ],
     [
@@ -486,16 +486,16 @@ describe('convertParentPipelineAggToColumns', () => {
           series,
           metrics: [
             { id, field, type: METRIC_TYPES.MAX },
-            { id: id1, field: `${id}[75]`, type: METRIC_TYPES.AVG },
-            { id: id2, field: `${id1}[50]`, type: METRIC_TYPES.DERIVATIVE },
+            { id: id1, field: `${id}`, type: TSVB_METRIC_TYPES.MOVING_AVERAGE },
+            { id: id2, field: `${id1}`, type: METRIC_TYPES.DERIVATIVE },
           ],
           dataView,
         },
       ],
       {
         meta: { metricId: 'some-id-2' },
         operationType: 'formula',
-        params: { formula: 'differences(average(max(bytes)))' },
+        params: { formula: 'differences(moving_average(max(bytes), window=5))' },
       },
     ],
     [

diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/parent_pipeline.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/parent_pipeline.ts
@@ -31,9 +31,9 @@ import { Metric } from '../../../../common/types';
 import {
   getFilterRatioFormula,
   getFormulaFromMetric,
-  getParentPipelineSeriesFormula,
   SupportedMetric,
   SUPPORTED_METRICS,
+  getPipelineSeriesFormula
 } from '../metrics';
 import { createColumn, getFormat } from './column';
 import { createFormulaColumn } from './formula';
@@ -186,7 +186,10 @@ export const computeParentPipelineColumns = (
   const aggFormula = getFormulaFromMetric(agg);
 
   if (subFunctionMetric.type === 'filter_ratio') {
-    const script = getFilterRatioFormula(subFunctionMetric, reducedTimeRange);
+    const script = getFilterRatioFormula(subFunctionMetric, {
+      reducedTimeRange,
+      timeShift: series.offset_time,
+    });
     if (!script) {
       return null;
     }
@@ -235,13 +238,11 @@ const convertMovingAvgOrDerivativeToColumns = (
   // support nested aggs with formula
   const additionalSubFunction = metrics.find(({ id }) => id === nestedFieldId);
   if (additionalSubFunction || pipelineAgg.name === 'counter_rate') {
-    const formula = getParentPipelineSeriesFormula(
-      metrics,
-      subFunctionMetric,
-      pipelineAgg,
-      metric.type,
-      { metaValue, reducedTimeRange }
-    );
+    const formula = getPipelineSeriesFormula(metric, metrics, subFunctionMetric, {
+      metaValue,
+      reducedTimeRange,
+      timeShift: series.offset_time,
+    });
     if (!formula) {
       return null;
     }

diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/std_deviation.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/std_deviation.ts
@@ -17,7 +17,10 @@ const createStandartDeviationFormulaColumn = (
   metrics: Metric[],
   reducedTimeRange?: string
 ) => {
-  const script = getFormulaEquivalent(metric, metrics, { reducedTimeRange });
+  const script = getFormulaEquivalent(metric, metrics, {
+    reducedTimeRange,
+    timeShift: series.offset_time,
+  });
   if (!script) return null;
   return createFormulaColumn(script, { series, metric, dataView });
 };

diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/terms.test.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/terms.test.ts
@@ -13,7 +13,7 @@ import {
   TermsParams,
 } from '@kbn/visualizations-plugin/common/convert_to_lens';
 import { createSeries } from '../__mocks__';
-import { converToTermsColumn, convertToTermsParams } from './terms';
+import { convertToTermsColumn, convertToTermsParams } from './terms';
 import { Column } from './types';
 
 describe('convertToTermsParams', () => {
@@ -208,7 +208,7 @@ describe('converToTermsColumn', () => {
   test.each<
     [
       string,
-      Parameters<typeof converToTermsColumn>,
+      Parameters<typeof convertToTermsColumn>,
       Partial<
         Omit<TermsColumn, 'params'> & {
           params: Partial<Omit<TermsColumn['params'], 'orderAgg'>> & {
@@ -275,9 +275,9 @@ describe('converToTermsColumn', () => {
     ],
   ])('should return %s', (_, input, expected) => {
     if (expected === null) {
-      expect(converToTermsColumn(...input)).toBeNull();
+      expect(convertToTermsColumn(...input)).toBeNull();
     } else {
-      expect(converToTermsColumn(...input)).toEqual(
+      expect(convertToTermsColumn(...input)).toEqual(
         expect.objectContaining({
           ...expected,
           params: expect.objectContaining({

diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/terms.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/terms.ts
@@ -24,13 +24,12 @@ const getOrderByWithAgg = (series: Series, columns: Column[]): OrderByWithAgg |
   }
 
   if (series.terms_order_by === '_count' || !series.terms_order_by) {
-    const columnId = uuid();
     return {
-      orderBy: { type: 'column', columnId },
+      orderBy: { type: 'custom' },
       orderAgg: {
         operationType: 'count',
         sourceField: 'document',
-        columnId,
+        columnId: uuid(),
         isBucketed: true,
         isSplit: false,
         dataType: 'number',
@@ -83,7 +82,7 @@ export const convertToTermsParams = (
   };
 };
 
-export const converToTermsColumn = (
+export const convertToTermsColumn = (
   termFields: [string, ...string[]],
   series: Series,
   columns: Column[],

diff --git a/...gins/vis_types/timeseries/public/convert_to_lens/lib/metrics/counter_rate_formula.test.ts b/...gins/vis_types/timeseries/public/convert_to_lens/lib/metrics/counter_rate_formula.test.ts
@@ -23,7 +23,8 @@ describe('buildCounterRateFormula', () => {
 
     const formula = buildCounterRateFormula(
       SUPPORTED_METRICS[metric.type]!.name,
-      dataView.fields[0].name
+      dataView.fields[0].name,
+      {}
     );
     expect(formula).toStrictEqual('counter_rate(max(bytes))');
   });

diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/metrics/counter_rate_formula.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/metrics/counter_rate_formula.ts
@@ -6,16 +6,23 @@
  * Side Public License, v 1.
  */
 
-const buildMaxFormula = (selector: string) => {
-  return `max(${selector})`;
+import { addAdditionalArgs } from '.';
+import { AdditionalFormulaArgs } from '../../types';
+
+const buildMaxFormula = (selector: string, additionalArgs: AdditionalFormulaArgs) => {
+  return `max(${selector}${addAdditionalArgs(additionalArgs)})`;
 };
 
 const buildСounterRateFormula = (aggFormula: string, selector: string) => {
   return `${aggFormula}(${selector})`;
 };
 
-export const buildCounterRateFormula = (aggFormula: string, fieldName: string) => {
-  const maxFormula = buildMaxFormula(fieldName);
+export const buildCounterRateFormula = (
+  aggFormula: string,
+  fieldName: string,
+  additionalArgs: AdditionalFormulaArgs
+) => {
+  const maxFormula = buildMaxFormula(fieldName, additionalArgs);
 
   const counterRateFormula = buildСounterRateFormula(aggFormula, maxFormula);
   return counterRateFormula;