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:
logan committed
1 parent
327e282356
commit
f9c6c1d826
204 files changed
+14107
-9103
No files matched your search
@@ -3,7 +3,7 @@ package models
|
||||
import (
|
||||
"time"
|
||||
|
||||
"lokideploy/pkg/crypto"
|
||||
"opsxloki/pkg/crypto"
|
||||
)
|
||||
|
||||
type Cluster struct {
|
||||
|
||||
@@ -26,6 +26,10 @@ type LokiDeployment struct {
|
||||
ResourcesCPU string `json:"resourcesCPU"`
|
||||
ResourcesMem string `json:"resourcesMem"`
|
||||
StorageSize string `json:"storageSize"`
|
||||
GrafanaEnabled bool `json:"grafanaEnabled"`
|
||||
GrafanaVersion string `json:"grafanaVersion"`
|
||||
GrafanaPort int `json:"grafanaPort"`
|
||||
GrafanaEndpoint string `json:"grafanaEndpoint"`
|
||||
Status string `json:"status"`
|
||||
StatusMessage string `json:"statusMessage"`
|
||||
HelmValues string `json:"helmValues"`
|
||||
@@ -62,6 +66,10 @@ func (d *LokiDeployment) Sanitized() map[string]interface{} {
|
||||
"resourcesCPU": d.ResourcesCPU,
|
||||
"resourcesMem": d.ResourcesMem,
|
||||
"storageSize": d.StorageSize,
|
||||
"grafanaEnabled": d.GrafanaEnabled,
|
||||
"grafanaVersion": d.GrafanaVersion,
|
||||
"grafanaPort": d.GrafanaPort,
|
||||
"grafanaEndpoint": d.GrafanaEndpoint,
|
||||
"status": d.Status,
|
||||
"statusMessage": d.StatusMessage,
|
||||
"helmValues": d.HelmValues,
|
||||
|
||||
+30
-28
@@ -3,7 +3,7 @@ package models
|
||||
import (
|
||||
"time"
|
||||
|
||||
"lokideploy/pkg/crypto"
|
||||
"opsxloki/pkg/crypto"
|
||||
)
|
||||
|
||||
// SSHAuthConfig SSH认证配置（定义在models包避免循环导入）
|
||||
@@ -19,37 +19,39 @@ type SSHAuthConfig struct {
|
||||
// Host 主机模型，敏感字段（Password/PrivateKey/KeyPhrase）加密存储
|
||||
// 加密格式: ENC:<base64(AES-GCM(ciphertext))>
|
||||
type Host struct {
|
||||
ID uint `json:"id"`
|
||||
Name string `json:"name"`
|
||||
HostIP string `json:"hostIP"`
|
||||
Port int `json:"port"`
|
||||
User string `json:"user"`
|
||||
AuthType string `json:"authType"`
|
||||
Password string `json:"password"` // 加密存储（ENC:前缀）
|
||||
PrivateKey string `json:"privateKey"` // 加密存储（ENC:前缀）
|
||||
KeyPhrase string `json:"keyPhrase"` // 加密存储（ENC:前缀）
|
||||
OS string `json:"os"`
|
||||
Arch string `json:"arch"`
|
||||
Status string `json:"status"`
|
||||
Labels string `json:"labels"`
|
||||
CreatedAt time.Time `json:"createdAt"`
|
||||
UpdatedAt time.Time `json:"updatedAt"`
|
||||
ID uint `json:"id"`
|
||||
Name string `json:"name"`
|
||||
HostIP string `json:"hostIP"`
|
||||
Port int `json:"port"`
|
||||
User string `json:"user"`
|
||||
AuthType string `json:"authType"`
|
||||
Password string `json:"password"` // 加密存储（ENC:前缀）
|
||||
PrivateKey string `json:"privateKey"` // 加密存储（ENC:前缀）
|
||||
KeyPhrase string `json:"keyPhrase"` // 加密存储（ENC:前缀）
|
||||
OS string `json:"os"`
|
||||
Arch string `json:"arch"`
|
||||
Status string `json:"status"`
|
||||
StatusMessage string `json:"statusMessage,omitempty"`
|
||||
Labels string `json:"labels"`
|
||||
CreatedAt time.Time `json:"createdAt"`
|
||||
UpdatedAt time.Time `json:"updatedAt"`
|
||||
}
|
||||
|
||||
func (h *Host) Sanitized() map[string]interface{} {
|
||||
return map[string]interface{}{
|
||||
"id": h.ID,
|
||||
"name": h.Name,
|
||||
"hostIP": h.HostIP,
|
||||
"port": h.Port,
|
||||
"user": h.User,
|
||||
"authType": h.AuthType,
|
||||
"os": h.OS,
|
||||
"arch": h.Arch,
|
||||
"status": h.Status,
|
||||
"labels": h.Labels,
|
||||
"createdAt": h.CreatedAt,
|
||||
"updatedAt": h.UpdatedAt,
|
||||
"id": h.ID,
|
||||
"name": h.Name,
|
||||
"hostIP": h.HostIP,
|
||||
"port": h.Port,
|
||||
"user": h.User,
|
||||
"authType": h.AuthType,
|
||||
"os": h.OS,
|
||||
"arch": h.Arch,
|
||||
"status": h.Status,
|
||||
"statusMessage": h.StatusMessage,
|
||||
"labels": h.Labels,
|
||||
"createdAt": h.CreatedAt,
|
||||
"updatedAt": h.UpdatedAt,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
package models
|
||||
|
||||
import "time"
|
||||
|
||||
// LogPolicyGroup grants one exact stream-label scope on one source to multiple users.
|
||||
type LogPolicyGroup struct {
|
||||
ID uint `json:"id"`
|
||||
Name string `json:"name"`
|
||||
SourceID uint `json:"sourceId"`
|
||||
Labels map[string]string `json:"labels"`
|
||||
UserIDs []uint `json:"userIds"`
|
||||
CreatedAt time.Time `json:"createdAt"`
|
||||
UpdatedAt time.Time `json:"updatedAt"`
|
||||
}
|
||||
|
||||
func (g *LogPolicyGroup) Sanitized() map[string]interface{} {
|
||||
return map[string]interface{}{
|
||||
"id": g.ID, "name": g.Name, "sourceId": g.SourceID,
|
||||
"labels": g.Labels, "userIds": g.UserIDs,
|
||||
"createdAt": g.CreatedAt, "updatedAt": g.UpdatedAt,
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
package models
|
||||
|
||||
import "time"
|
||||
|
||||
// LogSource 日志查询数据源。
|
||||
// cluster-svc: 经目标集群 kube-apiserver 的 service proxy 访问(无需直通 ClusterIP/DNS),
|
||||
//
|
||||
// 覆盖「本平台部署的 Loki」与「接入集群中已有的外部 Loki」两类场景;
|
||||
//
|
||||
// url: 直连地址(host-binary 部署或网络可达的 Loki)。
|
||||
type LogSource struct {
|
||||
ID uint `json:"id"`
|
||||
Name string `json:"name"`
|
||||
TargetType string `json:"targetType"` // cluster-svc | url
|
||||
ClusterID *uint `json:"clusterID,omitempty"`
|
||||
Namespace string `json:"namespace"`
|
||||
Service string `json:"service"`
|
||||
Port int `json:"port"`
|
||||
URL string `json:"url"`
|
||||
AuthType string `json:"authType"` // none | basic | bearer
|
||||
BasicUser string `json:"basicUser"`
|
||||
BasicPass string `json:"basicPass"` // ENC: 加密存储,不外发
|
||||
BearerToken string `json:"bearerToken"`
|
||||
Headers map[string]string `json:"headers,omitempty"`
|
||||
SkipTLSVerify bool `json:"skipTLSVerify"`
|
||||
IsDefault bool `json:"isDefault"`
|
||||
Access []LogSourceAccess `json:"access,omitempty"`
|
||||
CreatedAt time.Time `json:"createdAt"`
|
||||
UpdatedAt time.Time `json:"updatedAt"`
|
||||
}
|
||||
|
||||
func (s *LogSource) Sanitized() map[string]interface{} {
|
||||
return map[string]interface{}{
|
||||
"id": s.ID, "name": s.Name, "targetType": s.TargetType,
|
||||
"clusterID": s.ClusterID, "namespace": s.Namespace, "service": s.Service, "port": s.Port,
|
||||
"url": s.URL, "authType": s.AuthType, "basicUser": s.BasicUser,
|
||||
"hasBasicPass": s.BasicPass != "", "isDefault": s.IsDefault,
|
||||
"hasBearerToken": s.BearerToken != "", "headerNames": headerNames(s.Headers), "skipTLSVerify": s.SkipTLSVerify,
|
||||
"access": s.Access,
|
||||
"createdAt": s.CreatedAt, "updatedAt": s.UpdatedAt,
|
||||
}
|
||||
}
|
||||
|
||||
func headerNames(headers map[string]string) []string {
|
||||
names := make([]string, 0, len(headers))
|
||||
for name := range headers {
|
||||
names = append(names, name)
|
||||
}
|
||||
return names
|
||||
}
|
||||
|
||||
// LogSourceAccess grants one user access to a source, optionally restricted to exact stream labels.
|
||||
type LogSourceAccess struct {
|
||||
UserID uint `json:"userId"`
|
||||
Labels map[string]string `json:"labels,omitempty"`
|
||||
}
|
||||
@@ -80,6 +80,12 @@ func SanitizedJSON(v any) any {
|
||||
result[i] = item.Sanitized()
|
||||
}
|
||||
return result
|
||||
case []LogPolicyGroup:
|
||||
result := make([]map[string]interface{}, len(val))
|
||||
for i := range val {
|
||||
result[i] = val[i].Sanitized()
|
||||
}
|
||||
return result
|
||||
case []Sanitizer:
|
||||
result := make([]map[string]interface{}, len(val))
|
||||
for i, item := range val {
|
||||
|
||||
+12
-7
@@ -2,14 +2,18 @@ package models
|
||||
|
||||
import "time"
|
||||
|
||||
// User TokenVersion 用于服务端会话吊销：改密/管理员重置密码时递增，
|
||||
// 旧 token（access 与 refresh）随版本不匹配立即失效（借鉴 opsx-web-lite）。
|
||||
type User struct {
|
||||
ID uint `json:"id"`
|
||||
Username string `json:"username"`
|
||||
Password string `json:"password"`
|
||||
Nickname string `json:"nickname"`
|
||||
Role string `json:"role"`
|
||||
CreatedAt time.Time `json:"createdAt"`
|
||||
UpdatedAt time.Time `json:"updatedAt"`
|
||||
ID uint `json:"id"`
|
||||
Username string `json:"username"`
|
||||
Password string `json:"password"`
|
||||
Nickname string `json:"nickname"`
|
||||
Role string `json:"role"`
|
||||
AuthSource string `json:"authSource"` // local | ldap
|
||||
TokenVersion int `json:"tokenVersion"`
|
||||
CreatedAt time.Time `json:"createdAt"`
|
||||
UpdatedAt time.Time `json:"updatedAt"`
|
||||
}
|
||||
|
||||
func (u *User) Sanitized() map[string]interface{} {
|
||||
@@ -18,6 +22,7 @@ func (u *User) Sanitized() map[string]interface{} {
|
||||
"username": u.Username,
|
||||
"nickname": u.Nickname,
|
||||
"role": u.Role,
|
||||
"authSource": u.AuthSource,
|
||||
"createdAt": u.CreatedAt,
|
||||
"updatedAt": u.UpdatedAt,
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user