Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(metrics/collector): disabling kubelet and cAdvisor metrics #3133

Merged
merged 1 commit into from
Jul 6, 2023
Merged

fix(metrics/collector): disabling kubelet and cAdvisor metrics #3133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .changelog/3133.added.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
feat(metrics/collector): allow disabling cadvisor and kubelet metrics
3 changes: 2 additions & 1 deletion deploy/helm/sumologic/conf/metrics/collector/otelcol/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ receivers:
config:
global:
scrape_interval: 30s
scrape_configs:
## As of right now, if scrape_configs is empty, it needs to be an empty list, otherwise otel-operator rejects it
scrape_configs: {{ not (or .Values.sumologic.metrics.collector.otelcol.kubelet.enabled .Values.sumologic.metrics.collector.otelcol.cAdvisor.enabled) | ternary "[]" "" }}
{{- if .Values.sumologic.metrics.collector.otelcol.kubelet.enabled }}
## These scrape configs are for kubelet metrics
## Prometheus operator does this by manually maintaining a Service with Endpoints for all Nodes
Expand Down
3 changes: 2 additions & 1 deletion tests/helm/testdata/goldenfile/metrics_collector_otc/basic.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ spec:
config:
global:
scrape_interval: 30s
scrape_configs:
## As of right now, if scrape_configs is empty, it needs to be an empty list, otherwise otel-operator rejects it
scrape_configs:
## These scrape configs are for kubelet metrics
## Prometheus operator does this by manually maintaining a Service with Endpoints for all Nodes
## We don't have that capability, so we need to use a static configuration
Expand Down
3 changes: 2 additions & 1 deletion tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ spec:
config:
global:
scrape_interval: 30s
scrape_configs:
## As of right now, if scrape_configs is empty, it needs to be an empty list, otherwise otel-operator rejects it
scrape_configs: []
target_allocator:
endpoint: http://RELEASE-NAME-sumologic-metrics-targetallocator
interval: 30s
Expand Down