Compare commits

...

1 Commits

Author SHA1 Message Date
Yury Molodov
a688e2ec78 app/vmui: persist auto-refresh interval in URL (VictoriaMetrics/VictoriaLogs#1310)
Signed-off-by: Yury Molodov <yurymolodov@gmail.com>
2026-07-22 14:19:28 +02:00
4 changed files with 83 additions and 46 deletions

View File

@@ -1,4 +1,4 @@
import { FC, useEffect, useRef, useState } from "preact/compat";
import { FC, useEffect, useRef } from "preact/compat";
import { useTimeDispatch } from "../../../../state/time/TimeStateContext";
import { getAppModeEnable } from "../../../../utils/app-mode";
import Button from "../../../Main/Button/Button";
@@ -9,27 +9,38 @@ import classNames from "classnames";
import Tooltip from "../../../Main/Tooltip/Tooltip";
import useDeviceDetect from "../../../../hooks/useDeviceDetect";
import useBoolean from "../../../../hooks/useBoolean";
import { getMillisecondsFromDuration } from "../../../../utils/time";
import { useSearchParams } from "react-router";
interface AutoRefreshOption {
seconds: number
title: string
}
const delayOptions: AutoRefreshOption[] = [
{ seconds: 0, title: "Off" },
{ seconds: 1, title: "1s" },
{ seconds: 2, title: "2s" },
{ seconds: 5, title: "5s" },
{ seconds: 10, title: "10s" },
{ seconds: 30, title: "30s" },
{ seconds: 60, title: "1m" },
{ seconds: 300, title: "5m" },
{ seconds: 900, title: "15m" },
{ seconds: 1800, title: "30m" },
{ seconds: 3600, title: "1h" },
{ seconds: 7200, title: "2h" }
const delayOptions = [
"Off",
"1s",
"2s",
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h"
];
const DEFAULT_OPTION = delayOptions[0];
const MIN_REFRESH_MS = 1000;
const MAX_REFRESH_MS = getMillisecondsFromDuration(delayOptions[delayOptions.length - 1]);
const REFRESH_URL_PARAM = "refresh";
const durationToMs = (dur: string | null) => {
return dur ? getMillisecondsFromDuration(dur) : 0;
};
const isValidDelay = (ms: number) => {
return ms >= MIN_REFRESH_MS && ms <= MAX_REFRESH_MS;
};
interface ExecutionControlsProps {
tooltip: string;
useAutorefresh?: boolean;
@@ -38,12 +49,14 @@ interface ExecutionControlsProps {
export const ExecutionControls: FC<ExecutionControlsProps> = ({ tooltip, useAutorefresh, closeModal }) => {
const { isMobile } = useDeviceDetect();
const [searchParams, setSearchParams] = useSearchParams();
const dispatch = useTimeDispatch();
const appModeEnable = getAppModeEnable();
const [autoRefresh, setAutoRefresh] = useState(false);
const [selectedDelay, setSelectedDelay] = useState<AutoRefreshOption>(delayOptions[0]);
const rawDelay = searchParams.get(REFRESH_URL_PARAM);
const msDelay = durationToMs(rawDelay);
const selectedDelay = isValidDelay(msDelay) ? rawDelay : DEFAULT_OPTION;
const {
value: openOptions,
@@ -52,11 +65,20 @@ export const ExecutionControls: FC<ExecutionControlsProps> = ({ tooltip, useAuto
} = useBoolean(false);
const optionsButtonRef = useRef<HTMLDivElement>(null);
const handleChange = (d: AutoRefreshOption) => {
if ((autoRefresh && !d.seconds) || (!autoRefresh && d.seconds)) {
setAutoRefresh(prev => !prev);
}
setSelectedDelay(d);
const handleChange = (dur: string) => () => {
setSearchParams(prev => {
const nextParams = new URLSearchParams(prev);
const ms = durationToMs(dur);
if (ms) {
nextParams.set(REFRESH_URL_PARAM, `${dur}`);
} else {
nextParams.delete(REFRESH_URL_PARAM);
}
return nextParams;
});
handleCloseOptions();
};
@@ -68,23 +90,19 @@ export const ExecutionControls: FC<ExecutionControlsProps> = ({ tooltip, useAuto
};
useEffect(() => {
const delay = selectedDelay.seconds;
const ms = durationToMs(selectedDelay);
let timer: number;
if (autoRefresh) {
if (useAutorefresh && isValidDelay(ms)) {
timer = setInterval(() => {
dispatch({ type: "RUN_QUERY" });
}, delay * 1000) as unknown as number;
} else {
setSelectedDelay(delayOptions[0]);
}, ms) as unknown as number;
}
return () => {
timer && clearInterval(timer);
};
}, [selectedDelay, autoRefresh]);
const createHandlerChange = (d: AutoRefreshOption) => () => {
handleChange(d);
};
return () => {
clearInterval(timer);
};
}, [selectedDelay, useAutorefresh]);
return (
<>
@@ -106,7 +124,7 @@ export const ExecutionControls: FC<ExecutionControlsProps> = ({ tooltip, useAuto
<span className="vm-mobile-option__icon"><RestartIcon/></span>
<div className="vm-mobile-option-text">
<span className="vm-mobile-option-text__label">Auto-refresh</span>
<span className="vm-mobile-option-text__value">{selectedDelay.title}</span>
<span className="vm-mobile-option-text__value">{selectedDelay}</span>
</div>
<span className="vm-mobile-option__arrow"><ArrowDownIcon/></span>
</div>
@@ -139,7 +157,7 @@ export const ExecutionControls: FC<ExecutionControlsProps> = ({ tooltip, useAuto
)}
onClick={toggleOpenOptions}
>
{selectedDelay.title}
{selectedDelay}
</Button>
</div>
</Tooltip>
@@ -187,12 +205,12 @@ export const ExecutionControls: FC<ExecutionControlsProps> = ({ tooltip, useAuto
className={classNames({
"vm-list-item": true,
"vm-list-item_mobile": isMobile,
"vm-list-item_active": d.seconds === selectedDelay.seconds
"vm-list-item_active": d === selectedDelay
})}
key={d.seconds}
onClick={createHandlerChange(d)}
key={d}
onClick={handleChange(d)}
>
{d.title}
{d}
</div>
))}
</div>

View File

@@ -1,6 +1,6 @@
import { describe, it, expect } from "vitest";
import dayjs from "dayjs";
import { getNanoTimestamp, parseSupportedDuration } from "./time";
import { getMillisecondsFromDuration, getNanoTimestamp, parseSupportedDuration } from "./time";
describe("Time utils", () => {
describe("getNanoTimestamp", () => {
@@ -82,4 +82,19 @@ describe("Time utils", () => {
expect(parseSupportedDuration(" ")).toBeUndefined();
});
});
describe("getMillisecondsFromDuration", () => {
it("should convert valid durations to milliseconds", () => {
expect(getMillisecondsFromDuration("1s")).toBe(1000);
expect(getMillisecondsFromDuration("1.5s")).toBe(1500);
expect(getMillisecondsFromDuration("1m30s")).toBe(90000);
expect(getMillisecondsFromDuration("1h 30m")).toBe(5400000);
expect(getMillisecondsFromDuration("500ms")).toBe(500);
});
it("should return zero when duration cannot be parsed", () => {
expect(getMillisecondsFromDuration("garbage")).toBe(0);
expect(getMillisecondsFromDuration("")).toBe(0);
});
});
});

View File

@@ -100,6 +100,10 @@ export const getSecondsFromDuration = (dur: string) => {
return dayjs.duration(durObject).asSeconds();
};
export const getMillisecondsFromDuration = (dur: string): number => {
return getSecondsFromDuration(dur) * 1000;
};
const instantQueryViews = [DisplayType.table, DisplayType.code];
export const getStepFromDuration = (dur: number, histogram?: boolean, displayType?: DisplayType): string => {
if (displayType && instantQueryViews.includes(displayType)) return roundStep(dur);
@@ -276,4 +280,3 @@ export const getNanoTimestamp = (dateStr: string): bigint => {
// Return the full timestamp in nanoseconds as a BigInt
return BigInt(baseMs) * 1000000n + BigInt(extraNano);
};

View File

@@ -30,6 +30,7 @@ See also [LTS releases](https://docs.victoriametrics.com/victoriametrics/lts-rel
* FEATURE: [vmagent](https://docs.victoriametrics.com/victoriametrics/vmagent/) and [vmsingle](https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/): Improve background discovery performance for [http_sd](https://docs.victoriametrics.com/victoriametrics/sd_configs/#http_sd_configs) discovery. See [#8838](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/8838).
* FEATURE: [vmagent](https://docs.victoriametrics.com/victoriametrics/vmagent/) and [vmsingle](https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/): allow overriding `max_scrape_size` on a per-target basis via the `__max_scrape_size__` label during target relabeling. See [#11188](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/11188).
* FEATURE: [vmstorage](https://docs.victoriametrics.com/victoriametrics/cluster-victoriametrics/) and [vmsingle](https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/): add `-maxBackfillAge` command-line flag for limiting ingestion of samples with historical timestamps, for example, when older data has been moved between storage tiers (nvme/hdd, hot/cold). See [#11199](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/11199). Thanks to @AshwinRamaniPsg for contribution.
* FEATURE: [vmui](https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/#vmui): persist the selected auto-refresh interval in the URL. See [#1310](https://github.com/VictoriaMetrics/VictoriaLogs/issues/1310).
* BUGFIX: `vminsert` in [VictoriaMetrics cluster](https://docs.victoriametrics.com/victoriametrics/cluster-victoriametrics/): Now drops metadata blocks when communicating with vmstorage nodes over the legacy RPC protocol. To avoid this limitation, upgrade `vmstorage` to a version that supports the new RPC protocol (>= [v1.137.0](https://github.com/VictoriaMetrics/VictoriaMetrics/blob/master/docs/victoriametrics/changelog/CHANGELOG.md#v11370)). See [#11146](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/11146).
* BUGFIX: [vmbackup](https://docs.victoriametrics.com/victoriametrics/vmbackup/) and [vmbackupmanager](https://docs.victoriametrics.com/victoriametrics/vmbackupmanager/): retry S3 requests failing with `HTTP 429` status code or `TooManyRequests` error code. Previously such requests were not retried, so a short burst of rate limiting would fail the whole backup. See [#11218](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/11218). Thanks to @gautamrizwani for contribution.