[processor/k8sattributes] Add support for DaemonSet attributes (open-…

…telemetry#12994) Co-authored-by: Dmitrii Anoshin <[email protected]>
sakulali · Aug 8, 2022 · baf4a8c · baf4a8c
1 parent 9eb2952
commit baf4a8c
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 3 deletions.
diff --git a/processor/k8sattributesprocessor/config.go b/processor/k8sattributesprocessor/config.go
@@ -75,7 +75,8 @@ type ExtractConfig struct {
  // Metadata fields supported right now are,
  // k8s.pod.name, k8s.pod.uid, k8s.deployment.name,
  // k8s.node.name, k8s.namespace.name, k8s.pod.start_time,
- // k8s.replicaset.name, and k8s.replicaset.uid
+ // k8s.replicaset.name, k8s.replicaset.uid,
+ // k8s.daemonset.name, and k8s.daemonset.uid
  //
  // Specifying anything other than these values will result in an error.
  // By default all of the fields are extracted and added to spans and metrics.

diff --git a/processor/k8sattributesprocessor/internal/kube/client.go b/processor/k8sattributesprocessor/internal/kube/client.go
@@ -300,15 +300,24 @@ func (c *WatchClient) extractPodAttributes(pod *api_v1.Pod) map[string]string {
  }
  }
 
- if c.Rules.ReplicaSetID || c.Rules.ReplicaSetName {
+ if c.Rules.ReplicaSetID || c.Rules.ReplicaSetName ||
+ c.Rules.DaemonSetUID || c.Rules.DaemonSetName {
  for _, ref := range pod.OwnerReferences {
- if ref.Kind == "ReplicaSet" {
+ switch ref.Kind {
+ case "ReplicaSet":
  if c.Rules.ReplicaSetID {
  tags[conventions.AttributeK8SReplicaSetUID] = string(ref.UID)
  }
  if c.Rules.ReplicaSetName {
  tags[conventions.AttributeK8SReplicaSetName] = ref.Name
  }
+ case "DaemonSet":
+ if c.Rules.DaemonSetUID {
+ tags[conventions.AttributeK8SDaemonSetUID] = string(ref.UID)
+ }
+ if c.Rules.DaemonSetName {
+ tags[conventions.AttributeK8SDaemonSetName] = ref.Name
+ }
  }
  }
  }

diff --git a/processor/k8sattributesprocessor/internal/kube/client_test.go b/processor/k8sattributesprocessor/internal/kube/client_test.go
@@ -455,6 +455,12 @@ func TestExtractionRules(t *testing.T) {
  Name: "auth-service-66f5996c7c",
  UID: "207ea729-c779-401d-8347-008ecbc137e3",
  },
+ {
+ APIVersion: "apps/v1",
+ Kind: "DaemonSet",
+ Name: "auth-daemonset",
+ UID: "c94d3814-2253-427a-ab13-2cf609e4dafa",
+ },
  },
  },
  Spec: api_v1.PodSpec{
@@ -497,6 +503,22 @@ func TestExtractionRules(t *testing.T) {
  attributes: map[string]string{
  "k8s.replicaset.name": "auth-service-66f5996c7c",
  },
+ }, {
+ name: "daemonsetUID",
+ rules: ExtractionRules{
+ DaemonSetUID: true,
+ },
+ attributes: map[string]string{
+ "k8s.daemonset.uid": "c94d3814-2253-427a-ab13-2cf609e4dafa",
+ },
+ }, {
+ name: "daemonsetName",
+ rules: ExtractionRules{
+ DaemonSetName: true,
+ },
+ attributes: map[string]string{
+ "k8s.daemonset.name": "auth-daemonset",
+ },
  }, {
  name: "metadata",
  rules: ExtractionRules{

diff --git a/processor/k8sattributesprocessor/internal/kube/kube.go b/processor/k8sattributesprocessor/internal/kube/kube.go
@@ -183,6 +183,8 @@ type FieldFilter struct {
 // from pods and added to the spans as tags.
 type ExtractionRules struct {
  Deployment bool
+ DaemonSetUID bool
+ DaemonSetName bool
  Namespace bool
  PodName bool
  PodUID bool

diff --git a/processor/k8sattributesprocessor/options.go b/processor/k8sattributesprocessor/options.go
@@ -102,6 +102,10 @@ func withExtractMetadata(fields ...string) option {
  p.rules.ReplicaSetName = true
  case conventions.AttributeK8SReplicaSetUID:
  p.rules.ReplicaSetID = true
+ case conventions.AttributeK8SDaemonSetName:
+ p.rules.DaemonSetName = true
+ case conventions.AttributeK8SDaemonSetUID:
+ p.rules.DaemonSetUID = true
  case metadataNode, conventions.AttributeK8SNodeName:
  p.rules.Node = true
  case conventions.AttributeContainerID:

diff --git a/unreleased/k8sattributes-daemonset.yaml b/unreleased/k8sattributes-daemonset.yaml
@@ -0,0 +1,16 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
+component: k8sattributesprocessor
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add support for discovering Kubernetes DaemonSet name and DaemonSet UID"
+
+# One or more tracking issues related to the change
+issues: [141]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext: