Skip to content

Commit f1874d3

Browse files
piping new prometheus/controlplane jobs to metrics/nr_controlplane pi… (#1739)
…peline. <!-- 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: Piping controller-manager and server metrics through nr_controlplane pipeline. #### 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]`)
1 parent 505b7df commit f1874d3

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

charts/nr-k8s-otel-collector/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ type: application
1717
# This is the chart version. This version number should be incremented each time you make changes
1818
# to the chart and its templates, including the app version.
1919
# Versions are expected to follow Semantic Versioning (https://semver.org/)
20-
version: 0.8.20
20+
version: 0.8.21
2121

2222
dependencies:
2323
- name: common-library

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ data:
7474
target_label: job_label
7575
replacement: apiserver
7676
# if not running on openshift, this only works if controller-manager port 10257 is exposed in the pod
77-
# we may want to create our own service instead to expose the endpoint and scrape it instead
77+
# TODO: we may want to create our own service instead to expose the endpoint and scrape it instead
7878
- job_name: controller-manager
7979
scrape_interval: {{ .Values.receivers.prometheus.scrapeInterval }}
8080
metrics_path: /metrics
@@ -707,6 +707,12 @@ data:
707707
- context: datapoint
708708
condition: attributes["job_label"] == "apiserver"
709709
pipelines: [metrics/nr_controlplane]
710+
- context: datapoint
711+
condition: attributes["job_label"] == "controller-manager"
712+
pipelines: [metrics/nr_controlplane]
713+
- context: datapoint
714+
condition: attributes["job_label"] == "scheduler"
715+
pipelines: [metrics/nr_controlplane]
710716
711717
service:
712718
{{- if include "newrelic.common.verboseLog" . }}
@@ -747,7 +753,6 @@ data:
747753
- resourcedetection/openshift
748754
# TODO openshift resource detection already obtains some cloud provider details, revisit, resourcedetection/cloudproviders fails to obtain more attributes
749755
# https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/processor/resourcedetectionprocessor/internal/openshift/documentation.md
750-
#- resourcedetection/cloudproviders
751756
{{- else }}
752757
- resourcedetection/cloudproviders
753758
{{- end }}

0 commit comments

Comments
 (0)