Merge remote-tracking branch 'origin/master' into develop

Arquisoft · Apr 24, 2024 · e37ad64 · e37ad64
2 parents daa2b1d + 3b20f67
commit e37ad64
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/api/monitoring/grafana/provisioning/datasources/datasources.yml b/api/monitoring/grafana/provisioning/datasources/datasources.yml
@@ -4,7 +4,7 @@ datasources:
     type: prometheus
     access: proxy
     orgId: 1
-    url: http://prometheus:9090
+    url: http://20.199.84.5:9090
     basicAuth: false
     isDefault: true
     editable: true
diff --git a/api/monitoring/prometheus/Dockerfile b/api/monitoring/prometheus/Dockerfile
@@ -7,4 +7,4 @@ COPY ./configuration /etc/prometheus
 EXPOSE 9090
 
 # Run Prometheus in the foreground
-CMD ["prometheus"]
+CMD ["--config.file=/etc/prometheus/prometheus.yml"]
diff --git a/api/monitoring/prometheus/configuration/prometheus.yml b/api/monitoring/prometheus/configuration/prometheus.yml
@@ -2,7 +2,8 @@ scrape_configs:
   - job_name: 'WiqMetrics'
     metrics_path: '/actuator/prometheus'
     scrape_interval: 10s
+    scheme: https
     static_configs:
-      - targets: ['host.docker.internal:8443']
+      - targets: ['kiwiq.run.place:8443']
         labels:
           application: 'WIQ API'
diff --git a/api/src/main/java/lab/en2b/quizapi/auth/config/SecurityConfig.java b/api/src/main/java/lab/en2b/quizapi/auth/config/SecurityConfig.java
@@ -58,6 +58,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http, Authentication
                 .cors(Customizer.withDefaults())
                 .sessionManagement(configuration -> configuration.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
                 .authorizeHttpRequests(authorize -> authorize
+                        .requestMatchers(HttpMethod.GET, "/actuator/**").permitAll()
+                        .requestMatchers(HttpMethod.POST, "/actuator/**").permitAll()
                         .requestMatchers(HttpMethod.POST,"/questions/**").permitAll()
                         .requestMatchers(HttpMethod.GET,"/questions/**").permitAll()
                         .requestMatchers(HttpMethod.GET,"/users/details").authenticated()

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -95,6 +95,9 @@
         - "9090:9090"
       networks:
         mynetwork:
+      environment:
+        - API_URI=${API_URI}
+
       volumes:
         - prometheus_data:/prometheus
         - /certs:/etc/letsencrypt/kiwiq.run.place:ro
@@ -114,7 +117,7 @@
         - "9091:9091"
       environment:
         - GF_SERVER_HTTP_PORT=9091
-        - GF_AUTH_DISABLE_LOGIN_FORM=true
+        #- GF_AUTH_DISABLE_LOGIN_FORM=true
       depends_on:
         - prometheus  
   volumes: