rparodi/ft_transcendence
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(monitoring): fixes issues

Browse source
This commit is contained in:
Maieul BOYER 2025-12-17 21:00:21 +01:00
parent 3fd3635fd1
commit 41fdbfbaaa
No known key found for this signature in database
3 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
monitoring/grafana/datasources/prometheus.yaml
View file

@ -6,7 +6,7 @@ datasources:
type: prometheus type: prometheus
uid: prometheus uid: prometheus
access: proxy access: proxy
url: http://monitoring-prometheus:9090 url: http://mon-prometheus:9090
isDefault: true isDefault: true
jsonData: jsonData:
timeInterval: 15s timeInterval: 15s

6
monitoring/prometheus/prometheus.yml
View file

@ -4,11 +4,11 @@ global:
scrape_configs: scrape_configs:
- job_name: 'prometheus' - job_name: 'prometheus'
static_configs: static_configs:
- targets: ['monitoring-prometheus:9090'] - targets: ['mon-prometheus:9090']
- job_name: 'cadvisor' - job_name: 'cadvisor'
static_configs: static_configs:
- targets: ['monitoring-cadvisor:8080'] - targets: ['mon-cadvisor:8080']
- job_name: 'blackbox' - job_name: 'blackbox'
metrics_path: /probe metrics_path: /probe
@ -30,4 +30,4 @@ scrape_configs:
target_label: instance target_label: instance
- target_label: __address__ - target_label: __address__
replacement: monitoring-blackbox:9115 replacement: mon-blackbox:9115

11
nginx/conf/monitoring/locations.conf
View file

@ -1,22 +1,24 @@
# This is required to proxy Grafana Live WebSocket connections. set $upstream_kibana kibana:5601;
set $upstream_cadvisor cadvisor:8080;
set $upstream_grafana grafana:3000;
location /kibana { location /kibana {
proxy_set_header Host $host; proxy_set_header Host $host;
set $upstream_kibana kibana:5601;
proxy_pass http://$upstream_kibana; proxy_pass http://$upstream_kibana;
} }
location /cadvisor { location /cadvisor {
proxy_set_header Host $host; proxy_set_header Host $host;
set $upstream_cadvisor cadvisor:8080;
proxy_pass http://$upstream_cadvisor; proxy_pass http://$upstream_cadvisor;
} }
location /grafana { location /grafana {
proxy_set_header Host $host; proxy_set_header Host $host;
rewrite ^/grafana/?(.*) /$1 break; rewrite ^/grafana/?(.*) /$1 break;
set $upstream_grafana grafana:3000;
proxy_pass http://$upstream_grafana; proxy_pass http://$upstream_grafana;
} }
# This is required to proxy Grafana Live WebSocket connections.
# Proxy Grafana Live WebSocket connections. # Proxy Grafana Live WebSocket connections.
location /grafana/api/live/ { location /grafana/api/live/ {
proxy_http_version 1.1; proxy_http_version 1.1;
@ -24,7 +26,6 @@ location /grafana/api/live/ {
proxy_set_header Connection $connection_upgrade; proxy_set_header Connection $connection_upgrade;
proxy_set_header Host $host; proxy_set_header Host $host;
rewrite ^/grafana/?(.*) /$1 break; rewrite ^/grafana/?(.*) /$1 break;
set $upstream_grafana grafana:3000;
proxy_pass http://$upstream_grafana; proxy_pass http://$upstream_grafana;
} }