Add Grafana and Provision Prom as Data Source

Author: waleedbaroudi

.github/workflows/build-validation.yml

@@ -33,13 +33,6 @@ jobs:
           LANGSMITH_API_KEY: dummy_key
         run: ansible-playbook ansible/validate-compose.yml
 
-      - name: Login to GitHub Container Registry # TODO: why? - remove?
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Build client (validation only)
         run: |
           docker build --platform linux/amd64 -t ghcr.io/aet-devops25/team-3/client:${COMMIT_SHA} ./client

.github/workflows/deploy_vm.yml

@@ -91,6 +91,8 @@ jobs:
           OPEN_WEBUI_API_KEY_CHAT: ${{ secrets.OPEN_WEBUI_API_KEY_CHAT }}
           OPEN_WEBUI_API_KEY_GEN: ${{ secrets.OPEN_WEBUI_API_KEY_GEN }}
           LANGSMITH_API_KEY: ${{ secrets.LANGSMITH_API_KEY }}
+          GRAFANA_ADMIN_USERNAME: ${{ secrets.GRAFANA_ADMIN_USERNAME }}
+          GRAFANA_ADMIN_PASSWORD: ${{ secrets.GRAFANA_ADMIN_PASSWORD }}
         run: ansible-playbook -i inventory.ini ansible/deploy.yml
 
   deploy-k8s:

ansible/deploy.yml

@@ -37,6 +37,10 @@
         src: ../monitoring/prometheus/
         dest: "{{ project_dir }}/monitoring/prometheus/"
 
+    - name: Copy Grafana configuration files
+      copy:
+        src: ../monitoring/grafana/
+        dest: "{{ project_dir }}/monitoring/grafana/"
 
     - name: Log in to GHCR
       shell: |

ansible/tasks/env_vars.yml

@@ -3,4 +3,6 @@
     image_tag: "{{ lookup('env', 'IMAGE_TAG') }}"
     open_webui_api_key_chat: "{{ lookup('env', 'OPEN_WEBUI_API_KEY_CHAT') }}"
     open_webui_api_key_gen: "{{ lookup('env', 'OPEN_WEBUI_API_KEY_GEN') }}"
-    langsmith_api_key: "{{ lookup('env', 'LANGSMITH_API_KEY') }}"
+    langsmith_api_key: "{{ lookup('env', 'LANGSMITH_API_KEY') }}"
+    grafana_admin_username: "{{ lookup('env', 'GRAFANA_ADMIN_USERNAME') }}"
+    grafana_admin_password: "{{ lookup('env', 'GRAFANA_ADMIN_PASSWORD') }}"

docker-compose.dev-no-traefik.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   client:
     build:
@@ -109,9 +107,26 @@ services:
     networks:
       - dev-network
 
+  grafana:
+    image: grafana/grafana
+    environment:
+      - GF_SECURITY_ADMIN_USER=team3
+      - GF_SECURITY_ADMIN_PASSWORD=team3dev
+    container_name: studymate-grafana-dev
+    ports:
+      - "3030:3000"
+    volumes:
+      - grafana_data:/var/lib/grafana
+      - ./monitoring/grafana/provisioning:/etc/grafana/provisioning
+    depends_on:
+      - prometheus
+    networks:
+      - dev-network
+
 volumes:
   postgres_dev_data:
   weaviate_dev_data:
+  grafana_data:
 
 networks:
   dev-network:

docker-compose.yml.j2

@@ -118,6 +118,26 @@ services:
     networks:
       - proxy
 
+  grafana:
+    image: grafana/grafana
+    volumes:
+      - grafana_data:/var/lib/grafana
+      - ./monitoring/grafana/provisioning:/etc/grafana/provisioning
+    networks:
+      - proxy
+    environment:
+      - GF_SECURITY_ADMIN_USER= {{ grafana_admin_username }}
+      - GF_SECURITY_ADMIN_PASSWORD= {{ grafana_admin_password }}
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.grafana.rule=Host(`studymate-tum.xyz`) && PathPrefix(`/monitor`)"
+      - "traefik.http.routers.grafana.entrypoints=websecure"
+      - "traefik.http.routers.grafana.tls.certresolver=myresolver"
+      - "traefik.http.services.grafana.loadbalancer.server.port=3000"
+    depends_on:
+      - prometheus
+
+
 volumes:
   pgdata:
   weaviate_data:

monitoring/grafana/provisioning/datasources/prometheus.yml

@@ -0,0 +1,8 @@
+apiVersion: 1
+
+datasources:
+  - name: Prometheus
+    type: prometheus
+    access: proxy
+    url: http://prometheus:9090
+    isDefault: true