ENG-836: k8s.node.start_time added in all node metrics

middleware-labs · Dec 14, 2023 · d854006 · d854006
1 parent b1f3254
commit d854006
Show file tree

Hide file tree

Showing 18 changed files with 73 additions and 9 deletions.
diff --git a/receiver/k8sclusterreceiver/documentation.md b/receiver/k8sclusterreceiver/documentation.md
@@ -434,6 +434,7 @@ Current status reason of the pod (1 - Evicted, 2 - NodeAffinity, 3 - NodeLost, 4
 | k8s.namespace.name | The k8s namespace name. | Any Str | true |
 | k8s.namespace.uid | The k8s namespace uid. | Any Str | true |
 | k8s.node.name | The k8s node name. | Any Str | true |
+| k8s.node.start_time | The start time of the Node. | Any Str | true |
 | k8s.node.uid | The k8s node uid. | Any Str | true |
 | k8s.pod.name | The k8s pod name. | Any Str | true |
 | k8s.pod.uid | The k8s pod uid. | Any Str | true |

diff --git a/receiver/k8sclusterreceiver/internal/metadata/generated_config.go b/receiver/k8sclusterreceiver/internal/metadata/generated_config.go
diff --git a/receiver/k8sclusterreceiver/internal/metadata/generated_config_test.go b/receiver/k8sclusterreceiver/internal/metadata/generated_config_test.go
diff --git a/receiver/k8sclusterreceiver/internal/metadata/generated_metrics_test.go b/receiver/k8sclusterreceiver/internal/metadata/generated_metrics_test.go
diff --git a/receiver/k8sclusterreceiver/internal/metadata/generated_resource.go b/receiver/k8sclusterreceiver/internal/metadata/generated_resource.go
diff --git a/receiver/k8sclusterreceiver/internal/metadata/generated_resource_test.go b/receiver/k8sclusterreceiver/internal/metadata/generated_resource_test.go
diff --git a/receiver/k8sclusterreceiver/internal/metadata/testdata/config.yaml b/receiver/k8sclusterreceiver/internal/metadata/testdata/config.yaml
@@ -126,6 +126,8 @@ all_set:
       enabled: true
     k8s.node.name:
       enabled: true
+    k8s.node.start_time:
+      enabled: true
     k8s.node.uid:
       enabled: true
     k8s.pod.name:
@@ -293,6 +295,8 @@ none_set:
       enabled: false
     k8s.node.name:
       enabled: false
+    k8s.node.start_time:
+      enabled: false
     k8s.node.uid:
       enabled: false
     k8s.pod.name:

diff --git a/receiver/k8sclusterreceiver/internal/node/nodes.go b/receiver/k8sclusterreceiver/internal/node/nodes.go
@@ -91,6 +91,7 @@ func CustomMetrics(set receiver.CreateSettings, rb *metadata.ResourceBuilder, no
 
 	rb.SetK8sNodeUID(string(node.UID))
 	rb.SetK8sNodeName(node.Name)
+	rb.SetK8sNodeStartTime(node.GetCreationTimestamp().String())
 	rb.SetOpencensusResourcetype("k8s")
 	rb.Emit().MoveTo(rm.Resource())
 	return rm

diff --git a/receiver/k8sclusterreceiver/metadata.yaml b/receiver/k8sclusterreceiver/metadata.yaml
@@ -70,6 +70,11 @@ resource_attributes:
     type: string
     enabled: true
 
+  k8s.node.start_time:
+    description: "The start time of the Node."
+    enabled: true
+    type: string
+
   container.id:
     description: The container id.
     type: string

diff --git a/receiver/kubeletstatsreceiver/documentation.md b/receiver/kubeletstatsreceiver/documentation.md
@@ -424,7 +424,8 @@ The time since the pod started
 | k8s.container.name | Container name used by container runtime | Any Str | true |
 | k8s.namespace.name | The name of the namespace that the pod is running in | Any Str | true |
 | k8s.node.name | The name of the Node | Any Str | true |
-| k8s.node.uid | The UID of the Node | Any Str | false |
+| k8s.node.start_time | The start time of the Node. | Any Str | true |
+| k8s.node.uid | The UID of the Node | Any Str | true |
 | k8s.persistentvolumeclaim.name | The name of the Persistent Volume Claim | Any Str | true |
 | k8s.pod.name | The name of the Pod | Any Str | true |
 | k8s.pod.uid | The UID of the Pod | Any Str | true |

diff --git a/receiver/kubeletstatsreceiver/internal/kubelet/accumulator.go b/receiver/kubeletstatsreceiver/internal/kubelet/accumulator.go
@@ -66,8 +66,8 @@ func (a *metricDataAccumulator) nodeStats(s stats.NodeStats) {
 	// todo s.Runtime.ImageFs
 	rb := a.mbs.NodeMetricsBuilder.NewResourceBuilder()
 	rb.SetK8sNodeName(s.NodeName)
-	rb.SetK8sNodeName(s.NodeName)
 	rb.SetK8sNodeUID(a.getNodeUID(s.NodeName))
+	rb.SetK8sNodeStartTime(s.StartTime.Time.String())
 	a.m = append(a.m, a.mbs.NodeMetricsBuilder.Emit(
 		metadata.WithStartTimeOverride(pcommon.NewTimestampFromTime(s.StartTime.Time)),
 		metadata.WithResource(rb.Emit()),

diff --git a/receiver/kubeletstatsreceiver/internal/metadata/generated_config.go b/receiver/kubeletstatsreceiver/internal/metadata/generated_config.go
diff --git a/receiver/kubeletstatsreceiver/internal/metadata/generated_config_test.go b/receiver/kubeletstatsreceiver/internal/metadata/generated_config_test.go
diff --git a/receiver/kubeletstatsreceiver/internal/metadata/generated_metrics_test.go b/receiver/kubeletstatsreceiver/internal/metadata/generated_metrics_test.go
diff --git a/receiver/kubeletstatsreceiver/internal/metadata/generated_resource.go b/receiver/kubeletstatsreceiver/internal/metadata/generated_resource.go
diff --git a/receiver/kubeletstatsreceiver/internal/metadata/generated_resource_test.go b/receiver/kubeletstatsreceiver/internal/metadata/generated_resource_test.go
diff --git a/receiver/kubeletstatsreceiver/internal/metadata/testdata/config.yaml b/receiver/kubeletstatsreceiver/internal/metadata/testdata/config.yaml
@@ -112,6 +112,8 @@ all_set:
       enabled: true
     k8s.node.name:
       enabled: true
+    k8s.node.start_time:
+      enabled: true
     k8s.node.uid:
       enabled: true
     k8s.persistentvolumeclaim.name:
@@ -185,7 +187,7 @@ none_set:
     k8s.node.uptime:
       enabled: false
     k8s.pod.cpu.time:
-      enabled: true
+      enabled: false
     k8s.pod.cpu.utilization:
       enabled: false
     k8s.pod.filesystem.available:
@@ -243,6 +245,8 @@ none_set:
       enabled: false
     k8s.node.name:
       enabled: false
+    k8s.node.start_time:
+      enabled: false
     k8s.node.uid:
       enabled: false
     k8s.persistentvolumeclaim.name:

diff --git a/receiver/kubeletstatsreceiver/metadata.yaml b/receiver/kubeletstatsreceiver/metadata.yaml
@@ -17,6 +17,10 @@ resource_attributes:
     description: "The name of the Node"
     enabled: true
     type: string
+  k8s.node.start_time:
+    description: "The start time of the Node."
+    enabled: true
+    type: string
   k8s.pod.uid:
     description: "The UID of the Pod"
     enabled: true