Thanasis Naskos / CUREX - Knowledge Extraction Analytics - KEA

Download as
Browse Code ยป

Commit 02efe446452d672f24d97bdc334ec2193700eff6

Authored by George Vlahavas
1 parent 4d49dbcd48
Exists in master and in 2 other branches new_mltd_model, new_model_rabbitmq_server

Use separate KIBANA_URL and GRAFANA_URL

Showing 5 changed files with 23 additions and 6 deletions

api/.env.example View file @ 02efe44
... ... @@ -54,6 +54,8 @@
54 54 KEYCLOAK_URL=https://keycloak-curex.gnubila.fr/auth/
55 55 KEYCLOAK_CLIENT_ID=KEA
56 56  
  57 +KIBANA_URL=$APP_URL
  58 +GRAFANA_URL=$APP_URL
57 59 KIBANA_PORT=5611
58 60 GRAFANA_PORT=3001
59 61  
api/app/Http/Controllers/ConfigController.php View file @ 02efe44
... ... @@ -10,9 +10,9 @@
10 10 {
11 11 return [
12 12 'base_url' => env('APP_URL'),
13   - 'od_url' => env('APP_URL') . ':' . env('GRAFANA_PORT') . env('OD_GRAFANA_PARAMS'),
14   - 'mltd_url' => env('APP_URL') . ':' . env('GRAFANA_PORT') . env('MLTD_GRAFANA_PARAMS'),
15   - 'ceptd_url' => env('APP_URL') . ':' . env('KIBANA_PORT') . env('CEPTD_KIBANA_PARAMS'),
  13 + 'od_url' => env('GRAFANA_URL'),
  14 + 'mltd_url' => env('GRAFANA_URL'),
  15 + 'ceptd_url' => env('KIBANA_URL')
16 16 ];
17 17 }
18 18  
api/start.sh View file @ 02efe44
1 1 #!/bin/sh
2 2  
3   -sed "s|^APP_URL=.*|APP_URL=${APP_URL}|" .env.example > .env
  3 +sed "s|^APP_URL=.*|APP_URL=${APP_URL}|" .env.example | \
  4 + sed "s|^GRAFANA_URL=.*|GRAFANA_URL=${GRAFANA_URL}|" | \
  5 + sed "s|^KIBANA_URL=.*|KIBANA_URL=${KIBANA_URL}" > .env
4 6  
5 7 php-fpm
docker-compose-hetzner.yml View file @ 02efe44
... ... @@ -58,6 +58,11 @@
58 58 - 5601
59 59 networks:
60 60 - "proxy-network"
  61 + environment:
  62 + - "VIRTUAL_HOST=kea-kibana.vlahavas.com"
  63 + - "VIRTUAL_PORT=5601"
  64 + - "LETSENCRYPT_HOST=kea-kibana.vlahavas.com"
  65 + - "LETSENCRYPT_EMAIL=gvlahavas@csd.auth.gr"
61 66  
62 67 #Controller
63 68 webserver:
... ... @@ -92,6 +97,8 @@
92 97 - "APP_ENV=${APP_ENV}"
93 98 - "APP_DEBUG=${APP_DEBUG}"
94 99 - "APP_URL=${APP_URL}"
  100 + - "KIBANA_URL=${KIBANA_URL}"
  101 + - "GRAFANA_URL=${GRAFANA_URL}"
95 102 - "KIBANA_PORT=${KIBANA_PORT}"
96 103 - "GRAFANA_PORT=${GRAFANA_PORT}"
97 104 - "LOG_CHANNEL=${LOG_CHANNEL}"
... ... @@ -192,6 +199,10 @@
192 199 - GF_SECURITY_COOKIE_SAMESITE=none
193 200 - GF_AUTH_ANONYMOUS_ENABLED=true
194 201 - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
  202 + - "VIRTUAL_HOST=kea-grafana.vlahavas.com"
  203 + - "VIRTUAL_PORT=3000"
  204 + - "LETSENCRYPT_HOST=kea-grafana.vlahavas.com"
  205 + - "LETSENCRYPT_EMAIL=gvlahavas@csd.auth.gr"
195 206 networks:
196 207 - "proxy-network"
197 208  
hetzner_deploy.groovy View file @ 02efe44
... ... @@ -24,8 +24,10 @@
24 24 APP_DEBUG = "true"
25 25 APP_URL = "https://kea.curex-project.eu"
26 26  
27   - KIBANA_PORT = "5601"
28   - GRAFANA_PORT = "3000"
  27 + KIBANA_URL = "https://kea-kibana.vlahavas.com"
  28 + GRAFANA_URL = "https://kea-grafana.vlahavas.com"
  29 + KIBANA_PORT = "443"
  30 + GRAFANA_PORT = "443"
29 31  
30 32 LOG_CHANNEL = "stack"
31 33