Merge remote-tracking branch 'origin/develop' into feat/read-in-order

.github/workflows/staging-deployment.yaml

@@ -9,46 +9,34 @@ jobs:
     name: Deploy latest develop branch to staging
     runs-on: ubuntu-latest
     environment: staging
-    permissions:
-      contents: 'read'
-      id-token: 'write'
     steps:
-      - id: 'auth'
-        uses: 'google-github-actions/auth@v2'
-        with:
-          workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
-          service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }}
-
-      - name: 'sdk'
-        uses: 'google-github-actions/setup-gcloud@v2'
-
-      - name: 'ssh'
-        shell: bash
+      - name: Executing remote ssh commands using ssh key
+        uses: appleboy/ssh-action@v1.0.3
         env:
-          GITHUB_BRANCH: ${{ github.head_ref || github.ref_name }}
+          GITHUB_BRANCH: develop
           GITHUB_SHA: ${{ github.sha }}
-          GCP_PROJECT: ${{ secrets.GCP_PROJECT }}
-          GCP_ZONE: ${{ secrets.GCP_ZONE }}
-          GCP_INSTANCE: ${{ secrets.GCP_INSTANCE }}
-        run: |
-          read -r -d '' COMMAND <<EOF || true
-          echo "GITHUB_BRANCH: ${GITHUB_BRANCH}"
-          echo "GITHUB_SHA: ${GITHUB_SHA}"
-          export DOCKER_TAG="${GITHUB_SHA:0:7}" # needed for child process to access it
-          export OTELCOL_TAG="main"
-          export PATH="/usr/local/go/bin/:$PATH" # needed for Golang to work
-          docker system prune --force
-          docker pull signoz/signoz-otel-collector:main
-          docker pull signoz/signoz-schema-migrator:main
-          cd ~/signoz
-          git status
-          git add .
-          git stash push -m "stashed on $(date --iso-8601=seconds)"
-          git fetch origin
-          git checkout ${GITHUB_BRANCH}
-          git pull
-          make build-ee-query-service-amd64
-          make build-frontend-amd64
-          make run-signoz
-          EOF
-          gcloud compute ssh ${GCP_INSTANCE} --zone ${GCP_ZONE} --tunnel-through-iap --project ${GCP_PROJECT} --command "${COMMAND}"
+        with:
+          host: ${{ secrets.HOST_DNS }}
+          username: ${{ secrets.USERNAME }}
+          key: ${{ secrets.SSH_KEY }}
+          envs: GITHUB_BRANCH,GITHUB_SHA
+          command_timeout: 60m
+          script: |
+            echo "GITHUB_BRANCH: ${GITHUB_BRANCH}"
+            echo "GITHUB_SHA: ${GITHUB_SHA}"
+            export DOCKER_TAG="${GITHUB_SHA:0:7}" # needed for child process to access it
+            export OTELCOL_TAG="main"
+            export PATH="/usr/local/go/bin/:$PATH" # needed for Golang to work
+            docker system prune --force
+            docker pull signoz/signoz-otel-collector:main
+            docker pull signoz/signoz-schema-migrator:main
+            cd ~/signoz
+            git status
+            git add .
+            git stash push -m "stashed on $(date --iso-8601=seconds)"
+            git fetch origin
+            git checkout ${GITHUB_BRANCH}
+            git pull
+            make build-ee-query-service-amd64
+            make build-frontend-amd64
+            make run-signoz

.github/workflows/testing-deployment.yaml

@@ -9,47 +9,35 @@ jobs:
     runs-on: ubuntu-latest
     environment: testing
     if: ${{ github.event.label.name == 'testing-deploy' }}
-    permissions:
-      contents: 'read'
-      id-token: 'write'
     steps:
-      - id: 'auth'
-        uses: 'google-github-actions/auth@v2'
-        with:
-          workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
-          service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }}
-
-      - name: 'sdk'
-        uses: 'google-github-actions/setup-gcloud@v2'
-
-      - name: 'ssh'
-        shell: bash
+      - name: Executing remote ssh commands using ssh key
+        uses: appleboy/ssh-action@v1.0.3
         env:
           GITHUB_BRANCH: ${{ github.head_ref || github.ref_name }}
           GITHUB_SHA: ${{ github.sha }}
-          GCP_PROJECT: ${{ secrets.GCP_PROJECT }}
-          GCP_ZONE: ${{ secrets.GCP_ZONE }}
-          GCP_INSTANCE: ${{ secrets.GCP_INSTANCE }}
-        run: |
-          read -r -d '' COMMAND <<EOF || true
-          echo "GITHUB_BRANCH: ${GITHUB_BRANCH}"
-          echo "GITHUB_SHA: ${GITHUB_SHA}"
-          export DOCKER_TAG="${GITHUB_SHA:0:7}" # needed for child process to access it
-          export DEV_BUILD="1"
-          export PATH="/usr/local/go/bin/:$PATH" # needed for Golang to work
-          docker system prune --force
-          cd ~/signoz
-          git status
-          git add .
-          git stash push -m "stashed on $(date --iso-8601=seconds)"
-          git fetch origin
-          git checkout develop
-          git pull
-          # This is added to include the scenerio when new commit in PR is force-pushed
-          git branch -D ${GITHUB_BRANCH}
-          git checkout --track origin/${GITHUB_BRANCH}
-          make build-ee-query-service-amd64
-          make build-frontend-amd64
-          make run-signoz
-          EOF
-          gcloud compute ssh ${GCP_INSTANCE} --zone ${GCP_ZONE} --tunnel-through-iap --project ${GCP_PROJECT} --command "${COMMAND}"
+        with:
+          host: ${{ secrets.HOST_DNS }}
+          username: ${{ secrets.USERNAME }}
+          key: ${{ secrets.SSH_KEY }}
+          envs: GITHUB_BRANCH,GITHUB_SHA
+          command_timeout: 60m
+          script: |
+            echo "GITHUB_BRANCH: ${GITHUB_BRANCH}"
+            echo "GITHUB_SHA: ${GITHUB_SHA}"
+            export DOCKER_TAG="${GITHUB_SHA:0:7}" # needed for child process to access it
+            export DEV_BUILD="1"
+            export PATH="/usr/local/go/bin/:$PATH" # needed for Golang to work
+            docker system prune --force
+            cd ~/signoz
+            git status
+            git add .
+            git stash push -m "stashed on $(date --iso-8601=seconds)"
+            git fetch origin
+            git checkout develop
+            git pull
+            # This is added to include the scenerio when new commit in PR is force-pushed
+            git branch -D ${GITHUB_BRANCH}
+            git checkout --track origin/${GITHUB_BRANCH}
+            make build-ee-query-service-amd64
+            make build-frontend-amd64
+            make run-signoz

ee/query-service/model/plans.go

