diff --git a/ui/src/actions/metricsActions.ts b/ui/src/actions/metricsActions.ts index f78075c..19960fe 100644 --- a/ui/src/actions/metricsActions.ts +++ b/ui/src/actions/metricsActions.ts @@ -31,6 +31,12 @@ export function getMetricsAsync(endTime: number, duration: number) { return async (dispatch: Dispatch) => { dispatch({ type: GET_METRICS_BEGIN }); try { + console.log( + "DEBUG: fetching with endtime=", + endTime, + " duration=", + duration + ); const response = await getMetrics(endTime, duration); dispatch({ type: GET_METRICS_SUCCESS, payload: response }); } catch (error) { diff --git a/ui/src/components/QueueSizeMetricsChart.tsx b/ui/src/components/QueueSizeMetricsChart.tsx index ceacedc..93f83fd 100644 --- a/ui/src/components/QueueSizeMetricsChart.tsx +++ b/ui/src/components/QueueSizeMetricsChart.tsx @@ -51,8 +51,6 @@ const lineColors = [ ]; function QueueSizeMetricsChart(props: Props) { - console.log("DEBUG: QueueSizeMetricsChart props:", props); - console.log("DEBUG: chartData", toChartData(props.data)); const data = toChartData(props.data); const keys = props.data.map((x) => x.metric.queue); return ( diff --git a/ui/src/utils.ts b/ui/src/utils.ts index 9caeef5..121147e 100644 --- a/ui/src/utils.ts +++ b/ui/src/utils.ts @@ -124,7 +124,7 @@ export function currentUnixtime(): number { return Math.floor(Date.now() / 1000); } -const durationRegex = /[1-9]([0-9]*)[s|m|h]/; +const durationRegex = /([0-9]*(\.[0-9]*)?)[s|m|h]/; // Parses the given string and returns the number of seconds if the input is valid. // Otherwise, it throws an error // Supported time units are "s", "m", "h" @@ -132,14 +132,14 @@ export function parseDuration(s: string): number { if (!durationRegex.test(s)) { throw new Error("invalid duration"); } - const val = parseInt(s.slice(0, -1)); + const val = parseFloat(s.slice(0, -1)); switch (s.slice(-1)) { case "s": return val; case "m": return val * 60; case "h": - return val * 6 * 60; + return val * 60 * 60; default: throw new Error("invalid duration unit"); }