GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-01 04:11:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3272 from SigNoz/release/v0.25.3

Browse Source 
Release/v0.25.3
This commit is contained in:
Prashant Shahi 2023-08-06 21:48:00 +05:30 committed by GitHub
commit d14bd7386e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 19 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.25.2 image: signoz/query-service:0.25.3
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.25.2 image: signoz/frontend:0.25.3
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.25.2} image: signoz/query-service:${DOCKER_TAG:-0.25.3}
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.25.2} image: signoz/frontend:${DOCKER_TAG:-0.25.3}
container_name: frontend container_name: frontend
restart: on-failure restart: on-failure
depends_on: depends_on:

1
frontend/src/container/LogsContextList/index.tsx
View File

@ -103,6 +103,7 @@ function LogsContextList({
PANEL_TYPES.LIST, PANEL_TYPES.LIST,
{ {
keepPreviousData: true, keepPreviousData: true,
enabled: !!requestData,
onSuccess: handleSuccess, onSuccess: handleSuccess,
}, },
); );

8
frontend/src/container/LogsExplorerViews/LogsExplorerViews.styled.ts
View File

@ -1,13 +1,5 @@
import { Tabs } from 'antd';
import { themeColors } from 'constants/theme';
import styled from 'styled-components'; import styled from 'styled-components';
export const TabsStyled = styled(Tabs)`
& .ant-tabs-nav {
background-color: ${themeColors.lightBlack};
}
`;
export const ActionsWrapper = styled.div` export const ActionsWrapper = styled.div`
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;

8
frontend/src/container/LogsExplorerViews/index.tsx
View File

@ -1,4 +1,4 @@
import { TabsProps } from 'antd'; import { Tabs, TabsProps } from 'antd';
import TabLabel from 'components/TabLabel'; import TabLabel from 'components/TabLabel';
import { QueryParams } from 'constants/query'; import { QueryParams } from 'constants/query';
import { import {
@ -40,7 +40,7 @@ import {
import { DataSource, StringOperators } from 'types/common/queryBuilder'; import { DataSource, StringOperators } from 'types/common/queryBuilder';
import { GlobalReducer } from 'types/reducer/globalTime'; import { GlobalReducer } from 'types/reducer/globalTime';
import { ActionsWrapper, TabsStyled } from './LogsExplorerViews.styled'; import { ActionsWrapper } from './LogsExplorerViews.styled';
function LogsExplorerViews(): JSX.Element { function LogsExplorerViews(): JSX.Element {
const { notifications } = useNotifications(); const { notifications } = useNotifications();
@ -154,7 +154,7 @@ function LogsExplorerViews(): JSX.Element {
panelType, panelType,
{ {
keepPreviousData: true, keepPreviousData: true,
enabled: !isLimit, enabled: !isLimit && !!requestData,
}, },
{ {
...(timeRange && ...(timeRange &&
@ -480,7 +480,7 @@ function LogsExplorerViews(): JSX.Element {
/> />
</ActionsWrapper> </ActionsWrapper>
)} )}
<TabsStyled <Tabs
items={tabsItems} items={tabsItems}
defaultActiveKey={panelType || PANEL_TYPES.LIST} defaultActiveKey={panelType || PANEL_TYPES.LIST}
activeKey={panelType || PANEL_TYPES.LIST} activeKey={panelType || PANEL_TYPES.LIST}

3
frontend/src/container/PipelinePage/PipelineListsView/PipelineExpandView.tsx
View File

@ -193,7 +193,8 @@ function PipelineExpandView({
}, [setActionType]); }, [setActionType]);
const footer = useCallback((): JSX.Element | undefined => { const footer = useCallback((): JSX.Element | undefined => {
if (prevPipelineData.length === 0 || isEditingActionMode) { const prevPipelinesCount = prevPipelineData?.length || 0;
if (prevPipelinesCount === 0 || isEditingActionMode) {
return ( return (
<FooterButton type="link" onClick={addNewProcessorHandler}> <FooterButton type="link" onClick={addNewProcessorHandler}>
<PlusCircleOutlined /> <PlusCircleOutlined />

4
frontend/src/pages/AlertChannelCreate/config.tsx
View File

@ -13,7 +13,7 @@ export const alertsRoutesConfig = [
{ {
Component: (): JSX.Element => <CreateAlertChannels preType="slack" />, Component: (): JSX.Element => <CreateAlertChannels preType="slack" />,
name: t('routes.alert_channels'), name: t('routes.alert_channels'),
route: ROUTES.ALL_CHANNELS, route: ROUTES.CHANNELS_NEW,
key: ROUTES.ALL_CHANNELS, key: ROUTES.CHANNELS_NEW,
}, },
]; ];