Skip to content

Commit 874e03a

Browse files
[nr-k8s-otel-collector] fix: Remove prom jobs (#1638)
<!-- 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 - [ ] Title of the PR starts with chart name (e.g. `[mychartname]`)
1 parent 7cbaf51 commit 874e03a

File tree

2 files changed

+1
-60
lines changed

2 files changed

+1
-60
lines changed

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

+1-1
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.2
20+
version: 0.8.3
2121

2222
dependencies:
2323
- name: common-library

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

-59
Original file line numberDiff line numberDiff line change
@@ -65,65 +65,6 @@ data:
6565
- action: replace
6666
target_label: job_label
6767
replacement: apiserver
68-
- job_name: controller-manager
69-
scrape_interval: {{ .Values.receivers.prometheus.scrapeInterval }}
70-
metrics_path: /metrics
71-
kubernetes_sd_configs:
72-
- role: endpoints
73-
scheme: https
74-
tls_config:
75-
ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
76-
insecure_skip_verify: false
77-
bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
78-
relabel_configs:
79-
- action: keep
80-
regex: default;kubernetes;https
81-
source_labels:
82-
- __meta_kubernetes_namespace
83-
- __meta_kubernetes_service_name
84-
- __meta_kubernetes_endpoint_port_name
85-
- action: replace
86-
source_labels:
87-
- __meta_kubernetes_namespace
88-
target_label: namespace
89-
- action: replace
90-
source_labels:
91-
- __meta_kubernetes_pod_name
92-
target_label: pod
93-
- action: replace
94-
source_labels:
95-
- __meta_kubernetes_service_name
96-
target_label: service
97-
- action: replace
98-
target_label: job_label
99-
replacement: controller-manager
100-
- job_name: scheduler
101-
scrape_interval: {{ .Values.receivers.prometheus.scrapeInterval }}
102-
kubernetes_sd_configs:
103-
- role: endpoints
104-
scheme: https
105-
tls_config:
106-
ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
107-
insecure_skip_verify: true
108-
bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
109-
relabel_configs:
110-
- action: keep
111-
regex: default;kubernetes;https
112-
source_labels:
113-
- __meta_kubernetes_namespace
114-
- __meta_kubernetes_service_name
115-
- __meta_kubernetes_endpoint_port_name
116-
- action: replace
117-
source_labels:
118-
- __meta_kubernetes_namespace
119-
target_label: namespace
120-
- action: replace
121-
source_labels:
122-
- __meta_kubernetes_service_name
123-
target_label: service
124-
- action: replace
125-
target_label: job_label
126-
replacement: scheduler
12768
12869
processors:
12970
groupbyattrs:

0 commit comments

Comments
 (0)