feat(monitoring): fixes issues

monitoring/grafana/datasources/prometheus.yaml

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

monitoring/prometheus/prometheus.yml

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

nginx/conf/monitoring/locations.conf

@@ -1,30 +1,31 @@
-# 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 {
-    proxy_set_header Host $host;    
-    set $upstream_kibana kibana:5601;
+    proxy_set_header Host $host;
     proxy_pass http://$upstream_kibana;
 }
 
 location /cadvisor {
-    proxy_set_header Host $host;    
-    set $upstream_cadvisor cadvisor:8080;
+    proxy_set_header Host $host;
     proxy_pass http://$upstream_cadvisor;
 }
 
 location /grafana {
     proxy_set_header Host $host;
-    rewrite       ^/grafana/?(.*) /$1 break;
-    set $upstream_grafana grafana:3000;
+    rewrite ^/grafana/?(.*) /$1 break;
     proxy_pass http://$upstream_grafana;
 }
+
+# This is required to proxy Grafana Live WebSocket connections.
 # Proxy Grafana Live WebSocket connections.
 location /grafana/api/live/ {
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection $connection_upgrade;
     proxy_set_header Host $host;
-    rewrite       ^/grafana/?(.*) /$1 break;    
-    set $upstream_grafana grafana:3000;
+    rewrite ^/grafana/?(.*) /$1 break;
     proxy_pass http://$upstream_grafana;
 }
 
@@ -36,4 +37,4 @@ location /ok {
 location / {
     root /var/share/www/monitoring/;
     index monitoring.index.html;
-}
+}