@@ -8,7 +8,6 @@ import utc from "dayjs/plugin/utc";
8
8
import { EChartsOption } from "echarts" ;
9
9
import ReactECharts from "echarts-for-react" ;
10
10
import { fetcher } from "lib/GeneralUtils" ;
11
- import { RocksetParam } from "lib/rockset" ;
12
11
import _ from "lodash" ;
13
12
import useSWR from "swr" ;
14
13
dayjs . extend ( utc ) ;
@@ -256,11 +255,9 @@ export function TimeSeriesPanelWithData({
256
255
export default function TimeSeriesPanel ( {
257
256
// Human-readable title of the panel.
258
257
title,
259
- // Query lambda collection in Rockset.
260
- queryCollection = "metrics" ,
261
- // Query lambda name in Rockset.
258
+ // Query name
262
259
queryName,
263
- // Rockset query parameters
260
+ // Query parameters
264
261
queryParams,
265
262
// Granularity of the time buckets.
266
263
granularity,
@@ -279,7 +276,6 @@ export default function TimeSeriesPanel({
279
276
yAxisLabel,
280
277
// Additional EChartsOption (ex max y value)
281
278
additionalOptions,
282
- useClickHouse = false ,
283
279
smooth = true ,
284
280
chartType = "line" ,
285
281
sort_by = "name" ,
@@ -290,9 +286,8 @@ export default function TimeSeriesPanel({
290
286
dataReader = undefined ,
291
287
} : {
292
288
title : string ;
293
- queryCollection ?: string ;
294
289
queryName : string ;
295
- queryParams : RocksetParam [ ] | { } ;
290
+ queryParams : { [ key : string ] : any } ;
296
291
granularity : Granularity ;
297
292
groupByFieldName ?: string ;
298
293
timeFieldName : string ;
@@ -301,7 +296,6 @@ export default function TimeSeriesPanel({
301
296
yAxisRenderer : ( _value : any ) => string ;
302
297
yAxisLabel ?: string ;
303
298
additionalOptions ?: EChartsOption ;
304
- useClickHouse ?: boolean ;
305
299
smooth ?: boolean ;
306
300
chartType ?: ChartType ;
307
301
sort_by ?: "total" | "name" ;
@@ -313,19 +307,12 @@ export default function TimeSeriesPanel({
313
307
// - Granularity
314
308
// - Group by
315
309
// - Time field
316
- const url = useClickHouse
317
- ? `/api/clickhouse/${ queryName } ?parameters=${ encodeURIComponent (
318
- JSON . stringify ( {
319
- ...( queryParams as { } ) ,
320
- granularity : granularity as string ,
321
- } )
322
- ) } `
323
- : `/api/query/${ queryCollection } /${ queryName } ?parameters=${ encodeURIComponent (
324
- JSON . stringify ( [
325
- ...( queryParams as RocksetParam [ ] ) ,
326
- { name : "granularity" , type : "string" , value : granularity } ,
327
- ] )
328
- ) } `;
310
+ const url = `/api/clickhouse/${ queryName } ?parameters=${ encodeURIComponent (
311
+ JSON . stringify ( {
312
+ ...queryParams ,
313
+ granularity : granularity as string ,
314
+ } )
315
+ ) } `;
329
316
330
317
const { data : rawData } = useSWR ( url , fetcher , {
331
318
refreshInterval : auto_refresh ? 5 * 60 * 1000 : 0 ,
@@ -336,21 +323,11 @@ export default function TimeSeriesPanel({
336
323
}
337
324
const data = dataReader ? dataReader ( rawData ) : rawData ;
338
325
339
- let startTime , stopTime ;
340
- if ( useClickHouse ) {
341
- startTime = ( queryParams as any ) [ "startTime" ] ;
342
- stopTime = ( queryParams as any ) [ "stopTime" ] ;
343
- } else {
344
- startTime = ( queryParams as RocksetParam [ ] ) . find (
345
- ( p ) => p . name === "startTime"
346
- ) ?. value ;
347
- stopTime = ( queryParams as RocksetParam [ ] ) . find (
348
- ( p ) => p . name === "stopTime"
349
- ) ?. value ;
350
- }
326
+ let startTime = queryParams [ "startTime" ] ;
327
+ let stopTime = queryParams [ "stopTime" ] ;
351
328
352
329
// Clamp to the nearest granularity (e.g. nearest hour) so that the times will
353
- // align with the data we get from Rockset
330
+ // align with the data we get from the database
354
331
startTime = dayjs . utc ( startTime ) . startOf ( granularity ) ;
355
332
stopTime = dayjs . utc ( stopTime ) . endOf ( granularity ) ;
356
333
0 commit comments