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.

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

es-313 Add configuration support for scrape interval in Target Allocator #93

Merged
merged 13 commits into from
Aug 7, 2024
2 changes: 2 additions & 0 deletions charts/opentelemetry-collector/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Changelog

## OpenTelemetry Collector
### v0.89.1 / 2024-07-31
daidokoro marked this conversation as resolved.
Show resolved Hide resolved
daidokoro marked this conversation as resolved.
Show resolved Hide resolved
- [Feat] Allow configuration of scrape interval value for target allocator prometheus custom resources.

### v0.88.5 / 2024-08-05
- [Feat] add more system attributes to host entity event preset
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: opentelemetry-collector
version: 0.88.5
version: 0.88.6
description: OpenTelemetry Collector Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ data:
app.kubernetes.io/name: {{ include "opentelemetry-collector.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
prometheus_cr:
scrape_interval: 30s
{{- if .Values.targetAllocator.prometheusCR.scrapeInterval }}
scrape_interval: {{ .Values.targetAllocator.prometheusCR.scrapeInterval }}
{{- else }}
scrape_interval: {{ .Values.targetAllocator.prometheusCR.scrapeInterval | default "30s" }}
{{- end }}
{{- if .Values.targetAllocator.prometheusCR.podMonitorSelector }}
pod_monitor_selector:
{{- include "opentelemetry-target-allocator.podMonitorSelector" . | nindent 8 }}
Expand Down
5 changes: 4 additions & 1 deletion charts/opentelemetry-collector/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,10 @@
"type": "boolean"
},
"podMonitorSelector": {},
"serviceMonitorSelector": {}
"serviceMonitorSelector": {},
"scrapeInterval": {
"type": "string"
}
}
},
"allocationStrategy": {
Expand Down
1 change: 1 addition & 0 deletions charts/opentelemetry-collector/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ targetAllocator:
enabled: false
podMonitorSelector: {}
serviceMonitorSelector: {}
scrapeInterval: "30s"
allocationStrategy: ""
# Target allocator image defaults to repository and tag set by
# the operator (this should correspond to operator's version).
Expand Down
Loading