Merge branch 'master' into docs/improve-collector-documentation-v2

Author: dpacheconr

.github/workflows/nr-k8s-otel-e2e.yml

@@ -32,6 +32,7 @@ jobs:
           kubernetes version: ${{ env.LATEST_K8S_VERSION }}
           # default driver doesn't support 'eval $$(minikube docker-env)'.
           driver: docker
+          container runtime: containerd
           github token: ${{ secrets.GITHUB_TOKEN }}
       - name: Run e2e-test
         uses: newrelic/newrelic-integration-e2e-action@v1

charts/agent-control-bootstrap/Chart.yaml

@@ -3,9 +3,9 @@ name: agent-control-bootstrap
 description: Bootstraps New Relic' Agent Control
 
 type: application
-version: 1.4.1
+version: 1.6.0
 # agent-control-deployment chart default version.
-appVersion: 1.4.1
+appVersion: 1.6.0
 annotations:
   # agent-control-cd chart default version.
   agentControlCdVersion: 1.0.0

charts/agent-control-bootstrap/values.yaml

@@ -7,7 +7,7 @@ fullnameOverride: ""
 toolkitImage:
   registry:
   repository: newrelic/newrelic-agent-control-cli
-  tag: "1.9.1"
+  tag: "1.10.0"
   pullPolicy: IfNotPresent
   # -- The secrets that are needed to pull images from a custom registry.
   pullSecrets: []

charts/agent-control-deployment/Chart.yaml

@@ -4,8 +4,8 @@ description: A Helm chart to install New Relic Agent Control on Kubernetes
 
 type: application
 
-version: 1.4.1
-appVersion: "1.9.1"
+version: 1.6.0
+appVersion: "1.11.0"
 
 dependencies:
   - name: common-library

charts/agent-control-deployment/values.yaml

@@ -264,7 +264,7 @@ systemIdentity:
 
   image:
     repository: newrelic/agent-control-system-identity-registration
-    tag: "0.1.3"
+    tag: "0.1.4"
     pullPolicy: IfNotPresent
 
   # -- Configuration for the parent identity

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.34.0
-appVersion: 3.2.1
+version: 1.35.0
+appVersion: 3.4.0
 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: docker.io/newrelic/newrelic-fluentbit-output:3.2.1
+          value: docker.io/newrelic/newrelic-fluentbit-output:3.4.0
         template: templates/daemonset.yaml
       - equal:
           path: spec.template.spec.containers[0].image
-          value: docker.io/newrelic/newrelic-fluentbit-output:3.2.1-windows-ltsc-2019
+          value: docker.io/newrelic/newrelic-fluentbit-output:3.4.0-windows-ltsc-2019
         template: templates/daemonset-windows.yaml
         documentIndex: 0
       - equal:
           path: spec.template.spec.containers[0].image
-          value: docker.io/newrelic/newrelic-fluentbit-output:3.2.1-windows-ltsc-2022
+          value: docker.io/newrelic/newrelic-fluentbit-output:3.4.0-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: 1.2.2
+version: 1.3.0
 
 dependencies:
   - name: common-library
@@ -23,7 +23,7 @@ dependencies:
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.2.2"
+appVersion: "1.3.0"
 home: https://github.com/newrelic/helm-charts
 sources:
   - https://github.com/newrelic/

charts/nr-ebpf-agent/README.md

@@ -107,6 +107,7 @@ Options that can be defined globally include `affinity`, `nodeSelector`, `tolera
 | apmDataFilters.dropPodLabels | object | `{}` | Pod labels to match for filtering APM data. Empty map means no label-based filtering. (Example: dropPodLabels: `{ "app": "frontend", "env": "production" }`) |
 | apmDataFilters.dropEntityName | list | `[]` | List of entity names to drop ebpf APM data.|
 | apmDataFilters.keepEntityName | list | `[]` | List of entity names to always keep APM data. By default all entities are kept/enabled. This config bypasses `dropEntityName` filter. |
+| apmDataFilters.jvmMetricsReporting | bool | `true` | Enable JVM Metrics Reporting. |
 | cluster | string | `""` | Name of the Kubernetes cluster to be monitored. Mandatory. Can be configured with `global.cluster` |
 | containerSecurityContext | object | `{}` | Sets all pods' containerSecurityContext. Can be configured also with `global.securityContext.container` |
 | customSecretLicenseKey | string | `""` | In case you don't want to have the license key in your values, this allows you to point to which secret key is the license key located. Can be configured also with `global.customSecretLicenseKey` |
@@ -129,6 +130,12 @@ Options that can be defined globally include `affinity`, `nodeSelector`, `tolera
 | kubernetesClusterDomain | string | `"cluster.local"` | Kubernetes cluster domain. |
 | labels | object | `{}` | Additional labels for chart objects. |
 | licenseKey | string | `""` | The license key to use. Can be configured with `global.licenseKey` |
+| logDataFilters.applicationReporting.enabled | bool | `true` | Enable logs collection from the entities matching the filters below. |
+| logDataFilters.applicationReporting.fileRegex | string | `".*\\.log$"` | Regex to match log file names to include. |
+| logDataFilters.applicationReporting.keepFileEntityRegex | string | `".*"` | Regex to match entity names to keep logs from log files. |
+| logDataFilters.applicationReporting.keepStdEntityRegex | string | `".*"` | Regex to match entity names to keep logs from stdout and stderr. |
+| logDataFilters.applicationReporting.maxSamplePerMinute | int | `10000` | Maximum number of log samples to collect per minute from an entity. |
+| logReporting | bool | `true` | Enable log reporting. When enabled, the agent collects and reports logs from entities. |
 | networkMetricsDataFilter.dropPodLabels | object | `{}` | Pod labels to match for filtering Network metrics data. Empty map means no label-based filtering. (Example: dropPodLabels: `{ "app": "frontend", "env": "production" }`) |
 | networkMetricsDataFilter.dropEntityName | list | `[]` | List of entity names to drop Network metrics data for |
 | networkMetricsDataFilter.keepEntityName | list | `[]` | List of entity names to always keep Network metrics data. By default all entities are kept/enabled. This config bypasses `dropEntityName` filter. |

charts/nr-ebpf-agent/templates/_helpers.tpl

@@ -120,6 +120,30 @@ Extracts version from image tag and compares using semver
 {{- end -}}
 {{- end -}}
 
+{{/*
+Select the init container image for kernel header installation.
+On OpenShift, automatically resolves the driver-toolkit image from the cluster's ImageStream,
+which contains pre-built kernel headers matching the RHCOS kernel.
+*/}}
+{{- define "nr-ebpf-agent.initContainerImage" -}}
+{{- $dtkImage := "" -}}
+{{- if .Capabilities.APIVersions.Has "image.openshift.io/v1" -}}
+  {{- $is := (lookup "image.openshift.io/v1" "ImageStream" "openshift" "driver-toolkit") -}}
+  {{- if $is -}}
+    {{- range $is.spec.tags -}}
+      {{- if eq .name "latest" -}}
+        {{- $dtkImage = .from.name -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
+{{- if $dtkImage -}}
+  {{- $dtkImage -}}
+{{- else -}}
+  {{- printf "%s:agent-base-image-latest" .Values.ebpfAgent.image.repository -}}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Validate the user inputted quantile when sampling by latency.
 */}}