Merge branch 'master' into kang-makes/add-more-unittest-to-super-agent

charts/newrelic-logging/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
 description: A Helm chart to deploy New Relic Kubernetes Logging as a DaemonSet, supporting both Linux and Windows nodes and containers
 name: newrelic-logging
-version: 1.22.4
-appVersion: 2.0.0
+version: 1.23.0
+appVersion: 2.0.2
 home: https://github.com/newrelic/kubernetes-logging
 icon: https://newrelic.com/assets/newrelic/source/NewRelic-logo-square.svg
 maintainers:

charts/newrelic-logging/tests/images_test.yaml

@@ -17,16 +17,16 @@ tests:
     asserts:
       - equal:
           path: spec.template.spec.containers[0].image
-          value: newrelic/newrelic-fluentbit-output:2.0.0
+          value: newrelic/newrelic-fluentbit-output:2.0.2
         template: templates/daemonset.yaml
       - equal:
           path: spec.template.spec.containers[0].image
-          value: newrelic/newrelic-fluentbit-output:2.0.0-windows-ltsc-2019
+          value: newrelic/newrelic-fluentbit-output:2.0.2-windows-ltsc-2019
         template: templates/daemonset-windows.yaml
         documentIndex: 0
       - equal:
           path: spec.template.spec.containers[0].image
-          value: newrelic/newrelic-fluentbit-output:2.0.0-windows-ltsc-2022
+          value: newrelic/newrelic-fluentbit-output:2.0.2-windows-ltsc-2022
         template: templates/daemonset-windows.yaml
         documentIndex: 1
   - it: global registry is used if set

charts/nr-ebpf-agent/Chart.yaml

@@ -13,7 +13,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.1.4
+version: 0.1.5
 dependencies:
   - name: common-library
     version: 1.1.1

charts/nr-ebpf-agent/README.md

@@ -91,7 +91,7 @@ Options that can be defined globally include `affinity`, `nodeSelector`, `tolera
 | labels | object | `{}` | Additional labels for chart objects |
 | licenseKey | string | `""` | The license key to use. Can be configured with `global.licenseKey` |
 | nodeSelector | object | `{}` | Sets all pods' node selector. Can be configured also with `global.nodeSelector` |
-| nrStaging | bool | `false` | Endpoint to export data to. If enabled, sends data to the staging backend. Requires a valid staging license key. Can also be configured with global.nrStaging |
+| nrStaging | bool | `false` | Endpoint to export data to via the otel collector. NR prod (otlp.nr-data.net:4317) by default. Staging (staging-otlp.nr-data.net:4317) otherwise. Requires a valid staging license key. Can also be configured with global.nrStaging. |
 | otelCollector.collector.serviceAccount.annotations | object | `{}` | Annotations for the OTel collector service account. |
 | otelCollector.image.pullPolicy | string | `"IfNotPresent"` | The pull policy is defaulted to IfNotPresent, which skips pulling an image if it already exists. If pullPolicy is defined without a specific value, it is set to Always. |
 | otelCollector.image.repository | string | `"us-west1-docker.pkg.dev/pl-dev-infra/nr-ebpf-agent-lp/nr-ebpf-otel-collector"` | OpenTelemetry collector image to be deployed. |
@@ -102,6 +102,7 @@ Options that can be defined globally include `affinity`, `nodeSelector`, `tolera
 | otelCollector.resources.requests.memory | string | `"200Mi"` | Min memory allocated to the container. |
 | podLabels | object | `{}` | Additional labels for chart pods |
 | protocols | object | `{"amqp":true,"cass":true,"dns":true,"http":true,"kafka":true,"mongodb":true,"mysql":true,"pgsql":true,"redis":true}` | The protocols (and data export scripts) to enable for tracing in the socket_tracer. |
+| proxy | string | `""` | Configures the agent to send all data through the proxy specified via the otel collector. |
 | stirlingSources | string | `"socket_tracer,tcp_stats"` | The source connectors (and data export scripts) to enable. Note that socket_tracer tracks http, mysql, redis, mongodb, amqp, cassandra, dns, and postgresql while tcp_stats tracks TCP metrics. |
 | tableStoreDataLimitMB | string | `"250"` | The primary lever to control RAM use of the eBPF agent. Specified in MiB. |
 | tolerations | list | `[]` | Sets all pods' tolerations to node taints. Can be configured also with `global.tolerations` |
