From 0baf0e9453f149250e2ec6b2a25e5c102f355da6 Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Tue, 21 Jan 2025 23:25:15 +0530 Subject: [PATCH] chore: address some gaps in infra (#6871) --- .../InfraMonitoringK8s/Clusters/K8sClustersList.tsx | 3 ++- .../InfraMonitoringK8s/Deployments/K8sDeploymentsList.tsx | 3 ++- .../InfraMonitoringK8s/Namespaces/K8sNamespacesList.tsx | 3 ++- pkg/query-service/app/inframetrics/clusters.go | 5 +++-- pkg/query-service/app/inframetrics/daemonsets.go | 2 +- pkg/query-service/app/inframetrics/deployments.go | 2 +- pkg/query-service/app/inframetrics/jobs.go | 2 +- pkg/query-service/app/inframetrics/namespaces.go | 2 +- pkg/query-service/app/inframetrics/nodes.go | 2 +- pkg/query-service/app/inframetrics/pods.go | 2 +- pkg/query-service/app/inframetrics/pvcs.go | 2 +- pkg/query-service/app/inframetrics/statefulsets.go | 2 +- 12 files changed, 17 insertions(+), 13 deletions(-) diff --git a/frontend/src/container/InfraMonitoringK8s/Clusters/K8sClustersList.tsx b/frontend/src/container/InfraMonitoringK8s/Clusters/K8sClustersList.tsx index da29494f45..2b5eb9f9cc 100644 --- a/frontend/src/container/InfraMonitoringK8s/Clusters/K8sClustersList.tsx +++ b/frontend/src/container/InfraMonitoringK8s/Clusters/K8sClustersList.tsx @@ -164,7 +164,8 @@ function K8sClustersList({ } = useGetAggregateKeys( { dataSource: currentQuery.builder.queryData[0].dataSource, - aggregateAttribute: K8sEntityToAggregateAttributeMapping[K8sCategory.NODES], + aggregateAttribute: + K8sEntityToAggregateAttributeMapping[K8sCategory.CLUSTERS], aggregateOperator: 'noop', searchText: '', tagType: '', diff --git a/frontend/src/container/InfraMonitoringK8s/Deployments/K8sDeploymentsList.tsx b/frontend/src/container/InfraMonitoringK8s/Deployments/K8sDeploymentsList.tsx index 5e5d0ff489..3831a3d1e7 100644 --- a/frontend/src/container/InfraMonitoringK8s/Deployments/K8sDeploymentsList.tsx +++ b/frontend/src/container/InfraMonitoringK8s/Deployments/K8sDeploymentsList.tsx @@ -165,7 +165,8 @@ function K8sDeploymentsList({ } = useGetAggregateKeys( { dataSource: currentQuery.builder.queryData[0].dataSource, - aggregateAttribute: K8sEntityToAggregateAttributeMapping[K8sCategory.NODES], + aggregateAttribute: + K8sEntityToAggregateAttributeMapping[K8sCategory.DEPLOYMENTS], aggregateOperator: 'noop', searchText: '', tagType: '', diff --git a/frontend/src/container/InfraMonitoringK8s/Namespaces/K8sNamespacesList.tsx b/frontend/src/container/InfraMonitoringK8s/Namespaces/K8sNamespacesList.tsx index 0469bff802..4dc90954a0 100644 --- a/frontend/src/container/InfraMonitoringK8s/Namespaces/K8sNamespacesList.tsx +++ b/frontend/src/container/InfraMonitoringK8s/Namespaces/K8sNamespacesList.tsx @@ -164,7 +164,8 @@ function K8sNamespacesList({ } = useGetAggregateKeys( { dataSource: currentQuery.builder.queryData[0].dataSource, - aggregateAttribute: K8sEntityToAggregateAttributeMapping[K8sCategory.NODES], + aggregateAttribute: + K8sEntityToAggregateAttributeMapping[K8sCategory.NAMESPACES], aggregateOperator: 'noop', searchText: '', tagType: '', diff --git a/pkg/query-service/app/inframetrics/clusters.go b/pkg/query-service/app/inframetrics/clusters.go index d6af7ef09a..af1e098856 100644 --- a/pkg/query-service/app/inframetrics/clusters.go +++ b/pkg/query-service/app/inframetrics/clusters.go @@ -19,7 +19,8 @@ var ( clusterAttrsToEnrich = []string{"k8s_cluster_name"} - k8sClusterUIDAttrKey = "k8s_cluster_uid" + // TODO(srikanthccv): change this to k8s_cluster_uid after showing the missing data banner + k8sClusterUIDAttrKey = "k8s_cluster_name" queryNamesForClusters = map[string][]string{ "cpu": {"A"}, @@ -319,7 +320,7 @@ func (p *ClustersRepo) GetClusterList(ctx context.Context, req model.ClusterList } record.Meta = map[string]string{} - if _, ok := clusterAttrs[record.ClusterUID]; ok { + if _, ok := clusterAttrs[record.ClusterUID]; ok && record.ClusterUID != "" { record.Meta = clusterAttrs[record.ClusterUID] } diff --git a/pkg/query-service/app/inframetrics/daemonsets.go b/pkg/query-service/app/inframetrics/daemonsets.go index 05f4c1b9ab..74fe71a2d4 100644 --- a/pkg/query-service/app/inframetrics/daemonsets.go +++ b/pkg/query-service/app/inframetrics/daemonsets.go @@ -421,7 +421,7 @@ func (d *DaemonSetsRepo) GetDaemonSetList(ctx context.Context, req model.DaemonS } record.Meta = map[string]string{} - if _, ok := daemonSetAttrs[record.DaemonSetName]; ok { + if _, ok := daemonSetAttrs[record.DaemonSetName]; ok && record.DaemonSetName != "" { record.Meta = daemonSetAttrs[record.DaemonSetName] } diff --git a/pkg/query-service/app/inframetrics/deployments.go b/pkg/query-service/app/inframetrics/deployments.go index 691447c509..da11d48bba 100644 --- a/pkg/query-service/app/inframetrics/deployments.go +++ b/pkg/query-service/app/inframetrics/deployments.go @@ -421,7 +421,7 @@ func (d *DeploymentsRepo) GetDeploymentList(ctx context.Context, req model.Deplo } record.Meta = map[string]string{} - if _, ok := deploymentAttrs[record.DeploymentName]; ok { + if _, ok := deploymentAttrs[record.DeploymentName]; ok && record.DeploymentName != "" { record.Meta = deploymentAttrs[record.DeploymentName] } diff --git a/pkg/query-service/app/inframetrics/jobs.go b/pkg/query-service/app/inframetrics/jobs.go index 508a0014fb..52cf96b35b 100644 --- a/pkg/query-service/app/inframetrics/jobs.go +++ b/pkg/query-service/app/inframetrics/jobs.go @@ -475,7 +475,7 @@ func (d *JobsRepo) GetJobList(ctx context.Context, req model.JobListRequest) (mo } record.Meta = map[string]string{} - if _, ok := jobAttrs[record.JobName]; ok { + if _, ok := jobAttrs[record.JobName]; ok && record.JobName != "" { record.Meta = jobAttrs[record.JobName] } diff --git a/pkg/query-service/app/inframetrics/namespaces.go b/pkg/query-service/app/inframetrics/namespaces.go index 2e111aaeca..9772bdd6ab 100644 --- a/pkg/query-service/app/inframetrics/namespaces.go +++ b/pkg/query-service/app/inframetrics/namespaces.go @@ -322,7 +322,7 @@ func (p *NamespacesRepo) GetNamespaceList(ctx context.Context, req model.Namespa } record.Meta = map[string]string{} - if _, ok := namespaceAttrs[record.NamespaceName]; ok { + if _, ok := namespaceAttrs[record.NamespaceName]; ok && record.NamespaceName != "" { record.Meta = namespaceAttrs[record.NamespaceName] } diff --git a/pkg/query-service/app/inframetrics/nodes.go b/pkg/query-service/app/inframetrics/nodes.go index 2bac5dd212..3a941563a1 100644 --- a/pkg/query-service/app/inframetrics/nodes.go +++ b/pkg/query-service/app/inframetrics/nodes.go @@ -335,7 +335,7 @@ func (p *NodesRepo) GetNodeList(ctx context.Context, req model.NodeListRequest) } record.Meta = map[string]string{} - if _, ok := nodeAttrs[record.NodeUID]; ok { + if _, ok := nodeAttrs[record.NodeUID]; ok && record.NodeUID != "" { record.Meta = nodeAttrs[record.NodeUID] } diff --git a/pkg/query-service/app/inframetrics/pods.go b/pkg/query-service/app/inframetrics/pods.go index ce5bcfbd71..8f970c6b50 100644 --- a/pkg/query-service/app/inframetrics/pods.go +++ b/pkg/query-service/app/inframetrics/pods.go @@ -385,7 +385,7 @@ func (p *PodsRepo) GetPodList(ctx context.Context, req model.PodListRequest) (mo } record.Meta = map[string]string{} - if _, ok := podAttrs[record.PodUID]; ok { + if _, ok := podAttrs[record.PodUID]; ok && record.PodUID != "" { record.Meta = podAttrs[record.PodUID] } diff --git a/pkg/query-service/app/inframetrics/pvcs.go b/pkg/query-service/app/inframetrics/pvcs.go index c353dd9464..4b1a57b84a 100644 --- a/pkg/query-service/app/inframetrics/pvcs.go +++ b/pkg/query-service/app/inframetrics/pvcs.go @@ -355,7 +355,7 @@ func (p *PvcsRepo) GetPvcList(ctx context.Context, req model.VolumeListRequest) record.VolumeUsage = record.VolumeCapacity - record.VolumeAvailable record.Meta = map[string]string{} - if _, ok := volumeAttrs[record.PersistentVolumeClaimName]; ok { + if _, ok := volumeAttrs[record.PersistentVolumeClaimName]; ok && record.PersistentVolumeClaimName != "" { record.Meta = volumeAttrs[record.PersistentVolumeClaimName] } diff --git a/pkg/query-service/app/inframetrics/statefulsets.go b/pkg/query-service/app/inframetrics/statefulsets.go index f44ca77b6f..ef73e9c061 100644 --- a/pkg/query-service/app/inframetrics/statefulsets.go +++ b/pkg/query-service/app/inframetrics/statefulsets.go @@ -421,7 +421,7 @@ func (d *StatefulSetsRepo) GetStatefulSetList(ctx context.Context, req model.Sta } record.Meta = map[string]string{} - if _, ok := statefulSetAttrs[record.StatefulSetName]; ok { + if _, ok := statefulSetAttrs[record.StatefulSetName]; ok && record.StatefulSetName != "" { record.Meta = statefulSetAttrs[record.StatefulSetName] }