chore(service): add rqmetrics to deployment (#1480)

Author: jsam

docker-compose.yml

@@ -11,9 +11,41 @@ services:
     networks:
       - net
 
+  prometheus:
+    image: prom/prometheus
+    ports:
+      - "9090:9090"
+    networks:
+      - net
+    volumes:
+      - ../prometheus.yml:/etc/prometheus/prometheus.yml
+    command:
+      - '--config.file=/etc/prometheus/prometheus.yml'
+
+  grafana:
+    image: grafana/grafana
+    ports:
+      - "3000:3000"
+    networks:
+      - net
+
+  rq-metrics:
+    image: renku/rqmetrics:latest
+    container_name: rq-metrics
+    depends_on:
+      - redis
+    environment:
+      RQ_REDIS_HOST: redis
+    ports:
+      - "8765:8765"
+    networks:
+      - net
+
   rq-dashboard:
     image: eoranged/rq-dashboard:v0.6.1
     container_name: rq-dashboard
+    depends_on:
+      - redis
     environment:
       RQ_DASHBOARD_REDIS_URL: redis://redis:6379
     networks:
@@ -28,6 +60,8 @@ services:
     networks:
       - net
     env_file: .env
+    depends_on:
+      - redis
     ports:
       - "8080:8080"
     volumes:
@@ -38,6 +72,8 @@ services:
       context: .
       dockerfile: Dockerfile.svc
     entrypoint: ["python", "renku/service/scheduler.py"]
+    depends_on:
+      - redis
     networks:
       - net
     env_file: .env
@@ -47,6 +83,8 @@ services:
       context: .
       dockerfile: Dockerfile.svc
     entrypoint: ["python", "renku/service/worker.py"]
+    depends_on:
+      - redis
     networks:
       - net
     env_file: .env

helm-chart/renku-core/templates/deployment.yaml

@@ -14,6 +14,10 @@ spec:
       app.kubernetes.io/instance: {{ .Release.Name }}
   template:
     metadata:
+      annotations:
+        prometheus.io/scrape: 'true'
+        prometheus.io/path: '/metrics'
+        prometheus.io/port: '8765'
       labels:
         app.kubernetes.io/name: {{ include "renku-core.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
@@ -27,6 +31,14 @@ spec:
         - name: shared-volume
           emptyDir: {}
       containers:
+      {{ if .Values.metrics.enabled }}
+        - name: {{ .Chart.Name}}-rqmetrics
+          image: "{{ .Values.metrics.image.repository }}:{{ .Values.metrics.image.tag }}"
+          imagePullPolicy: {{ .Values.metrics.image.pullPolicy }}
+          env:
+            - name: RQ_REDIS_HOST
+              value: {{ include "call-nested" (list . "redis" "redis.fullname") }}-master
+      {{ end }}
         - name: {{ .Chart.Name }}-datasets-workers
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}

helm-chart/renku-core/values.yaml

@@ -31,6 +31,13 @@ service:
 ingress:
   enabled: false
 
+metrics:
+  enabled: false
+  image:
+    repository: renku/rqmetrics
+    tag: latest
+    pullPolicy: IfNotPresent
+
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little