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

[KEDA] add relabelling support #287

Merged
merged 1 commit into from
Jul 15, 2022
Merged

[KEDA] add relabelling support #287

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
2 changes: 2 additions & 0 deletions keda/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ their default values.
| `prometheus.metricServer.podMonitor.scrapeTimeout` | Scraping timeout for metric server using podMonitor crd (prometheus operator) | ``
| `prometheus.metricServer.podMonitor.namespace` | Scraping namespace for metric server using podMonitor crd (prometheus operator) | ``
| `prometheus.metricServer.podMonitor.additionalLabels` | Additional labels to add for metric server using podMonitor crd (prometheus operator) | `{}`
| `prometheus.metricServer.podMonitor.relabelings` | List of expressions that define custom relabeling rules for metric server podMonitor crd (prometheus operator) | `[]`
| `prometheus.operator.enabled` | Enable keda operator prometheus metrics expose | `false`
| `prometheus.operator.port` | HTTP port used for exposing keda operator prometheus metrics | `9022`
| `prometheus.operator.path` | Path used for exposing keda operator prometheus metrics | `/metrics`
Expand All @@ -133,6 +134,7 @@ their default values.
| `prometheus.operator.prometheusRules.namespace` | Scraping namespace for keda operator using prometheusRules crd (prometheus operator) | ``
| `prometheus.operator.prometheusRules.additionalLabels` | Additional labels to add for keda operator using prometheusRules crd (prometheus operator) | `{}`
| `prometheus.operator.prometheusRules.alerts` | Additional alerts to add for keda operator using prometheusRules crd (prometheus operator) | `[]`
| `prometheus.operator.podMonitor.relabelings` | List of expressions that define custom relabeling rules for keda operator podMonitor crd (prometheus operator) | `[]`
| `volumes.keda.extraVolumes` | Extra volumes for keda deployment | `[]`
| `volumes.keda.extraVolumeMounts` | Extra volume mounts for keda deployment | `[]`
| `volumes.metricsApiServer.extraVolumes` | Extra volumes for metric server deployment | `[]`
Expand Down
4 changes: 4 additions & 0 deletions keda/templates/14-keda-podmonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ spec:
{{- with .Values.prometheus.operator.podMonitor.scrapeTimeout }}
scrapeTimeout: {{ . }}
{{- end }}
{{- with .Values.prometheus.operator.podMonitor.relabelings }}
relabelings:
{{ toYaml . | indent 4 }}
{{- end }}
namespaceSelector:
matchNames:
- {{ .Release.Namespace }}
Expand Down
4 changes: 4 additions & 0 deletions keda/templates/26-metrics-podmonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ spec:
{{- with .Values.prometheus.metricServer.podMonitor.scrapeTimeout }}
scrapeTimeout: {{ . }}
{{- end }}
{{- with .Values.prometheus.metricServer.podMonitor.relabelings }}
relabelings:
{{ toYaml . | indent 4 }}
{{- end }}
namespaceSelector:
matchNames:
- {{ .Release.Namespace }}
Expand Down
2 changes: 2 additions & 0 deletions keda/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ prometheus:
scrapeTimeout:
namespace:
additionalLabels: {}
relabelings: []
operator:
enabled: false
port: 8080
Expand All @@ -238,6 +239,7 @@ prometheus:
scrapeTimeout:
namespace:
additionalLabels: {}
relabelings: []
prometheusRules:
# Enables PrometheusRules creation for the Prometheus Operator
enabled: false
Expand Down