feat: opsx-loki 全面升级 — 前端重构/用户与LDAP/部署向导/日志查询
基于 WEB-UI-Development-Guide 标准的整体升级,并更名 LokiDeploy → opsx-loki。 前端(Gin+React+shadcn/ui): - 按 02/07 章重构:页面域化拆分(无超 400 行文件)、PageContainer/ListQuery、 反馈分级(成功静默/失败 toast/危险确认)、401 单飞刷新+队列重放 - 暗色模式(next-themes)+ 语义 Token(--primary 品牌色/success/warning/info) - 部署向导(状态推导四步:环境→存储→Loki→采集,内嵌表单闭环) - 日志查询页:LogQL 标签构建器/拖拽直方图/日志上下文/Live Tail/查询历史 - 按用户+标签策略的查询授权(服务端强制合并策略) 后端(Go+Gin+JSON DB): - 简单用户管理(仅 admin,无 RBAC)+ TokenVersion 会话吊销 + 登录 IP 限流 - LDAP 接入:配置(AES 加密存储/hasPassword 脱敏)/测试连接/批量导入/登录 - 存储配置测试连接(SigV4 零依赖)+ 桶不存在自动创建 - Loki 三模式部署修复:SSH 密钥认证、3.x 配置模板、ruler 对象存储嵌套块、 凭证解密、孤儿 deploying 状态恢复、Grafana 部署(可选默认关)+面板导入 - DaemonSet 采集纯 YAML(去 helm 依赖)+ DNS 自愈回退 ClusterIP + 集群名标签 - 日志查询代理:cluster-svc 经 kube-apiserver proxy/url 直连 + cursor 翻页 - 统一 log 命名空间;部署就绪探活;Grafana 访问地址自动记录 修复:run.sh 增量编译检测、Sanitized 脱敏补全、LokiDeployment Update 白名单、 健康检查 CreatedAt 零值等 10+ 存量 bug。 数据兼容:DB 沿用旧 lokideploy.json(新名优先);localStorage 一次性迁移; HKDF 加密前缀保留(已加密凭证不受影响)。
This commit is contained in:
1 parent
327e282356
commit
f9c6c1d826
204 files changed
+14107
-9103
No files matched your search
+26
-26
@@ -1,5 +1,5 @@
|
||||
# ============================================================
|
||||
# LokiDeploy - Production Docker Compose Configuration
|
||||
# opsx-loki - Production Docker Compose Configuration
|
||||
# ============================================================
|
||||
# Features:
|
||||
# - Multi-instance deployment with load balancing
|
||||
@@ -15,14 +15,14 @@ services:
|
||||
# ---- Nginx Load Balancer ----
|
||||
nginx:
|
||||
image: nginx:1.27-alpine
|
||||
container_name: lokideploy-lb
|
||||
container_name: opsxloki-lb
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "8080:8080"
|
||||
volumes:
|
||||
- ./nginx.conf:/etc/nginx/nginx.conf:ro
|
||||
networks:
|
||||
- lokideploy-net
|
||||
- opsxloki-net
|
||||
healthcheck:
|
||||
test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8080/health"]
|
||||
interval: 30s
|
||||
@@ -52,21 +52,21 @@ services:
|
||||
- /var/cache/nginx:noexec,nosuid,size=10m
|
||||
- /var/run:noexec,nosuid,size=5m
|
||||
depends_on:
|
||||
lokideploy-1:
|
||||
opsxloki-1:
|
||||
condition: service_healthy
|
||||
lokideploy-2:
|
||||
opsxloki-2:
|
||||
condition: service_healthy
|
||||
|
||||
# ---- Application Instance 1 ----
|
||||
lokideploy-1:
|
||||
opsxloki-1:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile
|
||||
args:
|
||||
TARGETARCH: ${TARGETARCH:-amd64}
|
||||
image: lokideploy:v2
|
||||
container_name: lokideploy-1
|
||||
hostname: lokideploy-1
|
||||
image: opsxloki:v2
|
||||
container_name: opsxloki-1
|
||||
hostname: opsxloki-1
|
||||
restart: unless-stopped
|
||||
|
||||
security_opt:
|
||||
@@ -85,16 +85,16 @@ services:
|
||||
|
||||
volumes:
|
||||
# Named volume for data persistence
|
||||
- lokideploy-data-1:/app/data
|
||||
- opsxloki-data-1:/app/data
|
||||
# kubeconfig read-only (P0: non-root path)
|
||||
- ${KUBECONFIG_PATH:-~/.kube}:/home/lokideploy/.kube:ro
|
||||
- ${KUBECONFIG_PATH:-~/.kube}:/home/opsxloki/.kube:ro
|
||||
# SSH keys read-only
|
||||
- ${SSH_KEY_PATH:-~/.ssh}:/home/lokideploy/.ssh:ro
|
||||
- ${SSH_KEY_PATH:-~/.ssh}:/home/opsxloki/.ssh:ro
|
||||
|
||||
environment:
|
||||
- SERVER_PORT=8080
|
||||
- DATA_DIR=/app/data
|
||||
- KUBECONFIG=/home/lokideploy/.kube/config
|
||||
- KUBECONFIG=/home/opsxloki/.kube/config
|
||||
# Secrets via Docker Secrets file injection
|
||||
- JWT_SECRET_FILE=${JWT_SECRET_FILE:-/run/secrets/jwt_secret}
|
||||
- ENCRYPTION_KEY_FILE=${ENCRYPTION_KEY_FILE:-/run/secrets/encryption_key}
|
||||
@@ -136,18 +136,18 @@ services:
|
||||
|
||||
stop_grace_period: 30s
|
||||
networks:
|
||||
- lokideploy-net
|
||||
- opsxloki-net
|
||||
|
||||
# ---- Application Instance 2 ----
|
||||
lokideploy-2:
|
||||
opsxloki-2:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile
|
||||
args:
|
||||
TARGETARCH: ${TARGETARCH:-amd64}
|
||||
image: lokideploy:v2
|
||||
container_name: lokideploy-2
|
||||
hostname: lokideploy-2
|
||||
image: opsxloki:v2
|
||||
container_name: opsxloki-2
|
||||
hostname: opsxloki-2
|
||||
restart: unless-stopped
|
||||
|
||||
security_opt:
|
||||
@@ -163,14 +163,14 @@ services:
|
||||
- /tmp:noexec,nosuid,size=50m,uid=1000,gid=1000
|
||||
|
||||
volumes:
|
||||
- lokideploy-data-2:/app/data
|
||||
- ${KUBECONFIG_PATH:-~/.kube}:/home/lokideploy/.kube:ro
|
||||
- ${SSH_KEY_PATH:-~/.ssh}:/home/lokideploy/.ssh:ro
|
||||
- opsxloki-data-2:/app/data
|
||||
- ${KUBECONFIG_PATH:-~/.kube}:/home/opsxloki/.kube:ro
|
||||
- ${SSH_KEY_PATH:-~/.ssh}:/home/opsxloki/.ssh:ro
|
||||
|
||||
environment:
|
||||
- SERVER_PORT=8080
|
||||
- DATA_DIR=/app/data
|
||||
- KUBECONFIG=/home/lokideploy/.kube/config
|
||||
- KUBECONFIG=/home/opsxloki/.kube/config
|
||||
- JWT_SECRET_FILE=${JWT_SECRET_FILE:-/run/secrets/jwt_secret}
|
||||
- ENCRYPTION_KEY_FILE=${ENCRYPTION_KEY_FILE:-/run/secrets/encryption_key}
|
||||
|
||||
@@ -209,13 +209,13 @@ services:
|
||||
|
||||
stop_grace_period: 30s
|
||||
networks:
|
||||
- lokideploy-net
|
||||
- opsxloki-net
|
||||
|
||||
# ---- Named Volumes ----
|
||||
volumes:
|
||||
lokideploy-data-1:
|
||||
opsxloki-data-1:
|
||||
driver: local
|
||||
lokideploy-data-2:
|
||||
opsxloki-data-2:
|
||||
driver: local
|
||||
|
||||
# ---- Docker Secrets ----
|
||||
@@ -227,7 +227,7 @@ secrets:
|
||||
|
||||
# ---- Network ----
|
||||
networks:
|
||||
lokideploy-net:
|
||||
opsxloki-net:
|
||||
driver: bridge
|
||||
ipam:
|
||||
config:
|
||||
|
||||
Reference in new issue
Block a user