GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-15 22:55:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3801 from SigNoz/release/v0.32.1

Browse Source 
Release/v0.32.1
This commit is contained in:
Prashant Shahi 2023-10-26 00:15:52 +05:45 committed by GitHub
commit 9bad663c4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 569 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,7 +146,7 @@ services:
condition: on-failure
query-service:
image: signoz/query-service:0.32.0
image: signoz/query-service:0.32.1
command:
[
"-config=/root/config/prometheus.yml",
@ -186,7 +186,7 @@ services:
<<: *db-depend
frontend:
image: signoz/frontend:0.32.0
image: signoz/frontend:0.32.1
deploy:
restart_policy:
condition: on-failure
@ -199,7 +199,7 @@ services:
- ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf
otel-collector:
image: signoz/signoz-otel-collector:0.79.11
image: signoz/signoz-otel-collector:0.79.12
command:
[
"--config=/etc/otel-collector-config.yaml",
@ -237,7 +237,7 @@ services:
- query-service
otel-collector-migrator:
image: signoz/signoz-schema-migrator:0.79.11
image: signoz/signoz-schema-migrator:0.79.12
deploy:
restart_policy:
condition: on-failure
@ -250,7 +250,7 @@ services:
# - clickhouse-3
otel-collector-metrics:
image: signoz/signoz-otel-collector:0.79.11
image: signoz/signoz-otel-collector:0.79.12
command:
[
"--config=/etc/otel-collector-metrics-config.yaml",

6
deploy/docker/clickhouse-setup/docker-compose-core.yaml
View File

@ -66,7 +66,7 @@ services:
- --storage.path=/data
otel-collector-migrator:
image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.79.11}
image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.79.12}
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.79.11
image: signoz/signoz-otel-collector:0.79.12
command:
[
"--config=/etc/otel-collector-config.yaml",
@ -118,7 +118,7 @@ services:
otel-collector-metrics:
container_name: signoz-otel-collector-metrics
image: signoz/signoz-otel-collector:0.79.11
image: signoz/signoz-otel-collector:0.79.12
command:
[
"--config=/etc/otel-collector-metrics-config.yaml",

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

@ -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.32.0}
image: signoz/query-service:${DOCKER_TAG:-0.32.1}
container_name: signoz-query-service
command:
[
@ -203,7 +203,7 @@ services:
<<: *db-depend
frontend:
image: signoz/frontend:${DOCKER_TAG:-0.32.0}
image: signoz/frontend:${DOCKER_TAG:-0.32.1}
container_name: signoz-frontend
restart: on-failure
depends_on:
@ -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.79.11}
image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.79.12}
container_name: otel-migrator
command:
- "--dsn=tcp://clickhouse:9000"
@ -229,7 +229,7 @@ services:
otel-collector:
image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.79.11}
image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.79.12}
container_name: signoz-otel-collector
command:
[
@ -269,7 +269,7 @@ services:
condition: service_healthy
otel-collector-metrics:
image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.79.11}
image: signoz/signoz-otel-collector:${OTELCOL_TAG:-0.79.12}
container_name: signoz-otel-collector-metrics
command:
[

2
frontend/package.json
View File

@ -154,6 +154,7 @@
"@types/react-resizable": "3.0.3",
"@types/react-router-dom": "^5.1.6",
"@types/react-syntax-highlighter": "15.5.7",
"@types/redux-mock-store": "1.0.4",
"@types/styled-components": "^5.1.4",
"@types/uuid": "^8.3.1",
"@types/webpack": "^5.28.0",
@ -192,6 +193,7 @@
"react-hooks-testing-library": "0.6.0",
"react-hot-loader": "^4.13.0",
"react-resizable": "3.0.4",
"redux-mock-store": "1.5.4",
"sass": "1.66.1",
"sass-loader": "13.3.2",
"ts-jest": "^27.1.5",

193
frontend/src/container/BillingContainer/BillingContainer.test.tsx Normal file
View File

@ -0,0 +1,193 @@
import { billingSuccessResponse } from 'mocks-server/__mockdata__/billing';
import {
notOfTrailResponse,
trialConvertedToSubscriptionResponse,
} from 'mocks-server/__mockdata__/licenses';
import { server } from 'mocks-server/server';
import { rest } from 'msw';
import { act, render, screen } from 'tests/test-utils';
import { getFormattedDate } from 'utils/timeUtils';
import BillingContainer from './BillingContainer';
const lisenceUrl = 'http://localhost/api/v2/licenses';
describe('BillingContainer', () => {
test('Component should render', async () => {
act(() => {
render(<BillingContainer />);
});
const unit = screen.getAllByText(/unit/i);
expect(unit[1]).toBeInTheDocument();
const dataInjection = screen.getByRole('columnheader', {
name: /data ingested/i,
});
expect(dataInjection).toBeInTheDocument();
const pricePerUnit = screen.getByRole('columnheader', {
name: /price per unit/i,
});
expect(pricePerUnit).toBeInTheDocument();
const cost = screen.getByRole('columnheader', {
name: /cost \(billing period to date\)/i,
});
expect(cost).toBeInTheDocument();
const total = screen.getByRole('cell', {
name: /total/i,
});
expect(total).toBeInTheDocument();
const manageBilling = screen.getByRole('button', {
name: /manage billing/i,
});
expect(manageBilling).toBeInTheDocument();
const dollar = screen.getByRole('cell', {
name: /\$0/i,
});
expect(dollar).toBeInTheDocument();
const currentBill = screen.getByRole('heading', {
name: /current bill total/i,
});
expect(currentBill).toBeInTheDocument();
});
test('OnTrail', async () => {
act(() => {
render(<BillingContainer />);
});
const freeTrailText = await screen.findByText('Free Trial');
expect(freeTrailText).toBeInTheDocument();
const currentBill = await screen.findByRole('heading', {
name: /current bill total/i,
});
expect(currentBill).toBeInTheDocument();
const dollar0 = await screen.findByText(/\$0/i);
expect(dollar0).toBeInTheDocument();
const onTrail = await screen.findByText(
/You are in free trial period. Your free trial will end on 20 Oct 2023/i,
);
expect(onTrail).toBeInTheDocument();
const numberOfDayRemaining = await screen.findByText(
/1 days remaining in your billing period./i,
);
expect(numberOfDayRemaining).toBeInTheDocument();
const upgradeButton = await screen.findAllByRole('button', {
name: /upgrade/i,
});
expect(upgradeButton[1]).toBeInTheDocument();
expect(upgradeButton.length).toBe(2);
const checkPaidPlan = await screen.findByText(
/Check out features in paid plans/i,
);
expect(checkPaidPlan).toBeInTheDocument();
const link = screen.getByRole('link', { name: /here/i });
expect(link).toBeInTheDocument();
});
test('OnTrail but trialConvertedToSubscription', async () => {
server.use(
rest.get(lisenceUrl, (req, res, ctx) =>
res(ctx.status(200), ctx.json(trialConvertedToSubscriptionResponse)),
),
);
act(() => {
render(<BillingContainer />);
});
const currentBill = await screen.findByRole('heading', {
name: /current bill total/i,
});
expect(currentBill).toBeInTheDocument();
const dollar0 = await screen.findByText(/\$0/i);
expect(dollar0).toBeInTheDocument();
const onTrail = await screen.findByText(
/You are in free trial period. Your free trial will end on 20 Oct 2023/i,
);
expect(onTrail).toBeInTheDocument();
const receivedCardDetails = await screen.findByText(
/We have received your card details, your billing will only start after the end of your free trial period./i,
);
expect(receivedCardDetails).toBeInTheDocument();
const manageBillingButton = await screen.findByRole('button', {
name: /manage billing/i,
});
expect(manageBillingButton).toBeInTheDocument();
const dayRemainingInBillingPeriod = await screen.findByText(
/1 days remaining in your billing period./i,
);
expect(dayRemainingInBillingPeriod).toBeInTheDocument();
});
test('Not on ontrail', async () => {
server.use(
rest.get(lisenceUrl, (req, res, ctx) =>
res(ctx.status(200), ctx.json(notOfTrailResponse)),
),
);
render(<BillingContainer />);
const billingPeriodText = `Your current billing period is from ${getFormattedDate(
billingSuccessResponse.data.billingPeriodStart,
)} to ${getFormattedDate(billingSuccessResponse.data.billingPeriodEnd)}`;
const billingPeriod = await screen.findByRole('heading', {
name: new RegExp(billingPeriodText, 'i'),
});
expect(billingPeriod).toBeInTheDocument();
const currentBill = await screen.findByRole('heading', {
name: /current bill total/i,
});
expect(currentBill).toBeInTheDocument();
const dollar0 = await screen.findAllByText(/\$1278.3/i);
expect(dollar0[0]).toBeInTheDocument();
expect(dollar0.length).toBe(2);
const metricsRow = await screen.findByRole('row', {
name: /metrics Million 4012 0.1 \$ 401.2/i,
});
expect(metricsRow).toBeInTheDocument();
const logRow = await screen.findByRole('row', {
name: /Logs GB 497 0.4 \$ 198.8/i,
});
expect(logRow).toBeInTheDocument();
const totalBill = await screen.findByRole('cell', {
name: /\$1278/i,
});
expect(totalBill).toBeInTheDocument();
const totalBillRow = await screen.findByRole('row', {
name: /total \$1278/i,
});
expect(totalBillRow).toBeInTheDocument();
});
test('Should render corrent day remaining in billing period', async () => {
server.use(
rest.get(lisenceUrl, (req, res, ctx) =>
res(ctx.status(200), ctx.json(notOfTrailResponse)),
),
);
render(<BillingContainer />);
const dayRemainingInBillingPeriod = await screen.findByText(
/11 days remaining in your billing period./i,
);
expect(dayRemainingInBillingPeriod).toBeInTheDocument();
});
});

15
frontend/src/container/BillingContainer/BillingContainer.tsx
View File

@ -20,7 +20,7 @@ import { ErrorResponse, SuccessResponse } from 'types/api';
import { CheckoutSuccessPayloadProps } from 'types/api/billing/checkout';
import { License } from 'types/api/licenses/def';
import AppReducer from 'types/reducer/app';
import { getFormattedDate } from 'utils/timeUtils';
import { getFormattedDate, getRemainingDays } from 'utils/timeUtils';
interface DataType {
key: string;
@ -98,19 +98,6 @@ const dummyColumns: ColumnsType<DataType> = [
},
];
export const getRemainingDays = (billingEndDate: number): number => {
// Convert Epoch timestamps to Date objects
const startDate = new Date(); // Convert seconds to milliseconds
const endDate = new Date(billingEndDate * 1000); // Convert seconds to milliseconds
// Calculate the time difference in milliseconds
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
const timeDifference = endDate - startDate;
return Math.ceil(timeDifference / (1000 * 60 * 60 * 24));
};
export default function BillingContainer(): JSX.Element {
const daysRemainingStr = 'days remaining in your billing period.';
const [headerText, setHeaderText] = useState('');

3
frontend/src/container/Header/index.tsx
View File

@ -8,7 +8,6 @@ import {
import { Button, Divider, MenuProps, Space, Typography } from 'antd';
import { Logout } from 'api/utils';
import ROUTES from 'constants/routes';
import { getRemainingDays } from 'container/BillingContainer/BillingContainer';
import Config from 'container/ConfigDropdown';
import { useIsDarkMode, useThemeMode } from 'hooks/useDarkMode';
import useLicense, { LICENSE_PLAN_STATUS } from 'hooks/useLicense';
@ -26,7 +25,7 @@ import { useSelector } from 'react-redux';
import { NavLink } from 'react-router-dom';
import { AppState } from 'store/reducers';
import AppReducer from 'types/reducer/app';
import { getFormattedDate } from 'utils/timeUtils';
import { getFormattedDate, getRemainingDays } from 'utils/timeUtils';
import CurrentOrganization from './CurrentOrganization';
import ManageLicense from './ManageLicense';

100
frontend/src/container/PipelinePage/PipelineListsView/index.tsx
View File

@ -3,8 +3,8 @@ import { Modal, Table } from 'antd';
import { ExpandableConfig } from 'antd/es/table/interface';
import savePipeline from 'api/pipeline/post';
import { useNotifications } from 'hooks/useNotifications';
import { cloneDeep } from 'lodash-es';
import React, { useCallback, useEffect, useMemo, useState } from 'react';
import cloneDeep from 'lodash-es/cloneDeep';
import React, { useCallback, useMemo, useState } from 'react';
import { DndProvider } from 'react-dnd';
import { HTML5Backend } from 'react-dnd-html5-backend';
import { useTranslation } from 'react-i18next';
@ -61,31 +61,52 @@ function PipelineListsView({
const [currPipelineData, setCurrPipelineData] = useState<Array<PipelineData>>(
cloneDeep(pipelineData?.pipelines),
);
const [
expandedPipelineData,
setExpandedPipelineData,
] = useState<PipelineData>();
const [expandedPipelineId, setExpandedPipelineId] = useState<
string | undefined
>(undefined);
const expandedPipelineData = useCallback(
() => currPipelineData.find((p) => p.id === expandedPipelineId),
[currPipelineData, expandedPipelineId],
);
const setExpandedPipelineData = useCallback(
(newData: PipelineData): void => {
if (expandedPipelineId) {
const pipelineIdx = currPipelineData.findIndex(
(p) => p.id === expandedPipelineId,
);
if (pipelineIdx >= 0) {
const newPipelineData = [...currPipelineData];
newPipelineData[pipelineIdx] = newData;
setCurrPipelineData(newPipelineData);
}
}
},
[expandedPipelineId, currPipelineData],
);
const [
selectedProcessorData,
setSelectedProcessorData,
] = useState<ProcessorData>();
const [
selectedPipelineData,
setSelectedPipelineData,
] = useState<PipelineData>();
const [expandedRowKeys, setExpandedRowKeys] = useState<Array<string>>();
const [showSaveButton, setShowSaveButton] = useState<string>();
const isEditingActionMode = isActionMode === ActionMode.Editing;
useEffect(() => {
if (pipelineSearchValue === '') setCurrPipelineData(pipelineData?.pipelines);
if (pipelineSearchValue !== '') {
const filterData = pipelineData?.pipelines.filter((data: PipelineData) =>
getDataOnSearch(data as never, pipelineSearchValue),
);
setCurrPipelineData(filterData);
const visibleCurrPipelines = useMemo((): Array<PipelineData> => {
if (pipelineSearchValue === '') {
return currPipelineData;
}
}, [pipelineSearchValue, pipelineData?.pipelines]);
return currPipelineData.filter((data) =>
getDataOnSearch(data as never, pipelineSearchValue),
);
}, [currPipelineData, pipelineSearchValue]);
const handleAlert = useCallback(
({ title, descrition, buttontext, onCancel, onOk }: AlertMessage) => {
@ -173,11 +194,7 @@ function PipelineListsView({
align: 'center',
render: (_value, record): JSX.Element => (
<PipelineActions
pipeline={
expandedPipelineData?.id === record.id
? (expandedPipelineData as PipelineData)
: record
}
pipeline={record}
editAction={pipelineEditAction(record)}
deleteAction={pipelineDeleteAction(record)}
/>
@ -214,7 +231,6 @@ function PipelineListsView({
pipelineEditAction,
pipelineDeleteAction,
onSwitchPipelineChange,
expandedPipelineData,
]);
const updatePipelineSequence = useCallback(
@ -236,8 +252,14 @@ function PipelineListsView({
(dragIndex: number, hoverIndex: number) => {
if (currPipelineData && isEditingActionMode) {
const rawData = currPipelineData;
const updatedRow = getUpdatedRow(currPipelineData, dragIndex, hoverIndex);
updatedRow.forEach((item, index) => {
const updatedRows = getUpdatedRow(
currPipelineData,
visibleCurrPipelines[dragIndex].orderId - 1,
visibleCurrPipelines[hoverIndex].orderId - 1,
);
updatedRows.forEach((item, index) => {
const obj = item;
obj.orderId = index + 1;
});
@ -245,7 +267,7 @@ function PipelineListsView({
title: t('reorder_pipeline'),
descrition: t('reorder_pipeline_description'),
buttontext: t('reorder'),
onOk: updatePipelineSequence(updatedRow),
onOk: updatePipelineSequence(updatedRows),
onCancel: onCancelPipelineSequence(rawData),
});
}
@ -253,6 +275,7 @@ function PipelineListsView({
[
currPipelineData,
isEditingActionMode,
visibleCurrPipelines,
handleAlert,
t,
updatePipelineSequence,
@ -268,7 +291,7 @@ function PipelineListsView({
setActionType={setActionType}
processorEditAction={processorEditAction}
setShowSaveButton={setShowSaveButton}
expandedPipelineData={expandedPipelineData}
expandedPipelineData={expandedPipelineData()}
setExpandedPipelineData={setExpandedPipelineData}
prevPipelineData={prevPipelineData}
/>
@ -280,6 +303,7 @@ function PipelineListsView({
expandedPipelineData,
setActionType,
prevPipelineData,
setExpandedPipelineData,
],
);
@ -290,7 +314,7 @@ function PipelineListsView({
keys.push(record?.id);
}
setExpandedRowKeys(keys);
setExpandedPipelineData(record);
setExpandedPipelineId(record.id);
},
[],
);
@ -324,18 +348,7 @@ function PipelineListsView({
const onSaveConfigurationHandler = useCallback(async () => {
const modifiedPipelineData = currPipelineData.map((item: PipelineData) => {
const pipelineData = item;
if (
expandedPipelineData !== undefined &&
item.id === expandedPipelineData?.id
) {
pipelineData.config = expandedPipelineData?.config;
}
pipelineData.config = item.config;
return pipelineData;
});
modifiedPipelineData.forEach((item: PipelineData) => {
const pipelineData = item;
const pipelineData = { ...item };
delete pipelineData?.id;
return pipelineData;
});
@ -363,14 +376,7 @@ function PipelineListsView({
setCurrPipelineData(modifiedPipelineData);
setPrevPipelineData(modifiedPipelineData);
}
}, [
currPipelineData,
expandedPipelineData,
notifications,
refetchPipelineLists,
setActionMode,
t,
]);
}, [currPipelineData, notifications, refetchPipelineLists, setActionMode, t]);
const onCancelConfigurationHandler = useCallback((): void => {
setActionMode(ActionMode.Viewing);
@ -424,7 +430,7 @@ function PipelineListsView({
setActionType={setActionType}
selectedProcessorData={selectedProcessorData}
setShowSaveButton={setShowSaveButton}
expandedPipelineData={expandedPipelineData}
expandedPipelineData={expandedPipelineData()}
setExpandedPipelineData={setExpandedPipelineData}
/>
<Container>
@ -439,7 +445,7 @@ function PipelineListsView({
expandedRowRender={expandedRowView}
expandable={expandableConfig}
components={tableComponents}
dataSource={currPipelineData}
dataSource={visibleCurrPipelines}
onRow={onRowHandler}
footer={footer}
pagination={false}

6
frontend/src/lib/getChartData.ts
View File

@ -63,10 +63,6 @@ const getChartData = ({
}),
);
const allLabels = response
.map((e) => e.map((e) => e.label))
.reduce((a, b) => [...a, ...b], []);
const modifiedData = response
.flat()
.sort((a, b) => {
@ -89,6 +85,8 @@ const getChartData = ({
? modifiedData.slice(0, limit)
: modifiedData;
const allLabels = modifiedData.map((e) => e.label);
const updatedDataSet = updatedSortedData.map((e, index) => {
const datasetBaseConfig = {
index,

54
frontend/src/mocks-server/__mockdata__/billing.ts Normal file
View File

@ -0,0 +1,54 @@
export const billingSuccessResponse = {
status: 'success',
data: {
billingPeriodStart: 1697197809,
billingPeriodEnd: 1698777000,
details: {
total: 1278.3,
breakdown: [
{
type: 'Metrics',
unit: 'Million',
tiers: [
{
unitPrice: 0.1,
quantity: 4012,
tierStart: 0,
tierEnd: 0,
tierCost: 401.2,
},
],
},
{
type: 'Traces',
unit: 'GB',
tiers: [
{
unitPrice: 0.3,
quantity: 2261,
tierStart: 0,
tierEnd: 0,
tierCost: 678.3,
},
],
},
{
type: 'Logs',
unit: 'GB',
tiers: [
{
unitPrice: 0.4,
quantity: 497,
tierStart: 0,
tierEnd: 0,
tierCost: 198.8,
},
],
},
],
baseFee: 199,
billTotal: 1278.3,
},
discount: 0,
},
};

90
frontend/src/mocks-server/__mockdata__/licenses.ts Normal file
View File

@ -0,0 +1,90 @@
export const licensesSuccessResponse = {
status: 'success',
data: {
trialStart: 1695992049,
trialEnd: 1697806449,
onTrial: true,
workSpaceBlock: false,
trialConvertedToSubscription: false,
gracePeriodEnd: -1,
licenses: [
{
key: 'testKeyId1',
activationId: 'testActivationId1',
ValidationMessage: '',
isCurrent: false,
planKey: 'ENTERPRISE_PLAN',
ValidFrom: '2022-10-13T13:48:51Z',
ValidUntil: '2023-10-13T19:37:37Z',
status: 'VALID',
},
{
key: 'testKeyId2',
activationId: 'testActivationId2',
ValidationMessage: '',
isCurrent: true,
planKey: 'ENTERPRISE_PLAN',
ValidFrom: '2023-09-12T11:35:43Z',
ValidUntil: '2024-09-11T17:24:29Z',
status: 'VALID',
},
],
},
};
export const trialConvertedToSubscriptionResponse = {
status: 'success',
data: {
trialStart: 1695992049,
trialEnd: 1697806449,
onTrial: true,
workSpaceBlock: false,
trialConvertedToSubscription: true,
gracePeriodEnd: -1,
licenses: [
{
key: 'testKeyId1',
activationId: 'testActivationId1',
ValidationMessage: '',
isCurrent: false,
planKey: 'ENTERPRISE_PLAN',
ValidFrom: '2022-10-13T13:48:51Z',
ValidUntil: '2023-10-13T19:37:37Z',
status: 'VALID',
},
{
key: 'testKeyId2',
activationId: 'testActivationId2',
ValidationMessage: '',
isCurrent: true,
planKey: 'ENTERPRISE_PLAN',
ValidFrom: '2023-09-12T11:35:43Z',
ValidUntil: '2024-09-11T17:24:29Z',
status: 'VALID',
},
],
},
};
export const notOfTrailResponse = {
...trialConvertedToSubscriptionResponse,
data: {
...trialConvertedToSubscriptionResponse.data,
onTrial: false,
trialConvertedToSubscriptionResponse: false,
trialStart: -1,
trialEnd: -1,
},
};
export const workSpaceBlockResponse = {
...trialConvertedToSubscriptionResponse,
data: {
...trialConvertedToSubscriptionResponse.data,
onTrial: false,
trialConvertedToSubscriptionResponse: false,
trialStart: -1,
trialEnd: -1,
workSpaceBlock: true,
},
};

11
frontend/src/mocks-server/handlers.ts
View File

@ -1,5 +1,7 @@
import { rest } from 'msw';
import { billingSuccessResponse } from './__mockdata__/billing';
import { licensesSuccessResponse } from './__mockdata__/licenses';
import { queryRangeSuccessResponse } from './__mockdata__/query_range';
import { serviceSuccessResponse } from './__mockdata__/services';
import { topLevelOperationSuccessResponse } from './__mockdata__/top_level_operations';
@ -70,4 +72,13 @@ export const handlers = [
return res(ctx.status(500));
},
),
rest.get('http://localhost/api/v2/licenses', (req, res, ctx) =>
res(ctx.status(200), ctx.json(licensesSuccessResponse)),
),
// ?licenseKey=58707e3d-3bdb-44e7-8c89-a9be237939f4
rest.get('http://localhost/api/v1/billing', (req, res, ctx) =>
res(ctx.status(200), ctx.json(billingSuccessResponse)),
),
];

55
frontend/src/pages/Services/Metrics.test.tsx
View File

@ -1,4 +1,3 @@
import user from '@testing-library/user-event';
import { render, screen } from 'tests/test-utils';
import Metrics from '.';
@ -31,43 +30,45 @@ describe('Services', () => {
expect(operationPerSecond).toBeInTheDocument();
});
test('Should filter the table input according to input typed value', async () => {
user.setup();
render(<Metrics />);
const inputBox = screen.getByRole('combobox');
expect(inputBox).toBeInTheDocument();
// TODO: Fix this test
// test('Should filter the table input according to input typed value', async () => {
// user.setup();
// render(<Metrics />);
// const inputBox = screen.getByRole('combobox');
// expect(inputBox).toBeInTheDocument();
await user.click(inputBox);
// await user.click(inputBox);
const signozCollectorId = await screen.findAllByText(/signoz.collector.id/i);
expect(signozCollectorId[0]).toBeInTheDocument();
// const signozCollectorId = await screen.findAllByText(/signoz.collector.id/i);
// expect(signozCollectorId[0]).toBeInTheDocument();
await user.click(signozCollectorId[1]);
// screen.debug();
await user.click(inputBox);
// await user.click(inputBox);
// await user.click(signozCollectorId[1]);
const inOperator = await screen.findAllByText(/not in/i);
expect(inOperator[1]).toBeInTheDocument();
// await user.click(inputBox);
await user.click(inOperator[1]);
// const inOperator = await screen.findAllByText(/not in/i);
// expect(inOperator[1]).toBeInTheDocument();
await user.type(inputBox, '6d');
// await user.click(inOperator[1]);
const serviceId = await screen.findAllByText(
/6d4af7f0-4884-4a37-abd4-6bdbee29fa04/i,
);
// await user.type(inputBox, '6d');
expect(serviceId[1]).toBeInTheDocument();
// const serviceId = await screen.findAllByText(
// /6d4af7f0-4884-4a37-abd4-6bdbee29fa04/i,
// );
await user.click(serviceId[1]);
// expect(serviceId[1]).toBeInTheDocument();
const application = await screen.findByText(/application/i);
expect(application).toBeInTheDocument();
// await user.click(serviceId[1]);
await user.click(application);
// const application = await screen.findByText(/application/i);
// expect(application).toBeInTheDocument();
const testService = await screen.findByText(/testservice/i);
expect(testService).toBeInTheDocument();
}, 30000);
// await user.click(application);
// const testService = await screen.findByText(/testservice/i);
// expect(testService).toBeInTheDocument();
// }, 30000);
});

48
frontend/src/pages/WorkspaceLocked/WorkspaceLocked.test.tsx Normal file
View File

@ -0,0 +1,48 @@
import { act, render, screen } from 'tests/test-utils';
import WorkspaceLocked from '.';
describe('WorkspaceLocked', () => {
test('Should render the component', async () => {
act(() => {
render(<WorkspaceLocked />);
});
const workspaceLocked = screen.getByRole('heading', {
name: /workspace locked/i,
});
expect(workspaceLocked).toBeInTheDocument();
const gotQuestionText = screen.getByText(/got question?/i);
expect(gotQuestionText).toBeInTheDocument();
const contactUsLink = screen.getByRole('link', {
name: /contact us/i,
});
expect(contactUsLink).toBeInTheDocument();
});
test('Render for Admin', async () => {
render(<WorkspaceLocked />);
const contactAdminMessage = screen.queryByText(
/please contact your administrator for further help/i,
);
expect(contactAdminMessage).not.toBeInTheDocument();
const updateCreditCardBtn = screen.getByRole('button', {
name: /update credit card/i,
});
expect(updateCreditCardBtn).toBeInTheDocument();
});
test('Render for non Admin', async () => {
render(<WorkspaceLocked />, {}, 'VIEWER');
const updateCreditCardBtn = screen.queryByRole('button', {
name: /update credit card/i,
});
expect(updateCreditCardBtn).not.toBeInTheDocument();
const contactAdminMessage = screen.getByText(
/please contact your administrator for further help/i,
);
expect(contactAdminMessage).toBeInTheDocument();
});
});

39
frontend/src/tests/test-utils.tsx
View File

@ -5,6 +5,7 @@ import React, { ReactElement } from 'react';
import { QueryClient, QueryClientProvider } from 'react-query';
import { Provider } from 'react-redux';
import { BrowserRouter } from 'react-router-dom';
import configureStore from 'redux-mock-store';
import store from 'store';
const queryClient = new QueryClient({
@ -15,10 +16,35 @@ const queryClient = new QueryClient({
},
});
beforeEach(() => {
jest.useFakeTimers();
jest.setSystemTime(new Date('2023-10-20'));
});
afterEach(() => {
queryClient.clear();
jest.useRealTimers();
});
const mockStore = configureStore([]);
const mockStored = (role?: string): any =>
mockStore({
...store.getState(),
app: {
...store.getState().app,
role, // Use the role provided
user: {
userId: '6f532456-8cc0-4514-a93b-aed665c32b47',
email: 'test@signoz.io',
name: 'TestUser',
profilePictureURL: '',
accessJwt: '',
refreshJwt: '',
},
},
});
jest.mock('react-i18next', () => ({
useTranslation: (): {
t: (str: string) => string;
@ -42,13 +68,17 @@ jest.mock('react-router-dom', () => ({
function AllTheProviders({
children,
role, // Accept the role as a prop
}: {
children: React.ReactNode;
role: string; // Define the role prop
}): ReactElement {
return (
<ResourceProvider>
<QueryClientProvider client={queryClient}>
<Provider store={store}>
<Provider store={mockStored(role)}>
{' '}
{/* Use the mock store with the provided role */}
<BrowserRouter>{children}</BrowserRouter>
</Provider>
</QueryClientProvider>
@ -59,7 +89,12 @@ function AllTheProviders({
const customRender = (
ui: ReactElement,
options?: Omit<RenderOptions, 'wrapper'>,
): RenderResult => render(ui, { wrapper: AllTheProviders, ...options });
role = 'ADMIN', // Set a default role
): RenderResult =>
render(ui, {
wrapper: () => <AllTheProviders role={role}>{ui}</AllTheProviders>,
...options,
});
export * from '@testing-library/react';
export { customRender as render };

13
frontend/src/utils/timeUtils.ts
View File

@ -15,3 +15,16 @@ export const getFormattedDate = (epochTimestamp: number): string => {
// Format the date as "18 Nov 2013"
return date.format('DD MMM YYYY');
};
export const getRemainingDays = (billingEndDate: number): number => {
// Convert Epoch timestamps to Date objects
const startDate = new Date(); // Convert seconds to milliseconds
const endDate = new Date(billingEndDate * 1000); // Convert seconds to milliseconds
// Calculate the time difference in milliseconds
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
const timeDifference = endDate - startDate;
return Math.ceil(timeDifference / (1000 * 60 * 60 * 24));
};

19
frontend/yarn.lock
View File

@ -3573,6 +3573,13 @@
"@types/scheduler" "*"
csstype "^3.0.2"
"@types/redux-mock-store@1.0.4":
version "1.0.4"
resolved "https://registry.yarnpkg.com/@types/redux-mock-store/-/redux-mock-store-1.0.4.tgz#d82d97d61314f02a3849a18edabd1a169581e632"
integrity sha512-53nDnXba4M7aOJsRod8HKENDC9M2ccm19yZcXImoP15oDLuBru+Q+WKWOCQwKYOC1S/6AJx58mFp8kd4s8q1rQ==
dependencies:
redux "^4.0.5"
"@types/retry@0.12.0":
version "0.12.0"
resolved "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz"
@ -9992,6 +9999,11 @@ lodash.isequal@^4.0.0:
resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==
lodash.isplainobject@^4.0.6:
version "4.0.6"
resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==
lodash.memoize@4.x, lodash.memoize@^4.1.2:
version "4.1.2"
resolved "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz"
@ -13009,6 +13021,13 @@ redent@^3.0.0:
indent-string "^4.0.0"
strip-indent "^3.0.0"
redux-mock-store@1.5.4:
version "1.5.4"
resolved "https://registry.yarnpkg.com/redux-mock-store/-/redux-mock-store-1.5.4.tgz#90d02495fd918ddbaa96b83aef626287c9ab5872"
integrity sha512-xmcA0O/tjCLXhh9Fuiq6pMrJCwFRaouA8436zcikdIpYWWCjU76CRk+i2bHx8EeiSiMGnB85/lZdU3wIJVXHTA==
dependencies:
lodash.isplainobject "^4.0.6"
redux-thunk@^2.3.0:
version "2.4.2"
resolved "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.2.tgz"

2
pkg/query-service/rules/promRule.go
View File

@ -309,7 +309,7 @@ func (r *PromRule) getPqlQuery() (string, error) {
if r.ruleCondition.Target != nil && r.ruleCondition.CompareOp != CompareOpNone {
unitConverter := converter.FromUnit(converter.Unit(r.ruleCondition.TargetUnit))
value := unitConverter.Convert(converter.Value{F: *r.ruleCondition.Target, U: converter.Unit(r.ruleCondition.TargetUnit)}, converter.Unit(r.Unit()))
query = fmt.Sprintf("%s %s %f", query, ResolveCompareOp(r.ruleCondition.CompareOp), value.F)
query = fmt.Sprintf("(%s) %s %f", query, ResolveCompareOp(r.ruleCondition.CompareOp), value.F)
return query, nil
} else {
return query, nil

6
pkg/query-service/tests/test-deploy/docker-compose.yaml
View File

@ -192,7 +192,7 @@ services:
<<: *db-depend
otel-collector-migrator:
image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.79.11}
image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.79.12}
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.79.11
image: signoz/signoz-otel-collector:0.79.12
container_name: signoz-otel-collector
command:
[
@ -245,7 +245,7 @@ services:
condition: service_healthy
otel-collector-metrics:
image: signoz/signoz-otel-collector:0.79.11
image: signoz/signoz-otel-collector:0.79.12
container_name: signoz-otel-collector-metrics
command:
[