date_histogram bucket type as default

elastic · Aug 12, 2023 · 1cbc90a · 1cbc90a
1 parent 1d25ca7
commit 1cbc90a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 20 deletions.
diff --git a/...s/kbn-lens-embeddable-utils/attribute_builder/visualization_types/layers/xy_data_layer.ts b/...s/kbn-lens-embeddable-utils/attribute_builder/visualization_types/layers/xy_data_layer.ts
@@ -61,8 +61,19 @@ interface XYLayerConfig {
 
 export class XYDataLayer implements ChartLayer<XYDataLayerConfig> {
   private column: ChartColumn[];
-  constructor(private layerConfig: XYLayerConfig) {
+  private layerConfig: XYLayerConfig;
+  constructor(layerConfig: XYLayerConfig) {
     this.column = layerConfig.data.map((dataItem) => new FormulaColumn(dataItem));
+    this.layerConfig = {
+      ...layerConfig,
+      options: {
+        ...layerConfig.options,
+        buckets: {
+          type: 'date_histogram',
+          ...layerConfig.options?.buckets,
+        },
+      },
+    };
   }
 
   getName(): string | undefined {

diff --git a/x-pack/examples/embedded_lens_example/public/app.tsx b/x-pack/examples/embedded_lens_example/public/app.tsx
@@ -60,7 +60,6 @@ export const App = (props: {
           ],
           options: {
             seriesType: 'bar_stacked',
-            buckets: { type: 'date_histogram' },
           },
         }),
       ],

diff --git a/x-pack/plugins/infra/public/components/asset_details/tabs/overview/metrics/metrics_grid.tsx b/x-pack/plugins/infra/public/components/asset_details/tabs/overview/metrics/metrics_grid.tsx
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 import type { DataView } from '@kbn/data-views-plugin/public';
 import type { TimeRange } from '@kbn/es-query';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { XYLayerOptions, XYVisualOptions } from '@kbn/lens-embeddable-utils';
+import type { XYVisualOptions } from '@kbn/lens-embeddable-utils';
 import { UseLensAttributesXYLayerConfig } from '../../../../../hooks/use_lens_attributes';
 import { buildCombinedHostsFilter } from '../../../../../utils/filters/build';
 import { LensChart, type LensChartProps, HostMetricsExplanationContent } from '../../../../lens';
@@ -25,12 +25,6 @@ interface MetricChartConfig extends Pick<LensChartProps, 'id' | 'title' | 'overr
   toolTip: string;
 }
 
-const XY_LAYER_OPTIONS: XYLayerOptions = {
-  buckets: {
-    type: 'date_histogram',
-  },
-};
-
 const PERCENT_LEFT_AXIS: Pick<MetricChartConfig, 'overrides'>['overrides'] = {
   axisLeft: {
     domain: {
@@ -68,7 +62,6 @@ const CHARTS_IN_ORDER: Array<
       {
         data: [hostLensFormulas.cpuUsage],
         layerType: 'data',
-        options: XY_LAYER_OPTIONS,
       },
     ],
     dataViewOrigin: 'metrics',
@@ -85,7 +78,6 @@ const CHARTS_IN_ORDER: Array<
       {
         data: [hostLensFormulas.memoryUsage],
         layerType: 'data',
-        options: XY_LAYER_OPTIONS,
       },
     ],
     dataViewOrigin: 'metrics',
@@ -102,7 +94,6 @@ const CHARTS_IN_ORDER: Array<
       {
         data: [hostLensFormulas.normalizedLoad1m],
         layerType: 'data',
-        options: XY_LAYER_OPTIONS,
       },
       {
         data: [
@@ -132,7 +123,6 @@ const CHARTS_IN_ORDER: Array<
       {
         data: [hostLensFormulas.logRate],
         layerType: 'data',
-        options: XY_LAYER_OPTIONS,
       },
     ],
     dataViewOrigin: 'logs',
@@ -164,7 +154,6 @@ const CHARTS_IN_ORDER: Array<
         layerType: 'data',
         options: {
           seriesType: 'area',
-          ...XY_LAYER_OPTIONS,
         },
       },
     ],
@@ -205,7 +194,6 @@ const CHARTS_IN_ORDER: Array<
         layerType: 'data',
         options: {
           seriesType: 'area',
-          ...XY_LAYER_OPTIONS,
         },
       },
     ],
@@ -238,7 +226,6 @@ const CHARTS_IN_ORDER: Array<
         layerType: 'data',
         options: {
           seriesType: 'area',
-          ...XY_LAYER_OPTIONS,
         },
       },
     ],
@@ -271,7 +258,6 @@ const CHARTS_IN_ORDER: Array<
         layerType: 'data',
         options: {
           seriesType: 'area',
-          ...XY_LAYER_OPTIONS,
         },
       },
     ],

diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/components/tabs/metrics/metrics_grid.tsx b/x-pack/plugins/infra/public/pages/metrics/hosts/components/tabs/metrics/metrics_grid.tsx
@@ -16,9 +16,6 @@ import { Popover } from '../../table/popover';
 
 const DEFAULT_BREAKDOWN_SIZE = 20;
 const XY_LAYER_OPTIONS: XYLayerOptions = {
-  buckets: {
-    type: 'date_histogram',
-  },
   breakdown: {
     type: 'top_values',
     field: 'host.name',
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,7 +60,6 @@ export const App = (props: { @@
               ],
               options: {
                 seriesType: 'bar_stacked',
-                buckets: { type: 'date_histogram' },
               },
             }),
           ],
@@ Expand Down @@