From d8f2f7d9340dec3830ee59fe85f2ce1b5a476e8e Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Mon, 7 Oct 2024 09:15:04 +0200
Subject: [PATCH] WIP
---
.../dashboards/system.json | 6 ++----
dbrepo-gateway-service/dbrepo.conf | 18 ------------------
dbrepo-metric-db/prometheus.yml | 6 +-----
docker-compose.yml | 2 ++
4 files changed, 5 insertions(+), 27 deletions(-)
diff --git a/dbrepo-dashboard-service/dashboards/system.json b/dbrepo-dashboard-service/dashboards/system.json
index 6d904003af..4eb40a1a2e 100644
--- a/dbrepo-dashboard-service/dashboards/system.json
+++ b/dbrepo-dashboard-service/dashboards/system.json
@@ -930,7 +930,6 @@
}
},
"mappings": [],
- "noValue": "0",
"thresholds": {
"mode": "absolute",
"steps": [
@@ -1055,7 +1054,6 @@
}
},
"mappings": [],
- "noValue": "0",
"thresholds": {
"mode": "absolute",
"steps": [
@@ -1164,8 +1162,8 @@
"viz": false
},
"insertNulls": false,
- "lineInterpolation": "smooth",
- "lineWidth": 2,
+ "lineInterpolation": "linear",
+ "lineWidth": 1,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
diff --git a/dbrepo-gateway-service/dbrepo.conf b/dbrepo-gateway-service/dbrepo.conf
index e10a65bfae..ecb92ac3da 100644
--- a/dbrepo-gateway-service/dbrepo.conf
+++ b/dbrepo-gateway-service/dbrepo.conf
@@ -48,24 +48,6 @@ server {
listen 80 default_server;
server_name _;
- location /dashboard {
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://dashboard-service;
- proxy_read_timeout 90;
- }
-
- # Proxy Grafana Live WebSocket connections.
- location /dashboard/api/live {
- proxy_http_version 1.1;
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection $connection_upgrade;
- proxy_set_header Host $host;
- proxy_pass http://dashboard-service;
- }
-
location /api/search {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
diff --git a/dbrepo-metric-db/prometheus.yml b/dbrepo-metric-db/prometheus.yml
index 4363523cad..82986b2490 100644
--- a/dbrepo-metric-db/prometheus.yml
+++ b/dbrepo-metric-db/prometheus.yml
@@ -16,8 +16,4 @@ scrape_configs:
- job_name: 'metrics scrape'
metrics_path: '/metrics'
static_configs:
- - targets: ['auth-service:8080', 'analyse-service:8080', 'search-service:8080', 'data-db-sidecar:8080', 'broker-service:15692', 'storage-service:9090', 'upload-service:8080']
- - job_name: 'dashboard scrape'
- metrics_path: '/dashboard/metrics'
- static_configs:
- - targets: ['dashboard-service:3000']
+ - targets: ['auth-service:8080', 'analyse-service:8080', 'search-service:8080', 'data-db-sidecar:8080', 'broker-service:15692', 'storage-service:9090', 'upload-service:8080', 'dashboard-service:3000']
diff --git a/docker-compose.yml b/docker-compose.yml
index eb0102be96..d21cc5edb4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -458,6 +458,8 @@ services:
network: host
volumes:
- dashboard-service-data:/opt/bitnami/grafana/data
+ ports:
+ - "3000:3000"
environment:
GF_SERVER_DOMAIN: "dashboard-service"
GF_SERVER_ROOT_URL: "${BASE_URL:-http://localhost}"
--
GitLab