diff --git a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/chart/hooks/use_chart_layers_from_esql.test.ts b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/chart/hooks/use_chart_layers_from_esql.test.ts index d4334effa469a..1c5602a98ab14 100644 --- a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/chart/hooks/use_chart_layers_from_esql.test.ts +++ b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/chart/hooks/use_chart_layers_from_esql.test.ts @@ -40,7 +40,7 @@ describe('useChartLayers', () => { services: servicesMock as UnifiedHistogramServices, }; - const getTimeRange = (): TimeRange => ({ from: 'now-1h', to: 'now' }); + const timeRange: TimeRange = { from: 'now-1h', to: 'now' }; beforeEach(() => { jest.clearAllMocks(); @@ -59,7 +59,7 @@ describe('useChartLayers', () => { const { result } = renderHook(() => useChartLayersFromEsql({ query: 'FROM metrics-*', - getTimeRange, + timeRange, seriesType: 'line', color: 'red', services: mockServices.services, @@ -88,7 +88,7 @@ describe('useChartLayers', () => { const { result } = renderHook(() => useChartLayersFromEsql({ query: 'FROM metrics-*', - getTimeRange, + timeRange, seriesType: 'area', color: 'blue', services: mockServices.services, @@ -125,7 +125,7 @@ describe('useChartLayers', () => { const { result } = renderHook(() => useChartLayersFromEsql({ query: 'FROM metrics-*', - getTimeRange, + timeRange, seriesType: 'area', color: 'blue', services: mockServices.services, @@ -162,7 +162,7 @@ describe('useChartLayers', () => { const { result } = renderHook(() => useChartLayersFromEsql({ query: 'FROM metrics-*', - getTimeRange, + timeRange, seriesType: 'bar', services: mockServices.services, }) diff --git a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/chart/hooks/use_chart_layers_from_esql.ts b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/chart/hooks/use_chart_layers_from_esql.ts index 8f9eff92cc0ad..d41759afe4c30 100644 --- a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/chart/hooks/use_chart_layers_from_esql.ts +++ b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/chart/hooks/use_chart_layers_from_esql.ts @@ -11,7 +11,6 @@ import type { LensBaseLayer, LensSeriesLayer } from '@kbn/lens-embeddable-utils' import type { ChartSectionProps } from '@kbn/unified-histogram/types'; import useAsync from 'react-use/lib/useAsync'; import { useMemo } from 'react'; -import type { TimeRange } from '@kbn/data-plugin/common'; import { getESQLQueryColumns } from '@kbn/esql-utils'; import type { MetricUnit } from '@kbn/metrics-experience-plugin/common/types'; import { useEsqlQueryInfo } from '../../../hooks'; @@ -19,7 +18,7 @@ import { DIMENSIONS_COLUMN, getLensMetricFormat } from '../../../common/utils'; export const useChartLayersFromEsql = ({ query, - getTimeRange, + timeRange, color, seriesType, services, @@ -29,11 +28,10 @@ export const useChartLayersFromEsql = ({ query: string; color?: string; unit?: MetricUnit; - getTimeRange: () => TimeRange; seriesType: LensSeriesLayer['seriesType']; services: ChartSectionProps['services']; abortController?: AbortController; -} & Pick): LensSeriesLayer[] => { +} & Pick): LensSeriesLayer[] => { const queryInfo = useEsqlQueryInfo({ query }); const { value: columns = [] } = useAsync( @@ -42,10 +40,10 @@ export const useChartLayersFromEsql = ({ esqlQuery: query, search: services.data.search.search, signal: abortController?.signal, - timeRange: getTimeRange(), + timeRange, }), - [query, services.data.search, abortController, getTimeRange] + [query, services.data.search, abortController, timeRange] ); const layers = useMemo(() => { diff --git a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/chart/hooks/use_lens_props.test.ts b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/chart/hooks/use_lens_props.test.ts index 7011dd131c8cb..9b5f3e9873b58 100644 --- a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/chart/hooks/use_lens_props.test.ts +++ b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/chart/hooks/use_lens_props.test.ts @@ -38,7 +38,7 @@ describe('useLensProps', () => { }, ]; let discoverFetch$: BehaviorSubject; - const getTimeRange = (): TimeRange => ({ from: 'now-1h', to: 'now' }); + const timeRange: TimeRange = { from: 'now-1h', to: 'now' }; const createMockChartRef = () => { return React.createRef(); @@ -102,7 +102,7 @@ describe('useLensProps', () => { title: 'Test Chart', query: 'FROM metrics-*', services: servicesMock as UnifiedHistogramServices, - getTimeRange, + timeRange, discoverFetch$, chartRef, chartLayers: mockChartLayers, @@ -134,7 +134,7 @@ describe('useLensProps', () => { title: 'Test Chart', query: 'FROM metrics-*', services: servicesMock as UnifiedHistogramServices, - getTimeRange, + timeRange, discoverFetch$, chartRef, chartLayers: mockChartLayers, @@ -181,7 +181,7 @@ describe('useLensProps', () => { title: 'Test Chart', query: 'FROM metrics-*', services: servicesMock as UnifiedHistogramServices, - getTimeRange, + timeRange, discoverFetch$, chartRef, chartLayers: mockChartLayers, @@ -199,7 +199,7 @@ describe('useLensProps', () => { id: 'metricsExperienceLensComponent', noPadding: true, searchSessionId: undefined, - timeRange: getTimeRange(), + timeRange, viewMode: 'view', }); }); @@ -211,7 +211,7 @@ describe('useLensProps', () => { title: 'Test Chart', query: 'FROM metrics-*', services: servicesMock as UnifiedHistogramServices, - getTimeRange, + timeRange, discoverFetch$, chartRef: undefined, chartLayers: mockChartLayers, diff --git a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/chart/hooks/use_lens_props.ts b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/chart/hooks/use_lens_props.ts index f3771397025be..5f728259fb29e 100644 --- a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/chart/hooks/use_lens_props.ts +++ b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/chart/hooks/use_lens_props.ts @@ -26,7 +26,6 @@ import { combineLatest, map, } from 'rxjs'; -import type { TimeRange } from '@kbn/data-plugin/common'; import { useEuiTheme } from '@elastic/eui'; import type { LensYBoundsConfig, @@ -48,7 +47,7 @@ export const useLensProps = ({ title, query, services, - getTimeRange, + timeRange, searchSessionId, discoverFetch$, chartRef, @@ -58,11 +57,10 @@ export const useLensProps = ({ title: string; query: string; discoverFetch$: Observable; - getTimeRange: () => TimeRange; chartRef?: React.RefObject; chartLayers: LensSeriesLayer[]; yBounds?: LensYBoundsConfig; -} & Pick) => { +} & Pick) => { const { euiTheme } = useEuiTheme(); const chartConfigUpdates$ = useRef>(new BehaviorSubject(undefined)); @@ -87,11 +85,11 @@ export const useLensProps = ({ (attributes: LensAttributes) => { return getLensProps({ searchSessionId, - getTimeRange, + timeRange, attributes, }); }, - [searchSessionId, getTimeRange] + [searchSessionId, timeRange] ); const [lensPropsContext, setLensPropsContext] = useState>(); @@ -183,16 +181,15 @@ const buildLensParams = ({ const getLensProps = ({ searchSessionId, - getTimeRange, + timeRange, attributes, }: { searchSessionId?: string; attributes: LensAttributes; - getTimeRange: () => TimeRange; -}): LensProps => ({ +} & Pick) => ({ id: 'metricsExperienceLensComponent', - viewMode: 'view', - timeRange: getTimeRange(), + viewMode: 'view' as const, + timeRange, attributes, noPadding: true, searchSessionId, diff --git a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/chart/index.tsx b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/chart/index.tsx index 394bf5a58f012..1c4ff2c02614e 100644 --- a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/chart/index.tsx +++ b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/chart/index.tsx @@ -25,7 +25,7 @@ export const ChartSizes = { }; export type ChartSize = keyof typeof ChartSizes; -export type ChartProps = Pick & +export type ChartProps = Pick & Omit & { size?: ChartSize; discoverFetch$: Observable; @@ -44,7 +44,7 @@ export const Chart = ({ onBrushEnd, onFilter, onViewDetails, - requestParams, + timeRange, titleHighlight, discoverFetch$, size = 'm', @@ -60,7 +60,6 @@ export const Chart = ({ const [isSaveModalVisible, { toggle: toggleSaveModalVisible }] = useBoolean(false); const { SaveModalComponent } = services.lens; - const { getTimeRange } = requestParams; const lensProps = useLensProps({ title, @@ -68,7 +67,7 @@ export const Chart = ({ services, searchSessionId, discoverFetch$, - getTimeRange, + timeRange, chartRef, chartLayers, yBounds, diff --git a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/metrics_experience_grid.test.tsx b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/metrics_experience_grid.test.tsx index 50c379e940f72..e4524c503dd21 100644 --- a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/metrics_experience_grid.test.tsx +++ b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/metrics_experience_grid.test.tsx @@ -98,6 +98,7 @@ describe('MetricsExperienceGrid', () => { renderToggleActions: () =>
, chartToolbarCss: { name: '', styles: '' }, histogramCss: { name: '', styles: '' }, + timeRange: { from: 'now-15m', to: 'now' }, requestParams: { getTimeRange: () => ({ from: 'now-15m', to: 'now' }), filters: [], diff --git a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/metrics_experience_grid.tsx b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/metrics_experience_grid.tsx index 03d40f295712a..1aec3a0349d4c 100644 --- a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/metrics_experience_grid.tsx +++ b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/metrics_experience_grid.tsx @@ -50,7 +50,7 @@ export const MetricsExperienceGrid = ({ const { toggleActions, leftSideActions, rightSideActions } = useToolbarActions({ fields, renderToggleActions, - requestParams, + timeRange, }); const onKeyDown = useCallback( diff --git a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/metrics_experience_grid_content.tsx b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/metrics_experience_grid_content.tsx index 3a55089cc1156..ef3e7ad407458 100644 --- a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/metrics_experience_grid_content.tsx +++ b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/metrics_experience_grid_content.tsx @@ -198,7 +198,7 @@ export const MetricsExperienceGridContent = ({ onBrushEnd={onBrushEnd} onFilter={onFilter} discoverFetch$={discoverFetch$} - requestParams={requestParams} + timeRange={timeRange} abortController={abortController} searchTerm={searchTerm} /> diff --git a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/metrics_grid.test.tsx b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/metrics_grid.test.tsx index c8359ad6c39b0..946439d447d93 100644 --- a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/metrics_grid.test.tsx +++ b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/metrics_grid.test.tsx @@ -35,16 +35,7 @@ describe('MetricsGrid', () => { discoverFetch$.complete(); }); - const requestParams: MetricsGridProps['requestParams'] = { - filters: [], - getTimeRange: () => ({ from: 'now-1h', to: 'now' }), - query: { - esql: 'FROM metrics-*', - }, - esqlVariables: [], - relativeTimeRange: { from: 'now-1h', to: 'now' }, - updateTimeRange: () => {}, - }; + const timeRange: MetricsGridProps['timeRange'] = { from: 'now-1h', to: 'now' }; const services = { fieldsMetadata: fieldsMetadataPluginPublicMock.createStartContract(), @@ -72,7 +63,7 @@ describe('MetricsGrid', () => { dimensions={[]} discoverFetch$={discoverFetch$} fields={fields} - requestParams={requestParams} + timeRange={timeRange} services={services} /> ); @@ -88,7 +79,7 @@ describe('MetricsGrid', () => { dimensions={[{ name: 'host.name', type: ES_FIELD_TYPES.KEYWORD }]} discoverFetch$={discoverFetch$} fields={fields} - requestParams={requestParams} + timeRange={timeRange} services={services} /> ); @@ -101,7 +92,7 @@ describe('MetricsGrid', () => { dimensions={[{ name: 'host.name', type: ES_FIELD_TYPES.KEYWORD }]} discoverFetch$={discoverFetch$} fields={fields} - requestParams={requestParams} + timeRange={timeRange} services={services} /> ); @@ -126,7 +117,7 @@ describe('MetricsGrid', () => { dimensions={[]} discoverFetch$={discoverFetch$} fields={fields} - requestParams={requestParams} + timeRange={timeRange} services={services} /> ); @@ -149,7 +140,7 @@ describe('MetricsGrid', () => { dimensions={[]} discoverFetch$={discoverFetch$} fields={fields} - requestParams={requestParams} + timeRange={timeRange} services={services} /> ); @@ -177,7 +168,7 @@ describe('MetricsGrid', () => { dimensions={[]} discoverFetch$={discoverFetch$} fields={fields} - requestParams={requestParams} + timeRange={timeRange} services={services} /> ); @@ -208,7 +199,7 @@ describe('MetricsGrid', () => { dimensions={[]} discoverFetch$={discoverFetch$} fields={fields} - requestParams={requestParams} + timeRange={timeRange} services={services} /> ); @@ -246,7 +237,7 @@ describe('MetricsGrid', () => { dimensions={[]} discoverFetch$={discoverFetch$} fields={multipleFields} - requestParams={requestParams} + timeRange={timeRange} services={services} /> ); @@ -291,7 +282,7 @@ describe('MetricsGrid', () => { dimensions={[]} discoverFetch$={discoverFetch$} fields={fields} - requestParams={requestParams} + timeRange={timeRange} services={services} /> ); @@ -310,7 +301,7 @@ describe('MetricsGrid', () => { dimensions={[]} discoverFetch$={discoverFetch$} fields={fields} - requestParams={requestParams} + timeRange={timeRange} services={services} /> ); @@ -341,7 +332,7 @@ describe('MetricsGrid', () => { dimensions={[]} discoverFetch$={discoverFetch$} fields={fields} - requestParams={requestParams} + timeRange={timeRange} services={services} /> ); @@ -363,7 +354,7 @@ describe('MetricsGrid', () => { dimensions={[]} discoverFetch$={discoverFetch$} fields={fields} - requestParams={requestParams} + timeRange={timeRange} services={services} /> ); diff --git a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/metrics_grid.tsx b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/metrics_grid.tsx index 337df5975e963..3352cfe419436 100644 --- a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/metrics_grid.tsx +++ b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/metrics_grid.tsx @@ -30,7 +30,7 @@ import { useChartLayers } from './chart/hooks/use_chart_layers'; export type MetricsGridProps = Pick< ChartSectionProps, - 'searchSessionId' | 'services' | 'onBrushEnd' | 'onFilter' | 'abortController' | 'requestParams' + 'searchSessionId' | 'services' | 'onBrushEnd' | 'onFilter' | 'abortController' | 'timeRange' > & { filters?: DimensionFilters; dimensions: Dimension[]; @@ -52,7 +52,7 @@ export const MetricsGrid = ({ services, columns, abortController, - requestParams, + timeRange, discoverFetch$, searchTerm, filters = {}, @@ -169,7 +169,7 @@ export const MetricsGrid = ({ onBrushEnd={onBrushEnd} onFilter={onFilter} abortController={abortController} - requestParams={requestParams} + timeRange={timeRange} discoverFetch$={discoverFetch$} rowIndex={rowIndex} colIndex={colIndex} @@ -198,7 +198,7 @@ export const MetricsGrid = ({ interface ChartItemProps extends Pick< ChartSectionProps, - 'searchSessionId' | 'services' | 'onBrushEnd' | 'onFilter' | 'abortController' | 'requestParams' + 'searchSessionId' | 'services' | 'onBrushEnd' | 'onFilter' | 'abortController' | 'timeRange' > { id: string; metric: MetricField; @@ -230,7 +230,7 @@ const ChartItem = React.memo( onBrushEnd, onFilter, abortController, - requestParams, + timeRange, discoverFetch$, rowIndex, colIndex, @@ -279,7 +279,7 @@ const ChartItem = React.memo( esqlQuery={esqlQuery} size={size} discoverFetch$={discoverFetch$} - requestParams={requestParams} + timeRange={timeRange} services={services} abortController={abortController} searchSessionId={searchSessionId} diff --git a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/toolbar/hooks/use_toolbar_actions.tsx b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/toolbar/hooks/use_toolbar_actions.tsx index bd3b32d2fa6a7..adafd856519b6 100644 --- a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/toolbar/hooks/use_toolbar_actions.tsx +++ b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/toolbar/hooks/use_toolbar_actions.tsx @@ -20,14 +20,14 @@ import { ValuesSelector } from '../values_selector'; import { MAX_DIMENSIONS_SELECTIONS } from '../../../common/constants'; interface UseToolbarActionsProps - extends Pick { + extends Pick { fields: MetricField[]; hideDimensionsSelector?: boolean; hideRightSideActions?: boolean; } export const useToolbarActions = ({ fields, - requestParams, + timeRange, renderToggleActions, hideDimensionsSelector = false, hideRightSideActions = false, @@ -75,7 +75,7 @@ export const useToolbarActions = ({ onChange={onValuesChange} disabled={dimensions.length === 0} indices={indices} - timeRange={requestParams.getTimeRange()} + timeRange={timeRange} onClear={onClearValues} fullWidth={isSmallScreen} /> @@ -89,7 +89,7 @@ export const useToolbarActions = ({ onClearValues, onDimensionsChange, onValuesChange, - requestParams, + timeRange, valueFilters, hideDimensionsSelector, ] diff --git a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/toolbar/values_selector.tsx b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/toolbar/values_selector.tsx index 9f0fd22c532f9..2484092117b7f 100644 --- a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/toolbar/values_selector.tsx +++ b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/toolbar/values_selector.tsx @@ -18,11 +18,11 @@ import { EuiNotificationBadge, EuiText, } from '@elastic/eui'; -import type { TimeRange } from '@kbn/data-plugin/common'; import { i18n } from '@kbn/i18n'; import { comboBoxFieldOptionMatcher } from '@kbn/field-utils'; import { css } from '@emotion/react'; import type { Dimension } from '@kbn/metrics-experience-plugin/common/types'; +import type { ChartSectionProps } from '@kbn/unified-histogram/types'; import { FIELD_VALUE_SEPARATOR } from '../../common/constants'; import { useDimensionsQuery } from '../../hooks'; import { ClearAllSection } from './clear_all_section'; @@ -31,12 +31,11 @@ import { METRICS_VALUES_SELECTOR_DATA_TEST_SUBJ, } from '../../common/constants'; -export interface ValuesFilterProps { +export interface ValuesFilterProps extends Pick { selectedDimensions: Dimension[]; selectedValues: string[]; indices?: string[]; disabled?: boolean; - timeRange: TimeRange; fullWidth?: boolean; onChange: (values: string[]) => void; onClear: () => void; @@ -63,8 +62,8 @@ export const ValuesSelector = ({ } = useDimensionsQuery({ dimensions: selectedDimensionNames, indices, - from: timeRange.from, - to: timeRange.to, + from: timeRange?.from, + to: timeRange?.to, }); const groupedValues = useMemo(() => { diff --git a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/trace_metrics_grid/error_rate.tsx b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/trace_metrics_grid/error_rate.tsx index 142c3805b3aef..7420ad070fa76 100644 --- a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/trace_metrics_grid/error_rate.tsx +++ b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/trace_metrics_grid/error_rate.tsx @@ -19,7 +19,7 @@ const ERROR_RATE_Y_BOUNDS: LensYBoundsConfig = { mode: 'custom', lowerBound: 0, export const ErrorRateChart = () => { const { filters, - requestParams, + timeRange, services, abortController, discoverFetch$, @@ -29,7 +29,6 @@ export const ErrorRateChart = () => { onBrushEnd, onFilter, } = useTraceMetricsContext(); - const { getTimeRange } = requestParams; const { esqlQuery, seriesType, unit, color, title } = getErrorRateChart({ dataSource, @@ -41,7 +40,7 @@ export const ErrorRateChart = () => { query: esqlQuery, seriesType, services, - getTimeRange, + timeRange, unit, color, abortController, @@ -52,7 +51,7 @@ export const ErrorRateChart = () => { esqlQuery={esqlQuery} size="s" discoverFetch$={discoverFetch$} - requestParams={requestParams} + timeRange={timeRange} services={services} abortController={abortController} searchSessionId={searchSessionId} diff --git a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/trace_metrics_grid/index.tsx b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/trace_metrics_grid/index.tsx index 2eca33077beb9..1c2ad087c98ca 100644 --- a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/trace_metrics_grid/index.tsx +++ b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/trace_metrics_grid/index.tsx @@ -37,6 +37,7 @@ function TraceMetricsGrid({ chartToolbarCss, isComponentVisible, dataView, + timeRange, }: ChartSectionProps & { dataSource: DataSource; }) { @@ -92,7 +93,7 @@ function TraceMetricsGrid({ dataSource, indexes: indexPattern, filters, - requestParams, + timeRange, services, searchSessionId, abortController, diff --git a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/trace_metrics_grid/latency.tsx b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/trace_metrics_grid/latency.tsx index f0421f4c11465..e107cd605dcba 100644 --- a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/trace_metrics_grid/latency.tsx +++ b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/trace_metrics_grid/latency.tsx @@ -16,7 +16,6 @@ import { getLatencyChart } from './trace_charts_definition'; export const LatencyChart = () => { const { filters, - requestParams, services, abortController, discoverFetch$, @@ -25,6 +24,7 @@ export const LatencyChart = () => { indexes, onBrushEnd, onFilter, + timeRange, } = useTraceMetricsContext(); const { esqlQuery, seriesType, unit, color, title } = getLatencyChart({ @@ -51,7 +51,7 @@ export const LatencyChart = () => { esqlQuery={esqlQuery} size="s" discoverFetch$={discoverFetch$} - requestParams={requestParams} + timeRange={timeRange} services={services} abortController={abortController} searchSessionId={searchSessionId} diff --git a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/trace_metrics_grid/throughput.tsx b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/trace_metrics_grid/throughput.tsx index 26a08138b6f65..981a06f5211b8 100644 --- a/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/trace_metrics_grid/throughput.tsx +++ b/src/platform/packages/shared/kbn-unified-metrics-grid/src/components/trace_metrics_grid/throughput.tsx @@ -17,7 +17,7 @@ import { getThroughputChart } from './trace_charts_definition'; export const ThroughputChart = () => { const { filters, - requestParams, + timeRange, services, abortController, discoverFetch$, @@ -55,7 +55,7 @@ export const ThroughputChart = () => { esqlQuery={esqlQuery} size="s" discoverFetch$={discoverFetch$} - requestParams={requestParams} + timeRange={timeRange} services={services} abortController={abortController} searchSessionId={searchSessionId} diff --git a/src/platform/packages/shared/kbn-unified-metrics-grid/src/context/trace_metrics_context/index.ts b/src/platform/packages/shared/kbn-unified-metrics-grid/src/context/trace_metrics_context/index.ts index 055fd34264385..4fe80cd05eca3 100644 --- a/src/platform/packages/shared/kbn-unified-metrics-grid/src/context/trace_metrics_context/index.ts +++ b/src/platform/packages/shared/kbn-unified-metrics-grid/src/context/trace_metrics_context/index.ts @@ -19,7 +19,7 @@ type TraceMetricsContextProps = { discoverFetch$: Observable; } & Pick< ChartSectionProps, - 'requestParams' | 'services' | 'searchSessionId' | 'abortController' | 'onBrushEnd' | 'onFilter' + 'services' | 'searchSessionId' | 'abortController' | 'onBrushEnd' | 'onFilter' | 'timeRange' >; export const TraceMetricsContext = createContext(undefined);