feat(metrics): Added node labels to the upstream k8satrributeprocessor's config and updated integration tests

.changelog/3976.added.txt

@@ -0,0 +1 @@
+feat: added node labels to the upstream K8sattribute processor's config

deploy/helm/sumologic/conf/logs/otelcol/config.yaml

@@ -329,13 +329,19 @@ processors:
         - key_regex: "(.*)"
           tag_name: "namespace_labels_$$1"
           from: namespace
+        - key_regex: "(.*)" 
+          tag_name: "node_labels_$$1"
+          from: node
       annotations:
         - key_regex: "(.*)"
           tag_name: "pod_annotations_$$1"
           from: pod
         - key_regex: "(.*)"
           tag_name: "namespace_annotations_$$1"
           from: namespace
+        - key_regex: "(.*)" 
+          tag_name: "node_annotations_$$1"
+          from: node
       metadata:
         ## extract the following well-known metadata fields
         - k8s.pod.name

deploy/helm/sumologic/conf/metrics/otelcol/processors.yaml

@@ -63,6 +63,9 @@ k8sattributes:
       - key_regex: "(.*)"
         tag_name: "pod_labels_$$1"
         from: pod
+      - key_regex: "(.*)" 
+        tag_name: "node_labels_$$1"
+        from: node
     metadata:
       ## extract the following well-known metadata fields
       - k8s.pod.name

tests/helm/testdata/goldenfile/metadata_logs_otc/k8sattributes.output.yaml

@@ -163,13 +163,19 @@ data:
           - from: namespace
             key_regex: (.*)
             tag_name: namespace_annotations_$$1
+          - from: node
+            key_regex: (.*)
+            tag_name: node_annotations_$$1
           labels:
           - from: pod
             key_regex: (.*)
             tag_name: pod_labels_$$1
           - from: namespace
             key_regex: (.*)
             tag_name: namespace_labels_$$1
+          - from: node
+            key_regex: (.*)
+            tag_name: node_labels_$$1
           metadata:
           - k8s.pod.name
           - k8s.pod.uid

tests/integration/features.go

@@ -94,22 +94,28 @@ func GetMetricsK8sattributes(expectedMetrics []string, metricsCollector MetricsC
 				}
 				namespace := ctxopts.Namespace(ctx)
 				expectedLabels := sumologicmock.Labels{
-					"cluster":                      "kubernetes",
-					"_origin":                      "kubernetes",
-					"container":                    "sumologic-mock",
-					"deployment":                   deployment,
-					"endpoint":                     "https-metrics",
-					"image":                        "sumologic/sumologic-mock:.*",
-					"job":                          "kubelet",
-					"metrics_path":                 "/metrics/cadvisor",
-					"namespace":                    ctxopts.Namespace(ctx),
-					"node":                         internal.NodeNameRegex,
-					"pod_labels_app":               deployment,
-					"pod_labels_pod-template-hash": ".+",
-					"pod":                          podList.Items[0].Name,
-					"replicaset":                   fmt.Sprintf("%s-.*", deployment),
-					"service":                      deployment,
-					"service.namespace":            ctxopts.Namespace(ctx),
+					"cluster":                             "kubernetes",
+					"_origin":                             "kubernetes",
+					"container":                           "sumologic-mock",
+					"deployment":                          deployment,
+					"endpoint":                            "https-metrics",
+					"image":                               "sumologic/sumologic-mock:.*",
+					"job":                                 "kubelet",
+					"metrics_path":                        "/metrics/cadvisor",
+					"namespace":                           ctxopts.Namespace(ctx),
+					"node":                                internal.NodeNameRegex,
+					"pod_labels_app":                      deployment,
+					"pod_labels_pod-template-hash":        ".+",
+					"pod":                                 podList.Items[0].Name,
+					"replicaset":                          fmt.Sprintf("%s-.*", deployment),
+					"service":                             deployment,
+					"service.namespace":                   ctxopts.Namespace(ctx),
+					"k8s.node.uid":                        internal.UIDRegex,
+					"node_labels_beta.kubernetes.io/os":   internal.NodeLabelOSRegex,
+					"node_labels_beta.kubernetes.io/arch": internal.NodeLabelArchRegex,
+					"node_labels_kubernetes.io/hostname":  internal.NodeLabelHostnameRegex,
+					"node_labels_kubernetes.io/os":        internal.NodeLabelOSRegex,
+					"node_labels_kubernetes.io/arch":      internal.NodeLabelArchRegex,
 				}
 				expectedLabels = addCollectorSpecificMetricLabels(expectedLabels, releaseName, namespace, metricsCollector)
 

tests/integration/helm_k8s_processor_test.go

@@ -15,6 +15,7 @@ func Test_Helm_K8s_Processor(t *testing.T) {
 	expectedMetrics := internal.DefaultExpectedMetrics
 	// we have tracing enabled, so check tracing-specific metrics
 	expectedMetrics = append(expectedMetrics, internal.TracingOtelcolMetrics...)
+	expectedMetrics = append(expectedMetrics, internal.NodeLabelsMetrics...)
 
 	installChecks := []featureCheck{
 		CheckSumologicSecret(15),

tests/integration/internal/constants.go

@@ -78,6 +78,10 @@ const (
 	NodeNameRegex            = ".*-control-plane" // node name for KinD TODO: get this from the cluster directly instead
 	NotUndefinedRegex        = "(?!undefined$).*"
 	EmptyRegex               = "^$"
+	UIDRegex                 = "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"
+	NodeLabelHostnameRegex   = "^[a-zA-Z0-9]([a-zA-Z0-9\\._-]{0,61}[a-zA-Z0-9])?$"
+	NodeLabelOSRegex         = "^(linux|windows|osx)$"
+	NodeLabelArchRegex       = "amd64|arm64"
 )
 
 // metrics we expect the receiver to get
@@ -258,6 +262,10 @@ var (
 		"otelcol_fileconsumer_reading_files",
 		"otelcol_fileconsumer_open_files",
 	}
+	NodeLabelsMetrics = []string{
+		"otelcol_otelsvc_k8s_node_updated",
+		"otelcol_otelsvc_k8s_node_added",
+	}
 	TracingOtelcolMetrics = []string{ // not used by any App
 		"otelcol_loadbalancer_num_backend_updates",
 		"otelcol_loadbalancer_num_backends",