fix(host-list): not showing refresh status & refresh interval queries overlaps (#10812)

* fix(host-list): not showing refresh status & refresh interval queries overlaps

* fix(hosts-list): standardize the name of the store

* fix(hosts-list): use nano second multiplier

* fix(host-list): not showing a good error message

* fix(host-list): ensure states do not conflict with each other

docs/api/openapi.yml

@@ -1098,77 +1098,6 @@ components:
         enabled:
           type: boolean
       type: object
-    InframonitoringtypesHostRecord:
-      properties:
-        cpu:
-          format: double
-          type: number
-        diskUsage:
-          format: double
-          type: number
-        hostName:
-          type: string
-        load15:
-          format: double
-          type: number
-        memory:
-          format: double
-          type: number
-        meta:
-          additionalProperties: {}
-          nullable: true
-          type: object
-        status:
-          type: string
-        wait:
-          format: double
-          type: number
-      type: object
-    InframonitoringtypesHostStatus:
-      enum:
-      - active
-      - inactive
-      type: string
-    InframonitoringtypesHostsListRequest:
-      properties:
-        end:
-          format: int64
-          type: integer
-        filter:
-          $ref: '#/components/schemas/Querybuildertypesv5Filter'
-        filterByStatus:
-          $ref: '#/components/schemas/InframonitoringtypesHostStatus'
-        groupBy:
-          items:
-            $ref: '#/components/schemas/Querybuildertypesv5GroupByKey'
-          nullable: true
-          type: array
-        limit:
-          type: integer
-        offset:
-          type: integer
-        orderBy:
-          $ref: '#/components/schemas/Querybuildertypesv5OrderBy'
-        start:
-          format: int64
-          type: integer
-      type: object
-    InframonitoringtypesHostsListResponse:
-      properties:
-        endTimeBeforeRetention:
-          type: boolean
-        records:
-          items:
-            $ref: '#/components/schemas/InframonitoringtypesHostRecord'
-          nullable: true
-          type: array
-        sentAnyMetricsData:
-          type: boolean
-        total:
-          type: integer
-        type:
-          type: string
-      type: object
     MetricsexplorertypesInspectMetricsRequest:
       properties:
         end:
@@ -7251,64 +7180,6 @@ paths:
       summary: Health check
       tags:
       - health
-  /api/v2/infra-monitoring/hosts/list:
-    post:
-      deprecated: false
-      description: This endpoint returns a list of hosts along with other information
-        for each of them
-      operationId: HostsList
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/InframonitoringtypesHostsListRequest'
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                properties:
-                  data:
-                    $ref: '#/components/schemas/InframonitoringtypesHostsListResponse'
-                  status:
-                    type: string
-                required:
-                - status
-                - data
-                type: object
-          description: OK
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Bad Request
-        "401":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Unauthorized
-        "403":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Forbidden
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Internal Server Error
-      security:
-      - api_key:
-        - VIEWER
-      - tokenizer:
-        - VIEWER
-      summary: List Hosts for Infra Monitoring
-      tags:
-      - infra-monitoring
   /api/v2/livez:
     get:
       deprecated: false

frontend/src/api/generated/services/infra-monitoring/index.ts

@@ -1,104 +0,0 @@
-/**
- * ! Do not edit manually
- * * The file has been auto-generated using Orval for SigNoz
- * * regenerate with 'yarn generate:api'
- * SigNoz
- */
-import type {
-	MutationFunction,
-	UseMutationOptions,
-	UseMutationResult,
-} from 'react-query';
-import { useMutation } from 'react-query';
-
-import type { BodyType, ErrorType } from '../../../generatedAPIInstance';
-import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
-import type {
-	HostsList200,
-	InframonitoringtypesHostsListRequestDTO,
-	RenderErrorResponseDTO,
-} from '../sigNoz.schemas';
-
-/**
- * This endpoint returns a list of hosts along with other information for each of them
- * @summary List Hosts for Infra Monitoring
- */
-export const hostsList = (
-	inframonitoringtypesHostsListRequestDTO: BodyType<InframonitoringtypesHostsListRequestDTO>,
-	signal?: AbortSignal,
-) => {
-	return GeneratedAPIInstance<HostsList200>({
-		url: `/api/v2/infra-monitoring/hosts/list`,
-		method: 'POST',
-		headers: { 'Content-Type': 'application/json' },
-		data: inframonitoringtypesHostsListRequestDTO,
-		signal,
-	});
-};
-
-export const getHostsListMutationOptions = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof hostsList>>,
-		TError,
-		{ data: BodyType<InframonitoringtypesHostsListRequestDTO> },
-		TContext
-	>;
-}): UseMutationOptions<
-	Awaited<ReturnType<typeof hostsList>>,
-	TError,
-	{ data: BodyType<InframonitoringtypesHostsListRequestDTO> },
-	TContext
-> => {
-	const mutationKey = ['hostsList'];
-	const { mutation: mutationOptions } = options
-		? options.mutation &&
-		  'mutationKey' in options.mutation &&
-		  options.mutation.mutationKey
-			? options
-			: { ...options, mutation: { ...options.mutation, mutationKey } }
-		: { mutation: { mutationKey } };
-
-	const mutationFn: MutationFunction<
-		Awaited<ReturnType<typeof hostsList>>,
-		{ data: BodyType<InframonitoringtypesHostsListRequestDTO> }
-	> = (props) => {
-		const { data } = props ?? {};
-
-		return hostsList(data);
-	};
-
-	return { mutationFn, ...mutationOptions };
-};
-
-export type HostsListMutationResult = NonNullable<
-	Awaited<ReturnType<typeof hostsList>>
->;
-export type HostsListMutationBody = BodyType<InframonitoringtypesHostsListRequestDTO>;
-export type HostsListMutationError = ErrorType<RenderErrorResponseDTO>;
-
-/**
- * @summary List Hosts for Infra Monitoring
- */
-export const useHostsList = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof hostsList>>,
-		TError,
-		{ data: BodyType<InframonitoringtypesHostsListRequestDTO> },
-		TContext
-	>;
-}): UseMutationResult<
-	Awaited<ReturnType<typeof hostsList>>,
-	TError,
-	{ data: BodyType<InframonitoringtypesHostsListRequestDTO> },
-	TContext
-> => {
-	const mutationOptions = getHostsListMutationOptions(options);
-
-	return useMutation(mutationOptions);
-};

frontend/src/api/generated/services/sigNoz.schemas.ts

@@ -1330,105 +1330,6 @@ export interface GlobaltypesTokenizerConfigDTO {
 	enabled?: boolean;
 }
 
-/**
- * @nullable
- */
-export type InframonitoringtypesHostRecordDTOMeta = {
-	[key: string]: unknown;
-} | null;
-
-export interface InframonitoringtypesHostRecordDTO {
-	/**
-	 * @type boolean
-	 */
-	active?: boolean;
-	/**
-	 * @type number
-	 * @format double
-	 */
-	cpu?: number;
-	/**
-	 * @type string
-	 */
-	hostName?: string;
-	/**
-	 * @type number
-	 * @format double
-	 */
-	load15?: number;
-	/**
-	 * @type number
-	 * @format double
-	 */
-	memory?: number;
-	/**
-	 * @type object
-	 * @nullable true
-	 */
-	meta?: InframonitoringtypesHostRecordDTOMeta;
-	/**
-	 * @type number
-	 * @format double
-	 */
-	wait?: number;
-}
-
-export interface InframonitoringtypesHostsListRequestDTO {
-	/**
-	 * @type integer
-	 * @format int64
-	 */
-	end?: number;
-	filter?: Querybuildertypesv5FilterDTO;
-	/**
-	 * @type array
-	 * @nullable true
-	 */
-	groupBy?: Querybuildertypesv5GroupByKeyDTO[] | null;
-	/**
-	 * @type integer
-	 */
-	limit?: number;
-	/**
-	 * @type integer
-	 */
-	offset?: number;
-	orderBy?: Querybuildertypesv5OrderByDTO;
-	/**
-	 * @type integer
-	 * @format int64
-	 */
-	start?: number;
-}
-
-export interface InframonitoringtypesHostsListResponseDTO {
-	/**
-	 * @type boolean
-	 */
-	endTimeBeforeRetention?: boolean;
-	/**
-	 * @type boolean
-	 */
-	isSendingK8SAgentMetrics?: boolean;
-	/**
-	 * @type array
-	 * @nullable true
-	 */
-	records?: InframonitoringtypesHostRecordDTO[] | null;
-	/**
-	 * @type boolean
-	 */
-	sentAnyMetricsData?: boolean;
-	/**
-	 * @type integer
-	 */
-	total?: number;
-	/**
-	 * @type string
-	 */
-	type?: string;
-}
-
 export interface MetricsexplorertypesInspectMetricsRequestDTO {
 	/**
 	 * @type integer
@@ -4291,14 +4192,6 @@ export type Healthz503 = {
 	status: string;
 };
 
-export type HostsList200 = {
-	data: InframonitoringtypesHostsListResponseDTO;
-	/**
-	 * @type string
-	 */
-	status: string;
-};
-
 export type Livez200 = {
 	data: FactoryResponseDTO;
 	/**

frontend/src/api/infraMonitoring/getHostLists.ts

@@ -13,7 +13,9 @@ export interface HostListPayload {
 	orderBy?: {
 		columnName: string;
 		order: 'asc' | 'desc';
-	};
+	} | null;
+	start?: number;
+	end?: number;
 }
 
 export interface TimeSeriesValue {

frontend/src/components/ErrorModal/components/ErrorContent.tsx

@@ -10,7 +10,12 @@ import APIError from 'types/api/error';
 import './ErrorContent.styles.scss';
 
 interface ErrorContentProps {
-	error: APIError;
+	error:
+		| APIError
+		| {
+				code: number;
+				message: string;
+		  };
 	icon?: ReactNode;
 }
 
@@ -20,7 +25,15 @@ function ErrorContent({ error, icon }: ErrorContentProps): JSX.Element {
 		errors: errorMessages,
 		code: errorCode,
 		message: errorMessage,
-	} = error?.error?.error || {};
+	} =
+		error && 'error' in error
+			? error?.error?.error || {}
+			: {
+					url: undefined,
+					errors: [],
+					code: error.code || 500,
+					message: error.message || 'Something went wrong',
+			  };
 	return (
 		<section className="error-content">
 			{/* Summary Header */}

frontend/src/container/InfraMonitoringHosts/HostsList.tsx

@@ -1,41 +1,52 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
-// eslint-disable-next-line no-restricted-imports
-import { useSelector } from 'react-redux';
+import { useQuery } from 'react-query';
 import { VerticalAlignTopOutlined } from '@ant-design/icons';
 import { Button, Tooltip, Typography } from 'antd';
 import logEvent from 'api/common/logEvent';
-import { HostListPayload } from 'api/infraMonitoring/getHostLists';
+import {
+	getHostLists,
+	HostListPayload,
+	HostListResponse,
+} from 'api/infraMonitoring/getHostLists';
 import HostMetricDetail from 'components/HostMetricsDetail';
 import QuickFilters from 'components/QuickFilters/QuickFilters';
 import { QuickFiltersSource } from 'components/QuickFilters/types';
 import { InfraMonitoringEvents } from 'constants/events';
+import { FeatureKeys } from 'constants/features';
+import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
 import {
 	useInfraMonitoringCurrentPage,
 	useInfraMonitoringFiltersHosts,
 	useInfraMonitoringOrderByHosts,
 } from 'container/InfraMonitoringK8s/hooks';
 import { usePageSize } from 'container/InfraMonitoringK8s/utils';
-import { useGetHostList } from 'hooks/infraMonitoring/useGetHostList';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useQueryOperations } from 'hooks/queryBuilder/useQueryBuilderOperations';
 import { Filter } from 'lucide-react';
 import { parseAsString, useQueryState } from 'nuqs';
-import { AppState } from 'store/reducers';
-import { IBuilderQuery, Query } from 'types/api/queryBuilder/queryBuilderData';
-import { GlobalReducer } from 'types/reducer/globalTime';
+import { useAppContext } from 'providers/App/App';
+import { useGlobalTimeStore } from 'store/globalTime';
+import {
+	getAutoRefreshQueryKey,
+	NANO_SECOND_MULTIPLIER,
+} from 'store/globalTime/utils';
+import { ErrorResponse, SuccessResponse } from 'types/api';
+import {
+	IBuilderQuery,
+	Query,
+	TagFilter,
+} from 'types/api/queryBuilder/queryBuilderData';
 
-import { FeatureKeys } from '../../constants/features';
-import { useAppContext } from '../../providers/App/App';
 import HostsListControls from './HostsListControls';
 import HostsListTable from './HostsListTable';
 import { getHostListsQuery, GetHostsQuickFiltersConfig } from './utils';
 
 import './InfraMonitoring.styles.scss';
-function HostsList(): JSX.Element {
-	const { maxTime, minTime } = useSelector<AppState, GlobalReducer>(
-		(state) => state.globalTime,
-	);
 
+const defaultFilters: TagFilter = { items: [], op: 'and' };
+const baseQuery = getHostListsQuery();
+
+function HostsList(): JSX.Element {
 	const [currentPage, setCurrentPage] = useInfraMonitoringCurrentPage();
 	const [filters, setFilters] = useInfraMonitoringFiltersHosts();
 	const [orderBy, setOrderBy] = useInfraMonitoringOrderByHosts();
@@ -62,57 +73,49 @@ function HostsList(): JSX.Element {
 
 	const { pageSize, setPageSize } = usePageSize('hosts');
 
-	const query = useMemo(() => {
-		const baseQuery = getHostListsQuery();
-		return {
-			...baseQuery,
-			limit: pageSize,
-			offset: (currentPage - 1) * pageSize,
-			filters,
-			start: Math.floor(minTime / 1000000),
-			end: Math.floor(maxTime / 1000000),
-			orderBy,
-		};
-	}, [pageSize, currentPage, filters, minTime, maxTime, orderBy]);
+	const selectedTime = useGlobalTimeStore((s) => s.selectedTime);
+	const isRefreshEnabled = useGlobalTimeStore((s) => s.isRefreshEnabled);
+	const refreshInterval = useGlobalTimeStore((s) => s.refreshInterval);
+	const getMinMaxTime = useGlobalTimeStore((s) => s.getMinMaxTime);
 
-	const queryKey = useMemo(() => {
-		if (selectedHostName) {
-			return [
-				'hostList',
+	const queryKey = useMemo(
+		() =>
+			getAutoRefreshQueryKey(
+				selectedTime,
+				REACT_QUERY_KEY.GET_HOST_LIST,
 				String(pageSize),
 				String(currentPage),
 				JSON.stringify(filters),
 				JSON.stringify(orderBy),
-			];
-		}
-		return [
-			'hostList',
-			String(pageSize),
-			String(currentPage),
-			JSON.stringify(filters),
-			JSON.stringify(orderBy),
-			String(minTime),
-			String(maxTime),
-		];
-	}, [
-		pageSize,
-		currentPage,
-		filters,
-		orderBy,
-		selectedHostName,
-		minTime,
-		maxTime,
-	]);
-
-	const { data, isFetching, isLoading, isError } = useGetHostList(
-		query as HostListPayload,
-		{
-			queryKey,
-			enabled: !!query,
-			keepPreviousData: true,
-		},
+			),
+		[pageSize, currentPage, filters, orderBy, selectedTime],
 	);
 
+	const { data, isFetching, isLoading, isError } = useQuery<
+		SuccessResponse<HostListResponse> | ErrorResponse,
+		Error
+	>({
+		queryKey,
+		queryFn: ({ signal }) => {
+			const { minTime, maxTime } = getMinMaxTime();
+
+			const payload: HostListPayload = {
+				...baseQuery,
+				limit: pageSize,
+				offset: (currentPage - 1) * pageSize,
+				filters: filters ?? defaultFilters,
+				orderBy,
+				start: Math.floor(minTime / NANO_SECOND_MULTIPLIER),
+				end: Math.floor(maxTime / NANO_SECOND_MULTIPLIER),
+			};
+
+			return getHostLists(payload, signal);
+		},
+		enabled: true,
+		keepPreviousData: true,
+		refetchInterval: isRefreshEnabled ? refreshInterval : false,
+	});
+
 	const hostMetricsData = useMemo(() => data?.payload?.data?.records || [], [
 		data,
 	]);
@@ -227,7 +230,7 @@ function HostsList(): JSX.Element {
 						isError={isError}
 						tableData={data}
 						hostMetricsData={hostMetricsData}
-						filters={filters || { items: [], op: 'AND' }}
+						filters={filters ?? defaultFilters}
 						currentPage={currentPage}
 						setCurrentPage={setCurrentPage}
 						onHostClick={handleHostClick}

frontend/src/container/InfraMonitoringHosts/HostsListTable.tsx

@@ -10,6 +10,7 @@ import {
 } from 'antd';
 import type { SorterResult } from 'antd/es/table/interface';
 import logEvent from 'api/common/logEvent';
+import ErrorContent from 'components/ErrorModal/components/ErrorContent';
 import { InfraMonitoringEvents } from 'constants/events';
 import { isModifierKeyPressed } from 'utils/app';
 import { openInNewTab } from 'utils/navigation';
@@ -26,9 +27,40 @@ import {
 function EmptyOrLoadingView(
 	viewState: EmptyOrLoadingViewProps,
 ): React.ReactNode {
-	const { isError, errorMessage } = viewState;
-	if (isError) {
-		return <Typography>{errorMessage || 'Something went wrong'}</Typography>;
+	if (viewState.showTableLoadingState) {
+		return (
+			<div className="hosts-list-loading-state">
+				<Skeleton.Input
+					className="hosts-list-loading-state-item"
+					size="large"
+					block
+					active
+				/>
+				<Skeleton.Input
+					className="hosts-list-loading-state-item"
+					size="large"
+					block
+					active
+				/>
+				<Skeleton.Input
+					className="hosts-list-loading-state-item"
+					size="large"
+					block
+					active
+				/>
+			</div>
+		);
+	}
+	const { isError, data } = viewState;
+	if (isError || data?.error || (data?.statusCode || 0) >= 300) {
+		return (
+			<ErrorContent
+				error={{
+					code: data?.statusCode || 500,
+					message: data?.error || 'Something went wrong',
+				}}
+			/>
+		);
 	}
 	if (viewState.showHostsEmptyState) {
 		return (
@@ -76,30 +108,6 @@ function EmptyOrLoadingView(
 			</div>
 		);
 	}
-	if (viewState.showTableLoadingState) {
-		return (
-			<div className="hosts-list-loading-state">
-				<Skeleton.Input
-					className="hosts-list-loading-state-item"
-					size="large"
-					block
-					active
-				/>
-				<Skeleton.Input
-					className="hosts-list-loading-state-item"
-					size="large"
-					block
-					active
-				/>
-				<Skeleton.Input
-					className="hosts-list-loading-state-item"
-					size="large"
-					block
-					active
-				/>
-			</div>
-		);
-	}
 	return null;
 }
 
@@ -190,7 +198,8 @@ export default function HostsListTable({
 		!isLoading &&
 		formattedHostMetricsData.length === 0 &&
 		(!sentAnyHostMetricsData || isSendingIncorrectK8SAgentMetrics) &&
-		!filters.items.length;
+		!filters.items.length &&
+		!endTimeBeforeRetention;
 
 	const showEndTimeBeforeRetentionMessage =
 		!isFetching &&
@@ -211,7 +220,7 @@ export default function HostsListTable({
 
 	const emptyOrLoadingView = EmptyOrLoadingView({
 		isError,
-		errorMessage: data?.error ?? '',
+		data,
 		showHostsEmptyState,
 		sentAnyHostMetricsData,
 		isSendingIncorrectK8SAgentMetrics,

frontend/src/container/InfraMonitoringHosts/__tests__/HostsList.test.tsx

@@ -2,8 +2,8 @@ import { QueryClient, QueryClientProvider } from 'react-query';
 // eslint-disable-next-line no-restricted-imports
 import { Provider } from 'react-redux';
 import { MemoryRouter } from 'react-router-dom';
-import { render } from '@testing-library/react';
-import * as useGetHostListHooks from 'hooks/infraMonitoring/useGetHostList';
+import { render, waitFor } from '@testing-library/react';
+import * as getHostListsApi from 'api/infraMonitoring/getHostLists';
 import { withNuqsTestingAdapter } from 'nuqs/adapters/testing';
 import * as appContextHooks from 'providers/App/App';
 import * as timezoneHooks from 'providers/Timezone';
@@ -19,6 +19,10 @@ jest.mock('lib/getMinMax', () => ({
 		maxTime: 1713738000000,
 		isValidShortHandDateTimeFormat: jest.fn().mockReturnValue(true),
 	})),
+	getMinMaxForSelectedTime: jest.fn().mockReturnValue({
+		minTime: 1713734400000000000,
+		maxTime: 1713738000000000000,
+	}),
 }));
 jest.mock('container/TopNav/DateTimeSelectionV2', () => ({
 	__esModule: true,
@@ -41,7 +45,13 @@ jest.mock('components/CustomTimePicker/CustomTimePicker', () => ({
 	),
 }));
 
-const queryClient = new QueryClient();
+const queryClient = new QueryClient({
+	defaultOptions: {
+		queries: {
+			retry: false,
+		},
+	},
+});
 
 jest.mock('react-redux', () => ({
 	...jest.requireActual('react-redux'),
@@ -80,27 +90,40 @@ jest.spyOn(timezoneHooks, 'useTimezone').mockReturnValue({
 		offset: 0,
 	},
 } as any);
-jest.spyOn(useGetHostListHooks, 'useGetHostList').mockReturnValue({
-	data: {
-		payload: {
-			data: {
-				records: [
-					{
-						hostName: 'test-host',
-						active: true,
-						cpu: 0.75,
-						memory: 0.65,
-						wait: 0.03,
-					},
-				],
-				isSendingK8SAgentMetrics: false,
-				sentAnyHostMetricsData: true,
-			},
+
+jest.spyOn(getHostListsApi, 'getHostLists').mockResolvedValue({
+	statusCode: 200,
+	error: null,
+	message: 'Success',
+	payload: {
+		status: 'success',
+		data: {
+			type: 'list',
+			records: [
+				{
+					hostName: 'test-host',
+					active: true,
+					os: 'linux',
+					cpu: 0.75,
+					cpuTimeSeries: { labels: {}, labelsArray: [], values: [] },
+					memory: 0.65,
+					memoryTimeSeries: { labels: {}, labelsArray: [], values: [] },
+					wait: 0.03,
+					waitTimeSeries: { labels: {}, labelsArray: [], values: [] },
+					load15: 0.5,
+					load15TimeSeries: { labels: {}, labelsArray: [], values: [] },
+				},
+			],
+			groups: null,
+			total: 1,
+			sentAnyHostMetricsData: true,
+			isSendingK8SAgentMetrics: false,
+			endTimeBeforeRetention: false,
 		},
 	},
-	isLoading: false,
-	isError: false,
-} as any);
+	params: {} as any,
+});
+
 jest.spyOn(appContextHooks, 'useAppContext').mockReturnValue({
 	user: {
 		role: 'admin',
@@ -128,22 +151,11 @@ jest.spyOn(appContextHooks, 'useAppContext').mockReturnValue({
 const Wrapper = withNuqsTestingAdapter({ searchParams: {} });
 
 describe('HostsList', () => {
-	it('renders hosts list table', () => {
-		const { container } = render(
-			<Wrapper>
-				<QueryClientProvider client={queryClient}>
-					<MemoryRouter>
-						<Provider store={store}>
-							<HostsList />
-						</Provider>
-					</MemoryRouter>
-				</QueryClientProvider>
-			</Wrapper>,
-		);
-		expect(container.querySelector('.hosts-list-table')).toBeInTheDocument();
+	beforeEach(() => {
+		queryClient.clear();
 	});
 
-	it('renders filters', () => {
+	it('renders hosts list table', async () => {
 		const { container } = render(
 			<Wrapper>
 				<QueryClientProvider client={queryClient}>
@@ -155,6 +167,25 @@ describe('HostsList', () => {
 				</QueryClientProvider>
 			</Wrapper>,
 		);
-		expect(container.querySelector('.filters')).toBeInTheDocument();
+		await waitFor(() => {
+			expect(container.querySelector('.hosts-list-table')).toBeInTheDocument();
+		});
+	});
+
+	it('renders filters', async () => {
+		const { container } = render(
+			<Wrapper>
+				<QueryClientProvider client={queryClient}>
+					<MemoryRouter>
+						<Provider store={store}>
+							<HostsList />
+						</Provider>
+					</MemoryRouter>
+				</QueryClientProvider>
+			</Wrapper>,
+		);
+		await waitFor(() => {
+			expect(container.querySelector('.filters')).toBeInTheDocument();
+		});
 	});
 });

frontend/src/container/InfraMonitoringHosts/utils.tsx

@@ -1,8 +1,13 @@
 import { Dispatch, SetStateAction } from 'react';
 import { InfoCircleOutlined } from '@ant-design/icons';
 import { Color } from '@signozhq/design-tokens';
-import { Progress, TabsProps, Tag, Tooltip, Typography } from 'antd';
-import { TableColumnType as ColumnType } from 'antd';
+import {
+	Progress,
+	TableColumnType as ColumnType,
+	Tag,
+	Tooltip,
+	Typography,
+} from 'antd';
 import { SortOrder } from 'antd/lib/table/interface';
 import {
 	HostData,
@@ -13,8 +18,6 @@ import {
 	FiltersType,
 	IQuickFiltersConfig,
 } from 'components/QuickFilters/types';
-import TabLabel from 'components/TabLabel';
-import { PANEL_TYPES } from 'constants/queryBuilder';
 import { TriangleAlert } from 'lucide-react';
 import { ErrorResponse, SuccessResponse } from 'types/api';
 import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
@@ -22,9 +25,6 @@ import { TagFilter } from 'types/api/queryBuilder/queryBuilderData';
 import { DataSource } from 'types/common/queryBuilder';
 
 import { OrderBySchemaType } from '../InfraMonitoringK8s/schemas';
-import HostsList from './HostsList';
-
-import './InfraMonitoring.styles.scss';
 
 export interface HostRowData {
 	key?: string;
@@ -112,7 +112,10 @@ export interface HostsListTableProps {
 
 export interface EmptyOrLoadingViewProps {
 	isError: boolean;
-	errorMessage: string;
+	data:
+		| ErrorResponse<string>
+		| SuccessResponse<HostListResponse, unknown>
+		| undefined;
 	showHostsEmptyState: boolean;
 	sentAnyHostMetricsData: boolean;
 	isSendingIncorrectK8SAgentMetrics: boolean;
@@ -141,14 +144,6 @@ function mapOrderByToSortOrder(
 		: undefined;
 }
 
-export const getTabsItems = (): TabsProps['items'] => [
-	{
-		label: <TabLabel label="List View" isDisabled={false} tooltipText="" />,
-		key: PANEL_TYPES.LIST,
-		children: <HostsList />,
-	},
-];
-
 export const getHostsListColumns = (
 	orderBy: OrderBySchemaType,
 ): ColumnType<HostRowData>[] => [

frontend/src/container/TopNav/DateTimeSelectionV2/index.tsx

@@ -360,7 +360,11 @@ function DateTimeSelection({
 	const invalidateQueries = useGlobalTimeQueryInvalidate();
 	const onRefreshHandler = (): void => {
 		invalidateQueries();
-		onSelectHandler(selectedTime);
+		onSelectHandler(
+			isModalTimeSelection && modalSelectedInterval
+				? modalSelectedInterval
+				: selectedTime,
+		);
 		onLastRefreshHandler();
 	};
 	const handleReset = useCallback(() => {

frontend/src/hooks/infraMonitoring/useGetHostList.ts

@@ -1,42 +0,0 @@
-import { useMemo } from 'react';
-import { useQuery, UseQueryOptions, UseQueryResult } from 'react-query';
-import {
-	getHostLists,
-	HostListPayload,
-	HostListResponse,
-} from 'api/infraMonitoring/getHostLists';
-import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
-import { ErrorResponse, SuccessResponse } from 'types/api';
-
-type UseGetHostList = (
-	requestData: HostListPayload,
-	options?: UseQueryOptions<
-		SuccessResponse<HostListResponse> | ErrorResponse,
-		Error
-	>,
-	headers?: Record<string, string>,
-) => UseQueryResult<SuccessResponse<HostListResponse> | ErrorResponse, Error>;
-
-export const useGetHostList: UseGetHostList = (
-	requestData,
-	options,
-	headers,
-) => {
-	const queryKey = useMemo(() => {
-		if (options?.queryKey && Array.isArray(options.queryKey)) {
-			return [...options.queryKey];
-		}
-
-		if (options?.queryKey && typeof options.queryKey === 'string') {
-			return options.queryKey;
-		}
-
-		return [REACT_QUERY_KEY.GET_HOST_LIST, requestData];
-	}, [options?.queryKey, requestData]);
-
-	return useQuery<SuccessResponse<HostListResponse> | ErrorResponse, Error>({
-		queryFn: ({ signal }) => getHostLists(requestData, signal, headers),
-		...options,
-		queryKey,
-	});
-};

pkg/apiserver/signozapiserver/inframonitoring.go

@@ -1,33 +0,0 @@
-package signozapiserver
-
-import (
-	"net/http"
-
-	"github.com/SigNoz/signoz/pkg/http/handler"
-	"github.com/SigNoz/signoz/pkg/types"
-	"github.com/SigNoz/signoz/pkg/types/inframonitoringtypes"
-	"github.com/gorilla/mux"
-)
-
-func (provider *provider) addInfraMonitoringRoutes(router *mux.Router) error {
-	if err := router.Handle("/api/v2/infra-monitoring/hosts/list", handler.New(
-		provider.authZ.ViewAccess(provider.infraMonitoringHandler.HostsList),
-		handler.OpenAPIDef{
-			ID:                  "HostsList",
-			Tags:                []string{"infra-monitoring"},
-			Summary:             "List Hosts for Infra Monitoring",
-			Description:         "This endpoint returns a list of hosts along with other information for each of them",
-			Request:             new(inframonitoringtypes.HostsListRequest),
-			RequestContentType:  "application/json",
-			Response:            new(inframonitoringtypes.HostsListResponse),
-			ResponseContentType: "application/json",
-			SuccessStatusCode:   http.StatusOK,
-			ErrorStatusCodes:    []int{http.StatusBadRequest, http.StatusUnauthorized, http.StatusInternalServerError},
-			Deprecated:          false,
-			SecuritySchemes:     newSecuritySchemes(types.RoleViewer),
-		})).Methods(http.MethodPost).GetError(); err != nil {
-		return err
-	}
-
-	return nil
-}

pkg/apiserver/signozapiserver/provider.go

@@ -16,7 +16,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/modules/dashboard"
 	"github.com/SigNoz/signoz/pkg/modules/fields"
 	"github.com/SigNoz/signoz/pkg/modules/metricsexplorer"
-	"github.com/SigNoz/signoz/pkg/modules/inframonitoring"
 	"github.com/SigNoz/signoz/pkg/modules/organization"
 	"github.com/SigNoz/signoz/pkg/modules/preference"
 	"github.com/SigNoz/signoz/pkg/modules/promote"
@@ -48,7 +47,6 @@ type provider struct {
 	dashboardModule         dashboard.Module
 	dashboardHandler        dashboard.Handler
 	metricsExplorerHandler  metricsexplorer.Handler
-	infraMonitoringHandler  inframonitoring.Handler
 	gatewayHandler          gateway.Handler
 	fieldsHandler           fields.Handler
 	authzHandler            authz.Handler
@@ -75,7 +73,6 @@ func NewFactory(
 	dashboardModule dashboard.Module,
 	dashboardHandler dashboard.Handler,
 	metricsExplorerHandler metricsexplorer.Handler,
-	infraMonitoringHandler inframonitoring.Handler,
 	gatewayHandler gateway.Handler,
 	fieldsHandler fields.Handler,
 	authzHandler authz.Handler,
@@ -105,7 +102,6 @@ func NewFactory(
 			dashboardModule,
 			dashboardHandler,
 			metricsExplorerHandler,
-			infraMonitoringHandler,
 			gatewayHandler,
 			fieldsHandler,
 			authzHandler,
@@ -137,7 +133,6 @@ func newProvider(
 	dashboardModule dashboard.Module,
 	dashboardHandler dashboard.Handler,
 	metricsExplorerHandler metricsexplorer.Handler,
-	infraMonitoringHandler inframonitoring.Handler,
 	gatewayHandler gateway.Handler,
 	fieldsHandler fields.Handler,
 	authzHandler authz.Handler,
@@ -167,7 +162,6 @@ func newProvider(
 		dashboardModule:         dashboardModule,
 		dashboardHandler:        dashboardHandler,
 		metricsExplorerHandler:  metricsExplorerHandler,
-		infraMonitoringHandler:  infraMonitoringHandler,
 		gatewayHandler:          gatewayHandler,
 		fieldsHandler:           fieldsHandler,
 		authzHandler:            authzHandler,
@@ -234,10 +228,6 @@ func (provider *provider) AddToRouter(router *mux.Router) error {
 		return err
 	}
 
-	if err := provider.addInfraMonitoringRoutes(router); err != nil {
-		return err
-	}
-
 	if err := provider.addGatewayRoutes(router); err != nil {
 		return err
 	}

pkg/modules/inframonitoring/config.go

@@ -1,33 +0,0 @@
-package inframonitoring
-
-import (
-	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/factory"
-)
-
-type Config struct {
-	TelemetryStore TelemetryStoreConfig `mapstructure:"telemetrystore"`
-}
-
-type TelemetryStoreConfig struct {
-	Threads int `mapstructure:"threads"`
-}
-
-func NewConfigFactory() factory.ConfigFactory {
-	return factory.NewConfigFactory(factory.MustNewName("inframonitoring"), newConfig)
-}
-
-func newConfig() factory.Config {
-	return Config{
-		TelemetryStore: TelemetryStoreConfig{
-			Threads: 8,
-		},
-	}
-}
-
-func (c Config) Validate() error {
-	if c.TelemetryStore.Threads <= 0 {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "inframonitoring.telemetrystore.threads must be positive, got %d", c.TelemetryStore.Threads)
-	}
-	return nil
-}

pkg/modules/inframonitoring/implinframonitoring/commonmethods.go

@@ -1,233 +0,0 @@
-package implinframonitoring
-
-import (
-	"context"
-	"fmt"
-	"strings"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/querybuilder"
-	"github.com/SigNoz/signoz/pkg/telemetrymetrics"
-	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
-	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
-	"github.com/huandu/go-sqlbuilder"
-)
-
-const (
-	ResponseTypeList        = "list"
-	ResponseTypeGroupedList = "grouped_list"
-)
-
-func (m *module) buildFilterClause(ctx context.Context, filter *qbtypes.Filter, startMillis, endMillis int64) (*sqlbuilder.WhereClause, error) {
-	expression := ""
-	if filter != nil {
-		expression = strings.TrimSpace(filter.Expression)
-	}
-	if expression == "" {
-		return sqlbuilder.NewWhereClause(), nil
-	}
-
-	whereClauseSelectors := querybuilder.QueryStringToKeysSelectors(expression)
-	for idx := range whereClauseSelectors {
-		whereClauseSelectors[idx].Signal = telemetrytypes.SignalMetrics
-		whereClauseSelectors[idx].SelectorMatchType = telemetrytypes.FieldSelectorMatchTypeExact
-	}
-
-	keys, _, err := m.telemetryMetadataStore.GetKeysMulti(ctx, whereClauseSelectors)
-	if err != nil {
-		return nil, err
-	}
-
-	opts := querybuilder.FilterExprVisitorOpts{
-		Context:          ctx,
-		Logger:           m.logger,
-		FieldMapper:      m.fieldMapper,
-		ConditionBuilder: m.condBuilder,
-		FullTextColumn:   &telemetrytypes.TelemetryFieldKey{Name: "metric_name", FieldContext: telemetrytypes.FieldContextMetric},
-		FieldKeys:        keys,
-		StartNs:          querybuilder.ToNanoSecs(uint64(startMillis)),
-		EndNs:            querybuilder.ToNanoSecs(uint64(endMillis)),
-	}
-
-	whereClause, err := querybuilder.PrepareWhereClause(expression, opts)
-	if err != nil {
-		return nil, err
-	}
-
-	if whereClause == nil || whereClause.WhereClause == nil {
-		return sqlbuilder.NewWhereClause(), nil
-	}
-
-	return whereClause.WhereClause, nil
-}
-
-// getMetricsExistenceAndEarliestTime checks whether any of the given metric names
-// have been reported, and returns the total count and the earliest first-reported timestamp.
-// When count is 0, minFirstReportedUnixMilli is 0.
-func (m *module) getMetricsExistenceAndEarliestTime(ctx context.Context, metricNames []string) (uint64, uint64, error) {
-	if len(metricNames) == 0 {
-		return 0, 0, nil
-	}
-
-	sb := sqlbuilder.NewSelectBuilder()
-	sb.Select("count(*) AS cnt", "min(first_reported_unix_milli) AS min_first_reported")
-	sb.From(fmt.Sprintf("%s.%s", telemetrymetrics.DBName, telemetrymetrics.AttributesMetadataTableName))
-	sb.Where(sb.In("metric_name", sqlbuilder.List(metricNames)))
-
-	query, args := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
-
-	var count, minFirstReported uint64
-	err := m.telemetryStore.ClickhouseDB().QueryRow(ctx, query, args...).Scan(&count, &minFirstReported)
-	if err != nil {
-		return 0, 0, err
-	}
-	return count, minFirstReported, nil
-}
-
-// getMetadata fetches the latest values of additionalCols for each unique combination of groupBy keys,
-// within the given time range and metric names. It uses argMax(tuple(...), unix_milli) to ensure
-// we always pick attribute values from the latest timestamp for each group.
-//
-// The returned map has a composite key of groupBy column values joined by "\x00" (null byte),
-// mapping to a flat map of col_name -> col_value (includes both groupBy and additional cols).
-func (m *module) getMetadata(
-	ctx context.Context,
-	metricNames []string,
-	groupBy []qbtypes.GroupByKey,
-	additionalCols []string,
-	filter *qbtypes.Filter,
-	startMs, endMs int64,
-) (map[string]map[string]string, error) {
-	if len(metricNames) == 0 || len(groupBy) == 0 {
-		return nil, nil
-	}
-
-	// Pick the optimal timeseries table based on time range; also get adjusted start.
-	adjustedStart, adjustedEnd, distributedTableName, _ := telemetrymetrics.WhichTSTableToUse(
-		uint64(startMs), uint64(endMs), nil,
-	)
-
-	// Flatten groupBy keys to string names for SQL expressions and result scanning.
-	groupByCols := make([]string, len(groupBy))
-	for i, key := range groupBy {
-		groupByCols[i] = key.Name
-	}
-	allCols := append(groupByCols, additionalCols...)
-
-	// --- Build inner query ---
-	// Inner SELECT columns: JSONExtractString for each groupBy col + argMax(tuple(...)) for additional cols
-	innerSelectCols := make([]string, 0, len(groupByCols)+1)
-	for _, col := range groupByCols {
-		innerSelectCols = append(innerSelectCols,
-			fmt.Sprintf("JSONExtractString(labels, '%s') AS `%s`", col, col),
-		)
-	}
-
-	// Build the argMax(tuple(...), unix_milli) expression for all additional cols
-	if len(additionalCols) > 0 {
-		tupleArgs := make([]string, 0, len(additionalCols))
-		for _, col := range additionalCols {
-			tupleArgs = append(tupleArgs, fmt.Sprintf("JSONExtractString(labels, '%s')", col))
-		}
-		innerSelectCols = append(innerSelectCols,
-			fmt.Sprintf("argMax(tuple(%s), unix_milli) AS latest_attrs", strings.Join(tupleArgs, ", ")),
-		)
-	}
-
-	innerSB := sqlbuilder.NewSelectBuilder()
-	innerSB.Select(innerSelectCols...)
-	innerSB.From(fmt.Sprintf("%s.%s", telemetrymetrics.DBName, distributedTableName))
-	innerSB.Where(
-		innerSB.In("metric_name", sqlbuilder.List(metricNames)),
-		innerSB.GE("unix_milli", adjustedStart),
-		innerSB.L("unix_milli", adjustedEnd),
-	)
-
-	// Apply optional filter expression
-	if filter != nil && strings.TrimSpace(filter.Expression) != "" {
-		filterClause, err := m.buildFilterClause(ctx, filter, startMs, endMs)
-		if err != nil {
-			return nil, err
-		}
-		if filterClause != nil {
-			innerSB.AddWhereClause(sqlbuilder.CopyWhereClause(filterClause))
-		}
-	}
-
-	groupByAliases := make([]string, 0, len(groupByCols))
-	for _, col := range groupByCols {
-		groupByAliases = append(groupByAliases, fmt.Sprintf("`%s`", col))
-	}
-	innerSB.GroupBy(groupByAliases...)
-
-	innerQuery, innerArgs := innerSB.BuildWithFlavor(sqlbuilder.ClickHouse)
-
-	// --- Build outer query ---
-	// Outer SELECT columns: groupBy cols directly + tupleElement(latest_attrs, N) for each additionalCol
-	outerSelectCols := make([]string, 0, len(allCols))
-	for _, col := range groupByCols {
-		outerSelectCols = append(outerSelectCols, fmt.Sprintf("`%s`", col))
-	}
-	for i, col := range additionalCols {
-		outerSelectCols = append(outerSelectCols,
-			fmt.Sprintf("tupleElement(latest_attrs, %d) AS `%s`", i+1, col),
-		)
-	}
-
-	outerSB := sqlbuilder.NewSelectBuilder()
-	outerSB.Select(outerSelectCols...)
-	outerSB.From(fmt.Sprintf("(%s)", innerQuery))
-
-	outerQuery, _ := outerSB.BuildWithFlavor(sqlbuilder.ClickHouse)
-	// All ? params are in innerArgs; outer query introduces none of its own.
-
-	rows, err := m.telemetryStore.ClickhouseDB().Query(ctx, outerQuery, innerArgs...)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-
-	result := make(map[string]map[string]string)
-
-	for rows.Next() {
-		row := make([]string, len(allCols))
-		scanPtrs := make([]any, len(row))
-		for i := range row {
-			scanPtrs[i] = &row[i]
-		}
-
-		if err := rows.Scan(scanPtrs...); err != nil {
-			return nil, err
-		}
-
-		compositeKey := strings.Join(row[:len(groupByCols)], "\x00")
-
-		attrMap := make(map[string]string, len(allCols))
-		for i, col := range allCols {
-			attrMap[col] = row[i]
-		}
-		result[compositeKey] = attrMap
-	}
-
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-
-	return result, nil
-}
-
-func (m *module) validateOrderBy(orderBy *qbtypes.OrderBy, orderByToQueryNamesMap map[string][]string) error {
-	if orderBy == nil {
-		return nil
-	}
-
-	if _, exists := orderByToQueryNamesMap[orderBy.Key.Name]; !exists {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "invalid order by key: %s", orderBy.Key.Name)
-	}
-
-	if orderBy.Direction != qbtypes.OrderDirectionAsc && orderBy.Direction != qbtypes.OrderDirectionDesc {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "invalid order by direction: %s", orderBy.Direction)
-	}
-
-	return nil
-}

pkg/modules/inframonitoring/implinframonitoring/handler.go

@@ -1,49 +0,0 @@
-package implinframonitoring
-
-import (
-	"context"
-	"net/http"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/http/binding"
-	"github.com/SigNoz/signoz/pkg/http/render"
-	"github.com/SigNoz/signoz/pkg/modules/inframonitoring"
-	"github.com/SigNoz/signoz/pkg/types/authtypes"
-	"github.com/SigNoz/signoz/pkg/types/inframonitoringtypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
-)
-
-type handler struct {
-	module inframonitoring.Module
-}
-
-// NewHandler returns an inframonitoring.Handler implementation.
-func NewHandler(m inframonitoring.Module) inframonitoring.Handler {
-	return &handler{
-		module: m,
-	}
-}
-
-func (h *handler) HostsList(rw http.ResponseWriter, req *http.Request) {
-	claims, err := authtypes.ClaimsFromContext(req.Context())
-	if err != nil {
-		render.Error(rw, err)
-		return
-	}
-
-	orgID := valuer.MustNewUUID(claims.OrgID)
-
-	var parsedReq inframonitoringtypes.HostsListRequest
-	if err := binding.JSON.BindBody(req.Body, &parsedReq); err != nil {
-		render.Error(rw, errors.WrapInvalidInputf(err, errors.CodeInvalidInput, "failed to parse request body"))
-		return
-	}
-
-	result, err := h.module.HostsList(context.Background(), orgID, &parsedReq)
-	if err != nil {
-		render.Error(rw, err)
-		return
-	}
-
-	render.Success(rw, http.StatusOK, result)
-}

pkg/modules/inframonitoring/implinframonitoring/helpers.go

@@ -1,277 +0,0 @@
-package implinframonitoring
-
-import (
-	"fmt"
-	"sort"
-	"strings"
-
-	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
-)
-
-type rankedGroup struct {
-	labels map[string]string
-	value  float64
-}
-
-func isKeyInGroupByAttrs(groupByAttrs []qbtypes.GroupByKey, key string) bool {
-	for _, groupBy := range groupByAttrs {
-		if groupBy.Name == key {
-			return true
-		}
-	}
-	return false
-}
-
-func mergeFilterExpressions(queryFilterExpr, reqFilterExpr string) string {
-	queryFilterExpr = strings.TrimSpace(queryFilterExpr)
-	reqFilterExpr = strings.TrimSpace(reqFilterExpr)
-	if queryFilterExpr == "" {
-		return reqFilterExpr
-	}
-	if reqFilterExpr == "" {
-		return queryFilterExpr
-	}
-	return fmt.Sprintf("(%s) AND (%s)", queryFilterExpr, reqFilterExpr)
-}
-
-func compositeKeyFromLabels(labels map[string]string, groupBy []qbtypes.GroupByKey) string {
-	parts := make([]string, len(groupBy))
-	for i, key := range groupBy {
-		parts[i] = labels[key.Name]
-	}
-	return strings.Join(parts, "\x00")
-}
-
-// parseAndSortGroups extracts group label maps from a ScalarData response and
-// sorts them by the ranking query's aggregation value.
-func parseAndSortGroups(
-	resp *qbtypes.QueryRangeResponse,
-	rankingQueryName string,
-	groupBy []qbtypes.GroupByKey,
-	direction qbtypes.OrderDirection,
-) []rankedGroup {
-	if resp == nil || len(resp.Data.Results) == 0 {
-		return nil
-	}
-
-	// Find the ScalarData that contains the ranking column.
-	var sd *qbtypes.ScalarData
-	for _, r := range resp.Data.Results {
-		candidate, ok := r.(*qbtypes.ScalarData)
-		if !ok || candidate == nil {
-			continue
-		}
-		for _, col := range candidate.Columns {
-			if col.Type == qbtypes.ColumnTypeAggregation && col.QueryName == rankingQueryName {
-				sd = candidate
-				break
-			}
-		}
-		if sd != nil {
-			break
-		}
-	}
-	if sd == nil || len(sd.Data) == 0 {
-		return nil
-	}
-
-	groupColIndices := make(map[string]int)
-	rankingColIdx := -1
-	for i, col := range sd.Columns {
-		if col.Type == qbtypes.ColumnTypeGroup {
-			groupColIndices[col.Name] = i
-		}
-		if col.Type == qbtypes.ColumnTypeAggregation && col.QueryName == rankingQueryName {
-			rankingColIdx = i
-		}
-	}
-	if rankingColIdx == -1 {
-		return nil
-	}
-
-	groups := make([]rankedGroup, 0, len(sd.Data))
-	for _, row := range sd.Data {
-		labels := make(map[string]string, len(groupBy))
-		for _, key := range groupBy {
-			if idx, ok := groupColIndices[key.Name]; ok && idx < len(row) {
-				labels[key.Name] = fmt.Sprintf("%v", row[idx])
-			}
-		}
-		var value float64
-		if rankingColIdx < len(row) {
-			if v, ok := row[rankingColIdx].(float64); ok {
-				value = v
-			}
-		}
-		groups = append(groups, rankedGroup{labels: labels, value: value})
-	}
-
-	sort.Slice(groups, func(i, j int) bool {
-		if direction == qbtypes.OrderDirectionAsc {
-			return groups[i].value < groups[j].value
-		}
-		return groups[i].value > groups[j].value
-	})
-
-	return groups
-}
-
-// paginateWithBackfill returns the page of groups for [offset, offset+limit).
-// The virtual sorted list is: metric-ranked groups first, then metadata-only
-// groups (those in metadataMap but not in metric results) sorted alphabetically.
-func paginateWithBackfill(
-	metricGroups []rankedGroup,
-	metadataMap map[string]map[string]string,
-	groupBy []qbtypes.GroupByKey,
-	offset, limit int,
-) []map[string]string {
-	metricKeySet := make(map[string]bool, len(metricGroups))
-	for _, g := range metricGroups {
-		metricKeySet[compositeKeyFromLabels(g.labels, groupBy)] = true
-	}
-
-	metadataOnlyKeys := make([]string, 0)
-	for compositeKey := range metadataMap {
-		if !metricKeySet[compositeKey] {
-			metadataOnlyKeys = append(metadataOnlyKeys, compositeKey)
-		}
-	}
-	sort.Strings(metadataOnlyKeys)
-
-	totalMetric := len(metricGroups)
-	totalAll := totalMetric + len(metadataOnlyKeys)
-
-	end := offset + limit
-	if end > totalAll {
-		end = totalAll
-	}
-	if offset >= totalAll {
-		return nil
-	}
-
-	pageGroups := make([]map[string]string, 0, end-offset)
-	for i := offset; i < end; i++ {
-		if i < totalMetric {
-			pageGroups = append(pageGroups, metricGroups[i].labels)
-		} else {
-			compositeKey := metadataOnlyKeys[i-totalMetric]
-			attrs := metadataMap[compositeKey]
-			labels := make(map[string]string, len(groupBy))
-			for _, key := range groupBy {
-				labels[key.Name] = attrs[key.Name]
-			}
-			pageGroups = append(pageGroups, labels)
-		}
-	}
-	return pageGroups
-}
-
-// buildFullQueryRequest creates a QueryRangeRequest for all metrics,
-// restricted to the given page of groups via an IN filter.
-// Accepts primitive fields so it can be reused across different v2 APIs
-// (hosts, pods, etc.).
-func buildFullQueryRequest(
-	start int64,
-	end int64,
-	filterExpr string,
-	groupBy []qbtypes.GroupByKey,
-	pageGroups []map[string]string,
-	tableListQuery *qbtypes.QueryRangeRequest,
-) *qbtypes.QueryRangeRequest {
-	groupValues := make(map[string][]string)
-	for _, labels := range pageGroups {
-		for k, v := range labels {
-			groupValues[k] = append(groupValues[k], v)
-		}
-	}
-
-	inClauses := make([]string, 0, len(groupValues))
-	for key, values := range groupValues {
-		quoted := make([]string, len(values))
-		for i, v := range values {
-			quoted[i] = fmt.Sprintf("'%s'", v)
-		}
-		inClauses = append(inClauses, fmt.Sprintf("%s IN (%s)", key, strings.Join(quoted, ", ")))
-	}
-	inFilterExpr := strings.Join(inClauses, " AND ")
-
-	fullReq := &qbtypes.QueryRangeRequest{
-		Start:       uint64(start),
-		End:         uint64(end),
-		RequestType: qbtypes.RequestTypeScalar,
-		CompositeQuery: qbtypes.CompositeQuery{
-			Queries: make([]qbtypes.QueryEnvelope, 0, len(tableListQuery.CompositeQuery.Queries)),
-		},
-	}
-
-	for _, envelope := range tableListQuery.CompositeQuery.Queries {
-		copied := envelope
-		if copied.Type == qbtypes.QueryTypeBuilder {
-			existingExpr := ""
-			if f := copied.GetFilter(); f != nil {
-				existingExpr = f.Expression
-			}
-			merged := mergeFilterExpressions(existingExpr, filterExpr)
-			merged = mergeFilterExpressions(merged, inFilterExpr)
-			copied.SetFilter(&qbtypes.Filter{Expression: merged})
-			copied.SetGroupBy(groupBy)
-		}
-		fullReq.CompositeQuery.Queries = append(fullReq.CompositeQuery.Queries, copied)
-	}
-
-	return fullReq
-}
-
-// parseFullQueryResponse extracts per-group metric values from the full
-// composite query response. Returns compositeKey -> (queryName -> value).
-// Each enabled query/formula produces its own ScalarData entry in Results,
-// so we iterate over all of them and merge metrics per composite key.
-func parseFullQueryResponse(
-	resp *qbtypes.QueryRangeResponse,
-	groupBy []qbtypes.GroupByKey,
-) map[string]map[string]float64 {
-	result := make(map[string]map[string]float64)
-	if resp == nil || len(resp.Data.Results) == 0 {
-		return result
-	}
-
-	for _, r := range resp.Data.Results {
-		sd, ok := r.(*qbtypes.ScalarData)
-		if !ok || sd == nil {
-			continue
-		}
-
-		groupColIndices := make(map[string]int)
-		aggCols := make(map[int]string) // col index -> query name
-		for i, col := range sd.Columns {
-			if col.Type == qbtypes.ColumnTypeGroup {
-				groupColIndices[col.Name] = i
-			}
-			if col.Type == qbtypes.ColumnTypeAggregation {
-				aggCols[i] = col.QueryName
-			}
-		}
-
-		for _, row := range sd.Data {
-			labels := make(map[string]string, len(groupBy))
-			for _, key := range groupBy {
-				if idx, ok := groupColIndices[key.Name]; ok && idx < len(row) {
-					labels[key.Name] = fmt.Sprintf("%v", row[idx])
-				}
-			}
-			compositeKey := compositeKeyFromLabels(labels, groupBy)
-
-			if result[compositeKey] == nil {
-				result[compositeKey] = make(map[string]float64)
-			}
-			for idx, queryName := range aggCols {
-				if idx < len(row) {
-					if v, ok := row[idx].(float64); ok {
-						result[compositeKey][queryName] = v
-					}
-				}
-			}
-		}
-	}
-	return result
-}

pkg/modules/inframonitoring/implinframonitoring/helpers_test.go

@@ -1,234 +0,0 @@
-package implinframonitoring
-
-import (
-	"testing"
-
-	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
-	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
-)
-
-func groupByKey(name string) qbtypes.GroupByKey {
-	return qbtypes.GroupByKey{
-		TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: name},
-	}
-}
-
-func TestIsKeyInGroupByAttrs(t *testing.T) {
-	tests := []struct {
-		name          string
-		groupByAttrs  []qbtypes.GroupByKey
-		key           string
-		expectedFound bool
-	}{
-		{
-			name:          "key present in single-element list",
-			groupByAttrs:  []qbtypes.GroupByKey{groupByKey("host.name")},
-			key:           "host.name",
-			expectedFound: true,
-		},
-		{
-			name: "key present in multi-element list",
-			groupByAttrs: []qbtypes.GroupByKey{
-				groupByKey("host.name"),
-				groupByKey("os.type"),
-				groupByKey("k8s.cluster.name"),
-			},
-			key:           "os.type",
-			expectedFound: true,
-		},
-		{
-			name: "key at last position",
-			groupByAttrs: []qbtypes.GroupByKey{
-				groupByKey("host.name"),
-				groupByKey("os.type"),
-			},
-			key:           "os.type",
-			expectedFound: true,
-		},
-		{
-			name:          "key not in list",
-			groupByAttrs:  []qbtypes.GroupByKey{groupByKey("host.name")},
-			key:           "os.type",
-			expectedFound: false,
-		},
-		{
-			name:          "empty group by list",
-			groupByAttrs:  []qbtypes.GroupByKey{},
-			key:           "host.name",
-			expectedFound: false,
-		},
-		{
-			name:          "nil group by list",
-			groupByAttrs:  nil,
-			key:           "host.name",
-			expectedFound: false,
-		},
-		{
-			name:          "empty key string",
-			groupByAttrs:  []qbtypes.GroupByKey{groupByKey("host.name")},
-			key:           "",
-			expectedFound: false,
-		},
-		{
-			name:          "empty key matches empty-named group by key",
-			groupByAttrs:  []qbtypes.GroupByKey{groupByKey("")},
-			key:           "",
-			expectedFound: true,
-		},
-		{
-			name: "partial match does not count",
-			groupByAttrs: []qbtypes.GroupByKey{
-				groupByKey("host"),
-			},
-			key:           "host.name",
-			expectedFound: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := isKeyInGroupByAttrs(tt.groupByAttrs, tt.key)
-			if got != tt.expectedFound {
-				t.Errorf("isKeyInGroupByAttrs(%v, %q) = %v, want %v",
-					tt.groupByAttrs, tt.key, got, tt.expectedFound)
-			}
-		})
-	}
-}
-
-func TestMergeFilterExpressions(t *testing.T) {
-	tests := []struct {
-		name            string
-		queryFilterExpr string
-		reqFilterExpr   string
-		expected        string
-	}{
-		{
-			name:            "both non-empty",
-			queryFilterExpr: "cpu > 50",
-			reqFilterExpr:   "host.name = 'web-1'",
-			expected:        "(cpu > 50) AND (host.name = 'web-1')",
-		},
-		{
-			name:            "query empty, req non-empty",
-			queryFilterExpr: "",
-			reqFilterExpr:   "host.name = 'web-1'",
-			expected:        "host.name = 'web-1'",
-		},
-		{
-			name:            "query non-empty, req empty",
-			queryFilterExpr: "cpu > 50",
-			reqFilterExpr:   "",
-			expected:        "cpu > 50",
-		},
-		{
-			name:            "both empty",
-			queryFilterExpr: "",
-			reqFilterExpr:   "",
-			expected:        "",
-		},
-		{
-			name:            "whitespace-only query treated as empty",
-			queryFilterExpr: "   ",
-			reqFilterExpr:   "host.name = 'web-1'",
-			expected:        "host.name = 'web-1'",
-		},
-		{
-			name:            "whitespace-only req treated as empty",
-			queryFilterExpr: "cpu > 50",
-			reqFilterExpr:   "   ",
-			expected:        "cpu > 50",
-		},
-		{
-			name:            "both whitespace-only",
-			queryFilterExpr: "  ",
-			reqFilterExpr:   "  ",
-			expected:        "",
-		},
-		{
-			name:            "leading/trailing whitespace trimmed before merge",
-			queryFilterExpr: "  cpu > 50  ",
-			reqFilterExpr:   "  mem < 80  ",
-			expected:        "(cpu > 50) AND (mem < 80)",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := mergeFilterExpressions(tt.queryFilterExpr, tt.reqFilterExpr)
-			if got != tt.expected {
-				t.Errorf("mergeFilterExpressions(%q, %q) = %q, want %q",
-					tt.queryFilterExpr, tt.reqFilterExpr, got, tt.expected)
-			}
-		})
-	}
-}
-
-func TestCompositeKeyFromLabels(t *testing.T) {
-	tests := []struct {
-		name     string
-		labels   map[string]string
-		groupBy  []qbtypes.GroupByKey
-		expected string
-	}{
-		{
-			name:     "single group-by key",
-			labels:   map[string]string{"host.name": "web-1"},
-			groupBy:  []qbtypes.GroupByKey{groupByKey("host.name")},
-			expected: "web-1",
-		},
-		{
-			name: "multiple group-by keys joined with null separator",
-			labels: map[string]string{
-				"host.name": "web-1",
-				"os.type":   "linux",
-			},
-			groupBy:  []qbtypes.GroupByKey{groupByKey("host.name"), groupByKey("os.type")},
-			expected: "web-1\x00linux",
-		},
-		{
-			name:     "missing label yields empty segment",
-			labels:   map[string]string{"host.name": "web-1"},
-			groupBy:  []qbtypes.GroupByKey{groupByKey("host.name"), groupByKey("os.type")},
-			expected: "web-1\x00",
-		},
-		{
-			name:     "empty labels map",
-			labels:   map[string]string{},
-			groupBy:  []qbtypes.GroupByKey{groupByKey("host.name")},
-			expected: "",
-		},
-		{
-			name:     "empty group-by slice",
-			labels:   map[string]string{"host.name": "web-1"},
-			groupBy:  []qbtypes.GroupByKey{},
-			expected: "",
-		},
-		{
-			name:     "nil labels map",
-			labels:   nil,
-			groupBy:  []qbtypes.GroupByKey{groupByKey("host.name")},
-			expected: "",
-		},
-		{
-			name: "order matches group-by order, not map iteration order",
-			labels: map[string]string{
-				"z": "last",
-				"a": "first",
-				"m": "middle",
-			},
-			groupBy:  []qbtypes.GroupByKey{groupByKey("a"), groupByKey("m"), groupByKey("z")},
-			expected: "first\x00middle\x00last",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := compositeKeyFromLabels(tt.labels, tt.groupBy)
-			if got != tt.expected {
-				t.Errorf("compositeKeyFromLabels(%v, %v) = %q, want %q",
-					tt.labels, tt.groupBy, got, tt.expected)
-			}
-		})
-	}
-}

pkg/modules/inframonitoring/implinframonitoring/hosts.go

@@ -1,488 +0,0 @@
-package implinframonitoring
-
-import (
-	"context"
-	"fmt"
-	"slices"
-	"strings"
-	"time"
-
-	"github.com/SigNoz/signoz/pkg/telemetrymetrics"
-	"github.com/SigNoz/signoz/pkg/types/inframonitoringtypes"
-	"github.com/SigNoz/signoz/pkg/types/metrictypes"
-	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
-	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
-	"github.com/huandu/go-sqlbuilder"
-)
-
-var (
-	hostNameAttrKey = "host.name"
-)
-
-// Helper group-by key used across all queries
-var hostNameGroupByKey = qbtypes.GroupByKey{
-	TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{
-		Name:          hostNameAttrKey,
-		FieldContext:  telemetrytypes.FieldContextResource,
-		FieldDataType: telemetrytypes.FieldDataTypeString,
-	},
-}
-
-var hostsTableMetricNamesList = []string{
-	"system.cpu.time",
-	"system.memory.usage",
-	"system.cpu.load_average.15m",
-	"system.filesystem.usage",
-}
-
-var hostAttrKeysForMetadata = []string{
-	"os.type",
-}
-
-// orderByToHostsQueryNames maps the orderBy column to the query/formula names
-// from HostsTableListQuery used for ranking host groups.
-var orderByToHostsQueryNames = map[string][]string{
-	"cpu":        {"A", "B", "F1"},
-	"memory":     {"C", "D", "F2"},
-	"wait":       {"E", "F", "F3"},
-	"disk_usage": {"H", "I", "F4"},
-	"load15":     {"G"},
-}
-
-func (m *module) newHostsTableListQuery() *qbtypes.QueryRangeRequest {
-	return &qbtypes.QueryRangeRequest{
-		RequestType: qbtypes.RequestTypeScalar,
-		CompositeQuery: qbtypes.CompositeQuery{
-			Queries: []qbtypes.QueryEnvelope{
-				// Query A: CPU usage logic (non-idle)
-				{
-					Type: qbtypes.QueryTypeBuilder,
-					Spec: qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]{
-						Name:   "A",
-						Signal: telemetrytypes.SignalMetrics,
-						Aggregations: []qbtypes.MetricAggregation{
-							{
-								MetricName:       "system.cpu.time",
-								Temporality:      metrictypes.Cumulative,
-								TimeAggregation:  metrictypes.TimeAggregationRate,
-								SpaceAggregation: metrictypes.SpaceAggregationSum,
-								ReduceTo:         qbtypes.ReduceToAvg,
-							},
-						},
-						Filter: &qbtypes.Filter{
-							Expression: "state != 'idle'",
-						},
-						GroupBy:  []qbtypes.GroupByKey{hostNameGroupByKey},
-						Disabled: true,
-					},
-				},
-				// Query B: CPU usage (all states)
-				{
-					Type: qbtypes.QueryTypeBuilder,
-					Spec: qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]{
-						Name:   "B",
-						Signal: telemetrytypes.SignalMetrics,
-						Aggregations: []qbtypes.MetricAggregation{
-							{
-								MetricName:       "system.cpu.time",
-								Temporality:      metrictypes.Cumulative,
-								TimeAggregation:  metrictypes.TimeAggregationRate,
-								SpaceAggregation: metrictypes.SpaceAggregationSum,
-								ReduceTo:         qbtypes.ReduceToAvg,
-							},
-						},
-						GroupBy:  []qbtypes.GroupByKey{hostNameGroupByKey},
-						Disabled: true,
-					},
-				},
-				// Formula F1: CPU Usage (%)
-				{
-					Type: qbtypes.QueryTypeFormula,
-					Spec: qbtypes.QueryBuilderFormula{
-						Name:       "F1",
-						Expression: "A/B",
-						Legend:     "CPU Usage (%)",
-						Disabled:   false,
-					},
-				},
-				// Query C: Memory usage (state = used)
-				{
-					Type: qbtypes.QueryTypeBuilder,
-					Spec: qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]{
-						Name:   "C",
-						Signal: telemetrytypes.SignalMetrics,
-						Aggregations: []qbtypes.MetricAggregation{
-							{
-								MetricName:       "system.memory.usage",
-								Temporality:      metrictypes.Cumulative,
-								TimeAggregation:  metrictypes.TimeAggregationAvg,
-								SpaceAggregation: metrictypes.SpaceAggregationSum,
-								ReduceTo:         qbtypes.ReduceToAvg,
-							},
-						},
-						Filter: &qbtypes.Filter{
-							Expression: "state = 'used'",
-						},
-						GroupBy:  []qbtypes.GroupByKey{hostNameGroupByKey},
-						Disabled: true,
-					},
-				},
-				// Query D: Memory usage (all states)
-				{
-					Type: qbtypes.QueryTypeBuilder,
-					Spec: qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]{
-						Name:   "D",
-						Signal: telemetrytypes.SignalMetrics,
-						Aggregations: []qbtypes.MetricAggregation{
-							{
-								MetricName:       "system.memory.usage",
-								Temporality:      metrictypes.Cumulative,
-								TimeAggregation:  metrictypes.TimeAggregationAvg,
-								SpaceAggregation: metrictypes.SpaceAggregationSum,
-								ReduceTo:         qbtypes.ReduceToAvg,
-							},
-						},
-						GroupBy:  []qbtypes.GroupByKey{hostNameGroupByKey},
-						Disabled: true,
-					},
-				},
-				// Formula F2: Memory Usage (%)
-				{
-					Type: qbtypes.QueryTypeFormula,
-					Spec: qbtypes.QueryBuilderFormula{
-						Name:       "F2",
-						Expression: "C/D",
-						Legend:     "Memory Usage (%)",
-						Disabled:   false,
-					},
-				},
-				// Query E: CPU Wait time (state = wait)
-				{
-					Type: qbtypes.QueryTypeBuilder,
-					Spec: qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]{
-						Name:   "E",
-						Signal: telemetrytypes.SignalMetrics,
-						Aggregations: []qbtypes.MetricAggregation{
-							{
-								MetricName:       "system.cpu.time",
-								Temporality:      metrictypes.Cumulative,
-								TimeAggregation:  metrictypes.TimeAggregationRate,
-								SpaceAggregation: metrictypes.SpaceAggregationSum,
-								ReduceTo:         qbtypes.ReduceToAvg,
-							},
-						},
-						Filter: &qbtypes.Filter{
-							Expression: "state = 'wait'",
-						},
-						GroupBy:  []qbtypes.GroupByKey{hostNameGroupByKey},
-						Disabled: true,
-					},
-				},
-				// Query F: CPU time (all states)
-				{
-					Type: qbtypes.QueryTypeBuilder,
-					Spec: qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]{
-						Name:   "F",
-						Signal: telemetrytypes.SignalMetrics,
-						Aggregations: []qbtypes.MetricAggregation{
-							{
-								MetricName:       "system.cpu.time",
-								Temporality:      metrictypes.Cumulative,
-								TimeAggregation:  metrictypes.TimeAggregationRate,
-								SpaceAggregation: metrictypes.SpaceAggregationSum,
-								ReduceTo:         qbtypes.ReduceToAvg,
-							},
-						},
-						GroupBy:  []qbtypes.GroupByKey{hostNameGroupByKey},
-						Disabled: true,
-					},
-				},
-				// Formula F3: CPU Wait Time (%)
-				{
-					Type: qbtypes.QueryTypeFormula,
-					Spec: qbtypes.QueryBuilderFormula{
-						Name:       "F3",
-						Expression: "E/F",
-						Legend:     "CPU Wait Time (%)",
-						Disabled:   false,
-					},
-				},
-				// Query G: Load15
-				{
-					Type: qbtypes.QueryTypeBuilder,
-					Spec: qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]{
-						Name:   "G",
-						Signal: telemetrytypes.SignalMetrics,
-						Legend: "CPU Load Average (15m)",
-						Aggregations: []qbtypes.MetricAggregation{
-							{
-								MetricName:       "system.cpu.load_average.15m",
-								Temporality:      metrictypes.Unspecified,
-								TimeAggregation:  metrictypes.TimeAggregationAvg,
-								SpaceAggregation: metrictypes.SpaceAggregationSum,
-								ReduceTo:         qbtypes.ReduceToAvg,
-							},
-						},
-						GroupBy:  []qbtypes.GroupByKey{hostNameGroupByKey},
-						Disabled: false,
-					},
-				},
-				// Query H: Filesystem Usage (state = used)
-				{
-					Type: qbtypes.QueryTypeBuilder,
-					Spec: qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]{
-						Name:   "H",
-						Signal: telemetrytypes.SignalMetrics,
-						Aggregations: []qbtypes.MetricAggregation{
-							{
-								MetricName:       "system.filesystem.usage",
-								Temporality:      metrictypes.Cumulative,
-								TimeAggregation:  metrictypes.TimeAggregationAvg,
-								SpaceAggregation: metrictypes.SpaceAggregationSum,
-								ReduceTo:         qbtypes.ReduceToAvg,
-							},
-						},
-						Filter: &qbtypes.Filter{
-							Expression: "state = 'used'",
-						},
-						GroupBy:  []qbtypes.GroupByKey{hostNameGroupByKey},
-						Disabled: true,
-					},
-				},
-				// Query I: Filesystem Usage (all states)
-				{
-					Type: qbtypes.QueryTypeBuilder,
-					Spec: qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]{
-						Name:   "I",
-						Signal: telemetrytypes.SignalMetrics,
-						Aggregations: []qbtypes.MetricAggregation{
-							{
-								MetricName:       "system.filesystem.usage",
-								Temporality:      metrictypes.Cumulative,
-								TimeAggregation:  metrictypes.TimeAggregationAvg,
-								SpaceAggregation: metrictypes.SpaceAggregationSum,
-								ReduceTo:         qbtypes.ReduceToAvg,
-							},
-						},
-						GroupBy:  []qbtypes.GroupByKey{hostNameGroupByKey},
-						Disabled: true,
-					},
-				},
-				// Formula F4: Disk Usage (%)
-				{
-					Type: qbtypes.QueryTypeFormula,
-					Spec: qbtypes.QueryBuilderFormula{
-						Name:       "F4",
-						Expression: "H/I",
-						Legend:     "Disk Usage (%)",
-						Disabled:   false,
-					},
-				},
-			},
-		},
-	}
-}
-
-// getTopHostGroups runs a ranking query for the ordering metric, sorts the
-// results, paginates, and backfills from metadataMap when the page extends
-// past the metric-ranked groups.
-func (m *module) getTopHostGroups(
-	ctx context.Context,
-	orgID valuer.UUID,
-	req *inframonitoringtypes.HostsListRequest,
-	metadataMap map[string]map[string]string,
-) ([]map[string]string, error) {
-	orderByKey := req.OrderBy.Key.Name
-	queryNamesForOrderBy := orderByToHostsQueryNames[orderByKey]
-	// The last entry is the formula/query whose value we sort by.
-	rankingQueryName := queryNamesForOrderBy[len(queryNamesForOrderBy)-1]
-
-	topReq := &qbtypes.QueryRangeRequest{
-		Start:       uint64(req.Start),
-		End:         uint64(req.End),
-		RequestType: qbtypes.RequestTypeScalar,
-		CompositeQuery: qbtypes.CompositeQuery{
-			Queries: make([]qbtypes.QueryEnvelope, 0, len(queryNamesForOrderBy)),
-		},
-	}
-
-	for _, envelope := range m.newHostsTableListQuery().CompositeQuery.Queries {
-		if !slices.Contains(queryNamesForOrderBy, envelope.GetQueryName()) {
-			continue
-		}
-		copied := envelope
-		if copied.Type == qbtypes.QueryTypeBuilder {
-			existingExpr := ""
-			if f := copied.GetFilter(); f != nil {
-				existingExpr = f.Expression
-			}
-			reqFilterExpr := ""
-			if req.Filter != nil {
-				reqFilterExpr = req.Filter.Expression
-			}
-			merged := mergeFilterExpressions(existingExpr, reqFilterExpr)
-			copied.SetFilter(&qbtypes.Filter{Expression: merged})
-			copied.SetGroupBy(req.GroupBy)
-		}
-		topReq.CompositeQuery.Queries = append(topReq.CompositeQuery.Queries, copied)
-	}
-
-	resp, err := m.querier.QueryRange(ctx, orgID, topReq)
-	if err != nil {
-		return nil, err
-	}
-
-	allMetricGroups := parseAndSortGroups(resp, rankingQueryName, req.GroupBy, req.OrderBy.Direction)
-	return paginateWithBackfill(allMetricGroups, metadataMap, req.GroupBy, req.Offset, req.Limit), nil
-}
-
-// applyHostsActiveStatusFilter modifies req.Filter.Expression to include an IN/NOT IN
-// clause based on FilterByStatus and the set of active hosts.
-// Returns true if the caller should short-circuit with an empty result (ACTIVE
-// requested but no hosts are active).
-func (m *module) applyHostsActiveStatusFilter(req *inframonitoringtypes.HostsListRequest, activeHostsMap map[string]bool) (shouldShortCircuit bool) {
-	if req.FilterByStatus != inframonitoringtypes.HostStatusActive && req.FilterByStatus != inframonitoringtypes.HostStatusInactive {
-		return false
-	}
-
-	activeHosts := make([]string, 0, len(activeHostsMap))
-	for host := range activeHostsMap {
-		activeHosts = append(activeHosts, fmt.Sprintf("'%s'", host))
-	}
-
-	if len(activeHosts) == 0 {
-		return req.FilterByStatus == inframonitoringtypes.HostStatusActive
-	}
-
-	op := "IN"
-	if req.FilterByStatus == inframonitoringtypes.HostStatusInactive {
-		op = "NOT IN"
-	}
-	if req.Filter == nil {
-		req.Filter = &qbtypes.Filter{}
-	}
-	statusClause := fmt.Sprintf("%s %s (%s)", hostNameAttrKey, op, strings.Join(activeHosts, ", "))
-	req.Filter.Expression = fmt.Sprintf("(%s) AND (%s)", req.Filter.Expression, statusClause)
-	return false
-}
-
-func (m *module) getHostsTableMetadata(ctx context.Context, req *inframonitoringtypes.HostsListRequest) (map[string]map[string]string, error) {
-	var nonGroupByAttrs []string
-	for _, key := range hostAttrKeysForMetadata {
-		if !isKeyInGroupByAttrs(req.GroupBy, key) {
-			nonGroupByAttrs = append(nonGroupByAttrs, key)
-		}
-	}
-	metadataMap, err := m.getMetadata(ctx, hostsTableMetricNamesList, req.GroupBy, nonGroupByAttrs, req.Filter, req.Start, req.End)
-	if err != nil {
-		return nil, err
-	}
-	return metadataMap, nil
-}
-
-// buildHostRecords constructs the final list of HostRecords for a page.
-// Groups that had no metric data get default values of -1.
-func (m *module) buildHostRecords(
-	resp *qbtypes.QueryRangeResponse,
-	pageGroups []map[string]string,
-	groupBy []qbtypes.GroupByKey,
-	metadataMap map[string]map[string]string,
-	activeHostsMap map[string]bool,
-) []inframonitoringtypes.HostRecord {
-	metricsMap := parseFullQueryResponse(resp, groupBy)
-
-	records := make([]inframonitoringtypes.HostRecord, 0, len(pageGroups))
-	for _, labels := range pageGroups {
-		compositeKey := compositeKeyFromLabels(labels, groupBy)
-		hostName := labels[hostNameAttrKey]
-
-		var activeStatus string
-		if isActive, known := activeHostsMap[hostName]; known {
-			if isActive {
-				activeStatus = inframonitoringtypes.HostStatusActive.StringValue()
-			} else {
-				activeStatus = inframonitoringtypes.HostStatusInactive.StringValue()
-			}
-		}
-
-		record := inframonitoringtypes.HostRecord{
-			HostName:  hostName,
-			Status:    activeStatus,
-			CPU:       -1,
-			Memory:    -1,
-			Wait:      -1,
-			Load15:    -1,
-			DiskUsage: -1,
-			Meta:      map[string]interface{}{},
-		}
-
-		if metrics, ok := metricsMap[compositeKey]; ok {
-			if v, exists := metrics["F1"]; exists {
-				record.CPU = v
-			}
-			if v, exists := metrics["F2"]; exists {
-				record.Memory = v
-			}
-			if v, exists := metrics["F3"]; exists {
-				record.Wait = v
-			}
-			if v, exists := metrics["F4"]; exists {
-				record.DiskUsage = v
-			}
-			if v, exists := metrics["G"]; exists {
-				record.Load15 = v
-			}
-		}
-
-		if attrs, ok := metadataMap[compositeKey]; ok {
-			for k, v := range attrs {
-				record.Meta[k] = v
-			}
-		}
-
-		records = append(records, record)
-	}
-	return records
-}
-
-// getActiveHosts returns a set of host names that have reported metrics recently (since sinceUnixMilli).
-// It queries distributed_metadata for hosts where last_reported_unix_milli >= sinceUnixMilli.
-func (m *module) getActiveHosts(ctx context.Context, metricNames []string, hostNameAttr string) (map[string]bool, error) {
-	sinceUnixMilli := time.Now().Add(-10 * time.Minute).UTC().UnixMilli()
-
-	sb := sqlbuilder.NewSelectBuilder()
-	sb.Distinct()
-	sb.Select("attr_string_value")
-	sb.From(fmt.Sprintf("%s.%s", telemetrymetrics.DBName, telemetrymetrics.AttributesMetadataTableName))
-	sb.Where(
-		sb.In("metric_name", sqlbuilder.List(metricNames)),
-		sb.E("attr_name", hostNameAttr),
-		sb.GE("last_reported_unix_milli", sinceUnixMilli),
-	)
-
-	query, args := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
-
-	rows, err := m.telemetryStore.ClickhouseDB().Query(ctx, query, args...)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-
-	activeHosts := make(map[string]bool)
-	for rows.Next() {
-		var hostName string
-		if err := rows.Scan(&hostName); err != nil {
-			return nil, err
-		}
-		if hostName != "" {
-			activeHosts[hostName] = true
-		}
-	}
-
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-
-	return activeHosts, nil
-}

pkg/modules/inframonitoring/implinframonitoring/module.go

@@ -1,144 +0,0 @@
-package implinframonitoring
-
-import (
-	"context"
-	"log/slog"
-
-	"github.com/SigNoz/signoz/pkg/factory"
-	"github.com/SigNoz/signoz/pkg/modules/inframonitoring"
-	"github.com/SigNoz/signoz/pkg/querier"
-	"github.com/SigNoz/signoz/pkg/telemetrymetrics"
-	"github.com/SigNoz/signoz/pkg/telemetrystore"
-	"github.com/SigNoz/signoz/pkg/types/inframonitoringtypes"
-	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
-	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
-)
-
-type module struct {
-	telemetryStore         telemetrystore.TelemetryStore
-	telemetryMetadataStore telemetrytypes.MetadataStore
-	querier                querier.Querier
-	fieldMapper            qbtypes.FieldMapper
-	condBuilder            qbtypes.ConditionBuilder
-	logger                 *slog.Logger
-	config                 inframonitoring.Config
-}
-
-// NewModule constructs the inframonitoring module with the provided dependencies.
-func NewModule(
-	telemetryStore telemetrystore.TelemetryStore,
-	telemetryMetadataStore telemetrytypes.MetadataStore,
-	querier querier.Querier,
-	providerSettings factory.ProviderSettings,
-	cfg inframonitoring.Config,
-) inframonitoring.Module {
-	fieldMapper := telemetrymetrics.NewFieldMapper()
-	condBuilder := telemetrymetrics.NewConditionBuilder(fieldMapper)
-	return &module{
-		telemetryStore:         telemetryStore,
-		telemetryMetadataStore: telemetryMetadataStore,
-		querier:                querier,
-		fieldMapper:            fieldMapper,
-		condBuilder:            condBuilder,
-		logger:                 providerSettings.Logger,
-		config:                 cfg,
-	}
-}
-
-func (m *module) HostsList(ctx context.Context, orgID valuer.UUID, req *inframonitoringtypes.HostsListRequest) (*inframonitoringtypes.HostsListResponse, error) {
-	if err := req.Validate(); err != nil {
-		return nil, err
-	}
-
-	resp := &inframonitoringtypes.HostsListResponse{}
-
-	// default to cpu order by
-	if req.OrderBy == nil {
-		req.OrderBy = &qbtypes.OrderBy{
-			Key: qbtypes.OrderByKey{
-				TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{
-					Name: "cpu",
-				},
-			},
-			Direction: qbtypes.OrderDirectionDesc,
-		}
-	}
-
-	if err := m.validateOrderBy(req.OrderBy, orderByToHostsQueryNames); err != nil {
-		return nil, err
-	}
-
-	// default to host name group by
-	if len(req.GroupBy) == 0 {
-		req.GroupBy = []qbtypes.GroupByKey{hostNameGroupByKey}
-		resp.Type = ResponseTypeList
-	} else {
-		resp.Type = ResponseTypeGroupedList
-	}
-
-	// 1. Check if any host metrics exist and get earliest retention time.
-	// If no host metrics exist, return early — the UI shows the onboarding guide.
-	// 2. If metrics exist but req.End is before the earliest reported time, convey retention boundary.
-	if count, minFirstReportedUnixMilli, err := m.getMetricsExistenceAndEarliestTime(ctx, hostsTableMetricNamesList); err == nil {
-		if count == 0 {
-			resp.SentAnyMetricsData = false
-			resp.Records = []inframonitoringtypes.HostRecord{}
-			resp.Total = 0
-			return resp, nil
-		}
-		resp.SentAnyMetricsData = true
-		if req.End < int64(minFirstReportedUnixMilli) {
-			resp.EndTimeBeforeRetention = true
-			resp.Records = []inframonitoringtypes.HostRecord{}
-			resp.Total = 0
-			return resp, nil
-		}
-	}
-
-	// Determine active hosts: those with metrics reported in the last 10 minutes.
-	activeHostsMap, err := m.getActiveHosts(ctx, hostsTableMetricNamesList, hostNameAttrKey)
-	if err != nil {
-		return nil, err
-	}
-
-	if m.applyHostsActiveStatusFilter(req, activeHostsMap) {
-		resp.Records = []inframonitoringtypes.HostRecord{}
-		resp.Total = 0
-		return resp, nil
-	}
-
-	metadataMap, err := m.getHostsTableMetadata(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-	if metadataMap == nil {
-		metadataMap = make(map[string]map[string]string)
-	}
-
-	resp.Total = len(metadataMap)
-
-	pageGroups, err := m.getTopHostGroups(ctx, orgID, req, metadataMap)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(pageGroups) == 0 {
-		resp.Records = []inframonitoringtypes.HostRecord{}
-		return resp, nil
-	}
-
-	hostsFilterExpr := ""
-	if req.Filter != nil {
-		hostsFilterExpr = req.Filter.Expression
-	}
-	fullQueryReq := buildFullQueryRequest(req.Start, req.End, hostsFilterExpr, req.GroupBy, pageGroups, m.newHostsTableListQuery())
-	queryResp, err := m.querier.QueryRange(ctx, orgID, fullQueryReq)
-	if err != nil {
-		return nil, err
-	}
-
-	resp.Records = m.buildHostRecords(queryResp, pageGroups, req.GroupBy, metadataMap, activeHostsMap)
-
-	return resp, nil
-}

pkg/modules/inframonitoring/inframonitoring.go

@@ -1,17 +0,0 @@
-package inframonitoring
-
-import (
-	"context"
-	"net/http"
-
-	"github.com/SigNoz/signoz/pkg/types/inframonitoringtypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
-)
-
-type Handler interface {
-	HostsList(http.ResponseWriter, *http.Request)
-}
-
-type Module interface {
-	HostsList(ctx context.Context, orgID valuer.UUID, req *inframonitoringtypes.HostsListRequest) (*inframonitoringtypes.HostsListResponse, error)
-}

pkg/signoz/config.go

@@ -21,7 +21,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/global"
 	"github.com/SigNoz/signoz/pkg/identn"
 	"github.com/SigNoz/signoz/pkg/instrumentation"
-	"github.com/SigNoz/signoz/pkg/modules/inframonitoring"
 	"github.com/SigNoz/signoz/pkg/modules/metricsexplorer"
 	"github.com/SigNoz/signoz/pkg/modules/serviceaccount"
 	"github.com/SigNoz/signoz/pkg/modules/user"
@@ -113,9 +112,6 @@ type Config struct {
 	// MetricsExplorer config
 	MetricsExplorer metricsexplorer.Config `mapstructure:"metricsexplorer"`
 
-	// InfraMonitoring config
-	InfraMonitoring inframonitoring.Config `mapstructure:"inframonitoring"`
-
 	// Flagger config
 	Flagger flagger.Config `mapstructure:"flagger"`
 
@@ -153,7 +149,6 @@ func NewConfig(ctx context.Context, logger *slog.Logger, resolverConfig config.R
 		gateway.NewConfigFactory(),
 		tokenizer.NewConfigFactory(),
 		metricsexplorer.NewConfigFactory(),
-		inframonitoring.NewConfigFactory(),
 		flagger.NewConfigFactory(),
 		user.NewConfigFactory(),
 		identn.NewConfigFactory(),

pkg/signoz/handler.go

@@ -18,8 +18,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/modules/dashboard/impldashboard"
 	"github.com/SigNoz/signoz/pkg/modules/fields"
 	"github.com/SigNoz/signoz/pkg/modules/fields/implfields"
-	"github.com/SigNoz/signoz/pkg/modules/inframonitoring"
-	"github.com/SigNoz/signoz/pkg/modules/inframonitoring/implinframonitoring"
 	"github.com/SigNoz/signoz/pkg/modules/metricsexplorer"
 	"github.com/SigNoz/signoz/pkg/modules/metricsexplorer/implmetricsexplorer"
 	"github.com/SigNoz/signoz/pkg/modules/quickfilter"
@@ -53,7 +51,6 @@ type Handlers struct {
 	SpanPercentile          spanpercentile.Handler
 	Services                services.Handler
 	MetricsExplorer         metricsexplorer.Handler
-	InfraMonitoring         inframonitoring.Handler
 	Global                  global.Handler
 	FlaggerHandler          flagger.Handler
 	GatewayHandler          gateway.Handler
@@ -90,7 +87,6 @@ func NewHandlers(
 		RawDataExport:           implrawdataexport.NewHandler(modules.RawDataExport),
 		Services:                implservices.NewHandler(modules.Services),
 		MetricsExplorer:         implmetricsexplorer.NewHandler(modules.MetricsExplorer),
-		InfraMonitoring:         implinframonitoring.NewHandler(modules.InfraMonitoring),
 		SpanPercentile:          implspanpercentile.NewHandler(modules.SpanPercentile),
 		Global:                  signozglobal.NewHandler(global),
 		FlaggerHandler:          flagger.NewHandler(flaggerService),

pkg/signoz/module.go

@@ -13,8 +13,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/modules/authdomain"
 	"github.com/SigNoz/signoz/pkg/modules/authdomain/implauthdomain"
 	"github.com/SigNoz/signoz/pkg/modules/dashboard"
-	"github.com/SigNoz/signoz/pkg/modules/inframonitoring"
-	"github.com/SigNoz/signoz/pkg/modules/inframonitoring/implinframonitoring"
 	"github.com/SigNoz/signoz/pkg/modules/metricsexplorer"
 	"github.com/SigNoz/signoz/pkg/modules/metricsexplorer/implmetricsexplorer"
 	"github.com/SigNoz/signoz/pkg/modules/organization"
@@ -71,7 +69,6 @@ type Modules struct {
 	Services         services.Module
 	SpanPercentile   spanpercentile.Module
 	MetricsExplorer  metricsexplorer.Module
-	InfraMonitoring  inframonitoring.Module
 	Promote          promote.Module
 	ServiceAccount   serviceaccount.Module
 	RuleStateHistory rulestatehistory.Module
@@ -119,7 +116,6 @@ func NewModules(
 		SpanPercentile:   implspanpercentile.NewModule(querier, providerSettings),
 		Services:         implservices.NewModule(querier, telemetryStore),
 		MetricsExplorer:  implmetricsexplorer.NewModule(telemetryStore, telemetryMetadataStore, cache, ruleStore, dashboard, providerSettings, config.MetricsExplorer),
-		InfraMonitoring:  implinframonitoring.NewModule(telemetryStore, telemetryMetadataStore, querier, providerSettings, config.InfraMonitoring),
 		Promote:          implpromote.NewModule(telemetryMetadataStore, telemetryStore),
 		ServiceAccount:   implserviceaccount.NewModule(implserviceaccount.NewStore(sqlstore), authz, cache, analytics, providerSettings, config.ServiceAccount),
 		RuleStateHistory: implrulestatehistory.NewModule(implrulestatehistory.NewStore(telemetryStore, telemetryMetadataStore, providerSettings.Logger)),

pkg/signoz/openapi.go

@@ -21,7 +21,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/modules/dashboard"
 	"github.com/SigNoz/signoz/pkg/modules/fields"
 	"github.com/SigNoz/signoz/pkg/modules/metricsexplorer"
-	"github.com/SigNoz/signoz/pkg/modules/inframonitoring"
 	"github.com/SigNoz/signoz/pkg/modules/organization"
 	"github.com/SigNoz/signoz/pkg/modules/preference"
 	"github.com/SigNoz/signoz/pkg/modules/promote"
@@ -60,7 +59,6 @@ func NewOpenAPI(ctx context.Context, instrumentation instrumentation.Instrumenta
 		struct{ dashboard.Module }{},
 		struct{ dashboard.Handler }{},
 		struct{ metricsexplorer.Handler }{},
-		struct{ inframonitoring.Handler }{},
 		struct{ gateway.Handler }{},
 		struct{ fields.Handler }{},
 		struct{ authz.Handler }{},

pkg/signoz/provider.go

@@ -276,7 +276,6 @@ func NewAPIServerProviderFactories(orgGetter organization.Getter, authz authz.Au
 			modules.Dashboard,
 			handlers.Dashboard,
 			handlers.MetricsExplorer,
-			handlers.InfraMonitoring,
 			handlers.GatewayHandler,
 			handlers.Fields,
 			handlers.AuthzHandler,

pkg/types/inframonitoringtypes/inframonitoring.go

@@ -1,112 +0,0 @@
-package inframonitoringtypes
-
-import (
-	"encoding/json"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
-	"github.com/SigNoz/signoz/pkg/valuer"
-)
-
-type HostStatus struct {
-	valuer.String
-}
-
-var (
-	HostStatusActive   = HostStatus{valuer.NewString("active")}
-	HostStatusInactive = HostStatus{valuer.NewString("inactive")}
-)
-
-func (HostStatus) Enum() []any {
-	return []any{
-		HostStatusActive,
-		HostStatusInactive,
-	}
-}
-
-type HostsListRequest struct {
-	Start          int64                `json:"start"`
-	End            int64                `json:"end"`
-	Filter         *qbtypes.Filter      `json:"filter"`
-	FilterByStatus HostStatus           `json:"filterByStatus"`
-	GroupBy        []qbtypes.GroupByKey `json:"groupBy"`
-	OrderBy        *qbtypes.OrderBy     `json:"orderBy"`
-	Offset         int                  `json:"offset"`
-	Limit          int                  `json:"limit"`
-}
-
-// Validate ensures HostsListRequest contains acceptable values.
-func (req *HostsListRequest) Validate() error {
-	if req == nil {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "request is nil")
-	}
-
-	if req.Start <= 0 {
-		return errors.NewInvalidInputf(
-			errors.CodeInvalidInput,
-			"invalid start time %d: start must be greater than 0",
-			req.Start,
-		)
-	}
-
-	if req.End <= 0 {
-		return errors.NewInvalidInputf(
-			errors.CodeInvalidInput,
-			"invalid end time %d: end must be greater than 0",
-			req.End,
-		)
-	}
-
-	if req.Start >= req.End {
-		return errors.NewInvalidInputf(
-			errors.CodeInvalidInput,
-			"invalid time range: start (%d) must be less than end (%d)",
-			req.Start,
-			req.End,
-		)
-	}
-
-	if req.Limit < 1 || req.Limit > 5000 {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "limit must be between 1 and 5000")
-	}
-
-	if req.Offset < 0 {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "offset cannot be negative")
-	}
-
-	if !req.FilterByStatus.IsZero() && req.FilterByStatus != HostStatusActive && req.FilterByStatus != HostStatusInactive {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "invalid filter by status: %s", req.FilterByStatus)
-	}
-
-	return nil
-}
-
-// UnmarshalJSON validates input immediately after decoding.
-func (req *HostsListRequest) UnmarshalJSON(data []byte) error {
-	type raw HostsListRequest
-	var decoded raw
-	if err := json.Unmarshal(data, &decoded); err != nil {
-		return err
-	}
-	*req = HostsListRequest(decoded)
-	return req.Validate()
-}
-
-type HostsListResponse struct {
-	Type                   string       `json:"type"` // TODO(nikhilmantri0902): should this also be changed to valuer.string?
-	Records                []HostRecord `json:"records"`
-	Total                  int          `json:"total"`
-	SentAnyMetricsData     bool         `json:"sentAnyMetricsData"`
-	EndTimeBeforeRetention bool         `json:"endTimeBeforeRetention"`
-}
-
-type HostRecord struct {
-	HostName  string                 `json:"hostName"`
-	Status    string                 `json:"status"`
-	CPU       float64                `json:"cpu"`
-	Memory    float64                `json:"memory"`
-	Wait      float64                `json:"wait"`
-	Load15    float64                `json:"load15"`
-	DiskUsage float64                `json:"diskUsage"`
-	Meta      map[string]interface{} `json:"meta"`
-}

pkg/types/inframonitoringtypes/inframonitoring_test.go

@@ -1,178 +0,0 @@
-package inframonitoringtypes
-
-import (
-	"testing"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/valuer"
-	"github.com/stretchr/testify/require"
-)
-
-func TestHostsListRequest_Validate(t *testing.T) {
-	tests := []struct {
-		name    string
-		req     *HostsListRequest
-		wantErr bool
-	}{
-		{
-			name: "valid request",
-			req: &HostsListRequest{
-				Start:  1000,
-				End:    2000,
-				Limit:  100,
-				Offset: 0,
-			},
-			wantErr: false,
-		},
-		{
-			name:    "nil request",
-			req:     nil,
-			wantErr: true,
-		},
-		{
-			name: "start time zero",
-			req: &HostsListRequest{
-				Start:  0,
-				End:    2000,
-				Limit:  100,
-				Offset: 0,
-			},
-			wantErr: true,
-		},
-		{
-			name: "start time negative",
-			req: &HostsListRequest{
-				Start:  -1000,
-				End:    2000,
-				Limit:  100,
-				Offset: 0,
-			},
-			wantErr: true,
-		},
-		{
-			name: "end time zero",
-			req: &HostsListRequest{
-				Start:  1000,
-				End:    0,
-				Limit:  100,
-				Offset: 0,
-			},
-			wantErr: true,
-		},
-		{
-			name: "start time greater than end time",
-			req: &HostsListRequest{
-				Start:  2000,
-				End:    1000,
-				Limit:  100,
-				Offset: 0,
-			},
-			wantErr: true,
-		},
-		{
-			name: "start time equal to end time",
-			req: &HostsListRequest{
-				Start:  1000,
-				End:    1000,
-				Limit:  100,
-				Offset: 0,
-			},
-			wantErr: true,
-		},
-		{
-			name: "limit zero",
-			req: &HostsListRequest{
-				Start:  1000,
-				End:    2000,
-				Limit:  0,
-				Offset: 0,
-			},
-			wantErr: true,
-		},
-		{
-			name: "limit negative",
-			req: &HostsListRequest{
-				Start:  1000,
-				End:    2000,
-				Limit:  -10,
-				Offset: 0,
-			},
-			wantErr: true,
-		},
-		{
-			name: "limit exceeds max",
-			req: &HostsListRequest{
-				Start:  1000,
-				End:    2000,
-				Limit:  5001,
-				Offset: 0,
-			},
-			wantErr: true,
-		},
-		{
-			name: "offset negative",
-			req: &HostsListRequest{
-				Start:  1000,
-				End:    2000,
-				Limit:  100,
-				Offset: -5,
-			},
-			wantErr: true,
-		},
-		{
-			name: "filter by status ACTIVE",
-			req: &HostsListRequest{
-				Start:          1000,
-				End:            2000,
-				Limit:          100,
-				Offset:         0,
-				FilterByStatus: HostStatusActive,
-			},
-			wantErr: false,
-		},
-		{
-			name: "filter by status INACTIVE",
-			req: &HostsListRequest{
-				Start:          1000,
-				End:            2000,
-				Limit:          100,
-				Offset:         0,
-				FilterByStatus: HostStatusInactive,
-			},
-			wantErr: false,
-		},
-		{
-			name: "filter by status empty (zero value)",
-			req: &HostsListRequest{
-				Start:  1000,
-				End:    2000,
-				Limit:  100,
-				Offset: 0,
-			},
-			wantErr: false,
-		},
-		{
-			name: "filter by status invalid value",
-			req: &HostsListRequest{
-				Start:          1000,
-				End:            2000,
-				Limit:          100,
-				Offset:         0,
-				FilterByStatus: HostStatus{valuer.NewString("UNKNOWN")},
-			},
-			wantErr: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := tt.req.Validate()
-			if tt.wantErr {
-				require.Error(t, err)
-				require.True(t, errors.Ast(err, errors.TypeInvalidInput), "expected error to be of type InvalidInput")
-			} else {
-				require.NoError(t, err)
-			}
-		})
-	}
-}