Skip to content

Commit

Permalink
[nri-bundle] Add eAPM to NRI Bundle (#1579)
Browse files Browse the repository at this point in the history
<!--
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
No
#### What this PR does / why we need it:
Adds the changes from #1520
#### 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
- [x] Variables are documented in the README.md
- [x] Title of the PR starts with chart name (e.g. `[mychartname]`)

---------

Signed-off-by: kpattaswamy <[email protected]>
  • Loading branch information
kpattaswamy authored Jan 30, 2025
1 parent 03b49e4 commit 766b6ba
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 3 deletions.
7 changes: 5 additions & 2 deletions charts/nri-bundle/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ dependencies:
- name: newrelic-pixie
repository: https://newrelic.github.io/helm-charts
version: 2.1.6
- name: nr-ebpf-agent
repository: https://newrelic.github.io/helm-charts
version: 0.1.15
- name: k8s-agents-operator
repository: https://newrelic.github.io/k8s-agents-operator
version: 0.20.1
Expand All @@ -35,5 +38,5 @@ dependencies:
- name: newrelic-infra-operator
repository: https://newrelic.github.io/newrelic-infra-operator
version: 2.13.5
digest: sha256:36eb479d914f82a0725fabd9ea4a2caf571d461b138b265729298a92c21267a3
generated: "2025-01-27T15:27:11.813592884Z"
digest: sha256:e10196059a0afb5596f8b59129bce70abbaec86e2888b576d47db0ffca56c355
generated: "2025-01-30T16:44:28.101731032Z"
8 changes: 7 additions & 1 deletion charts/nri-bundle/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ sources:
- https://github.com/newrelic/nri-kube-events/tree/master/charts/nri-kube-events
- https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-logging
- https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-pixie
- https://github.com/newrelic/helm-charts/tree/master/charts/nr-ebpf-agent
- 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: 5.0.108
version: 5.0.109

dependencies:
- name: newrelic-infrastructure
Expand Down Expand Up @@ -65,6 +66,11 @@ dependencies:
condition: newrelic-pixie.enabled
version: 2.1.6

- name: nr-ebpf-agent
version: 0.1.15
condition: newrelic-eapm-agent.enabled
repository: https://newrelic.github.io/helm-charts

- name: k8s-agents-operator
repository: https://newrelic.github.io/k8s-agents-operator
condition: k8s-agents-operator.enabled
Expand Down
2 changes: 2 additions & 0 deletions charts/nri-bundle/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ here is a list of components that this chart installs and where you can find mor
| [newrelic-prometheus-configurator](https://github.com/newrelic/newrelic-prometheus-configurator/tree/master/charts/newrelic-prometheus-agent) | | Configures instances of Prometheus in Agent mode to send metrics to the New Relic Prometheus endpoint. |
| [newrelic-pixie](https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-pixie) | | Connects to the Pixie API and enables the New Relic plugin in Pixie. The plugin allows you to export data from Pixie to New Relic for long-term data retention. |
| [Pixie](https://docs.pixielabs.ai/installing-pixie/install-schemes/helm/#3.-deploy) | | Is an open source observability tool for Kubernetes applications that uses eBPF to automatically capture telemetry data without the need for manual instrumentation. |
| [newrelic-eAPM-agent](https://github.com/newrelic/helm-charts/tree/master/charts/nr-ebpf-agent) | | Configures instances of the New Relic eAPM agent to automatically capture telemetry data without the need for manual instrumentation. |
| [k8s-agents-operator](https://github.com/newrelic/k8s-agents-operator/tree/main/charts/k8s-agents-operator) | | (Preview) Streamlines full-stack observability for Kubernetes environments by automating APM instrumentation alongside Kubernetes agent deployment. |

## Configure components
Expand Down Expand Up @@ -182,6 +183,7 @@ Note, the value table below is automatically generated from `values.yaml` by `he
| global.verboseLog | bool | false | Sets the debug logs to this integration or all integrations if it is set globally |
| k8s-agents-operator.enabled | bool | `false` | Install the [`k8s-agents-operator` chart](https://github.com/newrelic/k8s-agents-operator/tree/main/charts/k8s-agents-operator) |
| kube-state-metrics.enabled | bool | `false` | Install the [`kube-state-metrics` chart](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-state-metrics) from the stable helm charts repository. This is mandatory if `infrastructure.enabled` is set to `true` and the user does not provide its own instance of KSM version >=1.8 and <=2.0. Note, kube-state-metrics v2+ disables labels/annotations metrics by default. You can enable the target labels/annotations metrics to be monitored by using the metricLabelsAllowlist/metricAnnotationsAllowList options described [here](https://github.com/prometheus-community/helm-charts/blob/159cd8e4fb89b8b107dcc100287504bb91bf30e0/charts/kube-state-metrics/values.yaml#L274) in your Kubernetes clusters. |
| newrelic-eapm-agent.enabled | bool | `false` | Install the [`newrelic-eapm-agent`](https://github.com/newrelic/helm-charts/tree/master/charts/nr-ebpf-agent) |
| newrelic-infra-operator.enabled | bool | `false` | Install the [`newrelic-infra-operator` chart](https://github.com/newrelic/newrelic-infra-operator/tree/main/charts/newrelic-infra-operator) (Beta) |
| newrelic-infrastructure.enabled | bool | `true` | Install the [`newrelic-infrastructure` chart](https://github.com/newrelic/nri-kubernetes/tree/main/charts/newrelic-infrastructure) |
| newrelic-k8s-metrics-adapter.enabled | bool | `false` | Install the [`newrelic-k8s-metrics-adapter.` chart](https://github.com/newrelic/newrelic-k8s-metrics-adapter/tree/main/charts/newrelic-k8s-metrics-adapter) (Beta) |
Expand Down
1 change: 1 addition & 0 deletions charts/nri-bundle/README.md.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ here is a list of components that this chart installs and where you can find mor
| [newrelic-prometheus-configurator](https://github.com/newrelic/newrelic-prometheus-configurator/tree/master/charts/newrelic-prometheus-agent) | | Configures instances of Prometheus in Agent mode to send metrics to the New Relic Prometheus endpoint. |
| [newrelic-pixie](https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-pixie) | | Connects to the Pixie API and enables the New Relic plugin in Pixie. The plugin allows you to export data from Pixie to New Relic for long-term data retention. |
| [Pixie](https://docs.pixielabs.ai/installing-pixie/install-schemes/helm/#3.-deploy) | | Is an open source observability tool for Kubernetes applications that uses eBPF to automatically capture telemetry data without the need for manual instrumentation. |
| [newrelic-eAPM-agent](https://github.com/newrelic/helm-charts/tree/master/charts/nr-ebpf-agent) | | Configures instances of the New Relic eAPM agent to automatically capture telemetry data without the need for manual instrumentation. |
| [k8s-agents-operator](https://github.com/newrelic/k8s-agents-operator/tree/main/charts/k8s-agents-operator) | | (Preview) Streamlines full-stack observability for Kubernetes environments by automating APM instrumentation alongside Kubernetes agent deployment. |

## Configure components
Expand Down
4 changes: 4 additions & 0 deletions charts/nri-bundle/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ newrelic-pixie:
# newrelic-pixie.enabled -- Install the [`newrelic-pixie`](https://github.com/newrelic/helm-charts/tree/master/charts/newrelic-pixie)
enabled: false

newrelic-eapm-agent:
# nr-eapm-agent.enabled -- Install the [`nr-eapm-agent`](https://github.com/newrelic/helm-charts/tree/master/charts/nr-ebpf-agent)
enabled: false

k8s-agents-operator:
# k8s-agents-operator.enabled -- Install the [`k8s-agents-operator` chart](https://github.com/newrelic/k8s-agents-operator/tree/main/charts/k8s-agents-operator)
enabled: false
Expand Down

0 comments on commit 766b6ba

Please sign in to comment.