@@ -52,14 +52,14 @@ var BasicPlan = basemodel.FeatureSet{
 		Name:       basemodel.QueryBuilderPanels,
 		Active:     true,
 		Usage:      0,
-		UsageLimit: -1,
+		UsageLimit: 20,
 		Route:      "",
 	},
 	basemodel.Feature{
 		Name:       basemodel.QueryBuilderAlerts,
 		Active:     true,
 		Usage:      0,
-		UsageLimit: -1,
+		UsageLimit: 10,
 		Route:      "",
 	},
 	basemodel.Feature{

frontend/jest.config.ts

@@ -4,7 +4,6 @@ const config: Config.InitialOptions = {
 	clearMocks: true,
 	coverageDirectory: 'coverage',
 	coverageReporters: ['text', 'cobertura', 'html', 'json-summary'],
-	collectCoverageFrom: ['src/**/*.{ts,tsx}'],
 	moduleFileExtensions: ['ts', 'tsx', 'js', 'json'],
 	modulePathIgnorePatterns: ['dist'],
 	moduleNameMapper: {

frontend/public/locales/en-GB/dashboard.json

@@ -16,7 +16,6 @@
 	"new_dashboard_title": "Sample Title",
 	"layout_saved_successfully": "Layout saved successfully",
 	"add_panel": "Add Panel",
-	"add_row": "Add Row",
 	"save_layout": "Save Layout",
 	"variable_updated_successfully": "Variable updated successfully",
 	"error_while_updating_variable": "Error while updating variable",

frontend/public/locales/en/dashboard.json

@@ -16,7 +16,6 @@
 	"new_dashboard_title": "Sample Title",
 	"layout_saved_successfully": "Layout saved successfully",
 	"add_panel": "Add Panel",
-	"add_row": "Add Row",
 	"save_layout": "Save Layout",
 	"full_view": "Full Screen View",
 	"variable_updated_successfully": "Variable updated successfully",

frontend/src/components/Logs/ListLogView/index.tsx

@@ -157,8 +157,8 @@ function ListLogView({
 	const timestampValue = useMemo(
 		() =>
 			typeof flattenLogData.timestamp === 'string'
-				? dayjs(flattenLogData.timestamp).format('YYYY-MM-DD HH:mm:ss.SSS')
-				: dayjs(flattenLogData.timestamp / 1e6).format('YYYY-MM-DD HH:mm:ss.SSS'),
+				? dayjs(flattenLogData.timestamp).format()
+				: dayjs(flattenLogData.timestamp / 1e6).format(),
 		[flattenLogData.timestamp],
 	);
 

frontend/src/components/Logs/RawLogView/index.tsx

@@ -90,12 +90,12 @@ function RawLogView({
 	const text = useMemo(
 		() =>
 			typeof data.timestamp === 'string'
-				? `${dayjs(data.timestamp).format(
-						'YYYY-MM-DD HH:mm:ss.SSS',
-				  )} | ${attributesText} ${severityText} ${data.body}`
-				: `${dayjs(data.timestamp / 1e6).format(
-						'YYYY-MM-DD HH:mm:ss.SSS',
-				  )} | ${attributesText} ${severityText} ${data.body}`,
+				? `${dayjs(data.timestamp).format()} | ${attributesText} ${severityText} ${
+						data.body
+				  }`
+				: `${dayjs(
+						data.timestamp / 1e6,
+				  ).format()} | ${attributesText} ${severityText} ${data.body}`,
 		[data.timestamp, data.body, severityText, attributesText],
 	);
 

frontend/src/components/Logs/TableView/useTableView.tsx

@@ -76,8 +76,8 @@ export const useTableView = (props: UseTableViewProps): UseTableViewResult => {
 				render: (field, item): ColumnTypeRender<Record<string, unknown>> => {
 					const date =
 						typeof field === 'string'
-							? dayjs(field).format('YYYY-MM-DD HH:mm:ss.SSS')
-							: dayjs(field / 1e6).format('YYYY-MM-DD HH:mm:ss.SSS');
+							? dayjs(field).format()
+							: dayjs(field / 1e6).format();
 					return {
 						children: (
 							<div className="table-timestamp">

frontend/src/components/facingIssueBtn/FacingIssueBtn.tsx

@@ -1,6 +1,6 @@
 import './FacingIssueBtn.style.scss';
 
-import { Button, Tooltip } from 'antd';
+import { Button } from 'antd';
 import logEvent from 'api/common/logEvent';
 import cx from 'classnames';
 import { FeatureKeys } from 'constants/features';
@@ -15,7 +15,6 @@ export interface FacingIssueBtnProps {
 	message?: string;
 	buttonText?: string;
 	className?: string;
-	onHoverText?: string;
 }
 
 function FacingIssueBtn({
@@ -24,7 +23,6 @@ function FacingIssueBtn({
 	message = '',
 	buttonText = '',
 	className = '',
-	onHoverText = '',
 }: FacingIssueBtnProps): JSX.Element | null {
 	const handleFacingIssuesClick = (): void => {
 		logEvent(eventName, attributes);
@@ -39,15 +37,13 @@ function FacingIssueBtn({
 
 	return isCloudUserVal && isChatSupportEnabled ? ( // Note: we would need to move this condition to license based in future
 		<div className="facing-issue-button">
-			<Tooltip title={onHoverText} autoAdjustOverflow>
-				<Button
-					className={cx('periscope-btn', 'facing-issue-button', className)}
-					onClick={handleFacingIssuesClick}
-					icon={<HelpCircle size={14} />}
-				>
-					{buttonText || 'Facing issues?'}
-				</Button>
-			</Tooltip>
+			<Button
+				className={cx('periscope-btn', 'facing-issue-button', className)}
+				onClick={handleFacingIssuesClick}
+				icon={<HelpCircle size={14} />}
+			>
+				{buttonText || 'Facing issues?'}
+			</Button>
 		</div>
 	) : null;
 }
@@ -56,7 +52,6 @@ FacingIssueBtn.defaultProps = {
 	message: '',
 	buttonText: '',
 	className: '',
-	onHoverText: '',
 };
 
 export default FacingIssueBtn;

frontend/src/components/facingIssueBtn/util.ts

@@ -1,57 +0,0 @@
-import { PANEL_TYPES } from 'constants/queryBuilder';
-import { AlertDef } from 'types/api/alerts/def';
-import { Dashboard, DashboardData } from 'types/api/dashboard/getAll';
-
-export const chartHelpMessage = (
-	selectedDashboard: Dashboard | undefined,
-	graphType: PANEL_TYPES,
-): string => `
-Hi Team,
-
-I need help in creating this chart. Here are my dashboard details
-
-Name: ${selectedDashboard?.data.title || ''}
-Panel type: ${graphType}
-Dashboard Id: ${selectedDashboard?.uuid || ''}
-
-Thanks`;
-
-export const dashboardHelpMessage = (
-	data: DashboardData | undefined,
-	selectedDashboard: Dashboard | undefined,
-): string => `
-Hi Team,
-
-I need help with this dashboard. Here are my dashboard details
-
-Name: ${data?.title || ''}
-Dashboard Id: ${selectedDashboard?.uuid || ''}
-
-Thanks`;
-
-export const dashboardListMessage = `Hi Team,
-
-I need help with dashboards.
-						
-Thanks`;
-
-export const listAlertMessage = `Hi Team,
-
-I need help with managing alerts.
-
-Thanks`;
-
-export const alertHelpMessage = (
-	alertDef: AlertDef,
-	ruleId: number,
-): string => `
-Hi Team,
-
-I need help in configuring this alert. Here are my alert rule details
-
-Name: ${alertDef?.alert || ''}
-Alert Type: ${alertDef?.alertType || ''}
-State: ${(alertDef as any)?.state || ''}
-Alert Id: ${ruleId}
-
-Thanks`;

frontend/src/constants/query.ts

@@ -30,5 +30,4 @@ export enum QueryParams {
 	integration = 'integration',
 	pagination = 'pagination',
 	relativeTime = 'relativeTime',
-	alertType = 'alertType',
 }

frontend/src/constants/queryBuilder.ts

@@ -289,11 +289,6 @@ export enum PANEL_TYPES {
 	EMPTY_WIDGET = 'EMPTY_WIDGET',
 }
 
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export enum PANEL_GROUP_TYPES {
-	ROW = 'row',
-}
-
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export enum ATTRIBUTE_TYPES {
 	SUM = 'Sum',

frontend/src/container/CreateAlertRule/index.tsx

@@ -1,9 +1,8 @@
 import { Form, Row } from 'antd';
 import { ENTITY_VERSION_V4 } from 'constants/app';
-import { QueryParams } from 'constants/query';
 import FormAlertRules from 'container/FormAlertRules';
 import { useGetCompositeQueryParam } from 'hooks/queryBuilder/useGetCompositeQueryParam';
-import history from 'lib/history';
+import { isEqual } from 'lodash-es';
 import { useEffect, useState } from 'react';
 import { useLocation } from 'react-router-dom';
 import { AlertTypes } from 'types/api/alerts/alertTypes';
@@ -20,25 +19,13 @@ import SelectAlertType from './SelectAlertType';
 
 function CreateRules(): JSX.Element {
 	const [initValues, setInitValues] = useState<AlertDef | null>(null);
+	const [alertType, setAlertType] = useState<AlertTypes>();
 
 	const location = useLocation();
 	const queryParams = new URLSearchParams(location.search);
 	const version = queryParams.get('version');
-	const alertTypeFromParams = queryParams.get(QueryParams.alertType);
 
 	const compositeQuery = useGetCompositeQueryParam();
-	function getAlertTypeFromDataSource(): AlertTypes | null {
-		if (!compositeQuery) {
-			return null;
-		}
-		const dataSource = compositeQuery?.builder?.queryData[0]?.dataSource;
-
-		return ALERT_TYPE_VS_SOURCE_MAPPING[dataSource];
-	}
-
-	const [alertType, setAlertType] = useState<AlertTypes>(
-		(alertTypeFromParams as AlertTypes) || getAlertTypeFromDataSource(),
-	);
 
 	const [formInstance] = Form.useForm();
 
@@ -60,17 +47,21 @@ function CreateRules(): JSX.Element {
 					version: version || ENTITY_VERSION_V4,
 				});
 		}
-		queryParams.set(QueryParams.alertType, typ);
-		const generatedUrl = `${location.pathname}?${queryParams.toString()}`;
-		history.replace(generatedUrl);
 	};
 
 	useEffect(() => {
-		if (alertType) {
-			onSelectType(alertType);
+		if (!compositeQuery) {
+			return;
+		}
+		const dataSource = compositeQuery?.builder?.queryData[0]?.dataSource;
+
+		const alertTypeFromQuery = ALERT_TYPE_VS_SOURCE_MAPPING[dataSource];
+
+		if (alertTypeFromQuery && !isEqual(alertType, alertTypeFromQuery)) {
+			onSelectType(alertTypeFromQuery);
 		}
 		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [alertType]);
+	}, [compositeQuery]);
 
 	if (!initValues) {
 		return (

frontend/src/container/FormAlertRules/index.tsx

@@ -12,7 +12,6 @@ import {
 import saveAlertApi from 'api/alerts/save';
 import testAlertApi from 'api/alerts/testAlert';
 import FacingIssueBtn from 'components/facingIssueBtn/FacingIssueBtn';
-import { alertHelpMessage } from 'components/facingIssueBtn/util';
 import { FeatureKeys } from 'constants/features';
 import { QueryParams } from 'constants/query';
 import { PANEL_TYPES } from 'constants/queryBuilder';
@@ -524,7 +523,6 @@ function FormAlertRules({
 							runQuery={handleRunQuery}
 							alertDef={alertDef}
 							panelType={panelType || PANEL_TYPES.TIME_SERIES}
-							key={currentQuery.queryType}
 						/>
 
 						<RuleOptions
@@ -586,9 +584,17 @@ function FormAlertRules({
 						}}
 						className="facing-issue-btn"
 						eventName="Alert: Facing Issues in alert"
-						buttonText="Need help with this alert?"
-						message={alertHelpMessage(alertDef, ruleId)}
-						onHoverText="Click here to get help with this alert"
+						buttonText="Facing Issues in alert"
+						message={`Hi Team,
+
+I am facing issues configuring alerts in SigNoz. Here are my alert rule details
+
+Name: ${alertDef?.alert || ''}
+Alert Type: ${alertDef?.alertType || ''}
+State: ${(alertDef as any)?.state || ''}
+Alert Id: ${ruleId}
+
+Thanks`}
 					/>
 				</Col>
 			</PanelContainer>

frontend/src/container/GridCardLayout/GridCard/WidgetGraphComponent.tsx

@@ -59,7 +59,7 @@ function WidgetGraphComponent({
 
 	const lineChartRef = useRef<ToggleGraphProps>();
 	const [graphVisibility, setGraphVisibility] = useState<boolean[]>(
-		Array(queryResponse.data?.payload?.data?.result?.length || 0).fill(true),
+		Array(queryResponse.data?.payload?.data.result.length || 0).fill(true),
 	);
 	const graphRef = useRef<HTMLDivElement>(null);
 
@@ -135,7 +135,7 @@ function WidgetGraphComponent({
 				i: uuid,
 				w: 6,
 				x: 0,
-				h: 6,
+				h: 3,
 				y: 0,
 			},
 		];

frontend/src/container/GridCardLayout/GridCardLayout.tsx

@@ -1,14 +1,11 @@
 import './GridCardLayout.styles.scss';
 
 import { PlusOutlined } from '@ant-design/icons';
-import { Flex, Form, Input, Modal, Tooltip, Typography } from 'antd';
-import { useForm } from 'antd/es/form/Form';
-import cx from 'classnames';
+import { Flex, Tooltip } from 'antd';
 import FacingIssueBtn from 'components/facingIssueBtn/FacingIssueBtn';
-import { dashboardHelpMessage } from 'components/facingIssueBtn/util';
 import { SOMETHING_WENT_WRONG } from 'constants/api';
 import { QueryParams } from 'constants/query';
-import { PANEL_GROUP_TYPES, PANEL_TYPES } from 'constants/queryBuilder';
+import { PANEL_TYPES } from 'constants/queryBuilder';
 import { themeColors } from 'constants/theme';
 import { useUpdateDashboard } from 'hooks/dashboard/useUpdateDashboard';
 import useComponentPermission from 'hooks/useComponentPermission';
@@ -16,21 +13,12 @@ import { useIsDarkMode } from 'hooks/useDarkMode';
 import { useNotifications } from 'hooks/useNotifications';
 import useUrlQuery from 'hooks/useUrlQuery';
 import history from 'lib/history';
-import { defaultTo } from 'lodash-es';
 import isEqual from 'lodash-es/isEqual';
-import {
-	FullscreenIcon,
-	GripVertical,
-	MoveDown,
-	MoveUp,
-	Settings,
-	Trash2,
-} from 'lucide-react';
+import { FullscreenIcon } from 'lucide-react';
 import { useDashboard } from 'providers/Dashboard/Dashboard';
-import { sortLayout } from 'providers/Dashboard/util';
 import { useCallback, useEffect, useState } from 'react';
 import { FullScreen, useFullScreenHandle } from 'react-full-screen';
-import { ItemCallback, Layout } from 'react-grid-layout';
+import { Layout } from 'react-grid-layout';
 import { useTranslation } from 'react-i18next';
 import { useDispatch, useSelector } from 'react-redux';
 import { useLocation } from 'react-router-dom';
@@ -40,7 +28,6 @@ import { Dashboard, Widgets } from 'types/api/dashboard/getAll';
 import AppReducer from 'types/reducer/app';
 import { ROLES, USER_ROLES } from 'types/roles';
 import { ComponentTypes } from 'utils/permission';
-import { v4 as uuid } from 'uuid';
 
 import { EditMenuAction, ViewMenuAction } from './config';
 import GridCard from './GridCard';
@@ -59,8 +46,6 @@ function GraphLayout({ onAddPanelHandler }: GraphLayoutProps): JSX.Element {
 		selectedDashboard,
 		layouts,
 		setLayouts,
-		panelMap,
-		setPanelMap,
 		setSelectedDashboard,
 		isDashboardLocked,
 	} = useDashboard();
@@ -81,26 +66,6 @@ function GraphLayout({ onAddPanelHandler }: GraphLayoutProps): JSX.Element {
 
 	const [dashboardLayout, setDashboardLayout] = useState<Layout[]>([]);
 
-	const [isSettingsModalOpen, setIsSettingsModalOpen] = useState<boolean>(false);
-
-	const [isDeleteModalOpen, setIsDeleteModalOpen] = useState<boolean>(false);
-
-	const [currentSelectRowId, setCurrentSelectRowId] = useState<string | null>(
-		null,
-	);
-
-	const [currentPanelMap, setCurrentPanelMap] = useState<
-		Record<string, { widgets: Layout[]; collapsed: boolean }>
-	>({});
-
-	useEffect(() => {
-		setCurrentPanelMap(panelMap);
-	}, [panelMap]);
-
-	const [form] = useForm<{
-		title: string;
-	}>();
-
 	const updateDashboardMutation = useUpdateDashboard();
 
 	const { notifications } = useNotifications();
@@ -123,7 +88,7 @@ function GraphLayout({ onAddPanelHandler }: GraphLayoutProps): JSX.Element {
 	);
 
 	useEffect(() => {
-		setDashboardLayout(sortLayout(layouts));
+		setDashboardLayout(layouts);
 	}, [layouts]);
 
 	const onSaveHandler = (): void => {
@@ -133,7 +98,6 @@ function GraphLayout({ onAddPanelHandler }: GraphLayoutProps): JSX.Element {
 			...selectedDashboard,
 			data: {
 				...selectedDashboard.data,
-				panelMap: { ...currentPanelMap },
 				layout: dashboardLayout.filter((e) => e.i !== PANEL_TYPES.EMPTY_WIDGET),
 			},
 			uuid: selectedDashboard.uuid,
@@ -143,9 +107,8 @@ function GraphLayout({ onAddPanelHandler }: GraphLayoutProps): JSX.Element {
 			onSuccess: (updatedDashboard) => {
 				if (updatedDashboard.payload) {
 					if (updatedDashboard.payload.data.layout)
-						setLayouts(sortLayout(updatedDashboard.payload.data.layout));
+						setLayouts(updatedDashboard.payload.data.layout);
 					setSelectedDashboard(updatedDashboard.payload);
-					setPanelMap(updatedDashboard.payload?.data?.panelMap || {});
 				}
 
 				featureResponse.refetch();
@@ -168,8 +131,7 @@ function GraphLayout({ onAddPanelHandler }: GraphLayoutProps): JSX.Element {
 			dashboardLayout,
 		);
 		if (!isEqual(filterLayout, filterDashboardLayout)) {
-			const updatedLayout = sortLayout(layout);
-			setDashboardLayout(updatedLayout);
+			setDashboardLayout(layout);
 		}
 	};
 
@@ -206,283 +168,6 @@ function GraphLayout({ onAddPanelHandler }: GraphLayoutProps): JSX.Element {
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [dashboardLayout]);
 
-	function handleAddRow(): void {
-		if (!selectedDashboard) return;
-		const id = uuid();
-
-		const newRowWidgetMap: { widgets: Layout[]; collapsed: boolean } = {
-			widgets: [],
-			collapsed: false,
-		};
-		const currentRowIdx = 0;
-		for (let j = currentRowIdx; j < dashboardLayout.length; j++) {
-			if (!currentPanelMap[dashboardLayout[j].i]) {
-				newRowWidgetMap.widgets.push(dashboardLayout[j]);
-			} else {
-				break;
-			}
-		}
-
-		const updatedDashboard: Dashboard = {
-			...selectedDashboard,
-			data: {
-				...selectedDashboard.data,
-				layout: [
-					{
-						i: id,
-						w: 12,
-						minW: 12,
-						minH: 1,
-						maxH: 1,
-						x: 0,
-						h: 1,
-						y: 0,
-					},
-					...dashboardLayout.filter((e) => e.i !== PANEL_TYPES.EMPTY_WIDGET),
-				],
-				panelMap: { ...currentPanelMap, [id]: newRowWidgetMap },
-				widgets: [
-					...(selectedDashboard.data.widgets || []),
-					{
-						id,
-						title: 'Sample Row',
-						description: '',
-						panelTypes: PANEL_GROUP_TYPES.ROW,
-					},
-				],
-			},
-			uuid: selectedDashboard.uuid,
-		};
-
-		updateDashboardMutation.mutate(updatedDashboard, {
-			// eslint-disable-next-line sonarjs/no-identical-functions
-			onSuccess: (updatedDashboard) => {
-				if (updatedDashboard.payload) {
-					if (updatedDashboard.payload.data.layout)
-						setLayouts(sortLayout(updatedDashboard.payload.data.layout));
-					setSelectedDashboard(updatedDashboard.payload);
-					setPanelMap(updatedDashboard.payload?.data?.panelMap || {});
-				}
-
-				featureResponse.refetch();
-			},
-			// eslint-disable-next-line sonarjs/no-identical-functions
-			onError: () => {
-				notifications.error({
-					message: SOMETHING_WENT_WRONG,
-				});
-			},
-		});
-	}
-
-	const handleRowSettingsClick = (id: string): void => {
-		setIsSettingsModalOpen(true);
-		setCurrentSelectRowId(id);
-	};
-
-	const onSettingsModalSubmit = (): void => {
-		const newTitle = form.getFieldValue('title');
-		if (!selectedDashboard) return;
-
-		if (!currentSelectRowId) return;
-
-		const currentWidget = selectedDashboard?.data?.widgets?.find(
-			(e) => e.id === currentSelectRowId,
-		);
-
-		if (!currentWidget) return;
-
-		currentWidget.title = newTitle;
-		const updatedWidgets = selectedDashboard?.data?.widgets?.filter(
-			(e) => e.id !== currentSelectRowId,
-		);
-
-		updatedWidgets?.push(currentWidget);
-
-		const updatedSelectedDashboard: Dashboard = {
-			...selectedDashboard,
-			data: {
-				...selectedDashboard.data,
-				widgets: updatedWidgets,
-			},
-			uuid: selectedDashboard.uuid,
-		};
-
-		updateDashboardMutation.mutateAsync(updatedSelectedDashboard, {
-			onSuccess: (updatedDashboard) => {
-				if (setLayouts) setLayouts(updatedDashboard.payload?.data?.layout || []);
-				if (setSelectedDashboard && updatedDashboard.payload) {
-					setSelectedDashboard(updatedDashboard.payload);
-				}
-				if (setPanelMap)
-					setPanelMap(updatedDashboard.payload?.data?.panelMap || {});
-				form.setFieldValue('title', '');
-				setIsSettingsModalOpen(false);
-				setCurrentSelectRowId(null);
-				featureResponse.refetch();
-			},
-			// eslint-disable-next-line sonarjs/no-identical-functions
-			onError: () => {
-				notifications.error({
-					message: SOMETHING_WENT_WRONG,
-				});
-			},
-		});
-	};
-
-	// eslint-disable-next-line sonarjs/cognitive-complexity
-	const handleRowCollapse = (id: string): void => {
-		if (!selectedDashboard) return;
-		const rowProperties = { ...currentPanelMap[id] };
-		const updatedPanelMap = { ...currentPanelMap };
-
-		let updatedDashboardLayout = [...dashboardLayout];
-		if (rowProperties.collapsed === true) {
-			rowProperties.collapsed = false;
-			const widgetsInsideTheRow = rowProperties.widgets;
-			let maxY = 0;
-			widgetsInsideTheRow.forEach((w) => {
-				maxY = Math.max(maxY, w.y + w.h);
-			});
-			const currentRowWidget = dashboardLayout.find((w) => w.i === id);
-			if (currentRowWidget && widgetsInsideTheRow.length) {
-				maxY -= currentRowWidget.h + currentRowWidget.y;
-			}
-
-			const idxCurrentRow = dashboardLayout.findIndex((w) => w.i === id);
-
-			for (let j = idxCurrentRow + 1; j < dashboardLayout.length; j++) {
-				updatedDashboardLayout[j].y += maxY;
-				if (updatedPanelMap[updatedDashboardLayout[j].i]) {
-					updatedPanelMap[updatedDashboardLayout[j].i].widgets = updatedPanelMap[
-						updatedDashboardLayout[j].i
-						// eslint-disable-next-line @typescript-eslint/no-loop-func
-					].widgets.map((w) => ({
-						...w,
-						y: w.y + maxY,
-					}));
-				}
-			}
-			updatedDashboardLayout = [...updatedDashboardLayout, ...widgetsInsideTheRow];
-		} else {
-			rowProperties.collapsed = true;
-			const currentIdx = dashboardLayout.findIndex((w) => w.i === id);
-
-			let widgetsInsideTheRow: Layout[] = [];
-			let isPanelMapUpdated = false;
-			for (let j = currentIdx + 1; j < dashboardLayout.length; j++) {
-				if (currentPanelMap[dashboardLayout[j].i]) {
-					rowProperties.widgets = widgetsInsideTheRow;
-					widgetsInsideTheRow = [];
-					isPanelMapUpdated = true;
-					break;
-				} else {
-					widgetsInsideTheRow.push(dashboardLayout[j]);
-				}
-			}
-			if (!isPanelMapUpdated) {
-				rowProperties.widgets = widgetsInsideTheRow;
-			}
-			let maxY = 0;
-			widgetsInsideTheRow.forEach((w) => {
-				maxY = Math.max(maxY, w.y + w.h);
-			});
-			const currentRowWidget = dashboardLayout[currentIdx];
-			if (currentRowWidget && widgetsInsideTheRow.length) {
-				maxY -= currentRowWidget.h + currentRowWidget.y;
-			}
-			for (let j = currentIdx + 1; j < updatedDashboardLayout.length; j++) {
-				updatedDashboardLayout[j].y += maxY;
-				if (updatedPanelMap[updatedDashboardLayout[j].i]) {
-					updatedPanelMap[updatedDashboardLayout[j].i].widgets = updatedPanelMap[
-						updatedDashboardLayout[j].i
-						// eslint-disable-next-line @typescript-eslint/no-loop-func
-					].widgets.map((w) => ({
-						...w,
-						y: w.y + maxY,
-					}));
-				}
-			}
-
-			updatedDashboardLayout = updatedDashboardLayout.filter(
-				(widget) => !rowProperties.widgets.some((w: Layout) => w.i === widget.i),
-			);
-		}
-		setCurrentPanelMap((prev) => ({
-			...prev,
-			...updatedPanelMap,
-			[id]: {
-				...rowProperties,
-			},
-		}));
-
-		setDashboardLayout(sortLayout(updatedDashboardLayout));
-	};
-
-	const handleDragStop: ItemCallback = (_, oldItem, newItem): void => {
-		if (currentPanelMap[oldItem.i]) {
-			const differenceY = newItem.y - oldItem.y;
-			const widgetsInsideRow = currentPanelMap[oldItem.i].widgets.map((w) => ({
-				...w,
-				y: w.y + differenceY,
-			}));
-			setCurrentPanelMap((prev) => ({
-				...prev,
-				[oldItem.i]: {
-					...prev[oldItem.i],
-					widgets: widgetsInsideRow,
-				},
-			}));
-		}
-	};
-
-	const handleRowDelete = (): void => {
-		if (!selectedDashboard) return;
-
-		if (!currentSelectRowId) return;
-
-		const updatedWidgets = selectedDashboard?.data?.widgets?.filter(
-			(e) => e.id !== currentSelectRowId,
-		);
-
-		const updatedLayout =
-			selectedDashboard.data.layout?.filter((e) => e.i !== currentSelectRowId) ||
-			[];
-
-		const updatedPanelMap = { ...currentPanelMap };
-		delete updatedPanelMap[currentSelectRowId];
-
-		const updatedSelectedDashboard: Dashboard = {
-			...selectedDashboard,
-			data: {
-				...selectedDashboard.data,
-				widgets: updatedWidgets,
-				layout: updatedLayout,
-				panelMap: updatedPanelMap,
-			},
-			uuid: selectedDashboard.uuid,
-		};
-
-		updateDashboardMutation.mutateAsync(updatedSelectedDashboard, {
-			onSuccess: (updatedDashboard) => {
-				if (setLayouts) setLayouts(updatedDashboard.payload?.data?.layout || []);
-				if (setSelectedDashboard && updatedDashboard.payload) {
-					setSelectedDashboard(updatedDashboard.payload);
-				}
-				if (setPanelMap)
-					setPanelMap(updatedDashboard.payload?.data?.panelMap || {});
-				setIsDeleteModalOpen(false);
-				setCurrentSelectRowId(null);
-				featureResponse.refetch();
-			},
-			// eslint-disable-next-line sonarjs/no-identical-functions
-			onError: () => {
-				notifications.error({
-					message: SOMETHING_WENT_WRONG,
-				});
-			},
-		});
-	};
 	return (
 		<>
 			<Flex justify="flex-end" gap={8} align="center">
@@ -493,9 +178,15 @@ function GraphLayout({ onAddPanelHandler }: GraphLayoutProps): JSX.Element {
 						screen: 'Dashboard Details',
 					}}
 					eventName="Dashboard: Facing Issues in dashboard"
-					buttonText="Need help with this dashboard?"
-					message={dashboardHelpMessage(data, selectedDashboard)}
-					onHoverText="Click here to get help for this dashboard"
+					buttonText="Facing Issues in dashboard"
+					message={`Hi Team,
+
+I am facing issues configuring dashboard in SigNoz. Here are my dashboard details
+
+Name: ${data?.title || ''}
+Dashboard Id: ${selectedDashboard?.uuid || ''}
+
+Thanks`}
 				/>
 				<ButtonContainer>
 					<Tooltip title="Open in Full Screen">
@@ -518,23 +209,13 @@ function GraphLayout({ onAddPanelHandler }: GraphLayoutProps): JSX.Element {
 							{t('dashboard:add_panel')}
 						</Button>
 					)}
-					{!isDashboardLocked && addPanelPermission && (
-						<Button
-							className="periscope-btn"
-							onClick={(): void => handleAddRow()}
-							icon={<PlusOutlined />}
-							data-testid="add-row"
-						>
-							{t('dashboard:add_row')}
-						</Button>
-					)}
 				</ButtonContainer>
 			</Flex>
 
 			<FullScreen handle={handle} className="fullscreen-grid-container">
 				<ReactGridLayout
 					cols={12}
-					rowHeight={45}
+					rowHeight={100}
 					autoSize
 					width={100}
 					useCSSTransforms
@@ -543,7 +224,6 @@ function GraphLayout({ onAddPanelHandler }: GraphLayoutProps): JSX.Element {
 					isResizable={!isDashboardLocked && addPanelPermission}
 					allowOverlap={false}
 					onLayoutChange={handleLayoutChange}
-					onDragStop={handleDragStop}
 					draggableHandle=".drag-handle"
 					layout={dashboardLayout}
 					style={{ backgroundColor: isDarkMode ? '' : themeColors.snowWhite }}
@@ -552,58 +232,6 @@ function GraphLayout({ onAddPanelHandler }: GraphLayoutProps): JSX.Element {
 						const { i: id } = layout;
 						const currentWidget = (widgets || [])?.find((e) => e.id === id);
 
-						if (currentWidget?.panelTypes === PANEL_GROUP_TYPES.ROW) {
-							const rowWidgetProperties = currentPanelMap[id] || {};
-							return (
-								<CardContainer
-									className="row-card"
-									isDarkMode={isDarkMode}
-									key={id}
-									data-grid={JSON.stringify(currentWidget)}
-								>
-									<div className={cx('row-panel')}>
-										<div style={{ display: 'flex', gap: '10px', alignItems: 'center' }}>
-											<Button
-												disabled={updateDashboardMutation.isLoading}
-												icon={
-													rowWidgetProperties.collapsed ? (
-														<MoveDown size={14} />
-													) : (
-														<MoveUp size={14} />
-													)
-												}
-												type="text"
-												onClick={(): void => handleRowCollapse(id)}
-											/>
-											<Typography.Text>{currentWidget.title}</Typography.Text>
-											<Button
-												icon={<Settings size={14} />}
-												type="text"
-												onClick={(): void => handleRowSettingsClick(id)}
-											/>
-										</div>
-										{rowWidgetProperties.collapsed && (
-											<Button
-												type="text"
-												icon={<GripVertical size={14} />}
-												className="drag-handle"
-											/>
-										)}
-										{!rowWidgetProperties.collapsed && (
-											<Button
-												type="text"
-												icon={<Trash2 size={14} />}
-												onClick={(): void => {
-													setIsDeleteModalOpen(true);
-													setCurrentSelectRowId(id);
-												}}
-											/>
-										)}
-									</div>
-								</CardContainer>
-							);
-						}
-
 						return (
 							<CardContainer
 								className={isDashboardLocked ? '' : 'enable-resize'}
@@ -616,7 +244,7 @@ function GraphLayout({ onAddPanelHandler }: GraphLayoutProps): JSX.Element {
 									$panelType={currentWidget?.panelTypes || PANEL_TYPES.TIME_SERIES}
 								>
 									<GridCard
-										widget={(currentWidget as Widgets) || ({ id, query: {} } as Widgets)}
+										widget={currentWidget || ({ id, query: {} } as Widgets)}
 										headerMenuList={widgetActions}
 										variables={variables}
 										version={selectedDashboard?.data?.version}
@@ -627,46 +255,6 @@ function GraphLayout({ onAddPanelHandler }: GraphLayoutProps): JSX.Element {
 						);
 					})}
 				</ReactGridLayout>
-				<Modal
-					open={isSettingsModalOpen}
-					title="Row Options"
-					destroyOnClose
-					footer={null}
-					onCancel={(): void => {
-						setIsSettingsModalOpen(false);
-						setCurrentSelectRowId(null);
-					}}
-				>
-					<Form form={form} onFinish={onSettingsModalSubmit} requiredMark>
-						<Form.Item required name={['title']}>
-							<Input
-								placeholder="Enter row name here..."
-								defaultValue={defaultTo(
-									widgets?.find((widget) => widget.id === currentSelectRowId)
-										?.title as string,
-									'Sample Title',
-								)}
-							/>
-						</Form.Item>
-						<Form.Item>
-							<Button type="primary" htmlType="submit">
-								Apply Changes
-							</Button>
-						</Form.Item>
-					</Form>
-				</Modal>
-				<Modal
-					open={isDeleteModalOpen}
-					title="Delete Row"
-					destroyOnClose
-					onCancel={(): void => {
-						setIsDeleteModalOpen(false);
-						setCurrentSelectRowId(null);
-					}}
-					onOk={(): void => handleRowDelete()}
-				>
-					<Typography.Text>Are you sure you want to delete this row</Typography.Text>
-				</Modal>
 			</FullScreen>
 		</>
 	);

frontend/src/container/GridCardLayout/config.ts

@@ -16,6 +16,6 @@ export const EMPTY_WIDGET_LAYOUT = {
 	i: PANEL_TYPES.EMPTY_WIDGET,
 	w: 6,
 	x: 0,
-	h: 6,
+	h: 3,
 	y: 0,
 };

frontend/src/container/GridCardLayout/styles.ts

@@ -29,17 +29,6 @@ interface Props {
 export const CardContainer = styled.div<Props>`
 	overflow: auto;
 
-	&.row-card {
-		.row-panel {
-			height: 100%;
-			display: flex;
-			justify-content: space-between;
-			background: var(--bg-ink-400);
-			align-items: center;
-			overflow: hidden;
-		}
-	}
-
 	&.enable-resize {
 		:hover {
 			.react-resizable-handle {

frontend/src/container/ListAlertRules/ListAlert.tsx

@@ -4,7 +4,6 @@ import { Input, Typography } from 'antd';
 import type { ColumnsType } from 'antd/es/table/interface';
 import saveAlertApi from 'api/alerts/save';
 import DropDown from 'components/DropDown/DropDown';
-import { listAlertMessage } from 'components/facingIssueBtn/util';
 import {
 	DynamicColumnsKey,
 	TableDataSource,
@@ -364,9 +363,12 @@ function ListAlert({ allAlertRules, refetch }: ListAlertProps): JSX.Element {
 						screen: 'Alert list page',
 					},
 					eventName: 'Alert: Facing Issues in alert',
-					buttonText: 'Facing issues with alerts?',
-					message: listAlertMessage,
-					onHoverText: 'Click here to get help with alerts',
+					buttonText: 'Facing Issues in alert',
+					message: `Hi Team,
+
+I am facing issues with alerts.
+
+Thanks`,
 				}}
 			/>
 		</>

frontend/src/container/ListOfDashboard/DashboardsList.tsx

@@ -3,7 +3,6 @@ import { Card, Col, Dropdown, Input, Row, TableColumnProps } from 'antd';
 import { ItemType } from 'antd/es/menu/hooks/useItems';
 import createDashboard from 'api/dashboard/create';
 import { AxiosError } from 'axios';
-import { dashboardListMessage } from 'components/facingIssueBtn/util';
 import {
 	DynamicColumnsKey,
 	TableDataSource,
@@ -391,9 +390,12 @@ function DashboardsList(): JSX.Element {
 							screen: 'Dashboard list page',
 						},
 						eventName: 'Dashboard: Facing Issues in dashboard',
-						buttonText: 'Facing issues with dashboards?',
-						message: dashboardListMessage,
-						onHoverText: 'Click here to get help with dashboards',
+						buttonText: 'Facing Issues in dashboard',
+						message: `Hi Team,
+
+I am facing issues with dashboards.
+						
+Thanks`,
 					}}
 				/>
 			</TableContainer>

frontend/src/container/LogControls/index.tsx

@@ -85,8 +85,8 @@ function LogControls(): JSX.Element | null {
 			logs.map((log) => {
 				const timestamp =
 					typeof log.timestamp === 'string'
-						? dayjs(log.timestamp).format('YYYY-MM-DD HH:mm:ss.SSS')
-						: dayjs(log.timestamp / 1e6).format('YYYY-MM-DD HH:mm:ss.SSS');
+						? dayjs(log.timestamp).format()
+						: dayjs(log.timestamp / 1e6).format();
 
 				return FlatLogData({
 					...log,

frontend/src/container/LogsExplorerViews/index.tsx

@@ -531,8 +531,8 @@ function LogsExplorerViews({
 			logs.map((log) => {
 				const timestamp =
 					typeof log.timestamp === 'string'
-						? dayjs(log.timestamp).format('YYYY-MM-DD HH:mm:ss.SSS')
-						: dayjs(log.timestamp / 1e6).format('YYYY-MM-DD HH:mm:ss.SSS');
+						? dayjs(log.timestamp).format()
+						: dayjs(log.timestamp / 1e6).format();
 
 				return FlatLogData({
 					timestamp,

frontend/src/container/NewWidget/LeftContainer/index.tsx

@@ -67,13 +67,12 @@ function LeftContainer({
 			setRequestData((prev) => ({
 				...prev,
 				selectedTime: selectedTime.enum || prev.selectedTime,
-				globalSelectedInterval,
 				graphType: getGraphType(selectedGraph || selectedWidget.panelTypes),
 				query: stagedQuery,
 			}));
 		}
 		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [stagedQuery, selectedTime, globalSelectedInterval]);
+	}, [stagedQuery, selectedTime]);
 
 	const queryResponse = useGetQueryRange(
 		requestData,

frontend/src/container/NewWidget/NewWidget.styles.scss

@@ -1,4 +0,0 @@
-.facing-issue-btn-container {
-	display: grid;
-	grid-template-columns: 1fr max-content;
-}

frontend/src/container/NewWidget/index.tsx

@@ -1,10 +1,7 @@
 /* eslint-disable sonarjs/cognitive-complexity */
-import './NewWidget.styles.scss';
-
 import { LockFilled, WarningOutlined } from '@ant-design/icons';
-import { Button, Modal, Space, Tooltip, Typography } from 'antd';
+import { Button, Flex, Modal, Space, Tooltip, Typography } from 'antd';
 import FacingIssueBtn from 'components/facingIssueBtn/FacingIssueBtn';
-import { chartHelpMessage } from 'components/facingIssueBtn/util';
 import { SOMETHING_WENT_WRONG } from 'constants/api';
 import { FeatureKeys } from 'constants/features';
 import { QueryParams } from 'constants/query';
@@ -107,7 +104,7 @@ function NewWidget({ selectedGraph }: NewWidgetProps): JSX.Element {
 		return defaultTo(
 			selectedWidget,
 			getDefaultWidgetData(widgetId || '', selectedGraph),
-		) as Widgets;
+		);
 	}, [query, selectedGraph, widgets]);
 
 	const [selectedWidget, setSelectedWidget] = useState(getWidget());
@@ -260,7 +257,7 @@ function NewWidget({ selectedGraph }: NewWidgetProps): JSX.Element {
 					i: widgetId || '',
 					w: 6,
 					x: 0,
-					h: 6,
+					h: 3,
 					y: 0,
 				},
 				...updatedLayout,
@@ -405,7 +402,7 @@ function NewWidget({ selectedGraph }: NewWidgetProps): JSX.Element {
 
 	return (
 		<Container>
-			<div className="facing-issue-btn-container">
+			<Flex justify="space-between" align="center">
 				<FacingIssueBtn
 					attributes={{
 						uuid: selectedDashboard?.uuid,
@@ -413,12 +410,18 @@ function NewWidget({ selectedGraph }: NewWidgetProps): JSX.Element {
 						panelType: graphType,
 						widgetId: query.get('widgetId'),
 						queryType: currentQuery.queryType,
-						screen: 'Dashboard list page',
 					}}
 					eventName="Dashboard: Facing Issues in dashboard"
-					buttonText="Need help with this chart?"
-					message={chartHelpMessage(selectedDashboard, graphType)}
-					onHoverText="Click here to get help in creating chart"
+					buttonText="Facing Issues in dashboard"
+					message={`Hi Team,
+
+I am facing issues configuring dashboard in SigNoz. Here are my dashboard details
+				
+Name: ${selectedDashboard?.data.title || ''}
+Panel type: ${graphType}
+Dashboard Id: ${selectedDashboard?.uuid || ''}
+				
+Thanks`}
 				/>
 				<ButtonContainer>
 					{isSaveDisabled && (
@@ -447,7 +450,7 @@ function NewWidget({ selectedGraph }: NewWidgetProps): JSX.Element {
 					)}
 					<Button onClick={onClickDiscardHandler}>Discard Changes</Button>
 				</ButtonContainer>
-			</div>
+			</Flex>
 
 			<PanelContainer>
 				<LeftContainerWrapper flex={5}>

frontend/src/container/PipelinePage/Layouts/ChangeHistory/tests/ChangeHistory.test.tsx

@@ -1,87 +0,0 @@
-import { render } from '@testing-library/react';
-import { I18nextProvider } from 'react-i18next';
-import { QueryClient, QueryClientProvider } from 'react-query';
-import { Provider } from 'react-redux';
-import { MemoryRouter } from 'react-router-dom';
-import i18n from 'ReactI18';
-import store from 'store';
-
-import ChangeHistory from '../index';
-import { pipelineData, pipelineDataHistory } from './testUtils';
-
-const queryClient = new QueryClient({
-	defaultOptions: {
-		queries: {
-			refetchOnWindowFocus: false,
-		},
-	},
-});
-
-describe('ChangeHistory test', () => {
-	it('should render changeHistory correctly', () => {
-		const { getAllByText, getByText } = render(
-			<MemoryRouter>
-				<QueryClientProvider client={queryClient}>
-					<Provider store={store}>
-						<I18nextProvider i18n={i18n}>
-							<ChangeHistory pipelineData={pipelineData} />
-						</I18nextProvider>
-					</Provider>
-				</QueryClientProvider>
-			</MemoryRouter>,
-		);
-
-		// change History table headers
-		[
-			'Version',
-			'Deployment Stage',
-			'Last Deploy Message',
-			'Last Deployed Time',
-			'Edited by',
-		].forEach((text) => expect(getByText(text)).toBeInTheDocument());
-
-		// table content
-		expect(getAllByText('test-user').length).toBe(2);
-		expect(getAllByText('Deployment was successful').length).toBe(2);
-	});
-
-	it('test deployment stage and icon based on history data', () => {
-		const { getByText, container } = render(
-			<MemoryRouter>
-				<QueryClientProvider client={queryClient}>
-					<Provider store={store}>
-						<I18nextProvider i18n={i18n}>
-							<ChangeHistory
-								pipelineData={{
-									...pipelineData,
-									history: pipelineDataHistory,
-								}}
-							/>
-						</I18nextProvider>
-					</Provider>
-				</QueryClientProvider>
-			</MemoryRouter>,
-		);
-
-		// assertion for different deployment stages
-		expect(container.querySelector('[data-icon="loading"]')).toBeInTheDocument();
-		expect(getByText('In Progress')).toBeInTheDocument();
-
-		expect(
-			container.querySelector('[data-icon="exclamation-circle"]'),
-		).toBeInTheDocument();
-		expect(getByText('Dirty')).toBeInTheDocument();
-
-		expect(
-			container.querySelector('[data-icon="close-circle"]'),
-		).toBeInTheDocument();
-		expect(getByText('Failed')).toBeInTheDocument();
-
-		expect(
-			container.querySelector('[data-icon="minus-circle"]'),
-		).toBeInTheDocument();
-		expect(getByText('Unknown')).toBeInTheDocument();
-
-		expect(container.querySelectorAll('.ant-table-row').length).toBe(5);
-	});
-});

frontend/src/container/PipelinePage/Layouts/ChangeHistory/tests/testUtils.ts

@@ -1,240 +0,0 @@
-/* eslint-disable sonarjs/no-duplicate-string */
-import { Pipeline } from 'types/api/pipeline/def';
-import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
-
-export const pipelineData: Pipeline = {
-	id: 'test-id-1',
-	version: 24,
-	elementType: 'log_pipelines',
-	active: false,
-	is_valid: false,
-	disabled: false,
-	deployStatus: 'DEPLOYED',
-	deployResult: 'Deployment was successful',
-	lastHash: 'log_pipelines:24',
-	lastConf: 'oiwernveroi',
-	createdBy: 'test-created-by',
-	pipelines: [
-		{
-			id: 'test-id-2',
-			orderId: 1,
-			name: 'hotrod logs parser',
-			alias: 'hotrodlogsparser',
-			description: 'Trying to test Logs Pipeline feature',
-			enabled: true,
-			filter: {
-				op: 'AND',
-				items: [
-					{
-						key: {
-							key: 'container_name',
-							dataType: DataTypes.String,
-							type: 'tag',
-							isColumn: false,
-							isJSON: false,
-						},
-						id: 'sampleid',
-						value: 'hotrod',
-						op: '=',
-					},
-				],
-			},
-			config: [
-				{
-					type: 'regex_parser',
-					id: 'parsetext(regex)',
-					output: 'parseattribsjson',
-					on_error: 'send',
-					orderId: 1,
-					enabled: true,
-					name: 'parse text (regex)',
-					parse_to: 'attributes',
-					regex:
-						'.+\\t+(?P<log_level>.+)\\t+(?P<location>.+)\\t+(?P<message>.+)\\t+(?P<attribs_json>.+)',
-					parse_from: 'body',
-				},
-				{
-					type: 'json_parser',
-					id: 'parseattribsjson',
-					output: 'removetempattribs_json',
-					orderId: 2,
-					enabled: true,
-					name: 'parse attribs json',
-					parse_to: 'attributes',
-					parse_from: 'attributes.attribs_json',
-				},
-				{
-					type: 'remove',
-					id: 'removetempattribs_json',
-					output: 'c2062723-895e-4614-ba38-29c5d5ee5927',
-					orderId: 3,
-					enabled: true,
-					name: 'remove temp attribs_json',
-					field: 'attributes.attribs_json',
-				},
-				{
-					type: 'add',
-					id: 'c2062723-895e-4614-ba38-29c5d5ee5927',
-					orderId: 4,
-					enabled: true,
-					name: 'test add ',
-					field: 'resource["container.name"]',
-					value: 'hotrod',
-				},
-			],
-			createdBy: 'test@email',
-			createdAt: '2024-01-02T13:56:02.858300964Z',
-		},
-		{
-			id: 'tes-id-1',
-			orderId: 2,
-			name: 'Logs Parser - test - Customer Service',
-			alias: 'LogsParser-test-CustomerService',
-			description: 'Trying to test Logs Pipeline feature',
-			enabled: true,
-			filter: {
-				op: 'AND',
-				items: [
-					{
-						key: {
-							key: 'service',
-							dataType: DataTypes.String,
-							type: 'tag',
-							isColumn: false,
-							isJSON: false,
-						},
-						id: 'sample-test-1',
-						value: 'customer',
-						op: '=',
-					},
-				],
-			},
-			config: [
-				{
-					type: 'grok_parser',
-					id: 'Testtest',
-					on_error: 'send',
-					orderId: 1,
-					enabled: true,
-					name: 'Test test',
-					parse_to: 'attributes',
-					pattern:
-						'^%{DATE:date}Z INFO customer/database.go:73 Loading customer {"service": "customer", "component": "mysql", "trace_id": "test-id", "span_id": "1427a3fcad8b1514", "customer_id": "567"}',
-					parse_from: 'body',
-				},
-			],
-			createdBy: 'test@email',
-			createdAt: '2024-01-02T13:56:02.863764227Z',
-		},
-	],
-	history: [
-		{
-			id: 'test-id-4',
-			version: 24,
-			elementType: 'log_pipelines',
-			active: false,
-			isValid: false,
-			disabled: false,
-			deployStatus: 'DEPLOYED',
-			deployResult: 'Deployment was successful',
-			lastHash: 'log_pipelines:24',
-			lastConf: 'eovineroiv',
-			createdBy: 'test-created-by',
-			createdByName: 'test-user',
-			createdAt: '2024-01-02T13:56:02Z',
-		},
-		{
-			id: 'test-4',
-			version: 23,
-			elementType: 'log_pipelines',
-			active: false,
-			isValid: false,
-			disabled: false,
-			deployStatus: 'DEPLOYED',
-			deployResult: 'Deployment was successful',
-			lastHash: 'log_pipelines:23',
-			lastConf: 'eivrounreovi',
-			createdBy: 'test-created-by',
-			createdByName: 'test-user',
-			createdAt: '2023-12-29T12:59:20Z',
-		},
-	],
-};
-
-export const pipelineDataHistory: Pipeline['history'] = [
-	{
-		id: 'test-id-4',
-		version: 24,
-		elementType: 'log_pipelines',
-		active: false,
-		isValid: false,
-		disabled: false,
-		deployStatus: 'DEPLOYED',
-		deployResult: 'Deployment was successful',
-		lastHash: 'log_pipelines:24',
-		lastConf: 'eovineroiv',
-		createdBy: 'test-created-by',
-		createdByName: 'test-user',
-		createdAt: '2024-01-02T13:56:02Z',
-	},
-	{
-		id: 'test-4',
-		version: 23,
-		elementType: 'log_pipelines',
-		active: false,
-		isValid: false,
-		disabled: false,
-		deployStatus: 'IN_PROGRESS',
-		deployResult: 'Deployment is in progress',
-		lastHash: 'log_pipelines:23',
-		lastConf: 'eivrounreovi',
-		createdBy: 'test-created-by',
-		createdByName: 'test-user',
-		createdAt: '2023-12-29T12:59:20Z',
-	},
-	{
-		id: 'test-4-1',
-		version: 25,
-		elementType: 'log_pipelines',
-		active: false,
-		isValid: false,
-		disabled: false,
-		deployStatus: 'DIRTY',
-		deployResult: 'Deployment is dirty',
-		lastHash: 'log_pipelines:23',
-		lastConf: 'eivrounreovi',
-		createdBy: 'test-created-by',
-		createdByName: 'test-user',
-		createdAt: '2023-12-29T12:59:20Z',
-	},
-	{
-		id: 'test-4-2',
-		version: 26,
-		elementType: 'log_pipelines',
-		active: false,
-		isValid: false,
-		disabled: false,
-		deployStatus: 'FAILED',
-		deployResult: 'Deployment failed',
-		lastHash: 'log_pipelines:23',
-		lastConf: 'eivrounreovi',
-		createdBy: 'test-created-by',
-		createdByName: 'test-user',
-		createdAt: '2023-12-29T12:59:20Z',
-	},
-	{
-		id: 'test-4-3',
-		version: 27,
-		elementType: 'log_pipelines',
-		active: false,
-		isValid: false,
-		disabled: false,
-		deployStatus: 'UNKNOWN',
-		deployResult: '',
-		lastHash: 'log_pipelines:23',
-		lastConf: 'eivrounreovi',
-		createdBy: 'test-created-by',
-		createdByName: 'test-user',
-		createdAt: '2023-12-29T12:59:20Z',
-	},
-];

frontend/src/container/PipelinePage/tests/CreatePipelineButton.test.tsx

@@ -1,5 +1,4 @@
 import { render } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
 import { I18nextProvider } from 'react-i18next';
 import { Provider } from 'react-redux';
 import { MemoryRouter } from 'react-router-dom';
@@ -9,17 +8,8 @@ import store from 'store';
 import CreatePipelineButton from '../Layouts/Pipeline/CreatePipelineButton';
 import { pipelineApiResponseMockData } from '../mocks/pipeline';
 
-const trackEventVar = jest.fn();
-jest.mock('hooks/analytics/useAnalytics', () => ({
-	__esModule: true,
-	default: jest.fn().mockImplementation(() => ({
-		trackEvent: trackEventVar,
-		trackPageView: jest.fn(),
-	})),
-}));
-
 describe('PipelinePage container test', () => {
-	it('should render CreatePipelineButton section', async () => {
+	it('should render CreatePipelineButton section', () => {
 		const { asFragment } = render(
 			<MemoryRouter>
 				<Provider store={store}>
@@ -36,58 +26,4 @@ describe('PipelinePage container test', () => {
 		);
 		expect(asFragment()).toMatchSnapshot();
 	});
-
-	it('CreatePipelineButton - edit mode & tracking', async () => {
-		const { getByText } = render(
-			<MemoryRouter>
-				<Provider store={store}>
-					<I18nextProvider i18n={i18n}>
-						<CreatePipelineButton
-							setActionType={jest.fn()}
-							isActionMode="viewing-mode"
-							setActionMode={jest.fn()}
-							pipelineData={pipelineApiResponseMockData}
-						/>
-					</I18nextProvider>
-				</Provider>
-			</MemoryRouter>,
-		);
-
-		// enter_edit_mode click and track event data
-		const editButton = getByText('enter_edit_mode');
-		expect(editButton).toBeInTheDocument();
-		await userEvent.click(editButton);
-
-		expect(trackEventVar).toBeCalledWith('Logs: Pipelines: Entered Edit Mode', {
-			source: 'signoz-ui',
-		});
-	});
-
-	it('CreatePipelineButton - add new mode & tracking', async () => {
-		const { getByText } = render(
-			<MemoryRouter>
-				<Provider store={store}>
-					<I18nextProvider i18n={i18n}>
-						<CreatePipelineButton
-							setActionType={jest.fn()}
-							isActionMode="viewing-mode"
-							setActionMode={jest.fn()}
-							pipelineData={{ ...pipelineApiResponseMockData, pipelines: [] }}
-						/>
-					</I18nextProvider>
-				</Provider>
-			</MemoryRouter>,
-		);
-		// new_pipeline click and track event data
-		const editButton = getByText('new_pipeline');
-		expect(editButton).toBeInTheDocument();
-		await userEvent.click(editButton);
-
-		expect(trackEventVar).toBeCalledWith(
-			'Logs: Pipelines: Clicked Add New Pipeline',
-			{
-				source: 'signoz-ui',
-			},
-		);
-	});
 });

frontend/src/container/PipelinePage/tests/PipelinesSearchSection.test.tsx

@@ -1,5 +1,4 @@
-import { fireEvent, render, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { render } from '@testing-library/react';
 import { I18nextProvider } from 'react-i18next';
 import { Provider } from 'react-redux';
 import { MemoryRouter } from 'react-router-dom';
@@ -21,43 +20,4 @@ describe('PipelinePage container test', () => {
 		);
 		expect(asFragment()).toMatchSnapshot();
 	});
-
-	it('should handle search', async () => {
-		const setPipelineValue = jest.fn();
-		const { getByPlaceholderText, container } = render(
-			<MemoryRouter>
-				<Provider store={store}>
-					<I18nextProvider i18n={i18n}>
-						<PipelinesSearchSection setPipelineSearchValue={setPipelineValue} />
-					</I18nextProvider>
-				</Provider>
-			</MemoryRouter>,
-		);
-
-		const searchInput = getByPlaceholderText('search_pipeline_placeholder');
-
-		// Type into the search input
-		userEvent.type(searchInput, 'sample_pipeline');
-
-		jest.advanceTimersByTime(299);
-		expect(setPipelineValue).not.toHaveBeenCalled();
-
-		// Wait for the debounce delay to pass
-		await waitFor(() => {
-			// Expect the callback to be called after debounce delay
-			expect(setPipelineValue).toHaveBeenCalledWith('sample_pipeline');
-		});
-
-		// clear button
-		fireEvent.click(
-			container.querySelector(
-				'span[class*="ant-input-clear-icon"]',
-			) as HTMLElement,
-		);
-
-		// Wait for the debounce delay to pass
-		await waitFor(() => {
-			expect(setPipelineValue).toHaveBeenCalledWith('');
-		});
-	});
 });

frontend/src/container/SideNav/SideNav.tsx

@@ -278,7 +278,7 @@ function SideNav({
 	}, [isCloudUserVal, isEnterprise, isFetching]);
 
 	useEffect(() => {
-		if (!(isCloudUserVal || isEECloudUser())) {
+		if (!isCloudUserVal) {
 			let updatedMenuItems = [...menuItems];
 			updatedMenuItems = updatedMenuItems.filter(
 				(item) => item.key !== ROUTES.INTEGRATIONS,

frontend/src/container/TraceDetail/SelectedSpanDetails/Events/index.tsx

@@ -13,18 +13,11 @@ function Events({
 		return <Typography>No events data in selected span</Typography>;
 	}
 
-	const sortedTraceEvents = events.sort((a, b) => {
-		// Handle undefined names by treating them as empty strings
-		const nameA = a.name || '';
-		const nameB = b.name || '';
-		return nameA.localeCompare(nameB);
-	});
-
 	return (
 		<ErrorTag
 			onToggleHandler={onToggleHandler}
 			setText={setText}
-			event={sortedTraceEvents}
+			event={events}
 			firstSpanStartTime={firstSpanStartTime}
 		/>
 	);

frontend/src/container/TraceDetail/SelectedSpanDetails/Tags/index.tsx

@@ -41,9 +41,8 @@ function Tags({
 		setSearchText(value);
 	};
 
-	const filteredTags = tags
-		.filter((tag) => tag.key.includes(searchText))
-		.sort((a, b) => a.key.localeCompare(b.key));
+	const filteredTags = tags.filter((tag) => tag.key.includes(searchText));
+
 	if (tags.length === 0) {
 		return <Typography>No tags in selected span</Typography>;
 	}

frontend/src/hooks/dashboard/utils.ts

@@ -16,7 +16,7 @@ export const addEmptyWidgetInDashboardJSONWithQuery = (
 				i: widgetId,
 				w: 6,
 				x: 0,
-				h: 6,
+				h: 3,
 				y: 0,
 			},
 			...(dashboard?.data?.layout || []),

frontend/src/lib/newQueryBuilder/getPaginationQueryData.ts

@@ -36,7 +36,7 @@ export const getPaginationQueryData: SetupPaginationQueryData = ({
 
 	const updatedFilters: TagFilter = {
 		...filters,
-		items: filters?.items?.filter((item) => item.key?.key !== 'id'),
+		items: filters.items.filter((item) => item.key?.key !== 'id'),
 	};
 
 	const tagFilters: TagFilter = {

frontend/src/lib/uPlotLib/getUplotChartOptions.ts

@@ -100,7 +100,7 @@ export const getUPlotChartOptions = ({
 			y: {
 				...getYAxisScale({
 					thresholds,
-					series: apiResponse?.data?.newResult?.data?.result || [],
+					series: apiResponse?.data.newResult.data.result,
 					yAxisUnit,
 					softMax,
 					softMin,

frontend/src/pages/DashboardWidget/index.tsx

@@ -9,7 +9,6 @@ import history from 'lib/history';
 import { useDashboard } from 'providers/Dashboard/Dashboard';
 import { useEffect, useState } from 'react';
 import { generatePath, useLocation, useParams } from 'react-router-dom';
-import { Widgets } from 'types/api/dashboard/getAll';
 
 function DashboardWidget(): JSX.Element | null {
 	const { search } = useLocation();
@@ -25,7 +24,7 @@ function DashboardWidget(): JSX.Element | null {
 	const { data } = selectedDashboard || {};
 	const { widgets } = data || {};
 
-	const selectedWidget = widgets?.find((e) => e.id === widgetId) as Widgets;
+	const selectedWidget = widgets?.find((e) => e.id === widgetId);
 
 	useEffect(() => {
 		const params = new URLSearchParams(search);

frontend/src/pages/SaveView/index.tsx

@@ -282,7 +282,7 @@ function SaveView(): JSX.Element {
 			<div className="save-view-content">
 				<Typography.Title className="title">Views</Typography.Title>
 				<Typography.Text className="subtitle">
-					Manage your saved views for {ROUTES_VS_SOURCEPAGE[pathname]}.
+					Manage your saved views for logs.
 				</Typography.Text>
 				<Input
 					placeholder="Search for views..."

frontend/src/providers/Dashboard/Dashboard.tsx

@@ -10,7 +10,6 @@ import { useDashboardVariablesFromLocalStorage } from 'hooks/dashboard/useDashbo
 import useAxiosError from 'hooks/useAxiosError';
 import useTabVisibility from 'hooks/useTabFocus';
 import { getUpdatedLayout } from 'lib/dashboard/getUpdatedLayout';
-import { defaultTo } from 'lodash-es';
 import isEqual from 'lodash-es/isEqual';
 import isUndefined from 'lodash-es/isUndefined';
 import omitBy from 'lodash-es/omitBy';
@@ -38,7 +37,6 @@ import { GlobalReducer } from 'types/reducer/globalTime';
 import { v4 as generateUUID } from 'uuid';
 
 import { IDashboardContext } from './types';
-import { sortLayout } from './util';
 
 const DashboardContext = createContext<IDashboardContext>({
 	isDashboardSliderOpen: false,
@@ -49,8 +47,6 @@ const DashboardContext = createContext<IDashboardContext>({
 	selectedDashboard: {} as Dashboard,
 	dashboardId: '',
 	layouts: [],
-	panelMap: {},
-	setPanelMap: () => {},
 	setLayouts: () => {},
 	setSelectedDashboard: () => {},
 	updatedTimeRef: {} as React.MutableRefObject<Dayjs | null>,
@@ -98,10 +94,6 @@ export function DashboardProvider({
 
 	const [layouts, setLayouts] = useState<Layout[]>([]);
 
-	const [panelMap, setPanelMap] = useState<
-		Record<string, { widgets: Layout[]; collapsed: boolean }>
-	>({});
-
 	const { isLoggedIn } = useSelector<AppState, AppReducer>((state) => state.app);
 
 	const dashboardId =
@@ -207,9 +199,7 @@ export function DashboardProvider({
 
 					dashboardRef.current = updatedDashboardData;
 
-					setLayouts(sortLayout(getUpdatedLayout(updatedDashboardData.data.layout)));
-
-					setPanelMap(defaultTo(updatedDashboardData?.data?.panelMap, {}));
+					setLayouts(getUpdatedLayout(updatedDashboardData.data.layout));
 				}
 
 				if (
@@ -245,11 +235,7 @@ export function DashboardProvider({
 
 							updatedTimeRef.current = dayjs(updatedDashboardData.updated_at);
 
-							setLayouts(
-								sortLayout(getUpdatedLayout(updatedDashboardData.data.layout)),
-							);
-
-							setPanelMap(defaultTo(updatedDashboardData.data.panelMap, {}));
+							setLayouts(getUpdatedLayout(updatedDashboardData.data.layout));
 						},
 					});
 
@@ -270,11 +256,7 @@ export function DashboardProvider({
 							updatedDashboardData.data.layout,
 						)
 					) {
-						setLayouts(
-							sortLayout(getUpdatedLayout(updatedDashboardData.data.layout)),
-						);
-
-						setPanelMap(defaultTo(updatedDashboardData.data.panelMap, {}));
+						setLayouts(getUpdatedLayout(updatedDashboardData.data.layout));
 					}
 				}
 			},
@@ -341,9 +323,7 @@ export function DashboardProvider({
 			selectedDashboard,
 			dashboardId,
 			layouts,
-			panelMap,
 			setLayouts,
-			setPanelMap,
 			setSelectedDashboard,
 			updatedTimeRef,
 			setToScrollWidgetId,
@@ -359,7 +339,6 @@ export function DashboardProvider({
 			selectedDashboard,
 			dashboardId,
 			layouts,
-			panelMap,
 			toScrollWidgetId,
 			updateLocalStorageDashboardVariables,
 			currentDashboard,

frontend/src/providers/Dashboard/types.ts

@@ -12,8 +12,6 @@ export interface IDashboardContext {
 	selectedDashboard: Dashboard | undefined;
 	dashboardId: string;
 	layouts: Layout[];
-	panelMap: Record<string, { widgets: Layout[]; collapsed: boolean }>;
-	setPanelMap: React.Dispatch<React.SetStateAction<Record<string, any>>>;
 	setLayouts: React.Dispatch<React.SetStateAction<Layout[]>>;
 	setSelectedDashboard: React.Dispatch<
 		React.SetStateAction<Dashboard | undefined>

frontend/src/providers/Dashboard/util.ts

@@ -1,34 +1,22 @@
-import { Layout } from 'react-grid-layout';
 import { Dashboard, Widgets } from 'types/api/dashboard/getAll';
 
 export const getPreviousWidgets = (
 	selectedDashboard: Dashboard,
 	selectedWidgetIndex: number,
 ): Widgets[] =>
-	(selectedDashboard.data.widgets?.slice(
-		0,
-		selectedWidgetIndex || 0,
-	) as Widgets[]) || [];
+	selectedDashboard.data.widgets?.slice(0, selectedWidgetIndex || 0) || [];
 
 export const getNextWidgets = (
 	selectedDashboard: Dashboard,
 	selectedWidgetIndex: number,
 ): Widgets[] =>
-	(selectedDashboard.data.widgets?.slice(
+	selectedDashboard.data.widgets?.slice(
 		(selectedWidgetIndex || 0) + 1, // this is never undefined
 		selectedDashboard.data.widgets?.length,
-	) as Widgets[]) || [];
+	) || [];
 
 export const getSelectedWidgetIndex = (
 	selectedDashboard: Dashboard,
 	widgetId: string | null,
 ): number =>
 	selectedDashboard.data.widgets?.findIndex((e) => e.id === widgetId) || 0;
-
-export const sortLayout = (layout: Layout[]): Layout[] =>
-	[...layout].sort((a, b) => {
-		if (a.y === b.y) {
-			return a.x - b.x;
-		}
-		return a.y - b.y;
-	});

frontend/src/styles.scss

@@ -242,7 +242,3 @@ body {
 		}
 	}
 }
-
-.ant-notification-notice-message {
-	padding-right: 20px;
-}

frontend/src/types/api/dashboard/getAll.ts

@@ -1,4 +1,4 @@
-import { PANEL_GROUP_TYPES, PANEL_TYPES } from 'constants/queryBuilder';
+import { PANEL_TYPES } from 'constants/queryBuilder';
 import { ThresholdProps } from 'container/NewWidget/RightContainer/Threshold/types';
 import { timePreferenceType } from 'container/NewWidget/RightContainer/timeItems';
 import { ReactNode } from 'react';
@@ -59,21 +59,13 @@ export interface DashboardData {
 	description?: string;
 	tags?: string[];
 	name?: string;
-	widgets?: Array<WidgetRow | Widgets>;
+	widgets?: Widgets[];
 	title: string;
 	layout?: Layout[];
-	panelMap?: Record<string, { widgets: Layout[]; collapsed: boolean }>;
 	variables: Record<string, IDashboardVariable>;
 	version?: string;
 }
 
-export interface WidgetRow {
-	id: string;
-	panelTypes: PANEL_GROUP_TYPES;
-	title: ReactNode;
-	description: string;
-}
-
 export interface IBaseWidget {
 	isStacked: boolean;
 	id: string;

frontend/yarn.lock

@@ -6333,13 +6333,13 @@ bl@^4.1.0:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
-body-parser@1.20.2:
-  version "1.20.2"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
-  integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
+body-parser@1.20.1:
+  version "1.20.1"
+  resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz"
+  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
   dependencies:
     bytes "3.1.2"
-    content-type "~1.0.5"
+    content-type "~1.0.4"
     debug "2.6.9"
     depd "2.0.0"
     destroy "1.2.0"
@@ -6347,7 +6347,7 @@ body-parser@1.20.2:
     iconv-lite "0.4.24"
     on-finished "2.4.1"
     qs "6.11.0"
-    raw-body "2.5.2"
+    raw-body "2.5.1"
     type-is "~1.6.18"
     unpipe "1.0.0"
 
@@ -7123,7 +7123,7 @@ content-disposition@0.5.4:
   dependencies:
     safe-buffer "5.2.1"
 
-content-type@~1.0.4, content-type@~1.0.5:
+content-type@~1.0.4:
   version "1.0.5"
   resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz"
   integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
@@ -7172,10 +7172,10 @@ cookie-signature@1.0.6:
   resolved "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"
   integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
 
-cookie@0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051"
-  integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==
+cookie@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"
+  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
 
 cookie@^0.4.2:
   version "0.4.2"
@@ -8902,16 +8902,16 @@ expect@^29.0.0:
     jest-util "^29.5.0"
 
 express@^4.17.3:
-  version "4.19.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465"
-  integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==
+  version "4.18.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
+  integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "1.20.2"
+    body-parser "1.20.1"
     content-disposition "0.5.4"
     content-type "~1.0.4"
-    cookie "0.6.0"
+    cookie "0.5.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
     depd "2.0.0"
@@ -14489,10 +14489,10 @@ range-parser@^1.2.1, range-parser@~1.2.1:
   resolved "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.5.2:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
-  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
+raw-body@2.5.1:
+  version "2.5.1"
+  resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"
+  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
   dependencies:
     bytes "3.1.2"
     http-errors "2.0.0"

pkg/query-service/app/clickhouseReader/wrapper.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"regexp"
+	"strings"
 
 	"github.com/ClickHouse/clickhouse-go/v2"
 	"github.com/ClickHouse/clickhouse-go/v2/lib/driver"
@@ -42,6 +43,12 @@ func (c clickhouseConnWrapper) addClickHouseSettings(ctx context.Context, query
 		settings["log_comment"] = logComment
 	}
 
+	// don't add resource restrictions traces
+	if strings.Contains(query, "signoz_traces") {
+		ctx = clickhouse.Context(ctx, clickhouse.WithSettings(settings))
+		return ctx
+	}
+
 	if c.settings.MaxBytesToRead != "" {
 		settings["max_bytes_to_read"] = c.settings.MaxBytesToRead
 	}

pkg/query-service/app/formula.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"math"
 	"sort"
-	"time"
 
 	"github.com/SigNoz/govaluate"
 	v3 "go.signoz.io/signoz/pkg/query-service/model/v3"
@@ -159,7 +158,7 @@ func processResults(results []*v3.Result, expression *govaluate.EvaluableExpress
 	}, nil
 }
 
-var SupportedFunctions = []string{"exp", "log", "ln", "exp2", "log2", "exp10", "log10", "sqrt", "cbrt", "erf", "erfc", "lgamma", "tgamma", "sin", "cos", "tan", "asin", "acos", "atan", "degrees", "radians", "now", "toUnixTimestamp"}
+var SupportedFunctions = []string{"exp", "log", "ln", "exp2", "log2", "exp10", "log10", "sqrt", "cbrt", "erf", "erfc", "lgamma", "tgamma", "sin", "cos", "tan", "asin", "acos", "atan", "degrees", "radians"}
 
 func evalFuncs() map[string]govaluate.ExpressionFunction {
 	GoValuateFuncs := make(map[string]govaluate.ExpressionFunction)
@@ -248,21 +247,5 @@ func evalFuncs() map[string]govaluate.ExpressionFunction {
 	GoValuateFuncs["radians"] = func(args ...interface{}) (interface{}, error) {
 		return args[0].(float64) * math.Pi / 180, nil
 	}
-
-	GoValuateFuncs["now"] = func(args ...interface{}) (interface{}, error) {
-		return time.Now().Unix(), nil
-	}
-
-	GoValuateFuncs["toUnixTimestamp"] = func(args ...interface{}) (interface{}, error) {
-		if len(args) != 1 {
-			return nil, fmt.Errorf("toUnixTimestamp requires exactly one argument")
-		}
-		t, err := time.Parse(time.RFC3339, args[0].(string))
-		if err != nil {
-			return nil, err
-		}
-		return t.Unix(), nil
-	}
-
 	return GoValuateFuncs
 }

pkg/query-service/app/limit.go

@@ -1,7 +1,6 @@
 package app
 
 import (
-	"math"
 	"sort"
 	"strings"
 
@@ -40,25 +39,16 @@ func applyMetricLimit(results []*v3.Result, queryRangeParams *v3.QueryRangeParam
 								}
 							}
 
-							ithSum, jthSum := 0.0, 0.0
-							for _, point := range result.Series[i].Points {
-								if math.IsNaN(point.Value) || math.IsInf(point.Value, 0) {
-									continue
-								}
-								ithSum += point.Value
+							// For graph type queries, sort based on GroupingSetsPoint
+							if result.Series[i].GroupingSetsPoint == nil || result.Series[j].GroupingSetsPoint == nil {
+								// Handle nil GroupingSetsPoint, if needed
+								// Here, we assume non-nil values are always less than nil values
+								return result.Series[i].GroupingSetsPoint != nil
 							}
-
-							for _, point := range result.Series[j].Points {
-								if math.IsNaN(point.Value) || math.IsInf(point.Value, 0) {
-									continue
-								}
-								jthSum += point.Value
-							}
-
 							if orderBy.Order == "asc" {
-								return ithSum < jthSum
+								return result.Series[i].GroupingSetsPoint.Value < result.Series[j].GroupingSetsPoint.Value
 							} else if orderBy.Order == "desc" {
-								return ithSum > jthSum
+								return result.Series[i].GroupingSetsPoint.Value > result.Series[j].GroupingSetsPoint.Value
 							}
 						} else {
 							// Sort based on Labels map

pkg/query-service/app/logs/v3/enrich_query.go

@@ -145,13 +145,12 @@ func enrichFieldWithMetadata(field v3.AttributeKey, fields map[string]v3.Attribu
 
 	// check if the field is present in the fields map
 	if existingField, ok := fields[field.Key]; ok {
-		// don't update if type is not the same
-		if (field.Type == "" && field.DataType == "") ||
-			(field.Type == existingField.Type && field.DataType == existingField.DataType) ||
-			(field.Type == "" && field.DataType == existingField.DataType) ||
-			(field.DataType == "" && field.Type == existingField.Type) {
+		if existingField.IsColumn {
 			return existingField
 		}
+		field.Type = existingField.Type
+		field.DataType = existingField.DataType
+		return field
 	}
 
 	// enrich with default values if metadata is not found

pkg/query-service/app/logs/v3/enrich_query_test.go

@@ -342,57 +342,6 @@ var testEnrichParamsData = []struct {
 			},
 		},
 	},
-	{
-		Name: "Don't enrich if other keys are non empty and not same",
-		Params: v3.QueryRangeParamsV3{
-			CompositeQuery: &v3.CompositeQuery{
-				BuilderQueries: map[string]*v3.BuilderQuery{
-					"test": {
-						QueryName:  "test",
-						Expression: "test",
-						DataSource: v3.DataSourceLogs,
-						AggregateAttribute: v3.AttributeKey{
-							Key:      "test",
-							Type:     v3.AttributeKeyTypeResource,
-							DataType: v3.AttributeKeyDataTypeInt64,
-						},
-						Filters: &v3.FilterSet{Operator: "AND", Items: []v3.FilterItem{
-							{Key: v3.AttributeKey{Key: "test", Type: v3.AttributeKeyTypeTag}, Value: "test", Operator: "="},
-							{Key: v3.AttributeKey{Key: "test", DataType: v3.AttributeKeyDataTypeString}, Value: "test1", Operator: "="},
-						}},
-					},
-				},
-			},
-		},
-		Fields: map[string]v3.AttributeKey{
-			"test": {
-				Key:      "test",
-				Type:     v3.AttributeKeyTypeTag,
-				DataType: v3.AttributeKeyDataTypeString,
-				IsColumn: true,
-			},
-		},
-		Result: v3.QueryRangeParamsV3{
-			CompositeQuery: &v3.CompositeQuery{
-				BuilderQueries: map[string]*v3.BuilderQuery{
-					"test": {
-						QueryName:  "test",
-						Expression: "test",
-						DataSource: v3.DataSourceLogs,
-						AggregateAttribute: v3.AttributeKey{
-							Key:      "test",
-							Type:     v3.AttributeKeyTypeResource,
-							DataType: v3.AttributeKeyDataTypeInt64,
-						},
-						Filters: &v3.FilterSet{Operator: "AND", Items: []v3.FilterItem{
-							{Key: v3.AttributeKey{Key: "test", Type: v3.AttributeKeyTypeTag, DataType: v3.AttributeKeyDataTypeString, IsColumn: true}, Value: "test", Operator: "="},
-							{Key: v3.AttributeKey{Key: "test", Type: v3.AttributeKeyTypeTag, DataType: v3.AttributeKeyDataTypeString, IsColumn: true}, Value: "test1", Operator: "="},
-						}},
-					},
-				},
-			},
-		},
-	},
 }
 
 func TestEnrichParams(t *testing.T) {

pkg/query-service/app/parser.go

@@ -20,7 +20,6 @@ import (
 	"go.signoz.io/signoz/pkg/query-service/app/metrics"
 	"go.signoz.io/signoz/pkg/query-service/app/queryBuilder"
 	"go.signoz.io/signoz/pkg/query-service/auth"
-	"go.signoz.io/signoz/pkg/query-service/common"
 	"go.signoz.io/signoz/pkg/query-service/constants"
 	"go.signoz.io/signoz/pkg/query-service/model"
 	v3 "go.signoz.io/signoz/pkg/query-service/model/v3"
@@ -1039,10 +1038,6 @@ func ParseQueryRangeParams(r *http.Request) (*v3.QueryRangeParamsV3, *model.ApiE
 				}
 			}
 
-			if minStep := common.MinAllowedStepInterval(queryRangeParams.Start, queryRangeParams.End); query.StepInterval < minStep {
-				query.StepInterval = minStep
-			}
-
 			var timeShiftBy int64
 			if len(query.Functions) > 0 {
 				for idx := range query.Functions {

pkg/query-service/app/parser_test.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.signoz.io/signoz/pkg/query-service/common"
 	v3 "go.signoz.io/signoz/pkg/query-service/model/v3"
 )
 
@@ -1175,105 +1174,3 @@ func TestQueryRangeFormula(t *testing.T) {
 		})
 	}
 }
-
-func TestParseQueryRangeParamsStepIntervalAdjustment(t *testing.T) {
-	reqCases := []struct {
-		desc  string
-		start int64
-		end   int64
-		step  int64
-	}{
-		{
-			desc:  "30 minutes and 60 seconds step",
-			start: time.Now().Add(-30 * time.Minute).UnixMilli(),
-			end:   time.Now().UnixMilli(),
-			step:  60, // no update
-		},
-		{
-			desc:  "1 hour and 1 second step",
-			start: time.Now().Add(-time.Hour).UnixMilli(),
-			end:   time.Now().UnixMilli(),
-			step:  1, // gets updated
-		},
-		{
-			desc:  "1 week and 1 minute step",
-			start: time.Now().Add(-7 * 24 * time.Hour).UnixMilli(),
-			end:   time.Now().UnixMilli(),
-			step:  60, // gets updated
-		},
-		{
-			desc:  "1 day and 1 hour step",
-			start: time.Now().Add(-24 * time.Hour).UnixMilli(),
-			end:   time.Now().UnixMilli(),
-			step:  3600, // no update
-		},
-		{
-			desc:  "1 day and 1 minute step",
-			start: time.Now().Add(-24 * time.Hour).UnixMilli(),
-			end:   time.Now().UnixMilli(),
-			step:  60, // gets updated
-		},
-		{
-			desc:  "1 day and 2 minutes step",
-			start: time.Now().Add(-24 * time.Hour).UnixMilli(),
-			end:   time.Now().UnixMilli(),
-			step:  120, // gets updated
-		},
-		{
-			desc:  "1 day and 5 minutes step",
-			start: time.Now().Add(-24 * time.Hour).UnixMilli(),
-			end:   time.Now().UnixMilli(),
-			step:  300, // no update
-		},
-		{
-			desc:  "1 week and 10 minutes step",
-			start: time.Now().Add(-7 * 24 * time.Hour).UnixMilli(),
-			end:   time.Now().UnixMilli(),
-			step:  600, // get updated
-		},
-		{
-			desc:  "1 week and 45 minutes step",
-			start: time.Now().Add(-7 * 24 * time.Hour).UnixMilli(),
-			end:   time.Now().UnixMilli(),
-			step:  2700, // no update
-		},
-	}
-
-	for _, tc := range reqCases {
-		t.Run(tc.desc, func(t *testing.T) {
-
-			queryRangeParams := &v3.QueryRangeParamsV3{
-				Start: tc.start,
-				End:   tc.end,
-				Step:  tc.step,
-				CompositeQuery: &v3.CompositeQuery{
-					PanelType: v3.PanelTypeGraph,
-					QueryType: v3.QueryTypeBuilder,
-					BuilderQueries: map[string]*v3.BuilderQuery{
-						"A": {
-							QueryName:          "A",
-							DataSource:         v3.DataSourceMetrics,
-							AggregateOperator:  v3.AggregateOperatorSum,
-							AggregateAttribute: v3.AttributeKey{Key: "signoz_calls_total"},
-							GroupBy:            []v3.AttributeKey{{Key: "service_name"}, {Key: "operation_name"}},
-							Expression:         "A",
-							StepInterval:       tc.step,
-						},
-					},
-				},
-				Variables: map[string]interface{}{},
-			}
-
-			body := &bytes.Buffer{}
-			err := json.NewEncoder(body).Encode(queryRangeParams)
-			require.NoError(t, err)
-			req := httptest.NewRequest(http.MethodPost, "/api/v3/query_range", body)
-
-			p, apiErr := ParseQueryRangeParams(req)
-			if apiErr != nil && apiErr.Err != nil {
-				t.Fatalf("unexpected error %s", apiErr.Err)
-			}
-			require.True(t, p.CompositeQuery.BuilderQueries["A"].StepInterval >= common.MinAllowedStepInterval(p.Start, p.End))
-		})
-	}
-}

pkg/query-service/app/querier/querier.go

@@ -525,7 +525,7 @@ func (q *querier) QueryRange(ctx context.Context, params *v3.QueryRangeParamsV3,
 
 	// return error if the number of series is more than one for value type panel
 	if params.CompositeQuery.PanelType == v3.PanelTypeValue {
-		if len(results) > 1 && params.CompositeQuery.EnabledQueries() > 1 {
+		if len(results) > 1 {
 			err = fmt.Errorf("there can be only one active query for value type panel")
 		} else if len(results) == 1 && len(results[0].Series) > 1 {
 			err = fmt.Errorf("there can be only one result series for value type panel but got %d", len(results[0].Series))

pkg/query-service/app/querier/v2/querier.go

@@ -518,7 +518,7 @@ func (q *querier) QueryRange(ctx context.Context, params *v3.QueryRangeParamsV3,
 
 	// return error if the number of series is more than one for value type panel
 	if params.CompositeQuery.PanelType == v3.PanelTypeValue {
-		if len(results) > 1 && params.CompositeQuery.EnabledQueries() > 1 {
+		if len(results) > 1 {
 			err = fmt.Errorf("there can be only one active query for value type panel")
 		} else if len(results) == 1 && len(results[0].Series) > 1 {
 			err = fmt.Errorf("there can be only one result series for value type panel but got %d", len(results[0].Series))

pkg/query-service/common/metrics.go

@@ -4,7 +4,6 @@ import (
 	"math"
 	"time"
 
-	"go.signoz.io/signoz/pkg/query-service/constants"
 	v3 "go.signoz.io/signoz/pkg/query-service/model/v3"
 )
 
@@ -24,10 +23,3 @@ func PastDayRoundOff() int64 {
 	now := time.Now().UnixMilli()
 	return int64(math.Floor(float64(now)/float64(time.Hour.Milliseconds()*24))) * time.Hour.Milliseconds() * 24
 }
-
-// start and end are in milliseconds
-func MinAllowedStepInterval(start, end int64) int64 {
-	step := (end - start) / constants.MaxAllowedPointsInTimeSeries / 1000
-	// return the nearest lower multiple of 60
-	return step - step%60
-}

pkg/query-service/constants/constants.go

@@ -25,8 +25,6 @@ var ConfigSignozIo = "https://config.signoz.io/api/v1"
 
 var DEFAULT_TELEMETRY_ANONYMOUS = false
 
-const MaxAllowedPointsInTimeSeries = 300
-
 func IsTelemetryEnabled() bool {
 	if testing.Testing() {
 		return false

pkg/query-service/model/featureSet.go

@@ -56,14 +56,14 @@ var BasicPlan = FeatureSet{
 		Name:       QueryBuilderPanels,
 		Active:     true,
 		Usage:      0,
-		UsageLimit: -1,
+		UsageLimit: 20,
 		Route:      "",
 	},
 	Feature{
 		Name:       QueryBuilderAlerts,
 		Active:     true,
 		Usage:      0,
-		UsageLimit: -1,
+		UsageLimit: 10,
 		Route:      "",
 	},
 	Feature{

pkg/query-service/model/v3/v3.go

@@ -402,31 +402,6 @@ type CompositeQuery struct {
 	Unit              string                      `json:"unit,omitempty"`
 }
 
-func (c *CompositeQuery) EnabledQueries() int {
-	count := 0
-	switch c.QueryType {
-	case QueryTypeBuilder:
-		for _, query := range c.BuilderQueries {
-			if !query.Disabled {
-				count++
-			}
-		}
-	case QueryTypeClickHouseSQL:
-		for _, query := range c.ClickHouseQueries {
-			if !query.Disabled {
-				count++
-			}
-		}
-	case QueryTypePromQL:
-		for _, query := range c.PromQueries {
-			if !query.Disabled {
-				count++
-			}
-		}
-	}
-	return count
-}
-
 func (c *CompositeQuery) Validate() error {
 	if c == nil {
 		return fmt.Errorf("composite query is required")

pkg/query-service/rules/thresholdRule.go

@@ -19,7 +19,6 @@ import (
 
 	"github.com/ClickHouse/clickhouse-go/v2"
 	"github.com/ClickHouse/clickhouse-go/v2/lib/driver"
-	"go.signoz.io/signoz/pkg/query-service/common"
 	"go.signoz.io/signoz/pkg/query-service/converter"
 
 	"go.signoz.io/signoz/pkg/query-service/app/queryBuilder"
@@ -470,7 +469,7 @@ func (r *ThresholdRule) prepareQueryRange(ts time.Time) *v3.QueryRangeParamsV3 {
 
 	if r.ruleCondition.CompositeQuery != nil && r.ruleCondition.CompositeQuery.BuilderQueries != nil {
 		for _, q := range r.ruleCondition.CompositeQuery.BuilderQueries {
-			q.StepInterval = int64(math.Max(float64(common.MinAllowedStepInterval(start, end)), 60))
+			q.StepInterval = 60
 		}
 	}
 
@@ -502,7 +501,13 @@ func (r *ThresholdRule) runChQuery(ctx context.Context, db clickhouse.Conn, quer
 	}
 
 	columnTypes := rows.ColumnTypes()
+	if err != nil {
+		return nil, err
+	}
 	columnNames := rows.Columns()
+	if err != nil {
+		return nil, err
+	}
 	vars := make([]interface{}, len(columnTypes))
 
 	for i := range columnTypes {
@@ -643,8 +648,7 @@ func (r *ThresholdRule) runChQuery(ctx context.Context, db clickhouse.Conn, quer
 					resultMap[labelHash] = sample
 				}
 			case OnAverage:
-				sample.Point.Vs = append(existing.Point.Vs, sample.Point.V)
-				sample.Point.V = (existing.Point.V + sample.Point.V)
+				sample.Point.V = (existing.Point.V + sample.Point.V) / 2
 				resultMap[labelHash] = sample
 			case InTotal:
 				sample.Point.V = (existing.Point.V + sample.Point.V)
@@ -674,13 +678,6 @@ func (r *ThresholdRule) runChQuery(ctx context.Context, db clickhouse.Conn, quer
 
 	}
 
-	if r.matchType() == OnAverage {
-		for hash, s := range resultMap {
-			s.Point.V = s.Point.V / float64(len(s.Point.Vs))
-			resultMap[hash] = s
-		}
-	}
-
 	for hash, s := range resultMap {
 		if r.matchType() == AllTheTimes && r.compareOp() == ValueIsEq {
 			for _, v := range s.Point.Vs {

pkg/query-service/rules/thresholdRule_test.go

@@ -266,45 +266,6 @@ func TestThresholdRuleCombinations(t *testing.T) {
 			matchType:   "1", // Once
 			target:      0.0,
 		},
-		{
-			values: [][]interface{}{
-				{int32(2), "endpoint"},
-				{int32(3), "endpoint"},
-				{int32(2), "endpoint"},
-				{int32(4), "endpoint"},
-				{int32(2), "endpoint"},
-			},
-			expectAlert: true,
-			compareOp:   "2", // Below
-			matchType:   "3", // On Average
-			target:      3.0,
-		},
-		{
-			values: [][]interface{}{
-				{int32(4), "endpoint"},
-				{int32(7), "endpoint"},
-				{int32(5), "endpoint"},
-				{int32(2), "endpoint"},
-				{int32(9), "endpoint"},
-			},
-			expectAlert: false,
-			compareOp:   "2", // Below
-			matchType:   "3", // On Average
-			target:      3.0,
-		},
-		{
-			values: [][]interface{}{
-				{int32(4), "endpoint"},
-				{int32(7), "endpoint"},
-				{int32(5), "endpoint"},
-				{int32(2), "endpoint"},
-				{int32(9), "endpoint"},
-			},
-			expectAlert: true,
-			compareOp:   "2", // Below
-			matchType:   "3", // On Average
-			target:      6.0,
-		},
 	}
 
 	for idx, c := range cases {