Files
LokiStack/Makefile
T
logan f9c6c1d826 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 加密前缀保留(已加密凭证不受影响)。
2026-10-24 13:20:12 +08:00

125 lines
4.2 KiB
Makefile

# ============================================================
# opsx-loki - Makefile
# Convenient shortcuts for common operations
# ============================================================
.PHONY: help build start stop status logs clean prod-setup secrets
# Default target
help:
@echo "opsx-loki v2 - Available Commands:"
@echo ""
@echo " make build - Build Docker image"
@echo " make start - Start with docker-compose (dev)"
@echo " make stop - Stop all services"
@echo " make status - Show container status and health"
@echo " make logs - Follow container logs"
@echo " make prod - Start production deployment"
@echo " make prod-stop - Stop production deployment"
@echo " make secrets - Generate secret files"
@echo " make clean - Remove containers, volumes, and images"
@echo " make shell - Open shell in running container"
@echo " make lint - Validate Docker and Compose files"
@echo ""
# Build Docker image
build:
@echo "Building opsx-loki v2 image..."
@docker compose build --no-cache
# Development
start:
@echo "Starting opsx-loki (dev mode)..."
@echo ""
@if [ -z "$${JWT_SECRET:-}" ]; then \
echo "WARNING: JWT_SECRET not set!"; \
echo "Run: export JWT_SECRET=\$$(openssl rand -hex 32)"; \
echo " export ENCRYPTION_KEY=\$$(openssl rand -hex 32)"; \
echo ""; \
read -p "Continue without secrets? (y/N) " ans; \
[ "$$ans" != "y" ] && [ "$$ans" != "Y" ] && exit 1; \
fi
@docker compose up -d
@echo ""
@echo "opsx-loki started!"
@echo " URL: http://localhost:$${SERVER_PORT:-8080}"
@echo " Check status: make status"
stop:
@echo "Stopping opsx-loki..."
@docker compose down --timeout 15
status:
@echo "=== Container Status ==="
@docker compose ps
@echo ""
@echo "=== Health Checks ==="
@docker inspect --format='{{.Name}}: {{.State.Health.Status}}' opsxloki 2>/dev/null || echo "opsxloki: container not found"
@echo ""
@echo "=== Resource Usage ==="
@docker stats --no-stream --format "table {{.Name}}\t{{.CPUPerc}}\t{{.MemUsage}}\t{{.NetIO}}\t{{.BlockIO}}" opsxloki 2>/dev/null || true
logs:
@docker compose logs -f --tail=50
# Production
prod-setup: secrets
@echo "Setting up production environment..."
@mkdir -p secrets
@echo "Production secrets created in ./secrets/"
prod:
@echo "Starting opsx-loki (production mode)..."
@if [ ! -f secrets/jwt_secret.txt ] || [ ! -f secrets/encryption_key.txt ]; then \
echo "ERROR: Secrets not found. Run 'make secrets' first."; \
exit 1; \
fi
@docker compose -f docker-compose.prod.yml up -d
@echo "Production deployment started!"
@echo " Load Balancer: http://localhost:$${SERVER_PORT:-8080}"
@echo " Check status: docker compose -f docker-compose.prod.yml ps"
prod-stop:
@echo "Stopping production deployment..."
@docker compose -f docker-compose.prod.yml down --timeout 30
# Secrets generation
secrets:
@echo "Generating secret files..."
@mkdir -p secrets
@chmod 700 secrets
@openssl rand -hex 32 > secrets/jwt_secret.txt
@openssl rand -hex 32 > secrets/encryption_key.txt
@chmod 600 secrets/*.txt
@echo "Secrets created:"
@echo " - secrets/jwt_secret.txt"
@echo " - secrets/encryption_key.txt"
@echo ""
@echo "IMPORTANT: Keep these files secure and never commit them!"
# Maintenance
shell:
@docker compose exec opsxloki /bin/sh
clean:
@echo "Cleaning up..."
@docker compose down --volumes --rmi local --timeout 15 2>/dev/null || true
@docker compose -f docker-compose.prod.yml down --volumes --rmi local --timeout 30 2>/dev/null || true
@echo "Cleanup complete."
# Linting
lint:
@echo "Validating Dockerfile..."
@docker run --rm -i hadolint/hadolint < Dockerfile 2>/dev/null || echo "hadolint not available, install from: https://github.com/hadolint/hadolint"
@echo ""
@echo "Validating docker-compose.yml..."
@docker compose config > /dev/null && echo "docker-compose.yml: OK"
@echo ""
@echo "Validating docker-compose.prod.yml..."
@docker compose -f docker-compose.prod.yml config > /dev/null && echo "docker-compose.prod.yml: OK"
@echo ""
@echo "Checking shell scripts..."
@bash -n run.sh && echo "run.sh: syntax OK"
@bash -n build.sh && echo "build.sh: syntax OK"
@bash -n docker-entrypoint.sh && echo "docker-entrypoint.sh: syntax OK"