diff --git a/frontend/src/container/InfraMonitoringK8s/Clusters/ClusterDetails/constants.ts b/frontend/src/container/InfraMonitoringK8s/Clusters/ClusterDetails/constants.ts index 154b0da37724..58949d50811c 100644 --- a/frontend/src/container/InfraMonitoringK8s/Clusters/ClusterDetails/constants.ts +++ b/frontend/src/container/InfraMonitoringK8s/Clusters/ClusterDetails/constants.ts @@ -51,8 +51,8 @@ export const getClusterMetricsQueryPayload = ( const getKey = (dotKey: string, underscoreKey: string): string => dotMetricsEnabled ? dotKey : underscoreKey; const k8sPodCpuUtilizationKey = getKey( - 'k8s.pod.cpu.utilization', - 'k8s_pod_cpu_utilization', + 'k8s.pod.cpu.usage', + 'k8s_pod_cpu_usage', ); const k8sNodeAllocatableCpuKey = getKey( 'k8s.node.allocatable_cpu', @@ -146,7 +146,7 @@ export const getClusterMetricsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.Float64, - id: 'k8s_pod_cpu_utilization--float64--Gauge--true', + id: 'k8s_pod_cpu_usage--float64--Gauge--true', isColumn: true, isJSON: false, key: k8sPodCpuUtilizationKey, @@ -189,7 +189,7 @@ export const getClusterMetricsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.Float64, - id: 'k8s_pod_cpu_utilization--float64--Gauge--true', + id: 'k8s_pod_cpu_usage--float64--Gauge--true', isColumn: true, isJSON: false, key: k8sPodCpuUtilizationKey, @@ -232,7 +232,7 @@ export const getClusterMetricsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.Float64, - id: 'k8s_pod_cpu_utilization--float64--Gauge--true', + id: 'k8s_pod_cpu_usage--float64--Gauge--true', isColumn: true, isJSON: false, key: k8sPodCpuUtilizationKey, diff --git a/frontend/src/container/InfraMonitoringK8s/DaemonSets/DaemonSetDetails/constants.ts b/frontend/src/container/InfraMonitoringK8s/DaemonSets/DaemonSetDetails/constants.ts index b207c4ccc12c..53ac8bb76c06 100644 --- a/frontend/src/container/InfraMonitoringK8s/DaemonSets/DaemonSetDetails/constants.ts +++ b/frontend/src/container/InfraMonitoringK8s/DaemonSets/DaemonSetDetails/constants.ts @@ -33,8 +33,8 @@ export const getDaemonSetMetricsQueryPayload = ( dotMetricsEnabled: boolean, ): GetQueryResultsProps[] => { const k8sPodCpuUtilizationKey = dotMetricsEnabled - ? 'k8s.pod.cpu.utilization' - : 'k8s_pod_cpu_utilization'; + ? 'k8s.pod.cpu.usage' + : 'k8s_pod_cpu_usage'; const k8sContainerCpuRequestKey = dotMetricsEnabled ? 'k8s.container.cpu_request' @@ -84,7 +84,7 @@ export const getDaemonSetMetricsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.Float64, - id: 'k8s_pod_cpu_utilization--float64--Gauge--true', + id: 'k8s_pod_cpu_usage--float64--Gauge--true', isColumn: true, isJSON: false, key: k8sPodCpuUtilizationKey, diff --git a/frontend/src/container/InfraMonitoringK8s/Deployments/DeploymentDetails/constants.ts b/frontend/src/container/InfraMonitoringK8s/Deployments/DeploymentDetails/constants.ts index f334f4ada957..4600d8e11327 100644 --- a/frontend/src/container/InfraMonitoringK8s/Deployments/DeploymentDetails/constants.ts +++ b/frontend/src/container/InfraMonitoringK8s/Deployments/DeploymentDetails/constants.ts @@ -33,8 +33,8 @@ export const getDeploymentMetricsQueryPayload = ( dotMetricsEnabled: boolean, ): GetQueryResultsProps[] => { const k8sPodCpuUtilizationKey = dotMetricsEnabled - ? 'k8s.pod.cpu.utilization' - : 'k8s_pod_cpu_utilization'; + ? 'k8s.pod.cpu.usage' + : 'k8s_pod_cpu_usage'; const k8sContainerCpuRequestKey = dotMetricsEnabled ? 'k8s.container.cpu_request' @@ -80,7 +80,7 @@ export const getDeploymentMetricsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.Float64, - id: 'k8s_pod_cpu_utilization--float64--Gauge--true', + id: 'k8s_pod_cpu_usage--float64--Gauge--true', isColumn: true, isJSON: false, key: k8sPodCpuUtilizationKey, diff --git a/frontend/src/container/InfraMonitoringK8s/Jobs/JobDetails/constants.ts b/frontend/src/container/InfraMonitoringK8s/Jobs/JobDetails/constants.ts index e8bed7671bdd..80c515e63635 100644 --- a/frontend/src/container/InfraMonitoringK8s/Jobs/JobDetails/constants.ts +++ b/frontend/src/container/InfraMonitoringK8s/Jobs/JobDetails/constants.ts @@ -33,8 +33,8 @@ export const getJobMetricsQueryPayload = ( dotMetricsEnabled: boolean, ): GetQueryResultsProps[] => { const k8sPodCpuUtilizationKey = dotMetricsEnabled - ? 'k8s.pod.cpu.utilization' - : 'k8s_pod_cpu_utilization'; + ? 'k8s.pod.cpu.usage' + : 'k8s_pod_cpu_usage'; const k8sPodMemoryUsageKey = dotMetricsEnabled ? 'k8s.pod.memory.usage' : 'k8s_pod_memory_usage'; @@ -59,7 +59,7 @@ export const getJobMetricsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.Float64, - id: 'k8s_pod_cpu_utilization--float64--Gauge--true', + id: 'k8s_pod_cpu_usage--float64--Gauge--true', isColumn: true, isJSON: false, key: k8sPodCpuUtilizationKey, diff --git a/frontend/src/container/InfraMonitoringK8s/Namespaces/NamespaceDetails/constants.ts b/frontend/src/container/InfraMonitoringK8s/Namespaces/NamespaceDetails/constants.ts index 8c6f928e0fe7..64acc4aedacb 100644 --- a/frontend/src/container/InfraMonitoringK8s/Namespaces/NamespaceDetails/constants.ts +++ b/frontend/src/container/InfraMonitoringK8s/Namespaces/NamespaceDetails/constants.ts @@ -59,8 +59,8 @@ export const getNamespaceMetricsQueryPayload = ( const getKey = (dotKey: string, underscoreKey: string): string => dotMetricsEnabled ? dotKey : underscoreKey; const k8sPodCpuUtilizationKey = getKey( - 'k8s.pod.cpu.utilization', - 'k8s_pod_cpu_utilization', + 'k8s.pod.cpu.usage', + 'k8s_pod_cpu_usage', ); const k8sContainerCpuRequestKey = getKey( 'k8s.container.cpu_request', diff --git a/frontend/src/container/InfraMonitoringK8s/Nodes/NodeDetails/constants.ts b/frontend/src/container/InfraMonitoringK8s/Nodes/NodeDetails/constants.ts index 659fb0110bb9..429069e19521 100644 --- a/frontend/src/container/InfraMonitoringK8s/Nodes/NodeDetails/constants.ts +++ b/frontend/src/container/InfraMonitoringK8s/Nodes/NodeDetails/constants.ts @@ -59,8 +59,8 @@ export const getNodeMetricsQueryPayload = ( const getKey = (dotKey: string, underscoreKey: string): string => dotMetricsEnabled ? dotKey : underscoreKey; const k8sNodeCpuUtilizationKey = getKey( - 'k8s.node.cpu.utilization', - 'k8s_node_cpu_utilization', + 'k8s.node.cpu.usage', + 'k8s_node_cpu_usage', ); const k8sNodeAllocatableCpuKey = getKey( @@ -99,8 +99,8 @@ export const getNodeMetricsQueryPayload = ( ); const k8sPodCpuUtilizationKey = getKey( - 'k8s.pod.cpu.utilization', - 'k8s_pod_cpu_utilization', + 'k8s.pod.cpu.usage', + 'k8s_pod_cpu_usage', ); const k8sPodMemoryUsageKey = getKey( @@ -147,7 +147,7 @@ export const getNodeMetricsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.Float64, - id: 'k8s_node_cpu_utilization--float64--Gauge--true', + id: 'k8s_node_cpu_usage--float64--Gauge--true', isColumn: true, isJSON: false, key: k8sNodeCpuUtilizationKey, @@ -276,7 +276,7 @@ export const getNodeMetricsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.Float64, - id: 'k8s_node_cpu_utilization--float64--Gauge--true', + id: 'k8s_node_cpu_usage--float64--Gauge--true', isColumn: true, isJSON: false, key: k8sNodeCpuUtilizationKey, @@ -319,7 +319,7 @@ export const getNodeMetricsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.Float64, - id: 'k8s_node_cpu_utilization--float64--Gauge--true', + id: 'k8s_node_cpu_usage--float64--Gauge--true', isColumn: true, isJSON: false, key: k8sNodeCpuUtilizationKey, @@ -729,7 +729,7 @@ export const getNodeMetricsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.Float64, - id: 'k8s_node_cpu_utilization--float64--Gauge--true', + id: 'k8s_node_cpu_usage--float64--Gauge--true', isColumn: true, isJSON: false, key: k8sNodeCpuUtilizationKey, @@ -1079,7 +1079,7 @@ export const getNodeMetricsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.Float64, - id: 'k8s_pod_cpu_utilization--float64--Gauge--true', + id: 'k8s_pod_cpu_usage--float64--Gauge--true', isColumn: true, isJSON: false, key: k8sPodCpuUtilizationKey, diff --git a/frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/constants.ts b/frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/constants.ts index ca825d14f107..331a90a58262 100644 --- a/frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/constants.ts +++ b/frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/constants.ts @@ -72,10 +72,7 @@ export const getPodMetricsQueryPayload = ( dotMetricsEnabled ? dotKey : underscoreKey; const k8sContainerNameKey = getKey('k8s.container.name', 'k8s_container_name'); - const k8sPodCpuUtilKey = getKey( - 'k8s.pod.cpu.utilization', - 'k8s_pod_cpu_utilization', - ); + const k8sPodCpuUtilKey = getKey('k8s.pod.cpu.usage', 'k8s_pod_cpu_usage'); const k8sPodCpuReqUtilKey = getKey( 'k8s.pod.cpu_request_utilization', @@ -115,8 +112,8 @@ export const getPodMetricsQueryPayload = ( ); const containerCpuUtilKey = getKey( - 'container.cpu.utilization', - 'container_cpu_utilization', + 'container.cpu.usage', + 'container_cpu_usage', ); const k8sContainerCpuRequestKey = getKey( @@ -189,7 +186,7 @@ export const getPodMetricsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.Float64, - id: 'k8s_pod_cpu_utilization--float64--Gauge--true', + id: 'k8s_pod_cpu_usage--float64--Gauge--true', isColumn: true, isJSON: false, key: k8sPodCpuUtilKey, @@ -245,7 +242,7 @@ export const getPodMetricsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.Float64, - id: 'k8s_pod_cpu_utilization--float64--Gauge--true', + id: 'k8s_pod_cpu_usage--float64--Gauge--true', isColumn: true, isJSON: false, key: k8sPodCpuUtilKey, @@ -301,7 +298,7 @@ export const getPodMetricsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.Float64, - id: 'k8s_pod_cpu_utilization--float64--Gauge--true', + id: 'k8s_pod_cpu_usage--float64--Gauge--true', isColumn: true, isJSON: false, key: k8sPodCpuUtilKey, @@ -1570,7 +1567,7 @@ export const getPodMetricsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.Float64, - id: 'container_cpu_utilization--float64--Gauge--true', + id: 'container_cpu_usage--float64--Gauge--true', isColumn: true, isJSON: false, key: containerCpuUtilKey, @@ -1668,7 +1665,7 @@ export const getPodMetricsQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.Float64, - id: 'container_cpu_utilization--float64--Gauge--true', + id: 'container_cpu_usage--float64--Gauge--true', isColumn: true, isJSON: false, key: containerCpuUtilKey, diff --git a/frontend/src/container/InfraMonitoringK8s/StatefulSets/StatefulSetDetails/constants.ts b/frontend/src/container/InfraMonitoringK8s/StatefulSets/StatefulSetDetails/constants.ts index e9deda80b8e2..b2b453b99269 100644 --- a/frontend/src/container/InfraMonitoringK8s/StatefulSets/StatefulSetDetails/constants.ts +++ b/frontend/src/container/InfraMonitoringK8s/StatefulSets/StatefulSetDetails/constants.ts @@ -49,8 +49,8 @@ export const getStatefulSetMetricsQueryPayload = ( const k8sPodNameKey = dotMetricsEnabled ? 'k8s.pod.name' : 'k8s_pod_name'; const k8sPodCpuUtilKey = dotMetricsEnabled - ? 'k8s.pod.cpu.utilization' - : 'k8s_pod_cpu_utilization'; + ? 'k8s.pod.cpu.usage' + : 'k8s_pod_cpu_usage'; const k8sContainerCpuRequestKey = dotMetricsEnabled ? 'k8s.container.cpu_request' : 'k8s_container_cpu_request'; diff --git a/frontend/src/container/InfraMonitoringK8s/constants.ts b/frontend/src/container/InfraMonitoringK8s/constants.ts index 8206177d5c19..958ff00f9397 100644 --- a/frontend/src/container/InfraMonitoringK8s/constants.ts +++ b/frontend/src/container/InfraMonitoringK8s/constants.ts @@ -38,28 +38,28 @@ export const K8sCategories = { export const underscoreMap = { [K8sCategory.HOSTS]: 'system_cpu_load_average_15m', - [K8sCategory.PODS]: 'k8s_pod_cpu_utilization', - [K8sCategory.NODES]: 'k8s_node_cpu_utilization', - [K8sCategory.NAMESPACES]: 'k8s_pod_cpu_utilization', - [K8sCategory.CLUSTERS]: 'k8s_node_cpu_utilization', - [K8sCategory.DEPLOYMENTS]: 'k8s_pod_cpu_utilization', - [K8sCategory.STATEFULSETS]: 'k8s_pod_cpu_utilization', - [K8sCategory.DAEMONSETS]: 'k8s_pod_cpu_utilization', - [K8sCategory.CONTAINERS]: 'k8s_pod_cpu_utilization', + [K8sCategory.PODS]: 'k8s_pod_cpu_usage', + [K8sCategory.NODES]: 'k8s_node_cpu_usage', + [K8sCategory.NAMESPACES]: 'k8s_pod_cpu_usage', + [K8sCategory.CLUSTERS]: 'k8s_node_cpu_usage', + [K8sCategory.DEPLOYMENTS]: 'k8s_pod_cpu_usage', + [K8sCategory.STATEFULSETS]: 'k8s_pod_cpu_usage', + [K8sCategory.DAEMONSETS]: 'k8s_pod_cpu_usage', + [K8sCategory.CONTAINERS]: 'k8s_pod_cpu_usage', [K8sCategory.JOBS]: 'k8s_job_desired_successful_pods', [K8sCategory.VOLUMES]: 'k8s_volume_capacity', }; export const dotMap = { [K8sCategory.HOSTS]: 'system.cpu.load_average.15m', - [K8sCategory.PODS]: 'k8s.pod.cpu.utilization', - [K8sCategory.NODES]: 'k8s.node.cpu.utilization', - [K8sCategory.NAMESPACES]: 'k8s.pod.cpu.utilization', - [K8sCategory.CLUSTERS]: 'k8s.node.cpu.utilization', - [K8sCategory.DEPLOYMENTS]: 'k8s.pod.cpu.utilization', - [K8sCategory.STATEFULSETS]: 'k8s.pod.cpu.utilization', - [K8sCategory.DAEMONSETS]: 'k8s.pod.cpu.utilization', - [K8sCategory.CONTAINERS]: 'k8s.pod.cpu.utilization', + [K8sCategory.PODS]: 'k8s.pod.cpu.usage', + [K8sCategory.NODES]: 'k8s.node.cpu.usage', + [K8sCategory.NAMESPACES]: 'k8s.pod.cpu.usage', + [K8sCategory.CLUSTERS]: 'k8s.node.cpu.usage', + [K8sCategory.DEPLOYMENTS]: 'k8s.pod.cpu.usage', + [K8sCategory.STATEFULSETS]: 'k8s.pod.cpu.usage', + [K8sCategory.DAEMONSETS]: 'k8s.pod.cpu.usage', + [K8sCategory.CONTAINERS]: 'k8s.pod.cpu.usage', [K8sCategory.JOBS]: 'k8s.job.desired_successful_pods', [K8sCategory.VOLUMES]: 'k8s.volume.capacity', }; @@ -96,8 +96,8 @@ export function GetPodsQuickFiltersConfig( // Define aggregate attribute (metric) name const cpuUtilizationMetric = dotMetricsEnabled - ? 'k8s.pod.cpu.utilization' - : 'k8s_pod_cpu_utilization'; + ? 'k8s.pod.cpu.usage' + : 'k8s_pod_cpu_usage'; return [ { @@ -252,8 +252,8 @@ export function GetNodesQuickFiltersConfig( // Define aggregate metric name for node CPU utilization const cpuUtilMetric = dotMetricsEnabled - ? 'k8s.node.cpu.utilization' - : 'k8s_node_cpu_utilization'; + ? 'k8s.node.cpu.usage' + : 'k8s_node_cpu_usage'; const environmentKey = dotMetricsEnabled ? 'deployment.environment' : 'deployment_environment'; @@ -314,8 +314,8 @@ export function GetNamespaceQuickFiltersConfig( : 'k8s_namespace_name'; const clusterKey = dotMetricsEnabled ? 'k8s.cluster.name' : 'k8s_cluster_name'; const cpuUtilMetric = dotMetricsEnabled - ? 'k8s.pod.cpu.utilization' - : 'k8s_pod_cpu_utilization'; + ? 'k8s.pod.cpu.usage' + : 'k8s_pod_cpu_usage'; const environmentKey = dotMetricsEnabled ? 'deployment.environment' : 'deployment_environment'; @@ -373,8 +373,8 @@ export function GetClustersQuickFiltersConfig( ): IQuickFiltersConfig[] { const clusterKey = dotMetricsEnabled ? 'k8s.cluster.name' : 'k8s_cluster_name'; const cpuUtilMetric = dotMetricsEnabled - ? 'k8s.node.cpu.utilization' - : 'k8s_node_cpu_utilization'; + ? 'k8s.node.cpu.usage' + : 'k8s_node_cpu_usage'; const environmentKey = dotMetricsEnabled ? 'deployment.environment' : 'deployment_environment'; @@ -541,9 +541,7 @@ export function GetDeploymentsQuickFiltersConfig( ? 'k8s.namespace.name' : 'k8s_namespace_name'; const clusterKey = dotMetricsEnabled ? 'k8s.cluster.name' : 'k8s_cluster_name'; - const metric = dotMetricsEnabled - ? 'k8s.pod.cpu.utilization' - : 'k8s_pod_cpu_utilization'; + const metric = dotMetricsEnabled ? 'k8s.pod.cpu.usage' : 'k8s_pod_cpu_usage'; const environmentKey = dotMetricsEnabled ? 'deployment.environment' : 'deployment_environment'; @@ -622,9 +620,7 @@ export function GetStatefulsetsQuickFiltersConfig( ? 'k8s.namespace.name' : 'k8s_namespace_name'; const clusterKey = dotMetricsEnabled ? 'k8s.cluster.name' : 'k8s_cluster_name'; - const metric = dotMetricsEnabled - ? 'k8s.pod.cpu.utilization' - : 'k8s_pod_cpu_utilization'; + const metric = dotMetricsEnabled ? 'k8s.pod.cpu.usage' : 'k8s_pod_cpu_usage'; const environmentKey = dotMetricsEnabled ? 'deployment.environment' : 'deployment_environment'; @@ -704,8 +700,8 @@ export function GetDaemonsetsQuickFiltersConfig( : 'k8s_namespace_name'; const clusterKey = dotMetricsEnabled ? 'k8s.cluster.name' : 'k8s_cluster_name'; const metricName = dotMetricsEnabled - ? 'k8s.pod.cpu.utilization' - : 'k8s_pod_cpu_utilization'; + ? 'k8s.pod.cpu.usage' + : 'k8s_pod_cpu_usage'; const environmentKey = dotMetricsEnabled ? 'deployment.environment' : 'deployment_environment'; @@ -781,8 +777,8 @@ export function GetJobsQuickFiltersConfig( : 'k8s_namespace_name'; const clusterKey = dotMetricsEnabled ? 'k8s.cluster.name' : 'k8s_cluster_name'; const metricName = dotMetricsEnabled - ? 'k8s.pod.cpu.utilization' - : 'k8s_pod_cpu_utilization'; + ? 'k8s.pod.cpu.usage' + : 'k8s_pod_cpu_usage'; const environmentKey = dotMetricsEnabled ? 'deployment.environment' : 'deployment_environment'; diff --git a/frontend/src/container/LogDetailedView/InfraMetrics/constants.ts b/frontend/src/container/LogDetailedView/InfraMetrics/constants.ts index bd51208e771a..c16749cea186 100644 --- a/frontend/src/container/LogDetailedView/InfraMetrics/constants.ts +++ b/frontend/src/container/LogDetailedView/InfraMetrics/constants.ts @@ -17,8 +17,8 @@ export const getPodQueryPayload = ( : 'k8s_cluster_name'; const k8sPodNameKey = dotMetricsEnabled ? 'k8s.pod.name' : 'k8s_pod_name'; const containerCpuUtilKey = dotMetricsEnabled - ? 'container.cpu.utilization' - : 'container_cpu_utilization'; + ? 'container.cpu.usage' + : 'container_cpu_usage'; const containerMemUsageKey = dotMetricsEnabled ? 'container.memory.usage' : 'container_memory_usage'; @@ -63,7 +63,7 @@ export const getPodQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.Float64, - id: 'container_cpu_utilization--float64--Gauge--true', + id: 'container_cpu_usage--float64--Gauge--true', isColumn: true, isJSON: false, key: containerCpuUtilKey, @@ -231,7 +231,7 @@ export const getPodQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.Float64, - id: 'container_cpu_utilization--float64--Gauge--true', + id: 'container_cpu_usage--float64--Gauge--true', isColumn: true, isJSON: false, key: containerCpuUtilKey, @@ -385,7 +385,7 @@ export const getPodQueryPayload = ( { aggregateAttribute: { dataType: DataTypes.Float64, - id: 'container_cpu_utilization--float64--Gauge--true', + id: 'container_cpu_usage--float64--Gauge--true', isColumn: true, isJSON: false, key: containerCpuUtilKey, diff --git a/pkg/query-service/app/inframetrics/clusters.go b/pkg/query-service/app/inframetrics/clusters.go index 08860609fb31..dc69fd9be0b3 100644 --- a/pkg/query-service/app/inframetrics/clusters.go +++ b/pkg/query-service/app/inframetrics/clusters.go @@ -16,7 +16,7 @@ import ( ) var ( - metricToUseForClusters = GetDotMetrics("k8s_node_cpu_utilization") + metricToUseForClusters = GetDotMetrics("k8s_node_cpu_usage") clusterAttrsToEnrich = []string{GetDotMetrics("k8s_cluster_name")} diff --git a/pkg/query-service/app/inframetrics/common.go b/pkg/query-service/app/inframetrics/common.go index 7ee1edbd638e..d712096768b0 100644 --- a/pkg/query-service/app/inframetrics/common.go +++ b/pkg/query-service/app/inframetrics/common.go @@ -16,8 +16,6 @@ var dotMetricMap = map[string]string{ "host_name": "host.name", "k8s_cluster_name": "k8s.cluster.name", "k8s_node_name": "k8s.node.name", - "k8s_node_cpu_utilization": "k8s.node.cpu.utilization", - "k8s_pod_cpu_utilization": "k8s.pod.cpu.utilization", "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", @@ -107,7 +105,6 @@ var dotMetricMap = map[string]string{ "k8s_pod_uptime": "k8s.pod.uptime", "container_cpu_usage": "container.cpu.usage", - "container_cpu_utilization": "container.cpu.utilization", "container_cpu_time": "container.cpu.time", "container_memory_available": "container.memory.available", "container_memory_usage": "container.memory.usage", @@ -209,7 +206,7 @@ WHERE metric_name IN (%s) var ( // TODO(srikanthccv): import metadata yaml from receivers and use generated files to check the metrics podMetricNamesToCheck = []string{ - GetDotMetrics("k8s_pod_cpu_utilization"), + GetDotMetrics("k8s_pod_cpu_usage"), GetDotMetrics("k8s_pod_memory_usage"), GetDotMetrics("k8s_pod_cpu_request_utilization"), GetDotMetrics("k8s_pod_memory_request_utilization"), @@ -219,7 +216,7 @@ var ( GetDotMetrics("k8s_pod_phase"), } nodeMetricNamesToCheck = []string{ - GetDotMetrics("k8s_node_cpu_utilization"), + GetDotMetrics("k8s_node_cpu_usage"), GetDotMetrics("k8s_node_allocatable_cpu"), GetDotMetrics("k8s_node_memory_usage"), GetDotMetrics("k8s_node_allocatable_memory"), diff --git a/pkg/query-service/app/inframetrics/daemonsets.go b/pkg/query-service/app/inframetrics/daemonsets.go index 85b31248b286..a5234b637cb8 100644 --- a/pkg/query-service/app/inframetrics/daemonsets.go +++ b/pkg/query-service/app/inframetrics/daemonsets.go @@ -16,7 +16,7 @@ import ( ) var ( - metricToUseForDaemonSets = GetDotMetrics("k8s_pod_cpu_utilization") + metricToUseForDaemonSets = GetDotMetrics("k8s_pod_cpu_usage") k8sDaemonSetNameAttrKey = GetDotMetrics("k8s_daemonset_name") metricNamesForDaemonSets = map[string]string{ diff --git a/pkg/query-service/app/inframetrics/deployments.go b/pkg/query-service/app/inframetrics/deployments.go index 3645d1a33a73..f06647d21734 100644 --- a/pkg/query-service/app/inframetrics/deployments.go +++ b/pkg/query-service/app/inframetrics/deployments.go @@ -16,7 +16,7 @@ import ( ) var ( - metricToUseForDeployments = GetDotMetrics("k8s_pod_cpu_utilization") + metricToUseForDeployments = GetDotMetrics("k8s_pod_cpu_usage") k8sDeploymentNameAttrKey = GetDotMetrics("k8s_deployment_name") metricNamesForDeployments = map[string]string{ diff --git a/pkg/query-service/app/inframetrics/namespaces.go b/pkg/query-service/app/inframetrics/namespaces.go index 32606d7282a5..d4a571047a0d 100644 --- a/pkg/query-service/app/inframetrics/namespaces.go +++ b/pkg/query-service/app/inframetrics/namespaces.go @@ -16,7 +16,7 @@ import ( ) var ( - metricToUseForNamespaces = GetDotMetrics("k8s_pod_cpu_utilization") + metricToUseForNamespaces = GetDotMetrics("k8s_pod_cpu_usage") namespaceAttrsToEnrich = []string{ GetDotMetrics("k8s_namespace_name"), diff --git a/pkg/query-service/app/inframetrics/nodes.go b/pkg/query-service/app/inframetrics/nodes.go index df0095a791aa..6fe442cfc46a 100644 --- a/pkg/query-service/app/inframetrics/nodes.go +++ b/pkg/query-service/app/inframetrics/nodes.go @@ -3,6 +3,10 @@ package inframetrics import ( "context" "fmt" + "math" + "sort" + "strings" + "github.com/SigNoz/signoz/pkg/query-service/app/metrics/v4/helpers" "github.com/SigNoz/signoz/pkg/query-service/common" "github.com/SigNoz/signoz/pkg/query-service/constants" @@ -12,13 +16,10 @@ import ( "github.com/SigNoz/signoz/pkg/query-service/postprocess" "github.com/SigNoz/signoz/pkg/valuer" "golang.org/x/exp/slices" - "math" - "sort" - "strings" ) var ( - metricToUseForNodes = GetDotMetrics("k8s_node_cpu_utilization") + metricToUseForNodes = GetDotMetrics("k8s_node_cpu_usage") nodeAttrsToEnrich = []string{GetDotMetrics("k8s_node_name"), GetDotMetrics("k8s_node_uid"), GetDotMetrics("k8s_cluster_name")} @@ -33,7 +34,7 @@ var ( nodeQueryNames = []string{"A", "B", "C", "D", "E", "F"} metricNamesForNodes = map[string]string{ - "cpu": GetDotMetrics("k8s_node_cpu_utilization"), + "cpu": GetDotMetrics("k8s_node_cpu_usage"), "cpu_allocatable": GetDotMetrics("k8s_node_allocatable_cpu"), "memory": GetDotMetrics("k8s_node_memory_usage"), "memory_allocatable": GetDotMetrics("k8s_node_allocatable_memory"), diff --git a/pkg/query-service/app/inframetrics/pods.go b/pkg/query-service/app/inframetrics/pods.go index d3a5a32325d5..63649706e082 100644 --- a/pkg/query-service/app/inframetrics/pods.go +++ b/pkg/query-service/app/inframetrics/pods.go @@ -19,7 +19,7 @@ import ( ) var ( - metricToUseForPods = GetDotMetrics("k8s_pod_cpu_utilization") + metricToUseForPods = GetDotMetrics("k8s_pod_cpu_usage") podAttrsToEnrich = []string{ GetDotMetrics("k8s_pod_uid"), @@ -49,7 +49,7 @@ var ( podQueryNames = []string{"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K"} metricNamesForPods = map[string]string{ - "cpu": GetDotMetrics("k8s_pod_cpu_utilization"), + "cpu": GetDotMetrics("k8s_pod_cpu_usage"), "cpu_request": GetDotMetrics("k8s_pod_cpu_request_utilization"), "cpu_limit": GetDotMetrics("k8s_pod_cpu_limit_utilization"), "memory": GetDotMetrics("k8s_pod_memory_usage"), diff --git a/pkg/query-service/app/inframetrics/statefulsets.go b/pkg/query-service/app/inframetrics/statefulsets.go index db9a68ff7d30..f5f05638eed6 100644 --- a/pkg/query-service/app/inframetrics/statefulsets.go +++ b/pkg/query-service/app/inframetrics/statefulsets.go @@ -16,7 +16,7 @@ import ( ) var ( - metricToUseForStatefulSets = GetDotMetrics("k8s_pod_cpu_utilization") + metricToUseForStatefulSets = GetDotMetrics("k8s_pod_cpu_usage") k8sStatefulSetNameAttrKey = GetDotMetrics("k8s_statefulset_name") metricNamesForStatefulSets = map[string]string{ diff --git a/pkg/query-service/app/inframetrics/workload_query.go b/pkg/query-service/app/inframetrics/workload_query.go index 0bc2a1f8838d..296f3dbf3c57 100644 --- a/pkg/query-service/app/inframetrics/workload_query.go +++ b/pkg/query-service/app/inframetrics/workload_query.go @@ -4,7 +4,7 @@ import v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" var ( metricNamesForWorkloads = map[string]string{ - "cpu": GetDotMetrics("k8s_pod_cpu_utilization"), + "cpu": GetDotMetrics("k8s_pod_cpu_usage"), "cpu_request": GetDotMetrics("k8s_pod_cpu_request_utilization"), "cpu_limit": GetDotMetrics("k8s_pod_cpu_limit_utilization"), "memory": GetDotMetrics("k8s_pod_memory_usage"), diff --git a/pkg/query-service/utils/format.go b/pkg/query-service/utils/format.go index a6d7cdcec79a..77435222881f 100644 --- a/pkg/query-service/utils/format.go +++ b/pkg/query-service/utils/format.go @@ -235,7 +235,7 @@ func ClickHouseFormattedMetricNames(v interface{}) string { if name, ok := v.(string); ok { transitionedMetrics := metrics.GetTransitionedMetric(name, !constants.IsDotMetricsEnabled) if transitionedMetrics != name { - return ClickHouseFormattedValue([]interface{}{name, transitionedMetrics}) + return ClickHouseFormattedValue([]interface{}{transitionedMetrics}) } else { return ClickHouseFormattedValue([]interface{}{name}) }