From cfdc1c9a06286a79e35296069fe57849d0ef096a Mon Sep 17 00:00:00 2001
From: csongnr <115833851+csongnr@users.noreply.github.com>
Date: Wed, 3 Jul 2024 16:11:16 -0700
Subject: [PATCH] [nr-k8s-otel-collector] add in top level prometheus controls
 for ksm specific pipeline (#1419)

<!--
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.]
- [ ] Chart Version bumped
- [ ] Variables are documented in the README.md
- [x] Title of the PR starts with chart name (e.g. `[mychartname]`)
---
 charts/nr-k8s-otel-collector/Chart.yaml                         | 2 +-
 .../nr-k8s-otel-collector/templates/deployment-configmap.yaml   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/charts/nr-k8s-otel-collector/Chart.yaml b/charts/nr-k8s-otel-collector/Chart.yaml
index 8bd1eca26..492d96251 100644
--- a/charts/nr-k8s-otel-collector/Chart.yaml
+++ b/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.5.1
+version: 0.5.2
 
 dependencies:
   - name: common-library
diff --git a/charts/nr-k8s-otel-collector/templates/deployment-configmap.yaml b/charts/nr-k8s-otel-collector/templates/deployment-configmap.yaml
index 3e102a4cd..abf03a48b 100644
--- a/charts/nr-k8s-otel-collector/templates/deployment-configmap.yaml
+++ b/charts/nr-k8s-otel-collector/templates/deployment-configmap.yaml
@@ -450,6 +450,7 @@ data:
           level: "debug"
       {{- end }}
       pipelines:
+        {{- if .Values.receivers.prometheus.enabled }}
         metrics/ksm:
           receivers:
             - prometheus/ksm
@@ -465,6 +466,7 @@ data:
             - transform/ksm
           exporters:
             - otlphttp/newrelic
+        {{- end }}
         {{- if or .Values.receivers.prometheus.enabled .Values.receivers.k8sCluster.enabled }}
         metrics:
           receivers: