[nr-k8s-otel-collector] fix: Fix daemonset collected metrics (#1639)

<!--
Thank you for contributing to New Relic's Helm charts. Before you submit
this PR we'd like to
make sure you are aware of our technical requirements:

*
https://github.com/newrelic-experimental/helm-charts/blob/master/CONTRIBUTING.md#technical-requirements

For a quick overview across what we will look at reviewing your PR,
please read
our review guidelines:

*
https://github.com/newrelic-experimental/helm-charts/blob/master/REVIEW_GUIDELINES.md

Following our best practices right from the start will accelerate the
review process and
help get your PR merged quicker.

When updates to your PR are requested, please add new commits and do not
squash the
history. This will make it easier to identify new changes. The PR will
be squashed
anyways when it is merged. Thanks.

For fast feedback, please @-mention maintainers that are listed in the
Chart.yaml file.

Please make sure you test your changes before you push them. Once
pushed, a Github Action
will run across your changes and do some initial checks and linting.
These checks run
very quickly. Please check the results. We would like these checks to
pass before we
even continue reviewing your changes.
-->
#### Is this a new chart

#### What this PR does / why we need it:

#### Which issue this PR fixes
*(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)`
format, will close that issue when PR gets merged)*
  - fixes #

#### Special notes for your reviewer:

#### Checklist
[Place an '[x]' (no spaces) in all applicable fields. Please remove
unrelated fields.]
- [X] Chart Version bumped
- [ ] Variables are documented in the README.md
- [X] Title of the PR starts with chart name (e.g. `[mychartname]`)

Author: dbudziwojskiNR

charts/nr-k8s-otel-collector/Chart.yaml

@@ -17,7 +17,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.8.3
+version: 0.8.4
 
 dependencies:
   - name: common-library

charts/nr-k8s-otel-collector/templates/daemonset-configmap.yaml

@@ -97,6 +97,9 @@ data:
                 - action: replace
                   target_label: job_label
                   replacement: cadvisor
+                - source_labels: [__meta_kubernetes_node_name]
+                  regex: ${KUBE_NODE_NAME}
+                  action: keep
               scheme: https
               tls_config:
                 ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
@@ -118,6 +121,9 @@ data:
                 - action: replace
                   target_label: job_label
                   replacement: kubelet
+                - source_labels: [__meta_kubernetes_node_name]
+                  regex: ${KUBE_NODE_NAME}
+                  action: keep
               scheme: https
               tls_config:
                 ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
@@ -447,29 +453,13 @@ data:
           - key: type
             action: delete
 
-      resourcedetection/env:
-        detectors: ["env", "system"]
-        override: false
-        system:
-          hostname_sources: ["os"]
-          resource_attributes:
-            host.id:
-              enabled: true
-
       resourcedetection/cloudproviders:
-        detectors: [gcp, eks, azure, aks, ec2, ecs]
+        detectors: [gcp, eks, ec2, aks, azure]
         timeout: 2s
         override: false
-        ec2:
-          resource_attributes:
-            host.name:
-              enabled: false
 
       resource:
         attributes:
-          - key: host.id
-            from_attribute: host.name
-            action: upsert
           # TODO (chris): Upsert only when cluster name not found (resource detection override: true)
           - key: k8s.cluster.name
             action: upsert
@@ -508,6 +498,7 @@ data:
             - k8s.pod.name
             - k8s.pod.uid
             - k8s.deployment.name
+            - k8s.daemonset.name
             - k8s.namespace.name
             - k8s.node.name
             - k8s.pod.start_time
@@ -519,11 +510,14 @@ data:
       attributes/self:
         actions:
           - key: k8s.pod.name
-            action: update
+            action: upsert
             from_attribute: pod
           - key: k8s.deployment.name
             action: update
             from_attribute: deployment
+          - key: k8s.daemonset.name
+            action: update
+            from_attribute: daemonset
           - key: k8s.node.name
             action: update
             from_attribute: node
@@ -594,15 +588,14 @@ data:
             - filter/exclude_system_paging
             - filter/exclude_network
             - attributes/exclude_system_paging
-            - resourcedetection/env
             - resourcedetection/cloudproviders
             - resource
             {{- if include "nrKubernetesOtel.lowDataMode" . }}
             - transform/low_data_mode_inator
             - resource/low_data_mode_inator
             {{- end }}
-            - k8sattributes
             - attributes/self
+            - k8sattributes
             - memory_limiter
             - cumulativetodelta
             - batch