Commit bf5fa064 authored by Radu Carpa's avatar Radu Carpa Committed by rcarpa
Browse files

servers & daemons: support relabeling for servicemonitor 

This is to perform transformation on metrics before
ingestion to prometheus. For example, to mark mertrics
which will be forwarded upstream for longer-term storage.
parent 4879bf3f

charts/rucio-daemons/Chart.yaml

+1 −1
Original line number Diff line number Diff line 
name: rucio-daemons

version: 1.30.0

version: 1.30.1

apiVersion: v1

description: A Helm chart to deploy daemons for Rucio

keywords:

charts/rucio-daemons/templates/servicemonitor.yaml

+8 −0
Original line number Diff line number Diff line
@@ -18,6 +18,14 @@ spec: 
 {{- end }}

 {{- if .Values.monitoring.telemetryPath }}

    path: {{ .Values.monitoring.telemetryPath }}

 {{- end }}

{{- if .Values.monitoring.serviceMonitor.metricRelabelings }}

    metricRelabelings:

{{ tpl (toYaml .Values.monitoring.serviceMonitor.metricRelabelings | indent 6) . }}

{{- end }}

{{- if .Values.monitoring.serviceMonitor.relabelings }}

    relabelings:

{{ toYaml .Values.monitoring.serviceMonitor.relabelings | indent 6 }}

{{- end }}

  jobLabel: {{ template "rucio.fullname" . }}-prometheus-exporter

  namespaceSelector:

charts/rucio-daemons/values.yaml

+17 −0
Original line number Diff line number Diff line
@@ -58,6 +58,23 @@ monitoring: 
  namespace: monitoring

  labels:

    release: prometheus-operator

  serviceMonitor:

    ## Metric relabel configs to apply to samples before ingestion.

    ##

    metricRelabelings: []

    # - action: keep

    #   regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+'

    #   sourceLabels: [__name__]



    #   relabel configs to apply to samples before ingestion.

    ##

    relabelings: []

    # - sourceLabels: [__meta_kubernetes_pod_node_name]

    #   separator: ;

    #   regex: ^(.*)$

    #   targetLabel: nodename

    #   replacement: $1

    #   action: replace



abacusAccount:

  threads: 1

charts/rucio-server/Chart.yaml

+1 −1
Original line number Diff line number Diff line 
name: rucio-server

version: 1.30.0

version: 1.30.1

apiVersion: v1

description: A Helm chart to deploy servers for Rucio

keywords:

charts/rucio-server/templates/auth_servicemonitor.yaml

+16 −0
Original line number Diff line number Diff line
@@ -19,12 +19,28 @@ spec: 
 {{- end }}

 {{- if .Values.monitoring.telemetryPath }}

    path: {{ .Values.monitoring.telemetryPath }}

 {{- end }}

{{- if .Values.monitoring.serviceMonitor.metricRelabelings }}

    metricRelabelings:

{{ tpl (toYaml .Values.monitoring.serviceMonitor.metricRelabelings | indent 6) . }}

{{- end }}

{{- if .Values.monitoring.serviceMonitor.relabelings }}

    relabelings:

{{ toYaml .Values.monitoring.serviceMonitor.relabelings | indent 6 }}

{{- end }}

  - targetPort: {{ .Values.monitoring.nativeMetricsPort }}

 {{- if .Values.monitoring.interval }}

    interval: {{ .Values.monitoring.interval }}

 {{- end }}

    path: /metrics/

{{- if .Values.monitoring.serviceMonitor.metricRelabelings }}

    metricRelabelings:

{{ tpl (toYaml .Values.monitoring.serviceMonitor.metricRelabelings | indent 6) . }}

{{- end }}

{{- if .Values.monitoring.serviceMonitor.relabelings }}

    relabelings:

{{ toYaml .Values.monitoring.serviceMonitor.relabelings | indent 6 }}

{{- end }}

  jobLabel: {{ template "rucio.fullname" . }}-prometheus-exporter-auth

  namespaceSelector:

    matchNames: