Skip to content

feat: add relabeling and metricRelabeling in serviceMonitor for all helm charts #804

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

Merged
Demonsthere merged 7 commits into from
Oct 2, 2025
Merged

feat: add relabeling and metricRelabeling in serviceMonitor for all helm charts #804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8715b62
feat: add relabeling and metricRelabeling in serviceMonitor for all h…
fedeabih Sep 21, 2025
01fafcc
Merge branch 'master' into feat-relabeling-and-metricRelabeling-for-a…
fedeabih Sep 25, 2025
9e9d80c
chore: add relabelings and metricRelabelings test values
fedeabih Sep 30, 2025
dfe3d13
chore: update README.md files
fedeabih Sep 30, 2025
0cc397c
fix: format test files for relabelings and metricRelabelings
fedeabih Sep 30, 2025
19c2180
fix: format test files for relabelings and metricRelabelings
fedeabih Sep 30, 2025
6e8fc27
Merge branch 'master' into feat-relabeling-and-metricRelabeling-for-a…
Demonsthere Oct 2, 2025
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
10 changes: 10 additions & 0 deletions hacks/values/hydra-maester/default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,13 @@ serviceMonitor:
release: "prometheus"
tlsConfig:
insecureSkipVerify: true
relabelings:
- source_labels: [__address__]
regex: "([^:]+):.*"
target_label: instance
replacement: "$1"
metricRelabelings:
- source_labels: [__address__]
regex: "([^:]+):.*"
target_label: instance
replacement: "$1"
10 changes: 10 additions & 0 deletions hacks/values/hydra/default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,16 @@ serviceMonitor:
release: "prometheus"
tlsConfig:
insecureSkipVerify: true
relabelings:
- source_labels: [__address__]
regex: "([^:]+):.*"
target_label: instance
replacement: "$1"
metricRelabelings:
- source_labels: [__address__]
regex: "([^:]+):.*"
target_label: instance
replacement: "$1"

cronjob:
janitor:
Expand Down
10 changes: 10 additions & 0 deletions hacks/values/keto/default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,16 @@ serviceMonitor:
release: "prometheus"
tlsConfig:
insecureSkipVerify: true
relabelings:
- source_labels: [__address__]
regex: "([^:]+):.*"
target_label: instance
replacement: "$1"
metricRelabelings:
- source_labels: [__address__]
regex: "([^:]+):.*"
target_label: instance
replacement: "$1"

test:
labels:
Expand Down
10 changes: 10 additions & 0 deletions hacks/values/kratos/default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,16 @@ serviceMonitor:
release: "prometheus"
tlsConfig:
insecureSkipVerify: true
relabelings:
- source_labels: [__address__]
regex: "([^:]+):.*"
target_label: instance
replacement: "$1"
metricRelabelings:
- source_labels: [__address__]
regex: "([^:]+):.*"
target_label: instance
replacement: "$1"