@@ -116,4 +117,4 @@ If the `nr-ebpf-client` or `nr-ebpf-agent` container logs indicate that the scri
 
 * ramkrishankumarN
 * kpattaswamy
-* benkilimnik
+* benkilimnik

charts/nr-ebpf-agent/templates/otel-collector-daemonset.yaml

@@ -41,7 +41,9 @@ spec:
                 key: NR_LICENSE_KEY
                 name: nr-ebpf-agent-secrets
           - name: NR_OTLP_ENDPOINT
-            {{- if .Values.nrStaging }}
+            {{- if .Values.proxy }}
+            value: "{{- .Values.proxy }}"
+            {{- else if .Values.nrStaging }}
             value: "staging-otlp.nr-data.net:4317"
             {{- else }}
             value: "otlp.nr-data.net:4317"

charts/nr-ebpf-agent/values.yaml

@@ -2,8 +2,10 @@
 cluster: ""
 # -- The license key to use. Can be configured with `global.licenseKey`
 licenseKey: ""
-# -- Endpoint to export data to. If enabled, sends data to the staging backend. Requires a valid staging license key. Can also be configured with global.nrStaging
+# -- Endpoint to export data to via the otel collector. NR prod (otlp.nr-data.net:4317) by default. Staging (staging-otlp.nr-data.net:4317) otherwise. Requires a valid staging license key. Can also be configured with global.nrStaging.
 nrStaging: false
+# -- Configures the agent to send all data through the proxy specified via the otel collector.
+proxy: ""
 # -- The primary lever to control RAM use of the eBPF agent. Specified in MiB.
 tableStoreDataLimitMB: "250"
 # -- The source connectors (and data export scripts) to enable.

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.7.5
+version: 0.7.6
 
 dependencies:
   - name: common-library
@@ -35,8 +35,6 @@ dependencies:
 appVersion: "0.7.1"
 
 maintainers:
-  - name: juanjjaramillo
-    url: https://github.com/juanjjaramillo
   - name: csongnr
     url: https://github.com/csongnr
   - name: dbudziwojskiNR

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

@@ -51,17 +51,18 @@ data:
             metrics:
               system.network.connections:
                 enabled: false
-          processes:
-          process:
-            metrics:
-              process.cpu.utilization:
-                enabled: true
-              process.cpu.time:
-                enabled: false
-            mute_process_name_error: true
-            mute_process_exe_error: true
-            mute_process_io_error: true
-            mute_process_user_error: true
+          # Uncomment to enable process metrics, which can be noisy but valuable.
+          # processes:
+          # process:
+          #   metrics:
+          #     process.cpu.utilization:
+          #       enabled: true
+          #     process.cpu.time:
+          #       enabled: false
+          #   mute_process_name_error: true
+          #   mute_process_exe_error: true
+          #   mute_process_io_error: true
+          #   mute_process_user_error: true
 
       kubeletstats:
         collection_interval: {{ .Values.receivers.kubeletstats.scrapeInterval }}
@@ -535,6 +536,8 @@ data:
          limit_percentage: 80
          spike_limit_percentage: 25
 
+      cumulativetodelta:
+
       batch:
         send_batch_max_size: 1000
         timeout: 30s
@@ -601,6 +604,7 @@ data:
             - k8sattributes
             - attributes/self
             - memory_limiter
+            - cumulativetodelta
             - batch
           exporters:
             - otlphttp/newrelic

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

@@ -467,6 +467,8 @@ data:
           - key: net.host.port
             action: delete
 
+      cumulativetodelta:
+
       k8sattributes:
         auth_type: "serviceAccount"
         passthrough: false
@@ -567,6 +569,7 @@ data:
             - k8sattributes
             - attributes/self
             - memory_limiter
+            - cumulativetodelta
             - batch
           exporters:
             - otlphttp/newrelic