From 64307f323fef376f67db7827a7c0a1748d951d4c Mon Sep 17 00:00:00 2001 From: Yunus M Date: Thu, 1 Feb 2024 04:04:19 +0530 Subject: [PATCH 1/7] feat: show info message in general settings for cloud users to reachout for retention change (#4476) --- .../GeneralSettingsCloud.styles.scss | 7 ++++ .../GeneralSettingsCloud.tsx | 16 +++++++++ .../container/GeneralSettingsCloud/index.tsx | 3 ++ frontend/src/container/SideNav/SideNav.tsx | 13 +++++++- frontend/src/pages/Settings/config.ts | 33 +++++++++++++------ frontend/src/pages/Settings/utils.ts | 17 +++++++--- 6 files changed, 73 insertions(+), 16 deletions(-) create mode 100644 frontend/src/container/GeneralSettingsCloud/GeneralSettingsCloud.styles.scss create mode 100644 frontend/src/container/GeneralSettingsCloud/GeneralSettingsCloud.tsx create mode 100644 frontend/src/container/GeneralSettingsCloud/index.tsx diff --git a/frontend/src/container/GeneralSettingsCloud/GeneralSettingsCloud.styles.scss b/frontend/src/container/GeneralSettingsCloud/GeneralSettingsCloud.styles.scss new file mode 100644 index 0000000000..07e391796c --- /dev/null +++ b/frontend/src/container/GeneralSettingsCloud/GeneralSettingsCloud.styles.scss @@ -0,0 +1,7 @@ +.general-settings-container { + .ant-card-body { + display: flex; + align-items: center; + gap: 16px; + } +} diff --git a/frontend/src/container/GeneralSettingsCloud/GeneralSettingsCloud.tsx b/frontend/src/container/GeneralSettingsCloud/GeneralSettingsCloud.tsx new file mode 100644 index 0000000000..4782d03e12 --- /dev/null +++ b/frontend/src/container/GeneralSettingsCloud/GeneralSettingsCloud.tsx @@ -0,0 +1,16 @@ +import './GeneralSettingsCloud.styles.scss'; + +import { Card, Typography } from 'antd'; +import { Info } from 'lucide-react'; + +export default function GeneralSettingsCloud(): JSX.Element { + return ( + + + + Please email us or connect with us via intercom support to change the + retention period. + + + ); +} diff --git a/frontend/src/container/GeneralSettingsCloud/index.tsx b/frontend/src/container/GeneralSettingsCloud/index.tsx new file mode 100644 index 0000000000..49acd9140a --- /dev/null +++ b/frontend/src/container/GeneralSettingsCloud/index.tsx @@ -0,0 +1,3 @@ +import GeneralSettingsCloud from './GeneralSettingsCloud'; + +export default GeneralSettingsCloud; diff --git a/frontend/src/container/SideNav/SideNav.tsx b/frontend/src/container/SideNav/SideNav.tsx index 29435a399b..b7a06ff0e5 100644 --- a/frontend/src/container/SideNav/SideNav.tsx +++ b/frontend/src/container/SideNav/SideNav.tsx @@ -253,6 +253,15 @@ function SideNav({ } }, [isCloudUserVal, isEnterprise, isFetching]); + const [isCurrentOrgSettings] = useComponentPermission( + ['current_org_settings'], + role, + ); + + const settingsRoute = isCurrentOrgSettings + ? ROUTES.ORG_SETTINGS + : ROUTES.SETTINGS; + return (
@@ -302,7 +311,9 @@ function SideNav({ item={item} isActive={activeMenuKey === item.key} onClick={(): void => { - if (item) { + if (item.key === ROUTES.SETTINGS) { + history.push(settingsRoute); + } else if (item) { onClickHandler(item?.key as string); } }} diff --git a/frontend/src/pages/Settings/config.ts b/frontend/src/pages/Settings/config.ts index 26fb1805fa..ca18559ec5 100644 --- a/frontend/src/pages/Settings/config.ts +++ b/frontend/src/pages/Settings/config.ts @@ -2,17 +2,21 @@ import { RouteTabProps } from 'components/RouteTab/types'; import ROUTES from 'constants/routes'; import AlertChannels from 'container/AllAlertChannels'; import GeneralSettings from 'container/GeneralSettings'; +import GeneralSettingsCloud from 'container/GeneralSettingsCloud'; import IngestionSettings from 'container/IngestionSettings/IngestionSettings'; import OrganizationSettings from 'container/OrganizationSettings'; import { TFunction } from 'i18next'; -export const commonRoutes = (t: TFunction): RouteTabProps['routes'] => [ +export const organizationSettings = (t: TFunction): RouteTabProps['routes'] => [ { - Component: GeneralSettings, - name: t('routes:general').toString(), - route: ROUTES.SETTINGS, - key: ROUTES.SETTINGS, + Component: OrganizationSettings, + name: t('routes:organization_settings').toString(), + route: ROUTES.ORG_SETTINGS, + key: ROUTES.ORG_SETTINGS, }, +]; + +export const alertChannels = (t: TFunction): RouteTabProps['routes'] => [ { Component: AlertChannels, name: t('routes:alert_channels').toString(), @@ -30,11 +34,20 @@ export const ingestionSettings = (t: TFunction): RouteTabProps['routes'] => [ }, ]; -export const organizationSettings = (t: TFunction): RouteTabProps['routes'] => [ +export const generalSettings = (t: TFunction): RouteTabProps['routes'] => [ { - Component: OrganizationSettings, - name: t('routes:organization_settings').toString(), - route: ROUTES.ORG_SETTINGS, - key: ROUTES.ORG_SETTINGS, + Component: GeneralSettings, + name: t('routes:general').toString(), + route: ROUTES.SETTINGS, + key: ROUTES.SETTINGS, + }, +]; + +export const generalSettingsCloud = (t: TFunction): RouteTabProps['routes'] => [ + { + Component: GeneralSettingsCloud, + name: t('routes:general').toString(), + route: ROUTES.SETTINGS, + key: ROUTES.SETTINGS, }, ]; diff --git a/frontend/src/pages/Settings/utils.ts b/frontend/src/pages/Settings/utils.ts index 862ee0adb9..89a4e7f3ef 100644 --- a/frontend/src/pages/Settings/utils.ts +++ b/frontend/src/pages/Settings/utils.ts @@ -3,7 +3,9 @@ import { TFunction } from 'i18next'; import { isCloudUser } from 'utils/app'; import { - commonRoutes, + alertChannels, + generalSettings, + generalSettingsCloud, ingestionSettings, organizationSettings, } from './config'; @@ -12,15 +14,20 @@ export const getRoutes = ( isCurrentOrgSettings: boolean, t: TFunction, ): RouteTabProps['routes'] => { - let common = commonRoutes(t); + const settings = []; if (isCurrentOrgSettings) { - common = [...common, ...organizationSettings(t)]; + settings.push(...organizationSettings(t)); } if (isCloudUser()) { - common = [...common, ...ingestionSettings(t)]; + settings.push(...ingestionSettings(t)); + settings.push(...alertChannels(t)); + settings.push(...generalSettingsCloud(t)); + } else { + settings.push(...alertChannels(t)); + settings.push(...generalSettings(t)); } - return common; + return settings; }; From 0f44246795aef0050ffee06dbc17e1f139981726 Mon Sep 17 00:00:00 2001 From: Yunus M Date: Thu, 1 Feb 2024 18:06:32 +0530 Subject: [PATCH 2/7] feat: all line series with same labels should have same color in a dashboard (#4478) --- frontend/src/lib/getChartData.ts | 4 +++- .../src/lib/uPlotLib/plugins/tooltipPlugin.ts | 7 +++++-- .../src/lib/uPlotLib/utils/generateColor.ts | 20 +++++++++++++++++++ .../src/lib/uPlotLib/utils/getSeriesData.ts | 7 ++++--- 4 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 frontend/src/lib/uPlotLib/utils/generateColor.ts diff --git a/frontend/src/lib/getChartData.ts b/frontend/src/lib/getChartData.ts index 4bb8789ad4..3742487366 100644 --- a/frontend/src/lib/getChartData.ts +++ b/frontend/src/lib/getChartData.ts @@ -88,9 +88,11 @@ const getChartData = ({ const allLabels = modifiedData.map((e) => e.label); const updatedDataSet = updatedSortedData.map((e, index) => { + const label = allLabels[index]; + const datasetBaseConfig = { index, - label: allLabels[index], + label, borderColor: colors[index % colors.length] || 'red', data: e.second, borderWidth: 1.5, diff --git a/frontend/src/lib/uPlotLib/plugins/tooltipPlugin.ts b/frontend/src/lib/uPlotLib/plugins/tooltipPlugin.ts index d714564855..713bf7958d 100644 --- a/frontend/src/lib/uPlotLib/plugins/tooltipPlugin.ts +++ b/frontend/src/lib/uPlotLib/plugins/tooltipPlugin.ts @@ -1,11 +1,12 @@ import { getToolTipValue } from 'components/Graph/yAxisConfig'; +import { themeColors } from 'constants/theme'; import dayjs from 'dayjs'; import customParseFormat from 'dayjs/plugin/customParseFormat'; import getLabelName from 'lib/getLabelName'; import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange'; -import { colors } from '../../getRandomColor'; import { placement } from '../placement'; +import { generateColor } from '../utils/generateColor'; dayjs.extend(customParseFormat); @@ -54,12 +55,14 @@ const generateTooltipContent = ( const value = data[index][idx]; const label = getLabelName(metric, queryName || '', legend || ''); + const color = generateColor(label, themeColors.chartcolors); + if (Number.isFinite(value)) { const tooltipValue = getToolTipValue(value, yAxisUnit); const dataObj = { show: item.show || false, - color: colors[(index - 1) % colors.length], + color, label, // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore diff --git a/frontend/src/lib/uPlotLib/utils/generateColor.ts b/frontend/src/lib/uPlotLib/utils/generateColor.ts new file mode 100644 index 0000000000..c58fde4e62 --- /dev/null +++ b/frontend/src/lib/uPlotLib/utils/generateColor.ts @@ -0,0 +1,20 @@ +/* eslint-disable no-bitwise */ +export function hashFn(str: string): number { + let hash = 5381; + for (let i = 0; i < str.length; i++) { + hash = (hash * 33) ^ str.charCodeAt(i); + } + + return hash >>> 0; +} + +export function generateColor( + key: string, + colorMap: Record, +): string { + const hashValue = hashFn(key); + const keys = Object.keys(colorMap); + const colorIndex = hashValue % keys.length; + const selectedKey = keys[colorIndex]; + return colorMap[selectedKey]; +} diff --git a/frontend/src/lib/uPlotLib/utils/getSeriesData.ts b/frontend/src/lib/uPlotLib/utils/getSeriesData.ts index d5f985e458..16be3aa04e 100644 --- a/frontend/src/lib/uPlotLib/utils/getSeriesData.ts +++ b/frontend/src/lib/uPlotLib/utils/getSeriesData.ts @@ -1,8 +1,9 @@ +import { themeColors } from 'constants/theme'; import getLabelName from 'lib/getLabelName'; -import { colors } from 'lib/getRandomColor'; import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange'; import { QueryData } from 'types/api/widgets/getQuery'; +import { generateColor } from './generateColor'; import getRenderer, { drawStyles, lineInterpolations } from './getRenderer'; const paths = ( @@ -36,8 +37,6 @@ const getSeries = ( const newGraphVisibilityStates = graphsVisibilityStates?.slice(1); for (let i = 0; i < seriesList?.length; i += 1) { - const color = colors[i % colors.length]; // Use modulo to loop through colors if there are more series than colors - const { metric = {}, queryName = '', legend = '' } = widgetMetaData[i] || {}; const label = getLabelName( @@ -46,6 +45,8 @@ const getSeries = ( legend || '', ); + const color = generateColor(label, themeColors.chartcolors); + const pointSize = seriesList[i].values.length > 1 ? 5 : 10; const showPoints = !(seriesList[i].values.length > 1); From 2cf0bb4fa5bb4568321e6fd83d0f3db60d93ae64 Mon Sep 17 00:00:00 2001 From: Vikrant Gupta Date: Fri, 2 Feb 2024 12:58:14 +0530 Subject: [PATCH 3/7] feat: add typecheck on pre-commit hook (#4472) * feat: add typecheck on pre-commit hook --- frontend/package.json | 3 ++- frontend/scripts/typecheck-staged.sh | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 frontend/scripts/typecheck-staged.sh diff --git a/frontend/package.json b/frontend/package.json index 4a57943602..c104f3715b 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -210,7 +210,8 @@ }, "lint-staged": { "*.(js|jsx|ts|tsx)": [ - "eslint --fix" + "eslint --fix", + "sh scripts/typecheck-staged.sh" ] }, "resolutions": { diff --git a/frontend/scripts/typecheck-staged.sh b/frontend/scripts/typecheck-staged.sh new file mode 100644 index 0000000000..ea4fdaad86 --- /dev/null +++ b/frontend/scripts/typecheck-staged.sh @@ -0,0 +1,25 @@ +files=""; + +# lint-staged will pass all files in $1 $2 $3 etc. iterate and concat. +for var in "$@" +do + files="$files \"$var\"," +done + +# create temporary tsconfig which includes only passed files +str="{ + \"extends\": \"./tsconfig.json\", + \"include\": [\"src/types/global.d.ts\",\"src/typings/window.ts\", $files] +}" +echo $str > tsconfig.tmp + +# run typecheck using temp config +tsc -p ./tsconfig.tmp + +# capture exit code of tsc +code=$? + +# delete temp config +rm ./tsconfig.tmp + +exit $code \ No newline at end of file From ac835c80e93382a000b4e81c46e29119f3352723 Mon Sep 17 00:00:00 2001 From: Vikrant Gupta Date: Fri, 2 Feb 2024 14:43:59 +0530 Subject: [PATCH 4/7] fix: custom range should be unique to pages (#4460) * fix: custom range should be unique to pages * fix: added type safety * fix: added type safety --- .../TopNav/DateTimeSelection/config.ts | 10 ++++ .../TopNav/DateTimeSelection/index.tsx | 57 ++++++++++++++++--- 2 files changed, 60 insertions(+), 7 deletions(-) diff --git a/frontend/src/container/TopNav/DateTimeSelection/config.ts b/frontend/src/container/TopNav/DateTimeSelection/config.ts index 0ece952909..bc77afe7d6 100644 --- a/frontend/src/container/TopNav/DateTimeSelection/config.ts +++ b/frontend/src/container/TopNav/DateTimeSelection/config.ts @@ -96,3 +96,13 @@ export const routesToSkip = [ ]; export const routesToDisable = [ROUTES.LOGS_EXPLORER, ROUTES.LIVE_LOGS]; + +export interface LocalStorageTimeRange { + localstorageStartTime: string | null; + localstorageEndTime: string | null; +} + +export interface TimeRange { + startTime: string; + endTime: string; +} diff --git a/frontend/src/container/TopNav/DateTimeSelection/index.tsx b/frontend/src/container/TopNav/DateTimeSelection/index.tsx index 58b090abb9..12e47e9f73 100644 --- a/frontend/src/container/TopNav/DateTimeSelection/index.tsx +++ b/frontend/src/container/TopNav/DateTimeSelection/index.tsx @@ -15,6 +15,7 @@ import useUrlQuery from 'hooks/useUrlQuery'; import GetMinMax from 'lib/getMinMax'; import getTimeString from 'lib/getTimeString'; import history from 'lib/history'; +import { isObject } from 'lodash-es'; import { useCallback, useEffect, useMemo, useState } from 'react'; import { connect, useSelector } from 'react-redux'; import { RouteComponentProps, withRouter } from 'react-router-dom'; @@ -27,7 +28,13 @@ import { GlobalReducer } from 'types/reducer/globalTime'; import AutoRefresh from '../AutoRefresh'; import CustomDateTimeModal, { DateTimeRangeType } from '../CustomDateTimeModal'; -import { getDefaultOption, getOptions, Time } from './config'; +import { + getDefaultOption, + getOptions, + LocalStorageTimeRange, + Time, + TimeRange, +} from './config'; import RefreshText from './Refresh'; import { Form, FormContainer, FormItem } from './styles'; @@ -44,8 +51,35 @@ function DateTimeSelection({ const searchStartTime = urlQuery.get('startTime'); const searchEndTime = urlQuery.get('endTime'); - const localstorageStartTime = getLocalStorageKey('startTime'); - const localstorageEndTime = getLocalStorageKey('endTime'); + const { + localstorageStartTime, + localstorageEndTime, + } = ((): LocalStorageTimeRange => { + const routes = getLocalStorageKey(LOCALSTORAGE.METRICS_TIME_IN_DURATION); + + if (routes !== null) { + const routesObject = JSON.parse(routes || '{}'); + const selectedTime = routesObject[location.pathname]; + + if (selectedTime) { + let parsedSelectedTime: TimeRange; + try { + parsedSelectedTime = JSON.parse(selectedTime); + } catch { + parsedSelectedTime = selectedTime; + } + + if (isObject(parsedSelectedTime)) { + return { + localstorageStartTime: parsedSelectedTime.startTime, + localstorageEndTime: parsedSelectedTime.endTime, + }; + } + return { localstorageStartTime: null, localstorageEndTime: null }; + } + } + return { localstorageStartTime: null, localstorageEndTime: null }; + })(); const getTime = useCallback((): [number, number] | undefined => { if (searchEndTime && searchStartTime) { @@ -118,6 +152,15 @@ function DateTimeSelection({ const selectedTime = routesObject[pathName]; if (selectedTime) { + let parsedSelectedTime: TimeRange; + try { + parsedSelectedTime = JSON.parse(selectedTime); + } catch { + parsedSelectedTime = selectedTime; + } + if (isObject(parsedSelectedTime)) { + return 'custom'; + } return selectedTime; } } @@ -125,7 +168,7 @@ function DateTimeSelection({ return defaultSelectedOption; }; - const updateLocalStorageForRoutes = (value: Time): void => { + const updateLocalStorageForRoutes = (value: Time | string): void => { const preRoutes = getLocalStorageKey(LOCALSTORAGE.METRICS_TIME_IN_DURATION); if (preRoutes !== null) { const preRoutesObject = JSON.parse(preRoutes); @@ -220,9 +263,9 @@ function DateTimeSelection({ startTimeMoment?.toDate().getTime() || 0, endTimeMoment?.toDate().getTime() || 0, ]); - setLocalStorageKey('startTime', startTimeMoment.toString()); - setLocalStorageKey('endTime', endTimeMoment.toString()); - updateLocalStorageForRoutes('custom'); + updateLocalStorageForRoutes( + JSON.stringify({ startTime: startTimeMoment, endTime: endTimeMoment }), + ); if (!isLogsExplorerPage) { urlQuery.set( QueryParams.startTime, From f5b5a9a65756444abb1ef2f551c6cba66f02bfe7 Mon Sep 17 00:00:00 2001 From: Yunus M Date: Fri, 2 Feb 2024 16:44:27 +0530 Subject: [PATCH 5/7] fix: maintain existing pagination configs (#4484) * fix: maintain existing pagination configs * fix: pass pagination info services table * fix: general setting - cloud - add email mailto link --- frontend/src/components/ResizeTable/ResizeTable.tsx | 11 ++--------- .../GeneralSettingsCloud/GeneralSettingsCloud.tsx | 4 ++-- .../ServiceMetrics/ServiceMetricTable.tsx | 5 +++++ .../ServiceTraces/ServiceTracesTable.tsx | 5 +++++ 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/frontend/src/components/ResizeTable/ResizeTable.tsx b/frontend/src/components/ResizeTable/ResizeTable.tsx index a7d0396a50..90cc588c47 100644 --- a/frontend/src/components/ResizeTable/ResizeTable.tsx +++ b/frontend/src/components/ResizeTable/ResizeTable.tsx @@ -73,19 +73,12 @@ function ResizeTable({ } }, [columns]); - const paginationConfig = { - hideOnSinglePage: true, - showTotal: (total: number, range: number[]): string => - `${range[0]}-${range[1]} of ${total} items`, - ...tableParams.pagination, - }; - return onDragColumn ? ( - +
) : ( -
+
); } diff --git a/frontend/src/container/GeneralSettingsCloud/GeneralSettingsCloud.tsx b/frontend/src/container/GeneralSettingsCloud/GeneralSettingsCloud.tsx index 4782d03e12..6a8988deaf 100644 --- a/frontend/src/container/GeneralSettingsCloud/GeneralSettingsCloud.tsx +++ b/frontend/src/container/GeneralSettingsCloud/GeneralSettingsCloud.tsx @@ -8,8 +8,8 @@ export default function GeneralSettingsCloud(): JSX.Element { - Please email us or connect with us via intercom support to change the - retention period. + Please email us or connect + with us via intercom support to change the retention period. ); diff --git a/frontend/src/container/ServiceApplication/ServiceMetrics/ServiceMetricTable.tsx b/frontend/src/container/ServiceApplication/ServiceMetrics/ServiceMetricTable.tsx index 4fee7aeb3a..5213513dc8 100644 --- a/frontend/src/container/ServiceApplication/ServiceMetrics/ServiceMetricTable.tsx +++ b/frontend/src/container/ServiceApplication/ServiceMetrics/ServiceMetricTable.tsx @@ -91,6 +91,11 @@ function ServiceMetricTable({ + `${range[0]}-${range[1]} of ${total} items`, + }} columns={tableColumns} loading={isLoading} dataSource={services} diff --git a/frontend/src/container/ServiceApplication/ServiceTraces/ServiceTracesTable.tsx b/frontend/src/container/ServiceApplication/ServiceTraces/ServiceTracesTable.tsx index 3b21acba6e..717060d901 100644 --- a/frontend/src/container/ServiceApplication/ServiceTraces/ServiceTracesTable.tsx +++ b/frontend/src/container/ServiceApplication/ServiceTraces/ServiceTracesTable.tsx @@ -49,6 +49,11 @@ function ServiceTraceTable({ + `${range[0]}-${range[1]} of ${total} items`, + }} columns={tableColumns} loading={loading} dataSource={services} From 48ebe9171307e665d3cda9118d40708a21e0b4f1 Mon Sep 17 00:00:00 2001 From: Prashant Shahi Date: Fri, 2 Feb 2024 17:44:59 +0545 Subject: [PATCH 6/7] =?UTF-8?q?chore(signoz):=20=F0=9F=93=8C=20pin=20versi?= =?UTF-8?q?ons:=20SigNoz=200.38.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Prashant Shahi --- deploy/docker-swarm/clickhouse-setup/docker-compose.yaml | 4 ++-- deploy/docker/clickhouse-setup/docker-compose.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml index b67ae289f1..fe7e653c6e 100644 --- a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml @@ -146,7 +146,7 @@ services: condition: on-failure query-service: - image: signoz/query-service:0.38.1 + image: signoz/query-service:0.38.2 command: [ "-config=/root/config/prometheus.yml", @@ -186,7 +186,7 @@ services: <<: *db-depend frontend: - image: signoz/frontend:0.38.1 + image: signoz/frontend:0.38.2 deploy: restart_policy: condition: on-failure diff --git a/deploy/docker/clickhouse-setup/docker-compose.yaml b/deploy/docker/clickhouse-setup/docker-compose.yaml index 316194eb5f..0a848939ba 100644 --- a/deploy/docker/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose.yaml @@ -164,7 +164,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` query-service: - image: signoz/query-service:${DOCKER_TAG:-0.38.1} + image: signoz/query-service:${DOCKER_TAG:-0.38.2} container_name: signoz-query-service command: [ @@ -203,7 +203,7 @@ services: <<: *db-depend frontend: - image: signoz/frontend:${DOCKER_TAG:-0.38.1} + image: signoz/frontend:${DOCKER_TAG:-0.38.2} container_name: signoz-frontend restart: on-failure depends_on: From d5e0a26f5599cace0bd333659c292e4d6b018a08 Mon Sep 17 00:00:00 2001 From: Prashant Shahi Date: Fri, 2 Feb 2024 17:58:55 +0545 Subject: [PATCH 7/7] =?UTF-8?q?chore(signoz):=20=F0=9F=93=8C=20pin=20versi?= =?UTF-8?q?ons:=20SigNoz=20OtelCollector=200.88.11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Prashant Shahi --- deploy/docker-swarm/clickhouse-setup/docker-compose.yaml | 4 ++-- deploy/docker/clickhouse-setup/docker-compose-core.yaml | 4 ++-- deploy/docker/clickhouse-setup/docker-compose.yaml | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- pkg/query-service/tests/test-deploy/docker-compose.yaml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml index fe7e653c6e..9ac386de77 100644 --- a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml @@ -199,7 +199,7 @@ services: - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf otel-collector: - image: signoz/signoz-otel-collector:0.88.9 + image: signoz/signoz-otel-collector:0.88.11 command: [ "--config=/etc/otel-collector-config.yaml", @@ -237,7 +237,7 @@ services: - query-service otel-collector-migrator: - image: signoz/signoz-schema-migrator:0.88.9 + image: signoz/signoz-schema-migrator:0.88.11 deploy: restart_policy: condition: on-failure diff --git a/deploy/docker/clickhouse-setup/docker-compose-core.yaml b/deploy/docker/clickhouse-setup/docker-compose-core.yaml index ba7058ad80..333427103a 100644 --- a/deploy/docker/clickhouse-setup/docker-compose-core.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose-core.yaml @@ -66,7 +66,7 @@ services: - --storage.path=/data otel-collector-migrator: - image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.9} + image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.11} container_name: otel-migrator command: - "--dsn=tcp://clickhouse:9000" @@ -81,7 +81,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` otel-collector: container_name: signoz-otel-collector - image: signoz/signoz-otel-collector:0.88.9 + image: signoz/signoz-otel-collector:0.88.11 command: [ "--config=/etc/otel-collector-config.yaml", diff --git a/deploy/docker/clickhouse-setup/docker-compose.yaml b/deploy/docker/clickhouse-setup/docker-compose.yaml index 0a848939ba..6fdaf92406 100644 --- a/deploy/docker/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose.yaml @@ -215,7 +215,7 @@ services: - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf otel-collector-migrator: - image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.9} + image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.11} container_name: otel-migrator command: - "--dsn=tcp://clickhouse:9000" @@ -229,7 +229,7 @@ services: otel-collector: - image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.88.9} + image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.88.11} container_name: signoz-otel-collector command: [ diff --git a/go.mod b/go.mod index eeb6e05ec9..d7d824f47d 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.21 require ( github.com/ClickHouse/clickhouse-go/v2 v2.15.0 github.com/SigNoz/govaluate v0.0.0-20220522085550-d19c08c206cb - github.com/SigNoz/signoz-otel-collector v0.88.9 + github.com/SigNoz/signoz-otel-collector v0.88.11 github.com/SigNoz/zap_otlp/zap_otlp_encoder v0.0.0-20230822164844-1b861a431974 github.com/SigNoz/zap_otlp/zap_otlp_sync v0.0.0-20230822164844-1b861a431974 github.com/antonmedv/expr v1.15.3 diff --git a/go.sum b/go.sum index 5d28bc873e..f65f071c40 100644 --- a/go.sum +++ b/go.sum @@ -98,8 +98,8 @@ github.com/SigNoz/govaluate v0.0.0-20220522085550-d19c08c206cb h1:bneLSKPf9YUSFm github.com/SigNoz/govaluate v0.0.0-20220522085550-d19c08c206cb/go.mod h1:JznGDNg9x1cujDKa22RaQOimOvvEfy3nxzDGd8XDgmA= github.com/SigNoz/prometheus v1.9.78 h1:bB3yuDrRzi/Mv00kWayR9DZbyjTuGfendSqISyDcXiY= github.com/SigNoz/prometheus v1.9.78/go.mod h1:MffmFu2qFILQrOHehx3D0XjYtaZMVfI+Ppeiv98x4Ww= -github.com/SigNoz/signoz-otel-collector v0.88.9 h1:7bbJSXrSZcQsdEVVLsjsNXm/bWe9MhKu8qfXp8MlXQM= -github.com/SigNoz/signoz-otel-collector v0.88.9/go.mod h1:7I4FWwraVSnDywsPNbo8TdHDsPxShtYkGU5usr6dTtk= +github.com/SigNoz/signoz-otel-collector v0.88.11 h1:w9IVcXg5T+o37c0HVtBfxdKxkPYyiGX1YaOrCexpjrc= +github.com/SigNoz/signoz-otel-collector v0.88.11/go.mod h1:2ddO2lcb/4kMONIJXwfXxegRsi7FYPSWtXTgji3qsp8= github.com/SigNoz/zap_otlp v0.1.0 h1:T7rRcFN87GavY8lDGZj0Z3Xv6OhJA6Pj3I9dNPmqvRc= github.com/SigNoz/zap_otlp v0.1.0/go.mod h1:lcHvbDbRgvDnPxo9lDlaL1JK2PyOyouP/C3ynnYIvyo= github.com/SigNoz/zap_otlp/zap_otlp_encoder v0.0.0-20230822164844-1b861a431974 h1:PKVgdf83Yw+lZJbFtNGBgqXiXNf3+kOXW2qZ7Ms7OaY= diff --git a/pkg/query-service/tests/test-deploy/docker-compose.yaml b/pkg/query-service/tests/test-deploy/docker-compose.yaml index 7ce3107dbd..25de92e819 100644 --- a/pkg/query-service/tests/test-deploy/docker-compose.yaml +++ b/pkg/query-service/tests/test-deploy/docker-compose.yaml @@ -192,7 +192,7 @@ services: <<: *db-depend otel-collector-migrator: - image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.9} + image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.11} container_name: otel-migrator command: - "--dsn=tcp://clickhouse:9000" @@ -205,7 +205,7 @@ services: # condition: service_healthy otel-collector: - image: signoz/signoz-otel-collector:0.88.9 + image: signoz/signoz-otel-collector:0.88.11 container_name: signoz-otel-collector command: [