Merge branch 'master' into pbeckwith/otel-pipelines

Author: Philip-R-Beckwith

charts/nr-k8s-otel-collector/README.md

@@ -34,12 +34,12 @@ kubectl logs <otel-pod-name> -n newrelic
 ```
 
 ### Confirm data coming through in New Relic
-You should see data reporting into New Relic within a couple of seconds to the `InfrastructureEvent` table, `Metric` table, and `Log` tables.
+You should see data reporting into New Relic within a couple of seconds to the `OtlpInfrastructureEvent` table, `Metric` table, and `Log` tables.
 ```
 FROM Metric SELECT * WHERE k8s.cluster.name='<CLUSTER_NAME>'
 ```
 ```
-FROM InfrastructureEvent SELECT * WHERE k8s.cluster.name='<CLUSTER_NAME>'
+FROM OtlpInfrastructureEvent SELECT * WHERE k8s.cluster.name='<CLUSTER_NAME>'
 ```
 ```
 FROM Log SELECT * WHERE k8s.cluster.name='<CLUSTER_NAME>'

charts/nr-k8s-otel-collector/README.md.gotmpl

@@ -37,12 +37,12 @@ kubectl logs <otel-pod-name> -n newrelic
 ```
 
 ### Confirm data coming through in New Relic
-You should see data reporting into New Relic within a couple of seconds to the `InfrastructureEvent` table, `Metric` table, and `Log` tables.
+You should see data reporting into New Relic within a couple of seconds to the `OtlpInfrastructureEvent` table, `Metric` table, and `Log` tables.
 ```
 FROM Metric SELECT * WHERE k8s.cluster.name='<CLUSTER_NAME>'
 ```
 ```
-FROM InfrastructureEvent SELECT * WHERE k8s.cluster.name='<CLUSTER_NAME>'
+FROM OtlpInfrastructureEvent SELECT * WHERE k8s.cluster.name='<CLUSTER_NAME>'
 ```
 ```
 FROM Log SELECT * WHERE k8s.cluster.name='<CLUSTER_NAME>'

charts/nr-k8s-otel-collector/examples/k8s/rendered/daemonset-configmap.yaml

@@ -635,6 +635,12 @@ data:
           - context: metric
             condition: instrumentation_scope.name == "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper"
             pipelines: [metrics/nr]
+          - context: metric
+            condition: instrumentation_scope.name == "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/pagingscraper"
+            pipelines: [metrics/nr]
+          - context: metric
+            condition: instrumentation_scope.name == "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver"
+            pipelines: [metrics/nr_prometheus_cadv_kubelet]
           - context: metric
             condition: instrumentation_scope.name == "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver"
             pipelines: [metrics/nr]

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

@@ -653,6 +653,12 @@ data:
           - context: metric
             condition: instrumentation_scope.name == "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper"
             pipelines: [metrics/nr]
+          - context: metric
+            condition: instrumentation_scope.name == "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/pagingscraper"
+            pipelines: [metrics/nr]
+          - context: metric
+            condition: instrumentation_scope.name == "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver"
+            pipelines: [metrics/nr_prometheus_cadv_kubelet]
           - context: metric
             condition: instrumentation_scope.name == "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver"
             pipelines: [metrics/nr]

charts/nri-bundle/Chart.lock

@@ -1,25 +1,25 @@
 dependencies:
 - name: newrelic-infrastructure
   repository: https://newrelic.github.io/nri-kubernetes
-  version: 3.47.1
+  version: 3.47.2
 - name: nri-prometheus
   repository: https://newrelic.github.io/nri-prometheus
-  version: 2.1.20
+  version: 2.1.21
 - name: newrelic-prometheus-agent
   repository: https://newrelic.github.io/newrelic-prometheus-configurator
-  version: 2.0.0
+  version: 2.0.1
 - name: nri-metadata-injection
   repository: https://newrelic.github.io/k8s-metadata-injection
-  version: 4.26.2
+  version: 4.26.3
 - name: newrelic-k8s-metrics-adapter
   repository: https://newrelic.github.io/newrelic-k8s-metrics-adapter
-  version: 1.15.1
+  version: 1.15.2
 - name: kube-state-metrics
   repository: https://prometheus-community.github.io/helm-charts
   version: 5.30.1
 - name: nri-kube-events
   repository: https://newrelic.github.io/nri-kube-events
-  version: 3.13.1
+  version: 3.13.2
 - name: newrelic-logging
   repository: https://newrelic.github.io/helm-charts
   version: 1.28.0
@@ -37,6 +37,6 @@ dependencies:
   version: 0.1.7
 - name: newrelic-infra-operator
   repository: https://newrelic.github.io/newrelic-infra-operator
-  version: 2.14.1
-digest: sha256:d71b0fc530b36778a13a93cc2176a77b8af3907ab0bb045593740d00230583b8
-generated: "2025-06-17T07:07:29.524099967Z"
+  version: 2.14.2
+digest: sha256:42a17a15534b0e178a2b807195f887ee8ce1842b49ba0dcd322b8bd7946d0afc
+generated: "2025-06-24T10:36:45.647733163Z"

charts/nri-bundle/Chart.yaml

@@ -18,33 +18,33 @@ sources:
   - https://github.com/newrelic/newrelic-infra-operator/tree/master/charts/newrelic-infra-operator
   - https://github.com/newrelic/k8s-agents-operator/tree/master/charts/k8s-agents-operator
 
-version: 6.0.2
+version: 6.0.3
 
 dependencies:
   - name: newrelic-infrastructure
     repository: https://newrelic.github.io/nri-kubernetes
     condition: infrastructure.enabled,newrelic-infrastructure.enabled
-    version: 3.47.1
+    version: 3.47.2
 
   - name: nri-prometheus
     repository: https://newrelic.github.io/nri-prometheus
     condition: prometheus.enabled,nri-prometheus.enabled
-    version: 2.1.20
+    version: 2.1.21
 
   - name: newrelic-prometheus-agent
     repository: https://newrelic.github.io/newrelic-prometheus-configurator
     condition: newrelic-prometheus-agent.enabled
-    version: 2.0.0
+    version: 2.0.1
 
   - name: nri-metadata-injection
     repository: https://newrelic.github.io/k8s-metadata-injection
     condition: webhook.enabled,nri-metadata-injection.enabled
-    version: 4.26.2
+    version: 4.26.3
 
   - name: newrelic-k8s-metrics-adapter
     repository: https://newrelic.github.io/newrelic-k8s-metrics-adapter
     condition: metrics-adapter.enabled,newrelic-k8s-metrics-adapter.enabled
-    version: 1.15.1
+    version: 1.15.2
 
   - name: kube-state-metrics
     version: 5.30.1
@@ -54,7 +54,7 @@ dependencies:
   - name: nri-kube-events
     repository: https://newrelic.github.io/nri-kube-events
     condition: kubeEvents.enabled,nri-kube-events.enabled
-    version: 3.13.1
+    version: 3.13.2
 
   - name: newrelic-logging
     repository: https://newrelic.github.io/helm-charts
@@ -88,7 +88,7 @@ dependencies:
   - name: newrelic-infra-operator
     repository: https://newrelic.github.io/newrelic-infra-operator
     condition: newrelic-infra-operator.enabled
-    version: 2.14.1
+    version: 2.14.2
 
 maintainers:
   - name: Philip-R-Beckwith