Fix annotation enrichment

[tetianakravchenko]

Signed-off-by: Tetiana Kravchenko [email protected]

What does this PR do?

node annotations enrichment doesn't work, with the config:

add_resource_metadata:
  node:
    include_annotations: ["test.annotation"]

events were not enriched with nodes annotation metadata

Why is it important?

Checklist

• My code follows the style guidelines of this project
• I have commented my code, particularly in hard-to-understand areas
• I have made corresponding changes to the documentation
• I have made corresponding change to the default configuration files
• I have added tests that prove my fix is effective or that my feature works
• I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

How to test this PR locally

1. Create a kind kubernetes cluster.
2. run metricbeat (how-to) with k8s configuration:

kubernetes.yml: |-
    - module: kubernetes
      metricsets:
        - node
        - system
        - pod
        - container
        - volume
      add_resource_metadata:
        node:
          include_annotations: ["another.annotation", "example.annotation"]
      period: 10s
      host: ${NODE_NAME}
      hosts: ["https://${NODE_NAME}:10250"]
      bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
      ssl.verification_mode: "none"

3. edit kind node so that the list of annotations include another.annotation and example.annotation:

$ kubectl describe node kind-control-plane
...
Annotations:        another.annotation: another
                    example.annotation: example
                    kubeadm.alpha.kubernetes.io/cri-socket: unix:///run/containerd/containerd.sock
                    node.alpha.kubernetes.io/ttl: 0
                    volumes.kubernetes.io/controller-managed-attach-detach: true
...

Related issues

• Closes Kubernetes: missing annotations enrichment #29597

Use cases

Screenshots

All node/namespace metadata:

note that annotations metadata were only added to pod and container metricsets:

Logs

[mergify]

This pull request does not have a backport label. Could you fix it @tetianakravchenko? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

• backport-v./d./d./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

[elasticmachine]

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

• Start Time: 2022-01-12T11:46:46.538+0000

• Duration: 105 min 48 sec

• Commit: 955ab99

Test stats 🧪

Test	Results
Failed	0
Passed	47850
Skipped	4284
Total	52134

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

• /test : Re-trigger the build.

• /package : Generate the packages and run the E2E tests.

• /beats-tester : Run the installation tests with beats-tester.

• run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

[elasticmachine]

Pinging @elastic/integrations (Team:Integrations)

[tetianakravchenko]

/package

[mergify]

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b add_resource_meta_enrichment upstream/add_resource_meta_enrichment
git merge upstream/master
git push upstream add_resource_meta_enrichment

[MichaelKatsoulis]

@tetianakravchenko great! Could you add some Kibana screenshots with the node annotations being added ?

[tetianakravchenko]

@MichaelKatsoulis I've added screenshots and the steps to reproduce test

[MichaelKatsoulis]

This is not very descriptive of your change. Something like Enrich kubernetes metadata with node annotations

[tetianakravchenko]

/package

[tetianakravchenko]

/package

[mergify]

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b add_resource_meta_enrichment upstream/add_resource_meta_enrichment
git merge upstream/master
git push upstream add_resource_meta_enrichment

[tetianakravchenko]

/package