GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-12 02:29:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix/remove-fe-owner

Browse Source
This commit is contained in:
Chintan Sudani 2023-04-03 17:17:24 +05:30 committed by GitHub
commit 0b3e8d797b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deploy/docker-swarm/clickhouse-setup/docker-compose.yaml
View File

@ -137,7 +137,7 @@ services:
condition: on-failure condition: on-failure
query-service: query-service:
image: signoz/query-service:0.18.0 image: signoz/query-service:0.18.1
command: ["-config=/root/config/prometheus.yml"] command: ["-config=/root/config/prometheus.yml"]
# ports: # ports:
# - "6060:6060" # pprof port # - "6060:6060" # pprof port
@ -166,7 +166,7 @@ services:
<<: *clickhouse-depend <<: *clickhouse-depend
frontend: frontend:
image: signoz/frontend:0.18.0 image: signoz/frontend:0.18.1
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure

4
deploy/docker/clickhouse-setup/docker-compose.yaml
View File

@ -153,7 +153,7 @@ services:
# Notes for Maintainers/Contributors who will change Line Numbers of Frontend & Query-Section. Please Update Line Numbers in `./scripts/commentLinesForSetup.sh` & `./CONTRIBUTING.md` # Notes for Maintainers/Contributors who will change Line Numbers of Frontend & Query-Section. Please Update Line Numbers in `./scripts/commentLinesForSetup.sh` & `./CONTRIBUTING.md`
query-service: query-service:
image: signoz/query-service:${DOCKER_TAG:-0.18.0} image: signoz/query-service:${DOCKER_TAG:-0.18.1}
container_name: query-service container_name: query-service
command: ["-config=/root/config/prometheus.yml"] command: ["-config=/root/config/prometheus.yml"]
# ports: # ports:
@ -181,7 +181,7 @@ services:
<<: *clickhouse-depend <<: *clickhouse-depend
frontend: frontend:
image: signoz/frontend:${DOCKER_TAG:-0.18.0} image: signoz/frontend:${DOCKER_TAG:-0.18.1}
container_name: frontend container_name: frontend
restart: on-failure restart: on-failure
depends_on: depends_on:

2
frontend/src/container/MetricsApplication/Tabs/util.ts
View File

@ -61,7 +61,7 @@ export function onGraphClickHandler(
const points = chart.getElementsAtEventForMode( const points = chart.getElementsAtEventForMode(
event.native, event.native,
'nearest', 'nearest',
{ intersect: true }, { intersect: false },
true, true,
); );
const id = `${from}_button`; const id = `${from}_button`;

9
frontend/src/container/SideNav/index.tsx
View File

@ -29,7 +29,6 @@ function SideNav(): JSX.Element {
const [collapsed, setCollapsed] = useState<boolean>( const [collapsed, setCollapsed] = useState<boolean>(
getLocalStorageKey(IS_SIDEBAR_COLLAPSED) === 'true', getLocalStorageKey(IS_SIDEBAR_COLLAPSED) === 'true',
); );
const { search } = useLocation();
const { currentVersion, latestVersion, isCurrentVersionError } = useSelector< const { currentVersion, latestVersion, isCurrentVersionError } = useSelector<
AppState, AppState,
AppReducer AppReducer
@ -48,15 +47,11 @@ function SideNav(): JSX.Element {
const onClickHandler = useCallback( const onClickHandler = useCallback(
(to: string) => { (to: string) => {
const queryParams = new URLSearchParams(search);
const url = queryParams.toString();
if (pathname !== to) { if (pathname !== to) {
history.push(`${to}?${url}`); history.push(`${to}`);
} }
}, },
[pathname, search], [pathname],
); );
const onClickSlackHandler = (): void => { const onClickSlackHandler = (): void => {

2
frontend/src/container/Trace/Filters/Panel/PanelBody/Duration/index.tsx
View File

@ -178,7 +178,7 @@ function Duration(): JSX.Element {
if (value === undefined) { if (value === undefined) {
return <div />; return <div />;
} }
return <div>{`${getMs(value?.toString())}ms`}</div>; return <div>{`${value?.toString()}ms`}</div>;
}, []); }, []);
return ( return (