From 71ae7e48a1b1955e71c7b5b496f1b7276e500137 Mon Sep 17 00:00:00 2001 From: Michael-u21546551 Date: Sat, 10 Aug 2024 15:46:57 +0200 Subject: [PATCH] chore: Update Dockerfile and configuration files for dev and prod environments --- .github/workflows/deploy-golang-develop.yml | 2 +- .github/workflows/deploy-golang-prod.yml | 2 +- occupi-backend/pkg/router/router.go | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-golang-develop.yml b/.github/workflows/deploy-golang-develop.yml index b3e542db..b9dd5287 100644 --- a/.github/workflows/deploy-golang-develop.yml +++ b/.github/workflows/deploy-golang-develop.yml @@ -99,7 +99,7 @@ jobs: host: ${{ secrets.VM_IP }} username: ${{ secrets.VM_USERNAME }} key: ${{ secrets.VM_SSH_KEY }} - source: "occupi-backend/docker-compose.dev.yml,occupi-backend/Dockerfile.dev,occupi-backend/centrifugo.config.json,prometheus.dev.yml" + source: "occupi-backend/docker-compose.dev.yml,occupi-backend/Dockerfile.dev,occupi-backend/centrifugo.config.json,occupi-backend/prometheus.dev.yml" target: "/home/${{ secrets.VM_USERNAME }}/occupi-backend-dev" # SSH to VM and run commands diff --git a/.github/workflows/deploy-golang-prod.yml b/.github/workflows/deploy-golang-prod.yml index 388f5841..d5d7443c 100644 --- a/.github/workflows/deploy-golang-prod.yml +++ b/.github/workflows/deploy-golang-prod.yml @@ -94,7 +94,7 @@ jobs: host: ${{ secrets.VM_IP }} username: ${{ secrets.VM_USERNAME }} key: ${{ secrets.VM_SSH_KEY }} - source: "occupi-backend/docker-compose.prod.yml,occupi-backend/Dockerfile.prod,occupi-backend/centrifugo.config.json,prometheus.prod.yml" + source: "occupi-backend/docker-compose.prod.yml,occupi-backend/Dockerfile.prod,occupi-backend/centrifugo.config.json,occupi-backend/prometheus.prod.yml" target: "/home/${{ secrets.VM_USERNAME }}/occupi-backend-prod" # SSH to VM and run commands diff --git a/occupi-backend/pkg/router/router.go b/occupi-backend/pkg/router/router.go index 21bb4e41..c43e601f 100644 --- a/occupi-backend/pkg/router/router.go +++ b/occupi-backend/pkg/router/router.go @@ -7,6 +7,7 @@ import ( "github.com/COS301-SE-2024/occupi/occupi-backend/pkg/models" "github.com/gin-gonic/gin" + "github.com/prometheus/client_golang/prometheus/promhttp" ) // creates available endpoints and attaches handlers for each endpoint @@ -93,4 +94,8 @@ func OccupiRouter(router *gin.Engine, appsession *models.AppSession) { rtc.POST("/enter", middleware.ProtectedRoute, func(ctx *gin.Context) { handlers.Enter(ctx, appsession) }) rtc.POST("/exit", middleware.ProtectedRoute, func(ctx *gin.Context) { handlers.Exit(ctx, appsession) }) } + metrics := router.Group("/metrics") + { + metrics.GET("", func(ctx *gin.Context) { promhttp.Handler().ServeHTTP(ctx.Writer, ctx.Request) }) + } }