test:
busybox:
Expand Down
2 changes: 2 additions & 0 deletions helm/charts/hydra-maester/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ A Helm chart for Kubernetes
| service.metrics.port | int | `8080` | |
| service.metrics.type | string | `"ClusterIP"` | |
| serviceMonitor.labels | object | `{}` | Provide additional labels to the ServiceMonitor resource metadata |
| serviceMonitor.metricRelabelings | list | `[]` | Metric relabeling is applied to samples as the last step before ingestion. Reference: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs |
| serviceMonitor.relabelings | list | `[]` | Relabeling is a powerful tool to dynamically rewrite the label set of a target before it gets scraped. Reference: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config |
| serviceMonitor.scheme | string | `"http"` | HTTP scheme to use for scraping. |
| serviceMonitor.scrapeInterval | string | `"60s"` | Interval at which metrics should be scraped |
| serviceMonitor.scrapeTimeout | string | `"30s"` | Timeout after which the scrape is ended |
Expand Down
6 changes: 6 additions & 0 deletions helm/charts/hydra-maester/templates/service-monitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ spec:
scheme: {{ .Values.serviceMonitor.scheme }}
interval: {{ .Values.serviceMonitor.scrapeInterval }}
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
{{- if .Values.serviceMonitor.metricRelabelings }}
metricRelabelings: {{- toYaml .Values.serviceMonitor.metricRelabelings | nindent 6 }}
{{- end }}
{{- if .Values.serviceMonitor.relabelings }}
relabelings: {{- toYaml .Values.serviceMonitor.relabelings | nindent 6 }}
{{- end }}
{{- with .Values.serviceMonitor.tlsConfig }}
tlsConfig:
{{- toYaml . | nindent 6 }}
Expand Down
6 changes: 6 additions & 0 deletions helm/charts/hydra-maester/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,12 @@ serviceMonitor:
scrapeInterval: 60s
# -- Timeout after which the scrape is ended
scrapeTimeout: 30s
# -- Relabeling is a powerful tool to dynamically rewrite the label set of a target before it gets scraped.
# Reference: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
relabelings: []
# -- Metric relabeling is applied to samples as the last step before ingestion.
# Reference: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs
metricRelabelings: []
# -- Provide additional labels to the ServiceMonitor resource metadata
labels: {}
# -- TLS configuration to use when scraping the endpoint
Expand Down
2 changes: 2 additions & 0 deletions helm/charts/hydra/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,8 @@ A Helm chart for deploying ORY Hydra in Kubernetes
| service.public.type | string | `"ClusterIP"` | The service type |
| serviceMonitor.enabled | bool | `false` | switch to true to enable creating the ServiceMonitor |
| serviceMonitor.labels | object | `{}` | Provide additionnal labels to the ServiceMonitor ressource metadata |
| serviceMonitor.metricRelabelings | list | `[]` | Metric relabeling is applied to samples as the last step before ingestion. Reference: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs |
| serviceMonitor.relabelings | list | `[]` | Relabeling is a powerful tool to dynamically rewrite the label set of a target before it gets scraped. Reference: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config |
| serviceMonitor.scheme | string | `"http"` | HTTP scheme to use for scraping. |
| serviceMonitor.scrapeInterval | string | `"60s"` | Interval at which metrics should be scraped |
| serviceMonitor.scrapeTimeout | string | `"30s"` | Timeout after which the scrape is ended |
Expand Down
6 changes: 6 additions & 0 deletions helm/charts/hydra/templates/service-admin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ spec:
scheme: {{ .Values.serviceMonitor.scheme }}
interval: {{ .Values.serviceMonitor.scrapeInterval }}
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
{{- if .Values.serviceMonitor.metricRelabelings }}
metricRelabelings: {{- toYaml .Values.serviceMonitor.metricRelabelings | nindent 6 }}
{{- end }}
{{- if .Values.serviceMonitor.relabelings }}
relabelings: {{- toYaml .Values.serviceMonitor.relabelings | nindent 6 }}
{{- end }}
{{- with .Values.serviceMonitor.tlsConfig }}
tlsConfig:
{{- toYaml . | nindent 6 }}
Expand Down
6 changes: 6 additions & 0 deletions helm/charts/hydra/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,12 @@ serviceMonitor:
scrapeInterval: 60s
# -- Timeout after which the scrape is ended
scrapeTimeout: 30s
# -- Relabeling is a powerful tool to dynamically rewrite the label set of a target before it gets scraped.
# Reference: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
relabelings: []
# -- Metric relabeling is applied to samples as the last step before ingestion.
# Reference: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs
metricRelabelings: []
# -- Provide additionnal labels to the ServiceMonitor ressource metadata
labels: {}
# -- TLS configuration to use when scraping the endpoint
Expand Down
2 changes: 2 additions & 0 deletions helm/charts/keto/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,8 @@ Access Control Policies as a Server
| serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
| serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
| serviceMonitor.labels | object | `{}` | Provide additionnal labels to the ServiceMonitor ressource metadata |
| serviceMonitor.metricRelabelings | list | `[]` | Metric relabeling is applied to samples as the last step before ingestion. Reference: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs |
| serviceMonitor.relabelings | list | `[]` | Relabeling is a powerful tool to dynamically rewrite the label set of a target before it gets scraped. Reference: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config |
| serviceMonitor.scheme | string | `"http"` | HTTP scheme to use for scraping. |
| serviceMonitor.scrapeInterval | string | `"60s"` | Interval at which metrics should be scraped |
| serviceMonitor.scrapeTimeout | string | `"30s"` | Timeout after which the scrape is ended |
Expand Down
6 changes: 6 additions & 0 deletions helm/charts/keto/templates/servicemonitor-metrics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ spec:
scheme: {{ .Values.serviceMonitor.scheme }}
interval: {{ .Values.serviceMonitor.scrapeInterval }}
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
{{- if .Values.serviceMonitor.metricRelabelings }}
metricRelabelings: {{- toYaml .Values.serviceMonitor.metricRelabelings | nindent 6 }}
{{- end }}
{{- if .Values.serviceMonitor.relabelings }}
relabelings: {{- toYaml .Values.serviceMonitor.relabelings | nindent 6 }}
{{- end }}
{{- with .Values.serviceMonitor.tlsConfig }}
tlsConfig:
{{- toYaml . | nindent 6 }}
Expand Down
6 changes: 6 additions & 0 deletions helm/charts/keto/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,12 @@ serviceMonitor:
scrapeInterval: 60s
# -- Timeout after which the scrape is ended
scrapeTimeout: 30s
# -- Relabeling is a powerful tool to dynamically rewrite the label set of a target before it gets scraped.
# Reference: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
relabelings: []
# -- Metric relabeling is applied to samples as the last step before ingestion.
# Reference: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs
metricRelabelings: []
# -- Provide additionnal labels to the ServiceMonitor ressource metadata
labels: {}
# -- TLS configuration to use when scraping the endpoint
Expand Down
2 changes: 2 additions & 0 deletions helm/charts/kratos/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,8 @@ A ORY Kratos Helm chart for Kubernetes
| service.public.type | string | `"ClusterIP"` | |
| serviceMonitor.enabled | bool | `false` | switch to true to enable creating the ServiceMonitor |
| serviceMonitor.labels | object | `{}` | Provide additional labels to the ServiceMonitor ressource metadata |
| serviceMonitor.metricRelabelings | list | `[]` | Metric relabeling is applied to samples as the last step before ingestion. Reference: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs |
| serviceMonitor.relabelings | list | `[]` | Relabeling is a powerful tool to dynamically rewrite the label set of a target before it gets scraped. Reference: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config |
| serviceMonitor.scheme | string | `"http"` | HTTP scheme to use for scraping. |
| serviceMonitor.scrapeInterval | string | `"60s"` | Interval at which metrics should be scraped |
| serviceMonitor.scrapeTimeout | string | `"30s"` | Timeout after which the scrape is ended |
Expand Down
6 changes: 6 additions & 0 deletions helm/charts/kratos/templates/service-admin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@ spec:
scheme: {{ .Values.serviceMonitor.scheme }}
interval: {{ .Values.serviceMonitor.scrapeInterval }}
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
{{- if .Values.serviceMonitor.metricRelabelings }}
metricRelabelings: {{- toYaml .Values.serviceMonitor.metricRelabelings | nindent 6 }}
{{- end }}
{{- if .Values.serviceMonitor.relabelings }}
relabelings: {{- toYaml .Values.serviceMonitor.relabelings | nindent 6 }}
{{- end }}
{{- with .Values.serviceMonitor.tlsConfig }}
tlsConfig:
{{- toYaml . | nindent 6 }}
Expand Down
6 changes: 6 additions & 0 deletions helm/charts/kratos/templates/svc-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ spec:
scheme: {{ .Values.serviceMonitor.scheme }}
interval: {{ .Values.serviceMonitor.scrapeInterval }}
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
{{- if .Values.serviceMonitor.metricRelabelings }}
metricRelabelings: {{- toYaml .Values.serviceMonitor.metricRelabelings | nindent 6 }}
{{- end }}
{{- if .Values.serviceMonitor.relabelings }}
relabelings: {{- toYaml .Values.serviceMonitor.relabelings | nindent 6 }}
{{- end }}
{{- with .Values.serviceMonitor.tlsConfig }}
tlsConfig:
{{- toYaml . | nindent 6 }}
Expand Down
6 changes: 6 additions & 0 deletions helm/charts/kratos/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,6 +783,12 @@ serviceMonitor:
scrapeInterval: 60s
# -- Timeout after which the scrape is ended
scrapeTimeout: 30s
# -- Relabeling is a powerful tool to dynamically rewrite the label set of a target before it gets scraped.
# Reference: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
relabelings: []
# -- Metric relabeling is applied to samples as the last step before ingestion.
# Reference: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs
metricRelabelings: []
# -- Provide additional labels to the ServiceMonitor ressource metadata
labels: {}
# -- TLS configuration to use when scraping the endpoint
Expand Down
Loading