Include k8s.namespace.name and k8s.node.name into the metadata

Author: k-shaikh

receiver/k8sclusterreceiver/internal/constants/constants.go

@@ -22,6 +22,7 @@ const (
 	K8sKeyClusterResourceQuotaName  = "openshift.clusterquota.name"
 	K8sKeyNamespaceName             = "k8s.namespace.name"
 	K8sKeyPodName                   = "k8s.pod.name"
+	K8sKeyNodeName                  = "k8s.node.name"
 
 	// Kubernetes resource kinds
 	K8sKindCronJob               = "CronJob"

receiver/k8sclusterreceiver/internal/container/containers.go

@@ -114,6 +114,8 @@ func GetMetadata(pod *corev1.Pod, cs corev1.ContainerStatus, logger *zap.Logger)
 	mdata[containerName] = cs.Name
 	mdata[constants.K8sKeyPodName] = pod.Name
 	mdata[constants.K8sKeyPodUID] = string(pod.UID)
+	mdata[constants.K8sKeyNamespaceName] = pod.Namespace
+	mdata[constants.K8sKeyNodeName] = pod.Spec.NodeName
 
 	if cs.State.Running != nil {
 		mdata[containerKeyStatus] = containerStatusRunning

receiver/k8sclusterreceiver/internal/container/containers_test.go

@@ -25,6 +25,9 @@ func TestGetMetadata(t *testing.T) {
 			Namespace: "test-namespace",
 			UID:       types.UID("test-pod-uid"),
 		},
+		Spec: corev1.PodSpec{
+			NodeName: "test-node",
+		},
 	}
 
 	tests := []struct {
@@ -40,6 +43,8 @@ func TestGetMetadata(t *testing.T) {
 		containerImageTag  string
 		podName            string
 		podUID             string
+		nodeName           string
+		namespaceName      string
 	}{
 		{
 			name: "Running container",
@@ -57,6 +62,8 @@ func TestGetMetadata(t *testing.T) {
 			containerImageTag:  "v1.0",
 			podName:            pod.Name,
 			podUID:             string(pod.UID),
+			namespaceName:      "test-namespace",
+			nodeName:           "test-node",
 		},
 		{
 			name: "Terminated container",
@@ -79,6 +86,8 @@ func TestGetMetadata(t *testing.T) {
 			containerImageTag:  "v1.1",
 			podName:            pod.Name,
 			podUID:             string(pod.UID),
+			namespaceName:      "test-namespace",
+			nodeName:           "test-node",
 		},
 		{
 			name: "Waiting container",
@@ -96,6 +105,8 @@ func TestGetMetadata(t *testing.T) {
 			containerImageTag:  "latest",
 			podName:            pod.Name,
 			podUID:             string(pod.UID),
+			namespaceName:      "test-namespace",
+			nodeName:           "test-node",
 		},
 	}
 	logger := zap.NewNop()
@@ -123,6 +134,8 @@ func TestGetMetadata(t *testing.T) {
 			assert.Equal(t, tt.containerImageTag, md.Metadata[containerImageTag])
 			assert.Equal(t, tt.podName, md.Metadata[constants.K8sKeyPodName])
 			assert.Equal(t, tt.podUID, md.Metadata[constants.K8sKeyPodUID])
+			assert.Equal(t, tt.namespaceName, md.Metadata[constants.K8sKeyNamespaceName])
+			assert.Equal(t, tt.nodeName, md.Metadata[constants.K8sKeyNodeName])
 		})
 	}
 }

receiver/k8sclusterreceiver/watcher_test.go

@@ -338,6 +338,8 @@ func TestObjMetadata(t *testing.T) {
 						"k8s.container.name":           "container-name",
 						"k8s.pod.name":                 "test-pod-0",
 						"k8s.pod.uid":                  "test-pod-0-uid",
+						"k8s.namespace.name":           "test-namespace",
+						"k8s.node.name":                "test-node",
 					},
 				},
 			},