Commit 31bb2bb2 authored by Lukáš Chudíček's avatar Lukáš Chudíček
Browse files

feat: merge branch 'fixes' into 'main' 

fix: fixing movie recommender port and grafana

See merge request !41
parents 8d657d75 73614079

compose.yml

+4 −0
Original line number Diff line number Diff line
@@ -133,6 +133,10 @@ services: 
    depends_on:

      - movie-service

      - rating-service

    environment:

      MOVIE_RECOMMENDER_PORT: ${MOVIE_RECOMMENDER_PORT}

      MOVIE_PORT: ${MOVIE_PORT}

      RATING_PORT: ${RATING_PORT}



volumes:

  movie-microservice-postgres-data:

movie-microservice/README.md

+2 −0
Original line number Diff line number Diff line
@@ -136,6 +136,8 @@ docker cp ./sql/clear_movie_database.sql movie-postgres:/ && \ 
docker exec -it movie-postgres psql -U movie_user -d movie_database -p 5431 -a -f ./clear_movie_database.sql

```



For windows use `;` instead of `&&` in the above commands.





## Validation and Error handling

movie-recommender-microservice/src/main/resources/application.yml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ server: 
  servlet:

    context-path: /api/v1

# todo ports from env

  port: ${RATING_PORT}

  port: ${MOVIE_RECOMMENDER_PORT}

  error:

    include-message: always

prometheus.yml

+2 −2
Original line number Diff line number Diff line
@@ -3,14 +3,14 @@ global: 


scrape_configs:

  - job_name: 'rating_microservice'

    metrics_path: '/api/v1/ratings/actuator/prometheus'  # Correct path to the metrics endpoint

    metrics_path: '/api/v1/actuator/prometheus'  # Correct path to the metrics endpoint

    static_configs:

      - targets: ['rating-service:8002']

        labels:

          application: 'rating-microservice'

          instance: 'rating-service:8002'

  - job_name: 'movie_microservice'

    metrics_path: '/api/v1/movies/actuator/prometheus'  # Correct path to the metrics endpoint

    metrics_path: '/api/v1/actuator/prometheus'  # Correct path to the metrics endpoint

    static_configs:

      - targets: [ 'movie-service:8001' ]

        labels: