فهرست منبع

dev: clickstack-proxy (nginx) pordil 8124 -> /clickstack UI + HyperDX backend + ClickHouse; ClickHouse HTTP 8125

ardo 1 ماه پیش
والد
کامیت
ab8c7feef7
3فایلهای تغییر یافته به همراه62 افزوده شده و 12 حذف شده
  1. 9 11
      dev/LOEMIND.md
  2. 36 0
      dev/config/clickstack-proxy/nginx.conf
  3. 17 1
      dev/docker-compose.yml

+ 9 - 11
dev/LOEMIND.md

@@ -11,7 +11,7 @@ mille eesmärk on Oracle-baaside ülemineku ettevalmistamine).
 |--------|---------|
 | Pilt | `clickhouse/clickhouse-server:26.8.1.2041` |
 | Konteiner | `clickhouse` |
-| HTTP API | **8124** (ClickHouse'i vaikimisi 8123 on Home Assistant'il) |
+| HTTP API | **8125** otse (ClickHouse'i vaikimisi 8123 on Home Assistant'il) — **8124** läbi `clickstack-proxy` |
 | Native TCP | **9004** (vaikimisi 9000 on portainer'il) |
 | Kasutaja | `default` |
 | Parool | `dev_clickhouse_2026` |
@@ -51,16 +51,19 @@ ClickStack = HyperDX UI + ClickHouse + OTel-kollektor (logid/traces/meetrikud).
 | Omadus | Väärtus |
 |--------|---------|
 | Konteiner | `clickstack` (`hyperdx-all-in-one`) |
-| **UI (otsing/dashboardid)** | **`http://100.87.1.24:18080/search`** |
+| **UI (otsing/dashboardid)** | **`http://100.87.1.24:8124/clickstack/search`** (läbi `clickstack-proxy`) |
+| UI otse (varuvariant) | `http://100.87.1.24:18080/search` |
 | OTLP gRPC sisend | 4317 |
 | OTLP HTTP sisend | 4318 |
 | Andmed | `./data/clickstack` (gitignore'd) |
 
-**NB! Port 8124 on ClickHouse'i HTTP.** ClickHouse 26.8 serveerib küll staatilist
-ClickStack UI kestat `/clickstack/` pordil 8124, aga **otsing seal ei tööta**
-(backendi `/__ENV.js` ja `/api` puuduvad). Töötav ClickStack on pordil **18080**.
-
+**Port 8124 = `clickstack-proxy` (nginx):**
+- `/clickstack/*` → ClickStack UI (ClickHouse staatiline kest)
+- `/__ENV.js`, `/api/*`, `/graphql` → HyperDX backend
+- `/`, `/play`, `/?query=...` → ClickHouse (ehk DBeaver 8124-ga töötab edasi)
+- ClickHouse'i HTTP otse on nüüd pordil **8125** (8124 läbi proxy sama API-ga)
 
+## Migratsiooninäide: postgres → ClickHouse (paberkrohv)
 
 2026-08-31 viidi `paberkrohv` andmebaas postgresist (100.87.1.24:5432)
 ClickHouse'isse — näide, kuidas hiljem Oracle-baase üle viia.
@@ -105,11 +108,6 @@ docker exec -it clickhouse clickhouse-client --user default --password dev_click
   --query "SELECT count() FROM paberkrohv.sorptsioon"
 ```
 
-## Migratsiooninäide: postgres → ClickHouse (paberkrohv)
-
-2026-08-31 viidi `paberkrohv` andmebaas postgresist (100.87.1.24:5432)
-ClickHouse'isse — näide, kuidas hiljem Oracle-baase üle viia.
-
 ## Märkused
 
 - Pordid valitud konfliktivabaks: 8124 (HTTP), 9004 (native). 8123 = Home Assistant, 9000 = portainer.

+ 36 - 0
dev/config/clickstack-proxy/nginx.conf

@@ -0,0 +1,36 @@
+server {
+    listen 8124;
+
+    # ClickStack UI staatiline kest (ClickHouse serveerib /clickstack/)
+    location /clickstack/ {
+        proxy_pass http://clickhouse:8123;
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
+    # HyperDX backend (ClickStack API)
+    location = /__ENV.js {
+        proxy_pass http://clickstack:8080/__ENV.js;
+        proxy_set_header Host $host;
+    }
+    location /api/ {
+        proxy_pass http://clickstack:8080;
+        proxy_set_header Host $host;
+    }
+    location /graphql {
+        proxy_pass http://clickstack:8080;
+        proxy_set_header Host $host;
+    }
+    location /ws {
+        proxy_pass http://clickstack:8080;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+    }
+
+    # Kõik muu -> ClickHouse
+    location / {
+        proxy_pass http://clickhouse:8123;
+        proxy_set_header Host $host;
+    }
+}

+ 17 - 1
dev/docker-compose.yml

@@ -10,7 +10,7 @@ services:
       - CLICKHOUSE_DB=default
       - CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT=1
     ports:
-      - "8124:8123"   # HTTP API + sisseehitatud web UI (/play)
+      - "8125:8123"   # ClickHouse HTTP (8124 on nüüd clickstack-proxy; DBeaver saab 8124 kaudu ikka ligi)
       - "9004:9000"   # native TCP (clickhouse-client)
     volumes:
       - ./data/clickhouse:/var/lib/clickhouse
@@ -41,6 +41,22 @@ services:
     networks:
       - main_ai_network
 
+  # Reverse-proxy pordil 8124: /clickstack/ -> ClickHouse staatiline UI,
+  # backendi teed -> HyperDX, kõik muu -> ClickHouse (nii jääb 8124 DBeaver-ile tööle)
+  clickstack-proxy:
+    image: nginx:alpine
+    container_name: clickstack-proxy
+    restart: unless-stopped
+    ports:
+      - "8124:8124"
+    volumes:
+      - ./config/clickstack-proxy/nginx.conf:/etc/nginx/conf.d/clickstack.conf:ro
+    depends_on:
+      - clickhouse
+      - clickstack
+    networks:
+      - main_ai_network
+
 networks:
   main_ai_network:
     external: true