Commit c2ccdd5d authored by Radu Carpa's avatar Radu Carpa
Browse files

servers: expose and collect server prometheus metrics 

Latest containers are now built with the possibility to export
prometheus metrics on a separate port:
https://github.com/rucio/containers/pull/180

This PR ensures that the correct ENV variable is set to trigger
this behavior in servers and that the prometheus-operator
ServiceMonitor CRD is configured to automatically scrape that
endpoint.
parent fea5417b

charts/rucio-server/Chart.yaml

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

version: 1.27.1

version: 1.27.2

apiVersion: v1

description: A Helm chart to deploy servers for Rucio

keywords:

charts/rucio-server/templates/auth_deployment.yaml

+9 −0
Original line number Diff line number Diff line
@@ -109,6 +109,11 @@ spec: 
            - name: https

              containerPort: 443

              protocol: TCP

{{- if .Values.monitoring.enabled }}

            - name: metrics

              containerPort: {{ .Values.monitoring.nativeMetricsPort }}

              protocol: TCP

{{- end }}

          livenessProbe:

            httpGet:

              path: /ping
@@ -187,6 +192,10 @@ spec: 
{{- else }}

            - name: RUCIO_ENABLE_SSL

              value: "False"

{{- end }}

{{- if .Values.monitoring.enabled }}

            - name: RUCIO_METRICS_PORT

              value: "{{ .Values.monitoring.nativeMetricsPort }}"

{{- end }}

            - name: RUCIO_SERVER_TYPE

              value: "{{ .Values.serverType.authServer }}"

charts/rucio-server/templates/auth_servicemonitor.yaml

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,11 @@ spec: 
 {{- if .Values.monitoring.telemetryPath }}

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

 {{- end }}

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

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

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

 {{- end }}

    path: /metrics/

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

  namespaceSelector:

    matchNames:

charts/rucio-server/templates/deployment.yaml

+9 −0
Original line number Diff line number Diff line
@@ -162,6 +162,11 @@ spec: 
            - name: https

              containerPort: 443

              protocol: TCP

{{- if .Values.monitoring.enabled }}

            - name: metrics

              containerPort: {{ .Values.monitoring.nativeMetricsPort }}

              protocol: TCP

{{- end }}

          livenessProbe:

            httpGet:

              path: /ping
@@ -205,6 +210,10 @@ spec: 
{{- else }}

            - name: RUCIO_ENABLE_SSL

              value: "False"

{{- end }}

{{- if .Values.monitoring.enabled }}

            - name: RUCIO_METRICS_PORT

              value: "{{ .Values.monitoring.nativeMetricsPort }}"

{{- end }}

            - name: RUCIO_SERVER_TYPE

              value: "{{ .Values.serverType.server }}"

charts/rucio-server/templates/servicemonitor.yaml

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,11 @@ spec: 
 {{- if .Values.monitoring.telemetryPath }}

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

 {{- end }}

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

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

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

 {{- end }}

    path: /metrics/

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

  namespaceSelector:

    matchNames: