Fix inconsistent map literal indentation in BuilderQueries

frontend/src/api/infraMonitoring/getHostLists.ts

@@ -39,6 +39,7 @@ export interface HostData {
 	waitTimeSeries: TimeSeries;
 	load15: number;
 	load15TimeSeries: TimeSeries;
+	filesystem: number;
 }
 
 export interface HostListResponse {

frontend/src/components/HostMetricsDetail/HostMetricsDetail.styles.scss

@@ -48,7 +48,7 @@
 			.labels-row,
 			.values-row {
 				display: grid;
-				grid-template-columns: 1fr 1.5fr 1.5fr 1.5fr;
+				grid-template-columns: 1fr 1.5fr 1.5fr 1.5fr 1.5fr;
 				gap: 30px;
 				align-items: center;
 			}

frontend/src/components/HostMetricsDetail/HostMetricsDetails.tsx

@@ -425,6 +425,12 @@ function HostMetricsDetails({
 								>
 									MEMORY USAGE
 								</Typography.Text>
+								<Typography.Text
+									type="secondary"
+									className="host-details-metadata-label"
+								>
+									DISK USAGE
+								</Typography.Text>
 							</div>
 
 							<div className="values-row">
@@ -477,6 +483,23 @@ function HostMetricsDetails({
 										className="progress-bar"
 									/>
 								</div>
+								<div className="progress-container">
+									<Progress
+										percent={Number((host.filesystem * 100).toFixed(1))}
+										size="small"
+										strokeColor={((): string => {
+											const filesystemPercent = Number((host.filesystem * 100).toFixed(1));
+											if (filesystemPercent >= 90) {
+												return Color.BG_CHERRY_500;
+											}
+											if (filesystemPercent >= 60) {
+												return Color.BG_AMBER_500;
+											}
+											return Color.BG_FOREST_500;
+										})()}
+										className="progress-bar"
+									/>
+								</div>
 							</div>
 						</div>
 					</div>

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

@@ -8,20 +8,20 @@ import { HostsListTableProps } from '../utils';
 
 const EMPTY_STATE_CONTAINER_CLASS = '.hosts-empty-state-container';
 
-const createMockHost = (): HostData =>
-	({
-		hostName: 'test-host-1',
-		active: true,
-		cpu: 0.75,
-		memory: 0.65,
-		wait: 0.03,
-		load15: 1.5,
-		os: 'linux',
-		cpuTimeSeries: { labels: {}, labelsArray: [], values: [] },
-		memoryTimeSeries: { labels: {}, labelsArray: [], values: [] },
-		waitTimeSeries: { labels: {}, labelsArray: [], values: [] },
-		load15TimeSeries: { labels: {}, labelsArray: [], values: [] },
-	} as HostData);
+const createMockHost = (): HostData => ({
+	hostName: 'test-host-1',
+	active: true,
+	cpu: 0.75,
+	memory: 0.65,
+	wait: 0.03,
+	load15: 1.5,
+	os: 'linux',
+	cpuTimeSeries: { labels: {}, labelsArray: [], values: [] },
+	memoryTimeSeries: { labels: {}, labelsArray: [], values: [] },
+	waitTimeSeries: { labels: {}, labelsArray: [], values: [] },
+	load15TimeSeries: { labels: {}, labelsArray: [], values: [] },
+	filesystem: 0.5,
+});
 
 const createMockTableData = (
 	overrides: Partial<HostListResponse['data']> = {},

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

@@ -24,6 +24,7 @@ describe('InfraMonitoringHosts utils', () => {
 					active: true,
 					cpu: 0.95,
 					memory: 0.85,
+					filesystem: 0.65,
 					wait: 0.05,
 					load15: 2.5,
 					os: 'linux',
@@ -67,6 +68,7 @@ describe('InfraMonitoringHosts utils', () => {
 					active: false,
 					cpu: 0.3,
 					memory: 0.4,
+					filesystem: 0.2,
 					wait: 0.02,
 					load15: 1.2,
 					os: 'linux',
@@ -91,6 +93,7 @@ describe('InfraMonitoringHosts utils', () => {
 					active: true,
 					cpu: 0.5,
 					memory: 0.4,
+					filesystem: 0.5,
 					wait: 0.01,
 					load15: 1.0,
 					os: 'linux',

frontend/src/container/InfraMonitoringHosts/utils.tsx

@@ -29,6 +29,7 @@ export interface HostRowData {
 	hostName: string;
 	cpu: React.ReactNode;
 	memory: React.ReactNode;
+	filesystem: React.ReactNode;
 	wait: string;
 	load15: number;
 	active: React.ReactNode;
@@ -181,6 +182,14 @@ export const getHostsListColumns = (): ColumnType<HostRowData>[] => [
 		sorter: true,
 		align: 'right',
 	},
+	{
+		title: <div className="column-header-right">Disk Usage</div>,
+		dataIndex: 'filesystem',
+		key: 'filesystem',
+		width: 100,
+		sorter: true,
+		align: 'right',
+	},
 	{
 		title: <div className="column-header-right">IOWait</div>,
 		dataIndex: 'wait',
@@ -251,6 +260,26 @@ export const formatDataForTable = (data: HostData[]): HostRowData[] =>
 				/>
 			</div>
 		),
+		filesystem: (
+			<div className="progress-container">
+				<Progress
+					percent={Number((host.filesystem * 100).toFixed(1))}
+					strokeLinecap="butt"
+					size="small"
+					strokeColor={((): string => {
+						const filesystemPercent = Number((host.filesystem * 100).toFixed(1));
+						if (filesystemPercent >= 90) {
+							return Color.BG_CHERRY_500;
+						}
+						if (filesystemPercent >= 60) {
+							return Color.BG_AMBER_500;
+						}
+						return Color.BG_FOREST_500;
+					})()}
+					className="progress-bar"
+				/>
+			</div>
+		),
 		wait: `${Number((host.wait * 100).toFixed(1))}%`,
 		load15: host.load15,
 	}));

frontend/src/container/LogDetailedView/InfraMetrics/constants.ts

@@ -1582,6 +1582,8 @@ export const getNodeQueryPayload = (
 	];
 };
 
+// We intentionally set stepInterval to 0 so backend computes the effective step from the selected time range.
+// TODO: Remove stepInterval usage from IBuilderQuery and all places where it is used.
 export const getHostQueryPayload = (
 	hostName: string,
 	start: number,
@@ -1622,6 +1624,9 @@ export const getHostQueryPayload = (
 	const diskPendingKey = dotMetricsEnabled
 		? 'system.disk.pending_operations'
 		: 'system_disk_pending_operations';
+	const fsUsageKey = dotMetricsEnabled
+		? 'system.filesystem.usage'
+		: 'system_filesystem_usage';
 
 	return [
 		{
@@ -1676,7 +1681,7 @@ export const getHostQueryPayload = (
 							queryName: 'A',
 							reduceTo: ReduceOperators.AVG,
 							spaceAggregation: 'sum',
-							stepInterval: 60,
+							stepInterval: 0,
 							timeAggregation: 'rate',
 						},
 						{
@@ -1717,7 +1722,7 @@ export const getHostQueryPayload = (
 							queryName: 'B',
 							reduceTo: ReduceOperators.AVG,
 							spaceAggregation: 'sum',
-							stepInterval: 60,
+							stepInterval: 0,
 							timeAggregation: 'rate',
 						},
 					],
@@ -1793,7 +1798,7 @@ export const getHostQueryPayload = (
 							queryName: 'A',
 							reduceTo: ReduceOperators.AVG,
 							spaceAggregation: 'sum',
-							stepInterval: 60,
+							stepInterval: 0,
 							timeAggregation: 'avg',
 						},
 					],
@@ -1854,7 +1859,7 @@ export const getHostQueryPayload = (
 							queryName: 'A',
 							reduceTo: ReduceOperators.AVG,
 							spaceAggregation: 'sum',
-							stepInterval: 60,
+							stepInterval: 0,
 							timeAggregation: 'avg',
 						},
 						{
@@ -1895,7 +1900,7 @@ export const getHostQueryPayload = (
 							queryName: 'B',
 							reduceTo: ReduceOperators.AVG,
 							spaceAggregation: 'sum',
-							stepInterval: 60,
+							stepInterval: 0,
 							timeAggregation: 'avg',
 						},
 						{
@@ -1936,7 +1941,7 @@ export const getHostQueryPayload = (
 							queryName: 'C',
 							reduceTo: ReduceOperators.AVG,
 							spaceAggregation: 'sum',
-							stepInterval: 60,
+							stepInterval: 0,
 							timeAggregation: 'avg',
 						},
 					],
@@ -2018,7 +2023,7 @@ export const getHostQueryPayload = (
 							queryName: 'A',
 							reduceTo: ReduceOperators.AVG,
 							spaceAggregation: 'sum',
-							stepInterval: 60,
+							stepInterval: 0,
 							timeAggregation: 'rate',
 						},
 					],
@@ -2094,7 +2099,7 @@ export const getHostQueryPayload = (
 							queryName: 'A',
 							reduceTo: ReduceOperators.AVG,
 							spaceAggregation: 'sum',
-							stepInterval: 60,
+							stepInterval: 0,
 							timeAggregation: 'rate',
 						},
 					],
@@ -2170,7 +2175,7 @@ export const getHostQueryPayload = (
 							queryName: 'A',
 							reduceTo: ReduceOperators.AVG,
 							spaceAggregation: 'sum',
-							stepInterval: 60,
+							stepInterval: 0,
 							timeAggregation: 'rate',
 						},
 					],
@@ -2246,7 +2251,7 @@ export const getHostQueryPayload = (
 							queryName: 'A',
 							reduceTo: ReduceOperators.AVG,
 							spaceAggregation: 'sum',
-							stepInterval: 60,
+							stepInterval: 0,
 							timeAggregation: 'rate',
 						},
 					],
@@ -2322,7 +2327,7 @@ export const getHostQueryPayload = (
 							queryName: 'A',
 							reduceTo: ReduceOperators.AVG,
 							spaceAggregation: 'sum',
-							stepInterval: 60,
+							stepInterval: 0,
 							timeAggregation: 'avg',
 						},
 					],
@@ -2383,7 +2388,7 @@ export const getHostQueryPayload = (
 							queryName: 'A',
 							reduceTo: ReduceOperators.AVG,
 							spaceAggregation: 'sum',
-							stepInterval: 60,
+							stepInterval: 0,
 							timeAggregation: 'rate',
 						},
 					],
@@ -2465,7 +2470,7 @@ export const getHostQueryPayload = (
 							queryName: 'A',
 							reduceTo: ReduceOperators.AVG,
 							spaceAggregation: 'sum',
-							stepInterval: 60,
+							stepInterval: 0,
 							timeAggregation: 'rate',
 						},
 					],
@@ -2482,6 +2487,143 @@ export const getHostQueryPayload = (
 			start,
 			end,
 		},
+		{
+			selectedTime: 'GLOBAL_TIME',
+			graphType: PANEL_TYPES.TIME_SERIES,
+			query: {
+				builder: {
+					queryData: [
+						{
+							aggregateAttribute: {
+								dataType: DataTypes.Float64,
+								id: 'system_filesystem_usage--float64--Gauge--true',
+
+								key: fsUsageKey,
+								type: 'Gauge',
+							},
+							aggregateOperator: 'avg',
+							dataSource: DataSource.METRICS,
+							disabled: true,
+							expression: 'A',
+							filters: {
+								items: [
+									{
+										id: 'fs_f1',
+										key: {
+											dataType: DataTypes.String,
+											id: 'host_name--string--tag--false',
+
+											key: hostNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value: hostName,
+									},
+									{
+										id: 'fs_f2',
+										key: {
+											dataType: DataTypes.String,
+											id: 'state--string--tag--false',
+
+											key: 'state',
+											type: 'tag',
+										},
+										op: '=',
+										value: 'used',
+									},
+								],
+								op: 'AND',
+							},
+							functions: [],
+							groupBy: [
+								{
+									dataType: DataTypes.String,
+									id: 'mountpoint--string--tag--false',
+
+									key: 'mountpoint',
+									type: 'tag',
+								},
+							],
+							having: [],
+							legend: '{{mountpoint}}',
+							limit: null,
+							orderBy: [],
+							queryName: 'A',
+							reduceTo: ReduceOperators.AVG,
+							spaceAggregation: 'sum',
+							stepInterval: 0,
+							timeAggregation: 'avg',
+						},
+						{
+							aggregateAttribute: {
+								dataType: DataTypes.Float64,
+								id: 'system_filesystem_usage--float64--Gauge--true',
+
+								key: fsUsageKey,
+								type: 'Gauge',
+							},
+							aggregateOperator: 'avg',
+							dataSource: DataSource.METRICS,
+							disabled: true,
+							expression: 'B',
+							filters: {
+								items: [
+									{
+										id: 'fs_f3',
+										key: {
+											dataType: DataTypes.String,
+											id: 'host_name--string--tag--false',
+
+											key: hostNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value: hostName,
+									},
+								],
+								op: 'AND',
+							},
+							functions: [],
+							groupBy: [
+								{
+									dataType: DataTypes.String,
+									id: 'mountpoint--string--tag--false',
+
+									key: 'mountpoint',
+									type: 'tag',
+								},
+							],
+							having: [],
+							legend: '{{mountpoint}}',
+							limit: null,
+							orderBy: [],
+							queryName: 'B',
+							reduceTo: ReduceOperators.AVG,
+							spaceAggregation: 'sum',
+							stepInterval: 0,
+							timeAggregation: 'avg',
+						},
+					],
+					queryFormulas: [
+						{
+							disabled: false,
+							expression: 'A/B',
+							legend: '{{mountpoint}}',
+							queryName: 'F1',
+						},
+					],
+					queryTraceOperator: [],
+				},
+				clickhouse_sql: [{ disabled: false, legend: '', name: 'A', query: '' }],
+				id: 'a1b2c3d4-e5f6-7890-abcd-ef1234567890',
+				promql: [{ disabled: false, legend: '', name: 'A', query: '' }],
+				queryType: EQueryType.QUERY_BUILDER,
+			},
+			variables: {},
+			formatForWeb: false,
+			start,
+			end,
+		},
 		{
 			selectedTime: 'GLOBAL_TIME',
 			graphType: PANEL_TYPES.TIME_SERIES,
@@ -2540,7 +2682,7 @@ export const getHostQueryPayload = (
 							queryName: 'A',
 							reduceTo: ReduceOperators.AVG,
 							spaceAggregation: 'sum',
-							stepInterval: 60,
+							stepInterval: 0,
 							timeAggregation: 'max',
 						},
 					],
@@ -2630,6 +2772,6 @@ export const hostWidgetInfo = [
 	{ title: 'Network connections', yAxisUnit: 'short' },
 	{ title: 'System disk io (bytes transferred)', yAxisUnit: 'bytes' },
 	{ title: 'System disk operations/s', yAxisUnit: 'short' },
+	{ title: 'Disk Usage (%) by mountpoint', yAxisUnit: 'percentunit' },
 	{ title: 'Queue size', yAxisUnit: 'short' },
-	{ title: 'Disk operations time', yAxisUnit: 's' },
 ];

pkg/query-service/app/inframetrics/common.go

@@ -10,14 +10,60 @@ import (
 )
 
 var dotMetricMap = map[string]string{
+	"host_name":                             "host.name",
+	"k8s_cluster_name":                      "k8s.cluster.name",
+	"k8s_node_name":                         "k8s.node.name",
+	"k8s_pod_memory_usage":                  "k8s.pod.memory.usage",
+	"k8s_pod_cpu_request_utilization":       "k8s.pod.cpu_request_utilization",
+	"k8s_pod_memory_request_utilization":    "k8s.pod.memory_request_utilization",
+	"k8s_pod_cpu_limit_utilization":         "k8s.pod.cpu_limit_utilization",
+	"k8s_pod_memory_limit_utilization":      "k8s.pod.memory_limit_utilization",
+	"k8s_container_restarts":                "k8s.container.restarts",
+	"k8s_pod_phase":                         "k8s.pod.phase",
+	"k8s_node_allocatable_cpu":              "k8s.node.allocatable_cpu",
+	"k8s_node_allocatable_memory":           "k8s.node.allocatable_memory",
+	"k8s_node_memory_usage":                 "k8s.node.memory.usage",
+	"k8s_node_condition_ready":              "k8s.node.condition_ready",
+	"k8s_daemonset_desired_scheduled_nodes": "k8s.daemonset.desired_scheduled_nodes",
+	"k8s_daemonset_current_scheduled_nodes": "k8s.daemonset.current_scheduled_nodes",
+	"k8s_deployment_desired":                "k8s.deployment.desired",
+	"k8s_deployment_available":              "k8s.deployment.available",
+	"k8s_job_desired_successful_pods":       "k8s.job.desired_successful_pods",
+	"k8s_job_active_pods":                   "k8s.job.active_pods",
+	"k8s_job_failed_pods":                   "k8s.job.failed_pods",
+	"k8s_job_successful_pods":               "k8s.job.successful_pods",
+	"k8s_statefulset_desired_pods":          "k8s.statefulset.desired_pods",
+	"k8s_statefulset_current_pods":          "k8s.statefulset.current_pods",
+	"k8s_namespace_name":                    "k8s.namespace.name",
+	"k8s_deployment_name":                   "k8s.deployment.name",
+	"k8s_cronjob_name":                      "k8s.cronjob.name",
+	"k8s_job_name":                          "k8s.job.name",
+	"k8s_daemonset_name":                    "k8s.daemonset.name",
+	"os_type":                               "os.type",
+	"process_cgroup":                        "process.cgroup",
+	"process_pid":                           "process.pid",
+	"process_parent_pid":                    "process.parent_pid",
+	"process_owner":                         "process.owner",
+	"process_executable_path":               "process.executable.path",
+	"process_executable_name":               "process.executable.name",
+	"process_command_line":                  "process.command_line",
+	"process_command":                       "process.command",
+	"process_memory_usage":                  "process.memory.usage",
+	"k8s_persistentvolumeclaim_name":        "k8s.persistentvolumeclaim.name",
+	"k8s_volume_available":                  "k8s.volume.available",
+	"k8s_volume_capacity":                   "k8s.volume.capacity",
+	"k8s_volume_inodes":                     "k8s.volume.inodes",
+	"k8s_volume_inodes_free":                "k8s.volume.inodes.free",
+	// add additional mappings as needed
 	"system_uptime":                  "system.uptime",
 	"system_cpu_physical_count":      "system.cpu.physical.count",
 	"system_cpu_logical_count":       "system.cpu.logical.count",
+	"system_filesystem_usage":        "system.filesystem.usage",
 	"system_cpu_time":                "system.cpu.time",
+	"system_memory_usage":            "system.memory.usage",
+	"system_cpu_load_average_15m":    "system.cpu.load_average.15m",
 	"system_cpu_frequency":           "system.cpu.frequency",
 	"system_cpu_utilization":         "system.cpu.utilization",
-	"system_cpu_load_average_15m":    "system.cpu.load_average.15m",
-	"system_memory_usage":            "system.memory.usage",
 	"system_memory_limit":            "system.memory.limit",
 	"system_memory_utilization":      "system.memory.utilization",
 	"system_memory_linux_available":  "system.memory.linux.available",
@@ -33,7 +79,6 @@ var dotMetricMap = map[string]string{
 	"system_disk_operation_time":     "system.disk.operation_time",
 	"system_disk_merged":             "system.disk.merged",
 	"system_disk_limit":              "system.disk.limit",
-	"system_filesystem_usage":        "system.filesystem.usage",
 	"system_filesystem_utilization":  "system.filesystem.utilization",
 	"system_filesystem_limit":        "system.filesystem.limit",
 	"system_network_errors":          "system.network.errors",
@@ -51,48 +96,10 @@ var dotMetricMap = map[string]string{
 	"system_cpu_load_average_1m":     "system.cpu.load_average.1m",
 	"system_cpu_load_average_5m":     "system.cpu.load_average.5m",
 
-	"host_name":                              "host.name",
-	"k8s_cluster_name":                       "k8s.cluster.name",
-	"k8s_node_name":                          "k8s.node.name",
-	"k8s_pod_memory_usage":                   "k8s.pod.memory.usage",
-	"k8s_pod_cpu_request_utilization":        "k8s.pod.cpu_request_utilization",
-	"k8s_pod_memory_request_utilization":     "k8s.pod.memory_request_utilization",
-	"k8s_pod_cpu_limit_utilization":          "k8s.pod.cpu_limit_utilization",
-	"k8s_pod_memory_limit_utilization":       "k8s.pod.memory_limit_utilization",
-	"k8s_container_restarts":                 "k8s.container.restarts",
-	"k8s_pod_phase":                          "k8s.pod.phase",
-	"k8s_node_allocatable_cpu":               "k8s.node.allocatable_cpu",
-	"k8s_node_allocatable_memory":            "k8s.node.allocatable_memory",
-	"k8s_node_memory_usage":                  "k8s.node.memory.usage",
-	"k8s_node_condition_ready":               "k8s.node.condition_ready",
-	"k8s_daemonset_desired_scheduled_nodes":  "k8s.daemonset.desired_scheduled_nodes",
-	"k8s_daemonset_current_scheduled_nodes":  "k8s.daemonset.current_scheduled_nodes",
-	"k8s_deployment_desired":                 "k8s.deployment.desired",
-	"k8s_deployment_available":               "k8s.deployment.available",
-	"k8s_job_desired_successful_pods":        "k8s.job.desired_successful_pods",
-	"k8s_job_active_pods":                    "k8s.job.active_pods",
-	"k8s_job_failed_pods":                    "k8s.job.failed_pods",
-	"k8s_job_successful_pods":                "k8s.job.successful_pods",
-	"k8s_statefulset_desired_pods":           "k8s.statefulset.desired_pods",
-	"k8s_statefulset_current_pods":           "k8s.statefulset.current_pods",
-	"k8s_namespace_name":                     "k8s.namespace.name",
-	"k8s_deployment_name":                    "k8s.deployment.name",
-	"k8s_cronjob_name":                       "k8s.cronjob.name",
-	"k8s_job_name":                           "k8s.job.name",
-	"k8s_daemonset_name":                     "k8s.daemonset.name",
-	"os_type":                                "os.type",
-	"process_cgroup":                         "process.cgroup",
-	"process_pid":                            "process.pid",
-	"process_parent_pid":                     "process.parent_pid",
-	"process_owner":                          "process.owner",
-	"process_executable_path":                "process.executable.path",
-	"process_executable_name":                "process.executable.name",
-	"process_command_line":                   "process.command_line",
-	"process_command":                        "process.command",
-	"process_memory_usage":                   "process.memory.usage",
-	"process_memory_virtual":                 "process.memory.virtual",
-	"process_cpu_time":                       "process.cpu.time",
-	"process_disk_io":                        "process.disk.io",
+	"process_memory_virtual": "process.memory.virtual",
+	"process_cpu_time":       "process.cpu.time",
+	"process_disk_io":        "process.disk.io",
+
 	"nfs_client_net_count":                   "nfs.client.net.count",
 	"nfs_client_net_tcp_connection_accepted": "nfs.client.net.tcp.connection.accepted",
 	"nfs_client_operation_count":             "nfs.client.operation.count",
@@ -109,11 +116,6 @@ var dotMetricMap = map[string]string{
 	"nfs_server_repcache_requests":           "nfs.server.repcache.requests",
 	"nfs_server_rpc_count":                   "nfs.server.rpc.count",
 	"nfs_server_thread_count":                "nfs.server.thread.count",
-	"k8s_persistentvolumeclaim_name":         "k8s.persistentvolumeclaim.name",
-	"k8s_volume_available":                   "k8s.volume.available",
-	"k8s_volume_capacity":                    "k8s.volume.capacity",
-	"k8s_volume_inodes":                      "k8s.volume.inodes",
-	"k8s_volume_inodes_free":                 "k8s.volume.inodes.free",
 
 	"k8s_pod_uid":              "k8s.pod.uid",
 	"k8s_pod_name":             "k8s.pod.name",

pkg/query-service/app/inframetrics/hosts.go

@@ -55,10 +55,11 @@ var (
 	}
 
 	queryNamesForTopHosts = map[string][]string{
-		"cpu":    {"A", "B", "F1"},
-		"memory": {"C", "D", "F2"},
-		"wait":   {"E", "F", "F3"},
-		"load15": {"G"},
+		"cpu":        {"A", "B", "F1"},
+		"memory":     {"C", "D", "F2"},
+		"wait":       {"E", "F", "F3"},
+		"load15":     {"G"},
+		"filesystem": {"H", "I", "F4"},
 	}
 
 	// TODO(srikanthccv): remove hardcoded metric name and support keys from any system metric
@@ -75,6 +76,7 @@ var (
 		"load15":     GetDotMetrics("system_cpu_load_average_15m"),
 		"wait":       GetDotMetrics("system_cpu_time"),
 	}
+
 	uniqueMetricNamesForHosts = []string{
 		GetDotMetrics("system_uptime"),
 		GetDotMetrics("system_cpu_time"),
@@ -507,10 +509,11 @@ func (h *HostsRepo) GetHostList(ctx context.Context, orgID valuer.UUID, req mode
 	for _, result := range formattedResponse {
 		for _, row := range result.Table.Rows {
 			record := model.HostListRecord{
-				CPU:    -1,
-				Memory: -1,
-				Wait:   -1,
-				Load15: -1,
+				CPU:        -1,
+				Memory:     -1,
+				Wait:       -1,
+				Load15:     -1,
+				Filesystem: -1,
 			}
 
 			if hostName, ok := row.Data[hostNameAttrKey].(string); ok {
@@ -529,6 +532,9 @@ func (h *HostsRepo) GetHostList(ctx context.Context, orgID valuer.UUID, req mode
 			if load15, ok := row.Data["G"].(float64); ok {
 				record.Load15 = load15
 			}
+			if filesystem, ok := row.Data["F4"].(float64); ok {
+				record.Filesystem = filesystem
+			}
 			record.Meta = map[string]string{}
 			if _, ok := hostAttrs[record.HostName]; ok {
 				record.Meta = hostAttrs[record.HostName]

pkg/query-service/app/inframetrics/hosts_query.go

@@ -305,6 +305,94 @@ var HostsTableListQuery = v3.QueryRangeParamsV3{
 				Disabled:         false,
 				Legend:           "CPU Load Average (15m)",
 			},
+			"H": {
+				QueryName:  "H",
+				DataSource: v3.DataSourceMetrics,
+				AggregateAttribute: v3.AttributeKey{
+					Key:      metricNamesForHosts["filesystem"],
+					DataType: v3.AttributeKeyDataTypeFloat64,
+				},
+				Temporality: v3.Cumulative,
+				Filters: &v3.FilterSet{
+					Operator: "AND",
+					Items: []v3.FilterItem{
+						{
+							Key: v3.AttributeKey{
+								Key:      "state",
+								DataType: v3.AttributeKeyDataTypeString,
+								Type:     v3.AttributeKeyTypeTag,
+							},
+							Operator: v3.FilterOperatorEqual,
+							Value:    "used",
+						},
+						{
+							Key: v3.AttributeKey{
+								Key:      hostNameAttrKey,
+								DataType: v3.AttributeKeyDataTypeString,
+								Type:     v3.AttributeKeyTypeResource,
+							},
+							Operator: v3.FilterOperatorNotContains,
+							Value:    agentNameToIgnore,
+						},
+					},
+				},
+				GroupBy: []v3.AttributeKey{
+					{
+						Key:      hostNameAttrKey,
+						DataType: v3.AttributeKeyDataTypeString,
+						Type:     v3.AttributeKeyTypeResource,
+					},
+				},
+				Expression:       "H",
+				ReduceTo:         v3.ReduceToOperatorAvg,
+				TimeAggregation:  v3.TimeAggregationAvg,
+				SpaceAggregation: v3.SpaceAggregationSum,
+				Disabled:         true,
+			},
+			"I": {
+				QueryName:  "I",
+				DataSource: v3.DataSourceMetrics,
+				AggregateAttribute: v3.AttributeKey{
+					Key:      metricNamesForHosts["filesystem"],
+					DataType: v3.AttributeKeyDataTypeFloat64,
+				},
+				Temporality: v3.Cumulative,
+				Filters: &v3.FilterSet{
+					Operator: "AND",
+					Items: []v3.FilterItem{
+						{
+							Key: v3.AttributeKey{
+								Key:      hostNameAttrKey,
+								DataType: v3.AttributeKeyDataTypeString,
+								Type:     v3.AttributeKeyTypeResource,
+							},
+							Operator: v3.FilterOperatorNotContains,
+							Value:    agentNameToIgnore,
+						},
+					},
+				},
+				GroupBy: []v3.AttributeKey{
+					{
+						Key:      hostNameAttrKey,
+						DataType: v3.AttributeKeyDataTypeString,
+						Type:     v3.AttributeKeyTypeResource,
+					},
+				},
+				Expression:       "I",
+				ReduceTo:         v3.ReduceToOperatorAvg,
+				TimeAggregation:  v3.TimeAggregationAvg,
+				SpaceAggregation: v3.SpaceAggregationSum,
+				Disabled:         true,
+			},
+			"F4": {
+				QueryName:  "F4",
+				Expression: "H/I",
+				Legend:     "Disk Usage (%)",
+				Filters: &v3.FilterSet{
+					Operator: "AND",
+					Items:    []v3.FilterItem{},
+				},
+			},
 		},
 		PanelType: v3.PanelTypeTable,
 		QueryType: v3.QueryTypeBuilder,

pkg/query-service/model/infra.go

@@ -26,14 +26,15 @@ type HostListRequest struct {
 }
 
 type HostListRecord struct {
-	HostName string            `json:"hostName"`
-	Active   bool              `json:"active"`
-	OS       string            `json:"os"`
-	CPU      float64           `json:"cpu"`
-	Memory   float64           `json:"memory"`
-	Wait     float64           `json:"wait"`
-	Load15   float64           `json:"load15"`
-	Meta     map[string]string `json:"meta"`
+	HostName   string            `json:"hostName"`
+	Active     bool              `json:"active"`
+	OS         string            `json:"os"`
+	CPU        float64           `json:"cpu"`
+	Memory     float64           `json:"memory"`
+	Wait       float64           `json:"wait"`
+	Load15     float64           `json:"load15"`
+	Filesystem float64           `json:"filesystem"`
+	Meta       map[string]string `json:"meta"`
 }
 
 type HostListResponse struct {
@@ -65,6 +66,10 @@ func (r *HostListResponse) SortBy(orderBy *v3.OrderBy) {
 		sort.Slice(r.Records, func(i, j int) bool {
 			return r.Records[i].Wait > r.Records[j].Wait
 		})
+	case "filesystem":
+		sort.Slice(r.Records, func(i, j int) bool {
+			return r.Records[i].Filesystem > r.Records[j].Filesystem
+		})
 	}
 	// the default is descending
 	if orderBy.Order == v3.DirectionAsc {