Skip to content
Snippets Groups Projects
Verified Commit d8f2f7d9 authored by Martin Weise's avatar Martin Weise
Browse files

WIP

parent 1f96ae34
Branches
Tags
7 merge requests!345Updated docs and endpoints:,!341Fixed mapping problem where UK and FK share columns they are inserted,!339Fixed mapping problem where UK and FK share columns they are inserted,!338Fixed mapping problem where UK and FK share columns they are inserted,!334Fixed mapping problem where UK and FK share columns they are inserted,!333Fixed mapping problem where UK and FK share columns they are inserted,!328Hotfix/mapping
...@@ -930,7 +930,6 @@ ...@@ -930,7 +930,6 @@
} }
}, },
"mappings": [], "mappings": [],
"noValue": "0",
"thresholds": { "thresholds": {
"mode": "absolute", "mode": "absolute",
"steps": [ "steps": [
...@@ -1055,7 +1054,6 @@ ...@@ -1055,7 +1054,6 @@
} }
}, },
"mappings": [], "mappings": [],
"noValue": "0",
"thresholds": { "thresholds": {
"mode": "absolute", "mode": "absolute",
"steps": [ "steps": [
...@@ -1164,8 +1162,8 @@ ...@@ -1164,8 +1162,8 @@
"viz": false "viz": false
}, },
"insertNulls": false, "insertNulls": false,
"lineInterpolation": "smooth", "lineInterpolation": "linear",
"lineWidth": 2, "lineWidth": 1,
"pointSize": 5, "pointSize": 5,
"scaleDistribution": { "scaleDistribution": {
"type": "linear" "type": "linear"
......
...@@ -48,24 +48,6 @@ server { ...@@ -48,24 +48,6 @@ server {
listen 80 default_server; listen 80 default_server;
server_name _; 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 { location /api/search {
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
......
...@@ -16,8 +16,4 @@ scrape_configs: ...@@ -16,8 +16,4 @@ scrape_configs:
- job_name: 'metrics scrape' - job_name: 'metrics scrape'
metrics_path: '/metrics' metrics_path: '/metrics'
static_configs: 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'] - 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']
- job_name: 'dashboard scrape'
metrics_path: '/dashboard/metrics'
static_configs:
- targets: ['dashboard-service:3000']
...@@ -458,6 +458,8 @@ services: ...@@ -458,6 +458,8 @@ services:
network: host network: host
volumes: volumes:
- dashboard-service-data:/opt/bitnami/grafana/data - dashboard-service-data:/opt/bitnami/grafana/data
ports:
- "3000:3000"
environment: environment:
GF_SERVER_DOMAIN: "dashboard-service" GF_SERVER_DOMAIN: "dashboard-service"
GF_SERVER_ROOT_URL: "${BASE_URL:-http://localhost}" GF_SERVER_ROOT_URL: "${BASE_URL:-http://localhost}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment