diff --git a/.gitignore b/.gitignore index 47d6e36c..94eaa49f 100644 --- a/.gitignore +++ b/.gitignore @@ -27,5 +27,4 @@ buf.lock configs/tenanter.yaml log/ -/go_build_gitlink_org_cn_JCCE_PCM /cache/ diff --git a/Makefile b/Makefile index bbbb7e0c..1d87b2d5 100644 --- a/Makefile +++ b/Makefile @@ -1,21 +1,9 @@ pcm-core-api: - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o pcm-core-api adaptor/PCM-CORE/api/pcm.go + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o pcm-core-api api/pcm.go pcm-core-rpc: - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o pcm-core-rpc adaptor/PCM-CORE/rpc/pcmcore.go + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o pcm-core-rpc rpc/pcmcore.go -pcm-ac-rpc: - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o pcm-ac adaptor/PCM-HPC/PCM-AC/rpc/hpcac.go +all-build: pcm-core-rpc pcm-core-api -pcm-kubenative-rpc: - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o pcm-kubenative adaptor/PCM-K8S/PCM-K8S-NATIVE/rpc/pcmkubenative.go - -pcm-modelarts-rpc: - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o pcm-modelarts adaptor/PCM-AI/PCM-MODELARTS/rpc/pcmmodelarts.go - -pcm-ceph-rpc: - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o pcm-ceph adaptor/PCM-STORAGE/PCM-CEPH/rpc/pcmceph.go - -all-build: pcm-core-rpc pcm-core-api pcm-ac-rpc pcm-kubenative-rpc pcm-modelarts-rpc pcm-ceph-rpc - -.PHONY: pcm-core-rpc pcm-core-api pcm-ac-rpc pcm-kubenative-rpc pcm-modelarts-rpc pcm-ceph-rpc \ No newline at end of file +.PHONY: pcm-core-rpc pcm-core-api \ No newline at end of file diff --git a/api/Dockerfile b/api/Dockerfile index 11153a75..a4372ef0 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -1,40 +1,29 @@ FROM golang:1.21.2-alpine3.18 AS builder -LABEL stage=gobuilder - -ENV CGO_ENABLED 0 -ENV GOARCH amd64 -ENV GOPROXY https://goproxy.cn,direct - -RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.sjtug.sjtu.edu.cn/g' /etc/apk/repositories && \ - apk update --no-cache && apk add --no-cache tzdata - WORKDIR /app -ADD go.mod . -ADD go.sum . -RUN go mod download COPY . . -COPY api/etc/ /app/ + +RUN go env -w GO111MODULE=on \ +&& go env -w GOPROXY=https://goproxy.cn,direct \ +&& go env -w CGO_ENABLED=0 \ +&& go mod download RUN go build -o pcm-coordinator-api /app/api/pcm.go +FROM alpine:3.18 -FROM alpine:3.16.2 WORKDIR /app - #修改alpine源为上海交通大学 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.sjtug.sjtu.edu.cn/g' /etc/apk/repositories && \ - apk update && \ - apk upgrade && \ - apk add --no-cache ca-certificates && update-ca-certificates && \ - apk add --update tzdata && \ - rm -rf /var/cache/apk/* + apk add --no-cache ca-certificates tzdata && \ + update-ca-certificates && \ + rm -rf /var/cache/apk/* -COPY --from=builder /app/pcm-coordinator-api . -COPY api/etc/pcm.yaml . +COPY --from=builder /app/pcm-coordinator-api /app/ +COPY --from=builder /app/api/etc/pcm.yaml /app/ ENV TZ=Asia/Shanghai EXPOSE 8999 -ENTRYPOINT ./pcm-coordinator-api -f pcm.yaml \ No newline at end of file +ENTRYPOINT ["./pcm-coordinator-api", "-f", "pcm.yaml"] \ No newline at end of file diff --git a/api/desc/monitoring/pcm-monitoring.api b/api/desc/monitoring/pcm-monitoring.api index befa84bb..9c5cee7c 100644 --- a/api/desc/monitoring/pcm-monitoring.api +++ b/api/desc/monitoring/pcm-monitoring.api @@ -11,6 +11,12 @@ type CreateAlertRuleReq { AlertType string `json:"alertType"` } +type DeleteAlertRuleReq { + Id int64 `form:"id"` + ClusterName string `form:"clusterName"` + Name string `form:"name"` +} + type ( AlertRulesReq { AlertType string `form:"alertType"` @@ -73,36 +79,35 @@ type ( ) type ( - adapterInfoReq{ + adapterInfoReq { clusterId string `form:"clusterId"` } - adapterInfoResp{ + adapterInfoResp { name string `json:"name"` version string `json:"version"` } ) type ( -scheduleSituationResp{ - nodes []NodeRegion `json:"nodes"` - links []Link `json:"links"` - categories []Category `json:"categories"` -} + scheduleSituationResp { + nodes []NodeRegion `json:"nodes"` + links []Link `json:"links"` + categories []Category `json:"categories"` + } -NodeRegion{ - id string `json:"id"` - name string `json:"name"` - category int `json:"category"` - value int `json:"value"` -} + NodeRegion { + id string `json:"id"` + name string `json:"name"` + category int `json:"category"` + value int `json:"value"` + } -Link{ - source string `json:"source"` - target string `json:"target"` -} - -Category{ - name string `json:"name"` -} + Link { + source string `json:"source"` + target string `json:"target"` + } + Category { + name string `json:"name"` + } ) \ No newline at end of file diff --git a/api/desc/pcm.api b/api/desc/pcm.api index 03779d46..7278fae0 100644 --- a/api/desc/pcm.api +++ b/api/desc/pcm.api @@ -1031,6 +1031,9 @@ service pcm { @handler alertRulesHandler get /monitoring/alert/rule (AlertRulesReq) returns (AlertRulesResp) + @handler DeleteAlertRuleHandler + delete /cloud/alert/rule (DeleteAlertRuleReq) + @doc "cluster resource load" @handler clustersLoadHandler get /monitoring/cluster/load (clustersLoadReq) returns (clustersLoadResp) diff --git a/api/internal/handler/monitoring/deletealertrulehandler.go b/api/internal/handler/monitoring/deletealertrulehandler.go new file mode 100644 index 00000000..e7593a92 --- /dev/null +++ b/api/internal/handler/monitoring/deletealertrulehandler.go @@ -0,0 +1,25 @@ +package monitoring + +import ( + "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" + "net/http" + + "github.com/zeromicro/go-zero/rest/httpx" + "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/logic/monitoring" + "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" + "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" +) + +func DeleteAlertRuleHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + var req types.DeleteAlertRuleReq + if err := httpx.Parse(r, &req); err != nil { + httpx.ErrorCtx(r.Context(), w, err) + return + } + + l := monitoring.NewDeleteAlertRuleLogic(r.Context(), svcCtx) + err := l.DeleteAlertRule(&req) + result.HttpResult(r, w, nil, err) + } +} diff --git a/api/internal/handler/routes.go b/api/internal/handler/routes.go index d63d02e1..03a8dab5 100644 --- a/api/internal/handler/routes.go +++ b/api/internal/handler/routes.go @@ -1302,6 +1302,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { Path: "/monitoring/alert/rule", Handler: monitoring.AlertRulesHandler(serverCtx), }, + { + Method: http.MethodDelete, + Path: "/cloud/alert/rule", + Handler: monitoring.DeleteAlertRuleHandler(serverCtx), + }, { Method: http.MethodGet, Path: "/monitoring/cluster/load", diff --git a/api/internal/logic/ai/getcentertasklistlogic.go b/api/internal/logic/ai/getcentertasklistlogic.go index edf3d1b4..2e63cf74 100644 --- a/api/internal/logic/ai/getcentertasklistlogic.go +++ b/api/internal/logic/ai/getcentertasklistlogic.go @@ -92,7 +92,7 @@ func (l *GetCenterTaskListLogic) updateAiTaskStatus(mu *sync.RWMutex, ch chan<- } for _, task := range taskList { t := task - if t.Status == constants.Completed { + if t.Status == constants.Completed || t.JobId == "" { continue } wg.Add(1) diff --git a/api/internal/logic/core/pagelisttasklogic.go b/api/internal/logic/core/pagelisttasklogic.go index be3baccd..0792be9a 100644 --- a/api/internal/logic/core/pagelisttasklogic.go +++ b/api/internal/logic/core/pagelisttasklogic.go @@ -4,6 +4,8 @@ import ( "context" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" + "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/constants" + "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/models" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/JointCloud/pcm-coordinator/pkg/utils/timeutils" "time" @@ -49,6 +51,11 @@ func (l *PageListTaskLogic) PageListTask(req *types.PageTaskReq) (resp *types.Pa if err != nil { return nil, result.NewDefaultError(err.Error()) } + + // 更新智算任务状态 + var ch = make(chan struct{}) + go l.updateAitaskStatus(list, ch) + for _, model := range list { if model.StartTime != "" && model.EndTime == "" { startTime := timeutils.TimeStringToGoTime(model.StartTime) @@ -65,5 +72,64 @@ func (l *PageListTaskLogic) PageListTask(req *types.PageTaskReq) (resp *types.Pa resp.PageNum = req.PageNum resp.Total = total - return resp, nil + select { + case _ = <-ch: + return resp, nil + case <-time.After(1 * time.Second): + return resp, nil + } +} + +func (l *PageListTaskLogic) updateAitaskStatus(tasks []*types.TaskModel, ch chan<- struct{}) { + for _, task := range tasks { + if task.AdapterTypeDict != 1 { + continue + } + if task.Status == constants.Succeeded { + continue + } + + var aiTask []*models.TaskAi + tx := l.svcCtx.DbEngin.Raw("select * from task_ai where `task_id` = ? ", task.Id).Scan(&aiTask) + if tx.Error != nil { + logx.Errorf(tx.Error.Error()) + return + } + + start, _ := time.ParseInLocation(constants.Layout, aiTask[0].StartTime, time.Local) + end, _ := time.ParseInLocation(constants.Layout, aiTask[0].EndTime, time.Local) + var status = constants.Succeeded + for _, a := range aiTask { + s, _ := time.ParseInLocation(constants.Layout, a.StartTime, time.Local) + e, _ := time.ParseInLocation(constants.Layout, a.EndTime, time.Local) + + if s.Before(start) { + start = s + } + + if e.After(end) { + end = e + } + + if a.Status == constants.Failed { + status = a.Status + break + } + + if a.Status == constants.Running { + status = a.Status + continue + } + } + + task.Status = status + task.StartTime = start.Format(constants.Layout) + task.EndTime = end.Format(constants.Layout) + + tx = l.svcCtx.DbEngin.Table("task").Updates(task) + if tx.Error != nil { + return + } + } + ch <- struct{}{} } diff --git a/api/internal/logic/core/pushtaskinfologic.go b/api/internal/logic/core/pushtaskinfologic.go index ff5a102f..63169a86 100644 --- a/api/internal/logic/core/pushtaskinfologic.go +++ b/api/internal/logic/core/pushtaskinfologic.go @@ -106,7 +106,7 @@ func syncTask(gorm *gorm.DB, noticeInfo clientCore.NoticeInfo) { if tx.Error != nil { logx.Error(tx.Error) } - + allStatus = strings.ToUpper(allStatus) for pcmStatus, ProviderStatus := range clientCore.StatusMapping { for _, originalStatus := range ProviderStatus { // if Failed type status appears in subTask then update mainTask to Failed diff --git a/api/internal/logic/hpc/commithpctasklogic.go b/api/internal/logic/hpc/commithpctasklogic.go index e716b2c0..374d7807 100644 --- a/api/internal/logic/hpc/commithpctasklogic.go +++ b/api/internal/logic/hpc/commithpctasklogic.go @@ -50,6 +50,11 @@ func (l *CommitHpcTaskLogic) CommitHpcTask(req *types.CommitHpcTaskReq) (resp *t var clusterIds []int64 l.svcCtx.DbEngin.Raw("SELECT id FROM `t_cluster` where adapter_id in ? and label = ?", req.AdapterIds, req.ClusterType).Scan(&clusterIds) + if len(clusterIds) == 0 || clusterIds == nil { + resp.Code = 400 + resp.Msg = "no cluster found" + return resp, nil + } var clusterName string var adapterId int64 @@ -61,12 +66,6 @@ func (l *CommitHpcTaskLogic) CommitHpcTask(req *types.CommitHpcTaskReq) (resp *t env, _ := json.Marshal(req.Environment) - if len(clusterIds) == 0 || clusterIds == nil { - resp.Code = 400 - resp.Msg = "no cluster found" - return resp, nil - } - hpcInfo := models.TaskHpc{ TaskId: taskModel.Id, AdapterId: uint(adapterId), diff --git a/api/internal/logic/monitoring/createalertrulelogic.go b/api/internal/logic/monitoring/createalertrulelogic.go index c9685c98..fb19d23f 100644 --- a/api/internal/logic/monitoring/createalertrulelogic.go +++ b/api/internal/logic/monitoring/createalertrulelogic.go @@ -46,7 +46,7 @@ func (l *CreateAlertRuleLogic) CreateAlertRule(req *types.CreateAlertRuleReq) er return tx.Error } - // query server http url. + // query cluster http url. var server string l.svcCtx.DbEngin.Raw("select ta.server from t_adapter ta,t_cluster tc where ta.id = tc.adapter_id and tc.name = ?", &req.ClusterName).Scan(&server) diff --git a/api/internal/logic/monitoring/deletealertrulelogic.go b/api/internal/logic/monitoring/deletealertrulelogic.go new file mode 100644 index 00000000..aa718829 --- /dev/null +++ b/api/internal/logic/monitoring/deletealertrulelogic.go @@ -0,0 +1,66 @@ +package monitoring + +import ( + "context" + + "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" + "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" + + "github.com/zeromicro/go-zero/core/logx" +) + +type DeleteAlertRuleLogic struct { + logx.Logger + ctx context.Context + svcCtx *svc.ServiceContext +} + +func NewDeleteAlertRuleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *DeleteAlertRuleLogic { + return &DeleteAlertRuleLogic{ + Logger: logx.WithContext(ctx), + ctx: ctx, + svcCtx: svcCtx, + } +} + +func (l *DeleteAlertRuleLogic) DeleteAlertRule(req *types.DeleteAlertRuleReq) error { + // Delete data from the database + l.svcCtx.DbEngin.Delete(&types.AlertRule{}, "id = ?", req.Id) + + // query cluster http url. + var server string + l.svcCtx.DbEngin.Raw("select ta.server from t_adapter ta,t_cluster tc where ta.id = tc.adapter_id and tc.name = ?", &req.ClusterName).Scan(&server) + + // create prometheus rule + response, err := l.svcCtx.HttpClient.R(). + SetBody(&CrdStruct{ + ClusterName: req.ClusterName, + Name: req.Name, + Grv: Grv{ + Group: "monitoring.coreos.com", + Version: "v1", + Resource: "prometheusrules", + }, + }). + ForceContentType("application/json"). + Delete(server + "/api/v1/crd") + if err != nil { + return err + } + if err != nil || response.IsError() { + return err + } + return nil +} + +type Grv struct { + Group string `json:"group"` + Version string `json:"version"` + Resource string `json:"resource"` +} + +type CrdStruct struct { + ClusterName string `json:"clusterName"` + Grv Grv `json:"grv"` + Name string `json:"name"` +} diff --git a/api/internal/logic/monitoring/schedulesituationlogic.go b/api/internal/logic/monitoring/schedulesituationlogic.go index 3dc1b64a..d2b41697 100644 --- a/api/internal/logic/monitoring/schedulesituationlogic.go +++ b/api/internal/logic/monitoring/schedulesituationlogic.go @@ -33,28 +33,28 @@ func (l *ScheduleSituationLogic) ScheduleSituation() (resp *types.ScheduleSituat // hpc var hpcLinks []string - tx = l.svcCtx.DbEngin.Raw("SELECT GROUP_CONCAT(cluster_id SEPARATOR ',') as cluster_ids FROM task_hpc WHERE deleted_at IS NULL GROUP BY task_id HAVING COUNT(*) > 1;").Scan(&hpcLinks) + tx = l.svcCtx.DbEngin.Raw("SELECT distinct GROUP_CONCAT( distinct cluster_id SEPARATOR ',') as cluster_ids FROM task_hpc WHERE deleted_at IS NULL GROUP BY task_id HAVING COUNT(*) > 1;").Scan(&hpcLinks) if tx.Error != nil { return nil, tx.Error } LinksHandler(hpcLinks, resp) // cloud var cloudLinks []string - tx = l.svcCtx.DbEngin.Raw("SELECT GROUP_CONCAT(cluster_id SEPARATOR ',') as cluster_ids FROM task_cloud WHERE deleted_at IS NULL GROUP BY task_id HAVING COUNT(*) > 1;").Scan(&cloudLinks) + tx = l.svcCtx.DbEngin.Raw("SELECT distinct GROUP_CONCAT(distinct cluster_id SEPARATOR ',') as cluster_ids FROM task_cloud WHERE deleted_at IS NULL GROUP BY task_id HAVING COUNT(*) > 1;").Scan(&cloudLinks) if tx.Error != nil { return nil, tx.Error } LinksHandler(cloudLinks, resp) // ai var aiLinks []string - tx = l.svcCtx.DbEngin.Raw("SELECT GROUP_CONCAT(cluster_id SEPARATOR ',') as cluster_ids FROM task_ai WHERE deleted_at IS NULL GROUP BY task_id HAVING COUNT(*) > 1;").Scan(&aiLinks) + tx = l.svcCtx.DbEngin.Raw("SELECT distinct GROUP_CONCAT(distinct cluster_id SEPARATOR ',') as cluster_ids FROM task_ai WHERE deleted_at IS NULL GROUP BY task_id HAVING COUNT(*) > 1;").Scan(&aiLinks) if tx.Error != nil { return nil, tx.Error } LinksHandler(aiLinks, resp) // vm var vmLinks []string - tx = l.svcCtx.DbEngin.Raw("SELECT GROUP_CONCAT(cluster_id SEPARATOR ',') as cluster_ids FROM task_vm WHERE deleted_at IS NULL GROUP BY task_id HAVING COUNT(*) > 1;").Scan(&vmLinks) + tx = l.svcCtx.DbEngin.Raw("SELECT distinct GROUP_CONCAT(distinct cluster_id SEPARATOR ',') as cluster_ids FROM task_vm WHERE deleted_at IS NULL GROUP BY task_id HAVING COUNT(*) > 1;").Scan(&vmLinks) if tx.Error != nil { return nil, tx.Error } diff --git a/api/internal/scheduler/schedulers/aiScheduler.go b/api/internal/scheduler/schedulers/aiScheduler.go index b61e03b7..19f67b83 100644 --- a/api/internal/scheduler/schedulers/aiScheduler.go +++ b/api/internal/scheduler/schedulers/aiScheduler.go @@ -197,7 +197,7 @@ func (as *AiScheduler) AssignTask(clusters []*strategy.AssignedCluster) (interfa return nil, errors.New("database add failed: " + err.Error()) } } - for s := range ch { + for _, s := range results { if s.Msg != "" { msg := fmt.Sprintf("clusterId: %v , error: %v \n", s.ClusterId, s.Msg) errmsg += msg diff --git a/api/internal/storeLink/octopus.go b/api/internal/storeLink/octopus.go index 3b1d2521..3f0f8021 100644 --- a/api/internal/storeLink/octopus.go +++ b/api/internal/storeLink/octopus.go @@ -53,17 +53,25 @@ const ( EnflameT20 = 128 BASE_TOPS = 128 CAMBRICON = "cambricon" - TIANSHU = "天数" + ILUVATAR = "iluvatar" TRAIN_CMD = "cd /code; python train.py" VERSION = "V1" DOMAIN = "http://192.168.242.41:8001/" + CAMBRICON_CN = "寒武纪290" + ENFLAME_CN = "燧原T20" + ILUVATAR_CN = "天数BI-V100" ) var ( cardAliasMap = map[string]string{ MLU: CAMBRICON, GCU: ENFLAME, - BIV100: TIANSHU, + BIV100: ILUVATAR, + } + cardCnMap = map[string]string{ + MLU: CAMBRICON_CN, + GCU: ENFLAME_CN, + BIV100: ILUVATAR_CN, } cardTopsMap = map[string]float64{ MLU: CAMBRICONMLU290, @@ -373,20 +381,37 @@ func (o *OctopusLink) DownloadAlgorithmCode(ctx context.Context, resourceType st } var algorithmId string + var algorithms []*octopus.Algorithms for _, a := range resp.Payload.Algorithms { if strings.ToLower(a.FrameworkName) != taskType { continue } - if a.AlgorithmName == name { - algorithmId = a.AlgorithmId - break + + if a.AlgorithmDescript == name { + algorithms = append(algorithms, a) } } - if algorithmId == "" { + if len(algorithms) == 0 { return "", errors.New("algorithmId not found") } + if len(algorithms) == 1 { + algorithmId = algorithms[0].AlgorithmId + } + + aLatest := &octopus.Algorithms{} + for i, _ := range algorithms { + if time.Unix(aLatest.CreatedAt, 0).After(time.Unix(algorithms[i].CreatedAt, 0)) { + aLatest = algorithms[i] + } + } + if aLatest.AlgorithmId == "" { + return "", errors.New("algorithmId not found") + } + + algorithmId = aLatest.AlgorithmId + dcReq := &octopus.DownloadCompressReq{ Platform: o.platform, Version: VERSION, @@ -428,6 +453,13 @@ func (o *OctopusLink) DownloadAlgorithmCode(ctx context.Context, resourceType st } func (o *OctopusLink) UploadAlgorithmCode(ctx context.Context, resourceType string, card string, taskType string, dataset string, algorithm string, code string) error { + //var name string + //if resourceType == CARD { + // name = dataset + UNDERSCORE + algorithm + UNDERSCORE + card + //} else { + // name = dataset + UNDERSCORE + algorithm + UNDERSCORE + CPU + //} + //uploadReq := &octopus.UploadAlgorithmReq{} return nil } @@ -447,6 +479,10 @@ func (o *OctopusLink) GetTrainingTaskLog(ctx context.Context, taskId string, ins return "", err } + if strings.Contains(resp.Content, "404 Not Found") { + resp.Content = "waiting for logs..." + } + return resp.Content, nil } @@ -455,9 +491,9 @@ func (o *OctopusLink) GetTrainingTask(ctx context.Context, taskId string) (*coll if err != nil { return nil, err } - jobresp := (resp).(*octopus.GetTrainJobResp) - if !jobresp.Success { - return nil, errors.New(jobresp.Error.Message) + jobresp, ok := (resp).(*octopus.GetTrainJobResp) + if !jobresp.Success || !ok { + return nil, errors.New("get training task failed") } var task collector.Task task.Id = jobresp.Payload.TrainJob.Id @@ -714,7 +750,7 @@ func setResourceIdByCard(option *option.AiOption, specs *octopus.GetResourceSpec if spec.Price == 1 { ns := strings.Split(spec.Name, COMMA) cardSpecs := strings.Split(ns[0], STAR) - if cardSpecs[1] == computeCard { + if cardSpecs[1] == cardCnMap[computeCard] { option.ResourceId = spec.Id option.ComputeCard = computeCard return nil @@ -730,7 +766,7 @@ func setResourceIdByCard(option *option.AiOption, specs *octopus.GetResourceSpec if spec.Price == 1 { ns := strings.Split(spec.Name, COMMA) cardSpecs := strings.Split(ns[0], STAR) - if cardSpecs[1] == computeCard { + if cardSpecs[1] == cardCnMap[computeCard] { option.ResourceId = spec.Id option.ComputeCard = computeCard return nil @@ -744,7 +780,7 @@ func setResourceIdByCard(option *option.AiOption, specs *octopus.GetResourceSpec continue } cardSpecs := strings.Split(ns[0], STAR) - if cardSpecs[1] != computeCard { + if cardSpecs[1] != cardCnMap[computeCard] { continue } s, err := strconv.ParseFloat(cardSpecs[0], 64) diff --git a/api/internal/types/types.go b/api/internal/types/types.go index 4c0eb207..e1620f47 100644 --- a/api/internal/types/types.go +++ b/api/internal/types/types.go @@ -5750,6 +5750,12 @@ type CreateAlertRuleReq struct { AlertType string `json:"alertType"` } +type DeleteAlertRuleReq struct { + Id int64 `form:"id"` + ClusterName string `form:"clusterName"` + Name string `form:"name"` +} + type AlertRulesReq struct { AlertType string `form:"alertType"` AdapterId string `form:"adapterId,optional"` diff --git a/deploy/pcm-yaml.zip b/deploy/pcm-yaml.zip index eb1b043d..ea3b15c9 100644 Binary files a/deploy/pcm-yaml.zip and b/deploy/pcm-yaml.zip differ diff --git a/deploy/pcm.sql b/deploy/pcm.sql index 0c7d0e74..9ffd9155 100644 --- a/deploy/pcm.sql +++ b/deploy/pcm.sql @@ -11,7 +11,7 @@ Target Server Version : 80036 (8.0.36) File Encoding : 65001 - Date: 29/04/2024 14:06:29 + Date: 13/05/2024 09:28:52 */ SET NAMES utf8mb4; @@ -191,19 +191,10 @@ CREATE TABLE `alert_rule` ( -- ---------------------------- -- Records of alert_rule -- ---------------------------- -INSERT INTO `alert_rule` VALUES (1777228855245803520, 'test', '0', 1770703902472146944, 'sum(node:node_num_cpu:sum) > 3', '1m', 'critical', '', NULL, NULL, '2024-04-08 14:55:53', NULL, '2024-04-08 14:55:53'); -INSERT INTO `alert_rule` VALUES (1780072372317982720, 'test', '0', 1770658294298316800, 'sum(node:node_num_cpu:sum) > 3', '1m', 'critical', '', NULL, NULL, '2024-04-16 11:15:00', NULL, '2024-04-16 11:15:00'); -INSERT INTO `alert_rule` VALUES (1782308215002763264, 'test', '0', 0, 'sum(node:node_num_cpu:sum) > 3', '1m', 'critical', '', NULL, NULL, '2024-04-22 15:19:26', NULL, '2024-04-22 15:19:26'); -INSERT INTO `alert_rule` VALUES (1782308936221724672, 'test', '0', 0, 'sum(node:node_num_cpu:sum) > 3', '1m', 'critical', '', NULL, NULL, '2024-04-22 15:22:18', NULL, '2024-04-22 15:22:18'); -INSERT INTO `alert_rule` VALUES (1782324358539120640, 'test2', '0', 1770703902472146944, 'sum(node:node_num_cpu:sum) > 3', '1m', 'critical', '', NULL, NULL, '2024-04-22 16:23:35', NULL, '2024-04-22 16:23:35'); -INSERT INTO `alert_rule` VALUES (1782324402155687936, 'test1', '0', 1766856565336487987, 'sum(node:node_num_cpu:sum) > 3', '1m', 'critical', '', NULL, NULL, '2024-04-22 16:23:46', NULL, '2024-04-22 16:23:46'); -INSERT INTO `alert_rule` VALUES (1782324578882686976, 'test3', '0', 1763132837495574528, 'sum(node:node_num_cpu:sum) > 3', '1m', 'critical', '', NULL, NULL, '2024-04-22 16:24:28', NULL, '2024-04-22 16:24:28'); -INSERT INTO `alert_rule` VALUES (1782331063696101376, 'test6', '0', 1766856565336487987, 'sum(node:node_num_cpu:sum) > 3', '1m', 'warning', '', NULL, NULL, '2024-04-22 16:50:14', NULL, '2024-04-22 16:50:14'); -INSERT INTO `alert_rule` VALUES (1782331381410435072, 'test7', '0', 1763132837495574528, 'sum(node:node_num_cpu:sum) > 3', '1m', 'info', '', NULL, NULL, '2024-04-22 16:51:30', NULL, '2024-04-22 16:51:30'); -INSERT INTO `alert_rule` VALUES (1782331881568604160, 'test8', '0', 1770703902472146944, 'sum(node:node_num_cpu:sum) > 3', '1m', 'info', '', NULL, NULL, '2024-04-22 16:53:29', NULL, '2024-04-22 16:53:29'); -INSERT INTO `alert_rule` VALUES (1782332943331495936, 'testweigou', '0', 1766856565336487987, 'sum(node:node_num_cpu:sum) > 3', '1m', 'critical', '', NULL, NULL, '2024-04-22 16:57:42', NULL, '2024-04-22 16:57:42'); -INSERT INTO `alert_rule` VALUES (1782696877527928832, 'test10', '0', 1766856565336487987, 'sum(node:node_num_cpu:sum) > 3', '1m', 'critical', '', NULL, NULL, '2024-04-23 17:03:51', NULL, '2024-04-23 17:03:51'); -INSERT INTO `alert_rule` VALUES (1782696905122254848, 'test10', '0', 1766856565336487987, 'sum(node:node_num_cpu:sum) > 3', '1m', 'critical', '', NULL, NULL, '2024-04-23 17:03:57', NULL, '2024-04-23 17:03:57'); +INSERT INTO `alert_rule` VALUES (1789227604499238912, 'node-cpu-idle11', '0', 1770703902472146944, 'instance:node_cpu:ratio < 0.05', '1m', 'critical', 'Idle node resources exist.', NULL, NULL, '2024-05-11 17:34:37', NULL, '2024-05-11 17:34:37'); +INSERT INTO `alert_rule` VALUES (1789234895155892224, 'node-cpu-idle', '0', 1763132837495574528, 'instance:node_cpu:ratio < 0.05', '1m', 'critical', 'Idle node resources exist.', NULL, NULL, '2024-05-11 18:03:36', NULL, '2024-05-11 18:03:36'); +INSERT INTO `alert_rule` VALUES (1789234938269143040, 'node-cpu-idle', '0', 1763132837495574528, 'instance:node_cpu:ratio < 0.05', '1m', 'critical', 'Idle node resources exist.', NULL, NULL, '2024-05-11 18:03:46', NULL, '2024-05-11 18:03:46'); +INSERT INTO `alert_rule` VALUES (1789235098231508992, 'node-cpu-idle', '0', 1763132837495574528, 'instance:node_cpu:ratio < 0.05', '1m', 'critical', 'Idle node resources exist.', NULL, NULL, '2024-05-11 18:04:24', NULL, '2024-05-11 18:04:24'); -- ---------------------------- -- Table structure for center_tag @@ -1749,132 +1740,6 @@ CREATE TABLE `sc_node_avail_info` ( -- ---------------------------- -- Records of sc_node_avail_info -- ---------------------------- -INSERT INTO `sc_node_avail_info` VALUES (1784805810891657216, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:44:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784805810891657217, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:44:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784805810891657218, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:44:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784806314048753664, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:46:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784806314048753665, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:46:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784806314048753666, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:46:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784806817365233664, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:48:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784806817365233665, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:48:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784806817365233666, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:48:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784807320841097216, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:50:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784807320841097217, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:50:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784807320841097218, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:50:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784807823998193664, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:52:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784807823998193665, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:52:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784807823998193666, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:52:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784808327427919872, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:54:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784808327427919873, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:54:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784808327427919874, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:54:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784808830631153664, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:56:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784808830631153665, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:56:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784808830631153666, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:56:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784809333947633664, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:58:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784809333947633665, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:58:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784809333947633666, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:58:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784809837264113664, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:00:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784809837264113665, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:00:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784809837264113666, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:00:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784810340580593664, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:02:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784810340580593665, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:02:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784810340580593666, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:02:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784810843901267968, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:04:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784810843901267969, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:04:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784810843901267970, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:04:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784811347209359360, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:06:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784811347209359361, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:06:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784811347209359362, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:06:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784811850672640000, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:08:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784811850672640001, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:08:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784811850672640002, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:08:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784812353850707968, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:10:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784812353850707969, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:10:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784812353850707970, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:10:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784812857326571520, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:12:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784812857326571521, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:12:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784812857326571522, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:12:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784813360475279360, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:14:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784813360475279361, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:14:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784813360475279362, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:14:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784813863791759360, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:16:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784813863791759361, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:16:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784813863791759362, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:16:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784814367108239360, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:18:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784814367108239361, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:18:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784814367108239362, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:18:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784814870424719360, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:20:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784814870424719361, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:20:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784814870424719362, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:20:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784815373913165824, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:22:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784815373913165825, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:22:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784815373913165826, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:22:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784815877057679360, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:24:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784815877057679361, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:24:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784815877057679362, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:24:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784816380378353664, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:26:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784816380378353665, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:26:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784816380378353666, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:26:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784816883879383040, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:28:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784816883879383041, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:28:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784816883879383042, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:28:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784817387187474432, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:30:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784817387187474433, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:30:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784817387187474434, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:30:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784817890336182272, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:32:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784817890336182273, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:32:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784817890336182274, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:32:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784818393799462912, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:34:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784818393799462913, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:34:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784818393799462914, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:34:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784818896956559360, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:36:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784818896956559361, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:36:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784818896956559362, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:36:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784819400277233664, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:38:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784819400277233665, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:38:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784819400277233666, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:38:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784819903593713664, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:40:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784819903593713665, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:40:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784819903593713666, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:40:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784820406910193664, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:42:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784820406910193665, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:42:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784820406910193666, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:42:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784820910226673664, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:44:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784820910226673665, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:44:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784820910226673666, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:44:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784821413543153664, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:46:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784821413543153665, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:46:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784821413543153666, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:46:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784821916859633664, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:48:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784821916859633665, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:48:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784821916859633666, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:48:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784822420171919360, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:50:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784822420171919361, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:50:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784822420171919362, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:50:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784822923492593664, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:52:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784822923492593665, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:52:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784822923492593666, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:52:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784823426809073664, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:54:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784823426809073665, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:54:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784823426809073666, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:54:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784823930293325824, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:56:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784823930293325825, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:56:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784823930293325826, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:56:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784824433601417216, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:58:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784824433601417217, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:58:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784824433601417218, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:58:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784824936892731392, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 14:00:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784824936892731393, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 14:00:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784824936892731394, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 14:00:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784825440234377216, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 14:02:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784825440234377217, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 14:02:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784825440234377218, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 14:02:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784825943391473664, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 14:04:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784825943391473665, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 14:04:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784825943391473666, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 14:04:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784826446712147968, 'aliyun-master', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 14:06:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784826446712147969, 'aliyun-work1', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 14:06:00', NULL, NULL); -INSERT INTO `sc_node_avail_info` VALUES (1784826446712147970, 'aliyun-work2', 8, 0.00, 0, 0, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 14:06:00', NULL, NULL); -- ---------------------------- -- Table structure for sc_node_phy_info @@ -1946,48 +1811,6 @@ CREATE TABLE `sc_participant_avail_info` ( -- ---------------------------- -- Records of sc_participant_avail_info -- ---------------------------- -INSERT INTO `sc_participant_avail_info` VALUES (1784805810887462912, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:44:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784806314044559360, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:46:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784806817361039360, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:48:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784807320836902912, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:50:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784807823993999360, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:52:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784808327306285056, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:54:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784808830626959360, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:56:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784809333943439360, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 12:58:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784809837259919360, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:00:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784810340576399360, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:02:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784810843897073664, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:04:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784811347205165056, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:06:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784811850668445696, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:08:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784812353846513664, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:10:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784812857322377216, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:12:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784813360466890752, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:14:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784813863787565056, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:16:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784814367104045056, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:18:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784814870420525056, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:20:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784815373908971520, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:22:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784815877053485056, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:24:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784816380374159360, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:26:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784816883875188736, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:28:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784817387120365568, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:30:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784817890331987968, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:32:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784818393791074304, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:34:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784818896948170752, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:36:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784819400273039360, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:38:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784819903589519360, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:40:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784820406905999360, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:42:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784820910222479360, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:44:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784821413538959360, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:46:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784821916855439360, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:48:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784822420167725056, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:50:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784822923488399360, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:52:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784823426804879360, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:54:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784823930289131520, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:56:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784824433597222912, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 13:58:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784824936888537088, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 14:00:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784825440230182912, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 14:02:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784825943387279360, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 14:04:00', NULL, NULL); -INSERT INTO `sc_participant_avail_info` VALUES (1784826446707953664, 0, 0, 0, 0, 1696118513460056064, 0, NULL, '2024-04-29 14:06:00', NULL, NULL); -- ---------------------------- -- Table structure for sc_participant_label_info @@ -2115,7 +1938,7 @@ CREATE TABLE `sc_tenant_info` ( `created_by` int NULL DEFAULT NULL COMMENT '创建人', `created_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `updated_by` int NULL DEFAULT NULL COMMENT '更新人', - `updated_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间', + `updated_time` datetime NULL COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '集群租户信息' ROW_FORMAT = DYNAMIC; @@ -2166,7 +1989,7 @@ CREATE TABLE `t_adapter` ( `created_by` int NULL DEFAULT 0 COMMENT '创建人', `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `updated_by` int NULL DEFAULT 0 COMMENT '更新人', - `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `update_time` datetime NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '适配器表' ROW_FORMAT = Dynamic; @@ -2175,8 +1998,8 @@ CREATE TABLE `t_adapter` ( -- ---------------------------- INSERT INTO `t_adapter` VALUES (1706858330967773111, '超算适配器', 2, 'slurm和ac两类超算调度系统适配器', 'v0.1.1', 'localhost:2007', NULL, 0, '2024-02-01 15:36:58', 0, '2024-03-14 15:27:44'); INSERT INTO `t_adapter` VALUES (1706858330967773113, '虚拟机适配器-修改测试', 3, '虚拟机适配器-修改测试', 'v0.1.1', 'pcm-openstack-service:2004', NULL, 0, '2024-02-27 16:16:45', 0, '2024-03-25 10:57:40'); -INSERT INTO `t_adapter` VALUES (1752857389213683712, '阿里云数算', 0, '阿里云k8s集群适配器', 'v0.1.0', 'http://pcm-kubernetes-ali.ns-admin:2005', NULL, 0, '2024-02-01 08:52:22', 0, '2024-04-09 10:52:41'); -INSERT INTO `t_adapter` VALUES (1770658294298316800, '腾讯云数算', 0, '腾讯云k8s集群适配器', 'v0.1.0', 'http://pcm-kubernetes-tencent.ns-admin:8082', NULL, 0, '2024-03-21 11:46:49', 0, '2024-04-08 09:57:52'); +INSERT INTO `t_adapter` VALUES (1752857389213683712, '阿里云数算', 0, '阿里云k8s集群适配器', 'v0.1.0', 'http://pcm-kubernetes-ali.ns-admin:8082', NULL, 0, '2024-02-01 08:52:22', 0, '2024-05-11 18:03:11'); +INSERT INTO `t_adapter` VALUES (1770658294298316800, '腾讯云数算', 0, '腾讯云k8s集群适配器', 'v0.1.0', 'http://pcm-kubernetes-tencent.ns-admin:8082', NULL, 0, '2024-03-21 11:46:49', 0, '2024-05-11 17:58:49'); INSERT INTO `t_adapter` VALUES (1777144940459986944, '智算异构适配器测试1', 1, 'octopus和ac两类智算调度系统适配器', 'v0.1.1', '', NULL, 0, '2024-04-08 09:22:35', 0, '2024-04-11 15:26:23'); INSERT INTO `t_adapter` VALUES (1781589135446773760, '驱动器', 2, '超算驱动器2', '1.0', '175.178.223.172', NULL, 0, '2024-04-20 15:42:04', 0, '2024-04-20 15:42:04'); @@ -2210,7 +2033,7 @@ CREATE TABLE `t_cluster` ( `created_by` int NULL DEFAULT 0 COMMENT '创建人', `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `updated_by` int NULL DEFAULT 0 COMMENT '更新人', - `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `update_time` datetime NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `t_cluster_name_uindex`(`name` ASC) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '集群表' ROW_FORMAT = Dynamic; @@ -2218,18 +2041,18 @@ CREATE TABLE `t_cluster` ( -- ---------------------------- -- Records of t_cluster -- ---------------------------- -INSERT INTO `t_cluster` VALUES (1758770002, 1706858330967773111, 'ac', 'ac超算', 'ac超算', 'http://172.20.184.1:3001', NULL, 'acgnnmfbwo', 'Pcl@2020', NULL, NULL, NULL, NULL, NULL, 'ac v1.25', NULL, 'ac', 0, 1, NULL, NULL, NULL, 0, '2024-04-05 09:32:34', 0, '2024-04-18 15:52:03'); -INSERT INTO `t_cluster` VALUES (1758770003, 1706858330967773113, 'Keylin_Openstack_T', '电科云openstack-T版集群', '电科云openstack-T版集群', 'http://10.200.1.82:35357/v3/auth/tokens?nocatalog', NULL, 'admin', '28b474f30dc3497d', NULL, NULL, NULL, NULL, NULL, 'train', NULL, 'openstack', NULL, 1, NULL, NULL, NULL, 0, '2024-02-27 16:26:42', 0, '2024-04-09 15:24:13'); -INSERT INTO `t_cluster` VALUES (1758770004, 1706858330967773113, 'DianKe_Openstack_R', '电科云openstack-R版集群', '电科云openstack-R版集群', 'http://10.200.15.121:35357/v3/auth/tokens?nocatalog', NULL, 'admin', 'nrfD3plQn9ro3WZ3nFmejFA3F7y5VpGwL0KARvlq', NULL, NULL, NULL, NULL, NULL, 'rocky', NULL, 'openstack', NULL, 1, NULL, NULL, NULL, 0, '2024-02-27 16:30:30', 0, '2024-03-14 11:21:21'); -INSERT INTO `t_cluster` VALUES (1758770005, 1706858330967773111, 'slurm', '华为云slurm测试环境', '华为云slurm测试环境', 'http://121.37.170.20:6820', '121.37.170.20', 'root', '-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAtuPZOTAB+v8H5wtjW4kB1e+T+nj7vCuXZc6gZzSZ9MMt/za+\n65knupMvvvI+mGwZsQkq7fsl1T3NDKgp9gD4/YIYtZ+H9UvW2/azZh4BC35u0kql\nWtMe/LZgywlaXfZ9AExq4XXLkRm63KlaGmG9D3HuNf6MkIK33BMPN4KxKOD74m1Y\nRJbP8juKx41ly5kPLWzCH9S5JUONdEz0ryfKowzvNRbCEYHQCbq7IvYN1UyHap0l\nctjg+83yvtcmLWNMrqjENGFhxqXIf5BM1mdZjhmxgvHGdKnas4wSN6mJQC88mZen\nyuBZZGs284StyQJgmIHqOTzbzTwrceKYXTzwvQIDAQABAoIBAAvw7oLsXoS72BE+\nzhrw5BzKyrek5JLRqc3s4s46Qf8YK02pjmellVF6QLjP6kRbcoX7mkD1j+/PXC8C\nX9L/F0K+FsztAJyEeh/ciLQXK2xLsgKq+wbmF/TaF5HKJ4tRB7JYSvYzkboEmw3D\nRO3KCeUTREFkQFtDHawR1oGCV/zaL3aGNfQj/y/MEZeFgy7Bza5S/fqnUjxe9THK\nVB9kCapJtHi2ug1JG8C8fUDlNTwc2YBtj+qvph1SWBRgOdpixoEy8CKkjANQioDy\naC3V3P4bOod/wTCp7a4Q38jVTSTDEoOudLQN0uS4/GsPzJ00JazxaoM6ICazwcqk\nlF8ZJgECgYEA2OHTK1tCoPG2dnk15EsDVnZVsIDpb6UVvuf7kKpxlJhwshgjPZOW\nt6G63RF17hUmak0cpqhak/vB/mdQQ60c5LGzfIkl8TrjTKzTlOe333y6BRuHgutl\nKcTVaQxyI3MuI+yQsQplPYyrsQrbb1ZhTD/DKj5wMQ+Lvu+sV6VScT0CgYEA1+B+\noFtNZ0/GgcEVeXgmasC96IpwtUSFD4kOVGuazpS6ld8UBIVjGyrmzO9PxqYeepu7\ntBUBCOszDq68iTPWmJG4twg48o71DGVg7607bDCXGFkoxZNAmjLSydoV9Kn+FqgQ\nNsvRBgh0XzKnd/D/jbr5xZ/xnhFkiJp6wQHFdYECgYA70NSn4YyXzPJw7G8znoi2\nIP7zJiq7swEzXNHiDVA0FnMGe2fExN7NmJpr/DPVTRoCOXBMeqQ4qjfPzXiyoZ0V\naflBwKWpSX+FFylnqRzqU4EOhZAzSG7nPTVKurcEFfFE0Sr62Q4hEpoLwx3QMDe3\niuJt1TimH06Ag6O5rIv3VQKBgHkhEUwfDvaKL8M8uTT4Mu4xih3CGG3Nra/C4pSB\n8FI759oSWuQSiEKFNw4EtcmsCmwXmCH6qyL6/iId79I4kQ/4rCGfbnzDtEIpXFP/\n6tjRBub1mEgMUPJ01AvI4Arxm43Q7ZAhmv58nfeQr6FAS9SV9nJqRaPA9J0luP01\nZjuBAoGBAMURXJFfbplqyswaOVN6rOMBnDe+mVPzhHHFLx2jjEa3Uf8/5KLxK7H4\nIUO6GMIB6g2+IddaSYrdfJ6q5/hujD1rTseVNtPPfoWxxdT6nJ2QA7Og1BfTm0mL\nJOI7tshE7TA3vu1Az6H45GBBn//XWAjcJeCE46VTO9u1LMy4i4ku\n-----END RSA PRIVATE KEY-----\n', 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MTE0NTI0ODksImlhdCI6MTcxMTQxNjQ4OSwic3VuIjoic2x1cm1yZXN0ZCJ9.LCn29-UPkzQvy9e8tQUUnMnUQy9cYTzDXxOTOoPoOnU', NULL, NULL, NULL, NULL, 'v0.0.38', NULL, 'slurm', 0, 1, NULL, NULL, NULL, 0, '2024-02-05 09:32:34', 0, '2024-04-19 17:43:52'); -INSERT INTO `t_cluster` VALUES (1758770009, 1706858330967773113, 'Nudt_Openstack_R', '麒麟云(科大)openstack集群-修改测试', '麒麟云(科大)openstack集群', 'http://172.20.184.1:35357', NULL, 'admin', 'KzNGIS7EkDwalZmqgdpa2b9bNWFpa7GdnBLhjaxP', NULL, NULL, NULL, NULL, '9f6db6c0f4704390b34991faf60c1822', 'rocky', NULL, 'openstack', NULL, 1, NULL, NULL, NULL, 0, '2024-02-05 13:16:09', 0, '2024-03-26 11:30:56'); -INSERT INTO `t_cluster` VALUES (1758770010, 1706858330967773111, 'paratera', '并行科技账号', '并行科技账号', 'https://cloud.paratera.com', NULL, '13278887558', 'eb78bbb29cfb2b31a54751873c3dab5f', NULL, NULL, NULL, NULL, 'NMPHONE', 'rocky', NULL, 'paratera', NULL, 1, NULL, NULL, NULL, 0, '2024-02-27 16:30:31', 0, '2024-04-18 15:49:39'); -INSERT INTO `t_cluster` VALUES (1758770011, 1706858330967773111, 'paratera2', '并行科技账号', '并行科技账号', 'https://cloud.paratera.com', NULL, '13278887558', 'eb78bbb29cfb2b31a54751873c3dab5f', NULL, NULL, NULL, NULL, 'NMPHONE', 'rocky', NULL, 'paratera', NULL, 1, NULL, NULL, NULL, 0, '2024-02-27 16:30:32', 0, '2024-04-18 15:49:39'); -INSERT INTO `t_cluster` VALUES (1763132837495574528, 1752857389213683712, 'aliyun-sealos', '阿里云sealos集群', '阿里云sealos集群', 'https://47.92.39.128:6443', 'http://prometheus-kube-prometheus-prometheus.monitoring:9090', '', '', 'eyJhbGciOiJSUzI1NiIsImtpZCI6IkY2ZUo5c0taNHpmbkM3eUlDWjlRSDQ4bk5GX21haHE4TlBLQlZiTFg0elEifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJucy1hZG1pbiIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VjcmV0Lm5hbWUiOiJzZWFsb3MtdG9rZW4tYWRtaW4tOTRkNCIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50Lm5hbWUiOiJhZG1pbiIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50LnVpZCI6ImZlZjEzYzE4LTVlZDYtNDA0My05NjQwLTQ0M2QwNGEwZTRmNSIsInN1YiI6InN5c3RlbTpzZXJ2aWNlYWNjb3VudDpucy1hZG1pbjphZG1pbiJ9.K3rKj9pul1F1uQoz46ZzYq4WQD8wkFxUbVWn7JRih2vpkFEh6Ndx88lmphQZnz3OlXFRKZfAxOxrSjtohgudEchvEpbJOmJtLHkT1nwoyWWm07kjcwUUjKwT5gDwuY8E1d-AQ2EB5KBiYTozwf1wfgE1nf9pzozZtMdc6--KGX-nwp2t5MOun7KJ1ZRiHTw8QX3wi5NTEUNcEjjsiAyyCGGz7iiciIyIOp8KGIZ9j7aZNBtovxfF4EdkHQwf-kSAjnJasJ6QBLnfvKXSK15PPzELXDAyDzCg6UkRjc-SVtGjZLDUE9GuqclWV7BrC13fprZhwOVdtrSohs57UQMMYQ', '', '', 'default', '', 'k8s v1.25.6', NULL, 'kubernetes', 0, 2, '11', '5', NULL, 0, '2024-02-29 17:23:20', 0, '2024-03-27 15:01:57'); -INSERT INTO `t_cluster` VALUES (1766856565336487987, 1752857389213683712, 'aliyun-old', '阿里云老集群', '阿里云老集群', 'http://121.89.194.135:6443', 'http://121.89.194.135:31965', NULL, NULL, 'eyJhbGciOiJSUzI1NiIsImtpZCI6IjdyeU1HdUxNYTVxLWRzMWY1UGdOV1pjVnQxUXRETXRXZzJyczlIeHVtLXMifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJrdWJlLXN5c3RlbSIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VjcmV0Lm5hbWUiOiJuYW1lc3BhY2UtY29udHJvbGxlci10b2tlbi01cHE5NyIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50Lm5hbWUiOiJuYW1lc3BhY2UtY29udHJvbGxlciIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50LnVpZCI6ImE5NGJlMGQ1LWI1YWQtNGU5Yi1iOTA1LTgwZWM3YzZhY2IzYiIsInN1YiI6InN5c3RlbTpzZXJ2aWNlYWNjb3VudDprdWJlLXN5c3RlbTpuYW1lc3BhY2UtY29udHJvbGxlciJ9.F9O7LR1TykgFsq7nthBY9m7CYle2btKNbzDgXJUQGjP7WyntY1po-EbcYlTV7c8vu651dlTY5m_SFKCAVMQymwt8BRgUprejKdJhMzrhy2lFkXOz-B7baIVKhiTB5Vts02ra9h7mmzyKY9fD38NeKS6y9qyvsdhCrvnH96meHffFtXpXSB3HfrVNP1pw5xj_RzIQu7U-x6GPYle2F76smoQr0xC-WWr5X66dqnQiATUVkBaaVWqtJ86GScYZ69XJBYCGDf_HvYrcKhyyw4o9hc5ISTJ2xMEJfum-ylVRwnfdY9d-uiduTrK6fwiHjT3IeNXQHZ68JBj8VkK1ufOe2A', NULL, NULL, NULL, NULL, NULL, NULL, 'kubernetes', NULL, 2, NULL, NULL, NULL, 0, '2024-03-19 10:00:53', 0, '2024-04-23 17:23:09'); -INSERT INTO `t_cluster` VALUES (1770703902472146944, 1770658294298316800, 'tencent-sealos', '腾讯云数算', '腾讯云数算集群', 'https://119.45.100.73:6443', 'http://119.45.100.73:32755', '', '', 'eyJhbGciOiJSUzI1NiIsImtpZCI6IkNzNXRMOE5VdWdiVHJ2U2JtU3ZKWk5razRwZlJHWWZmV3M0aVNHLUJJOHMifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJrdWJlLXN5c3RlbSIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VjcmV0Lm5hbWUiOiJhZG1pbi11c2VyLXRva2VuLTg0bW5sIiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9zZXJ2aWNlLWFjY291bnQubmFtZSI6ImFkbWluLXVzZXIiLCJrdWJlcm5ldGVzLmlvL3NlcnZpY2VhY2NvdW50L3NlcnZpY2UtYWNjb3VudC51aWQiOiJjOWU1NjU1OC1lZTRhLTQ1MGUtYTljNy03NGNhNDU4NzEyNGEiLCJzdWIiOiJzeXN0ZW06c2VydmljZWFjY291bnQ6a3ViZS1zeXN0ZW06YWRtaW4tdXNlciJ9.IxXITCqR8Yv-C3mkC3ItwkDLhNueFk_HMF7QhFtjch8miVhUYH3g2Uh70EB5M_3F8vZIF3CoYd3TLG_1acg2JR9Tf7Ipiwzol3npXIqG27QQJ-px3q2i3CMqwjogKjCSEMWTxHS03CDOCJUFLL2qKIa4U-QmEUYnbOFnNsoXDr7zkgRyREi5QUqlEB1ODMlEy8wb6n1g8E9AqNxnYBeHywAAS8ZMkTiKlEdhi-7Jgblkcssmb_P_5xbWelIy6HfBZuumJICzd8b5JRrkX7m7MaIx4TgNETa17kCFi1JnC6MvC1u3UGQQ7MKiXrud06cN9Sphgnu5nIkFjF5TWpSuaA', '', '', 'default', '', 'k8s v1.25.6', NULL, 'kubernetes', 0, 2, '2', '3', NULL, 0, '2024-03-21 14:48:03', 0, '2024-04-16 11:24:32'); -INSERT INTO `t_cluster` VALUES (1777157653982613504, 1777144940459986944, 'octopus', 'hanwuji', '启智章鱼智算', '172.26.184.143:31031', '', 'c2net2@pcl.ac.cn', 'c2net123', '', '', '', '', '', '', NULL, '', 0, 2, '', '', NULL, 0, '2024-04-08 10:12:57', 0, '2024-04-08 15:38:03'); -INSERT INTO `t_cluster` VALUES (1777240145309732864, 1777144940459986944, 'shuguangAi', 'shuguangAi', '曙光智算', 'pcm-ac:2001', '', 'acgnnmfbwo', 'Pcl@2020', '', '', '', '', '', '', NULL, '', 0, 2, '', '', NULL, 0, '2024-04-08 15:40:44', 0, '2024-04-19 15:40:34'); +INSERT INTO `t_cluster` VALUES (1758770002, 1706858330967773111, 'ac', 'ac超算', 'ac超算', 'http://172.20.184.1:3001', NULL, 'acgnnmfbwo', 'Pcl@2020', NULL, NULL, NULL, NULL, NULL, 'ac v1.25', NULL, 'ac', 0, 1, NULL, '0', NULL, 0, '2024-04-05 09:32:34', 0, '2024-05-06 09:57:10'); +INSERT INTO `t_cluster` VALUES (1758770003, 1706858330967773113, 'Keylin_Openstack_T', '电科云openstack-T版集群', '电科云openstack-T版集群', 'http://10.200.1.82:35357/v3/auth/tokens?nocatalog', NULL, 'admin', '28b474f30dc3497d', NULL, NULL, NULL, NULL, NULL, 'train', NULL, 'openstack', NULL, 1, NULL, '1', NULL, 0, '2024-02-27 16:26:42', 0, '2024-05-06 09:57:11'); +INSERT INTO `t_cluster` VALUES (1758770004, 1706858330967773113, 'DianKe_Openstack_R', '电科云openstack-R版集群', '电科云openstack-R版集群', 'http://10.200.15.121:35357/v3/auth/tokens?nocatalog', NULL, 'admin', 'nrfD3plQn9ro3WZ3nFmejFA3F7y5VpGwL0KARvlq', NULL, NULL, NULL, NULL, NULL, 'rocky', NULL, 'openstack', NULL, 1, NULL, '2', NULL, 0, '2024-02-27 16:30:30', 0, '2024-05-06 09:57:12'); +INSERT INTO `t_cluster` VALUES (1758770005, 1706858330967773111, 'slurm', '华为云slurm测试环境', '华为云slurm测试环境', 'http://121.37.170.20:6820', '121.37.170.20', 'root', '-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAtuPZOTAB+v8H5wtjW4kB1e+T+nj7vCuXZc6gZzSZ9MMt/za+\n65knupMvvvI+mGwZsQkq7fsl1T3NDKgp9gD4/YIYtZ+H9UvW2/azZh4BC35u0kql\nWtMe/LZgywlaXfZ9AExq4XXLkRm63KlaGmG9D3HuNf6MkIK33BMPN4KxKOD74m1Y\nRJbP8juKx41ly5kPLWzCH9S5JUONdEz0ryfKowzvNRbCEYHQCbq7IvYN1UyHap0l\nctjg+83yvtcmLWNMrqjENGFhxqXIf5BM1mdZjhmxgvHGdKnas4wSN6mJQC88mZen\nyuBZZGs284StyQJgmIHqOTzbzTwrceKYXTzwvQIDAQABAoIBAAvw7oLsXoS72BE+\nzhrw5BzKyrek5JLRqc3s4s46Qf8YK02pjmellVF6QLjP6kRbcoX7mkD1j+/PXC8C\nX9L/F0K+FsztAJyEeh/ciLQXK2xLsgKq+wbmF/TaF5HKJ4tRB7JYSvYzkboEmw3D\nRO3KCeUTREFkQFtDHawR1oGCV/zaL3aGNfQj/y/MEZeFgy7Bza5S/fqnUjxe9THK\nVB9kCapJtHi2ug1JG8C8fUDlNTwc2YBtj+qvph1SWBRgOdpixoEy8CKkjANQioDy\naC3V3P4bOod/wTCp7a4Q38jVTSTDEoOudLQN0uS4/GsPzJ00JazxaoM6ICazwcqk\nlF8ZJgECgYEA2OHTK1tCoPG2dnk15EsDVnZVsIDpb6UVvuf7kKpxlJhwshgjPZOW\nt6G63RF17hUmak0cpqhak/vB/mdQQ60c5LGzfIkl8TrjTKzTlOe333y6BRuHgutl\nKcTVaQxyI3MuI+yQsQplPYyrsQrbb1ZhTD/DKj5wMQ+Lvu+sV6VScT0CgYEA1+B+\noFtNZ0/GgcEVeXgmasC96IpwtUSFD4kOVGuazpS6ld8UBIVjGyrmzO9PxqYeepu7\ntBUBCOszDq68iTPWmJG4twg48o71DGVg7607bDCXGFkoxZNAmjLSydoV9Kn+FqgQ\nNsvRBgh0XzKnd/D/jbr5xZ/xnhFkiJp6wQHFdYECgYA70NSn4YyXzPJw7G8znoi2\nIP7zJiq7swEzXNHiDVA0FnMGe2fExN7NmJpr/DPVTRoCOXBMeqQ4qjfPzXiyoZ0V\naflBwKWpSX+FFylnqRzqU4EOhZAzSG7nPTVKurcEFfFE0Sr62Q4hEpoLwx3QMDe3\niuJt1TimH06Ag6O5rIv3VQKBgHkhEUwfDvaKL8M8uTT4Mu4xih3CGG3Nra/C4pSB\n8FI759oSWuQSiEKFNw4EtcmsCmwXmCH6qyL6/iId79I4kQ/4rCGfbnzDtEIpXFP/\n6tjRBub1mEgMUPJ01AvI4Arxm43Q7ZAhmv58nfeQr6FAS9SV9nJqRaPA9J0luP01\nZjuBAoGBAMURXJFfbplqyswaOVN6rOMBnDe+mVPzhHHFLx2jjEa3Uf8/5KLxK7H4\nIUO6GMIB6g2+IddaSYrdfJ6q5/hujD1rTseVNtPPfoWxxdT6nJ2QA7Og1BfTm0mL\nJOI7tshE7TA3vu1Az6H45GBBn//XWAjcJeCE46VTO9u1LMy4i4ku\n-----END RSA PRIVATE KEY-----\n', 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MTE0NTI0ODksImlhdCI6MTcxMTQxNjQ4OSwic3VuIjoic2x1cm1yZXN0ZCJ9.LCn29-UPkzQvy9e8tQUUnMnUQy9cYTzDXxOTOoPoOnU', NULL, NULL, NULL, NULL, 'v0.0.38', NULL, 'slurm', 0, 1, NULL, '3', NULL, 0, '2024-02-05 09:32:34', 0, '2024-05-06 09:57:14'); +INSERT INTO `t_cluster` VALUES (1758770009, 1706858330967773113, 'Nudt_Openstack_R', '麒麟云(科大)openstack集群-修改测试', '麒麟云(科大)openstack集群', 'http://172.20.184.1:35357', NULL, 'admin', 'KzNGIS7EkDwalZmqgdpa2b9bNWFpa7GdnBLhjaxP', NULL, NULL, NULL, NULL, '9f6db6c0f4704390b34991faf60c1822', 'rocky', NULL, 'openstack', NULL, 1, NULL, '4', NULL, 0, '2024-02-05 13:16:09', 0, '2024-05-06 09:57:15'); +INSERT INTO `t_cluster` VALUES (1758770010, 1706858330967773111, 'paratera', '并行科技账号', '并行科技账号', 'https://cloud.paratera.com', NULL, '13278887558', 'eb78bbb29cfb2b31a54751873c3dab5f', NULL, NULL, NULL, NULL, 'NMPHONE', 'rocky', NULL, 'paratera', NULL, 1, NULL, '5', NULL, 0, '2024-02-27 16:30:31', 0, '2024-05-06 09:57:17'); +INSERT INTO `t_cluster` VALUES (1758770011, 1706858330967773111, 'paratera2', '并行科技账号', '并行科技账号', 'https://cloud.paratera.com', NULL, '13278887558', 'eb78bbb29cfb2b31a54751873c3dab5f', NULL, NULL, NULL, NULL, 'NMPHONE', 'rocky', NULL, 'paratera', NULL, 1, NULL, '6', NULL, 0, '2024-02-27 16:30:32', 0, '2024-05-06 09:57:21'); +INSERT INTO `t_cluster` VALUES (1763132837495574528, 1752857389213683712, 'aliyun-sealos', '阿里云sealos集群', '阿里云sealos集群', 'https://47.92.39.128:6443', 'http://prometheus-kube-prometheus-prometheus.monitoring:9090', '', '', 'eyJhbGciOiJSUzI1NiIsImtpZCI6IkY2ZUo5c0taNHpmbkM3eUlDWjlRSDQ4bk5GX21haHE4TlBLQlZiTFg0elEifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJucy1hZG1pbiIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VjcmV0Lm5hbWUiOiJzZWFsb3MtdG9rZW4tYWRtaW4tOTRkNCIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50Lm5hbWUiOiJhZG1pbiIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50LnVpZCI6ImZlZjEzYzE4LTVlZDYtNDA0My05NjQwLTQ0M2QwNGEwZTRmNSIsInN1YiI6InN5c3RlbTpzZXJ2aWNlYWNjb3VudDpucy1hZG1pbjphZG1pbiJ9.K3rKj9pul1F1uQoz46ZzYq4WQD8wkFxUbVWn7JRih2vpkFEh6Ndx88lmphQZnz3OlXFRKZfAxOxrSjtohgudEchvEpbJOmJtLHkT1nwoyWWm07kjcwUUjKwT5gDwuY8E1d-AQ2EB5KBiYTozwf1wfgE1nf9pzozZtMdc6--KGX-nwp2t5MOun7KJ1ZRiHTw8QX3wi5NTEUNcEjjsiAyyCGGz7iiciIyIOp8KGIZ9j7aZNBtovxfF4EdkHQwf-kSAjnJasJ6QBLnfvKXSK15PPzELXDAyDzCg6UkRjc-SVtGjZLDUE9GuqclWV7BrC13fprZhwOVdtrSohs57UQMMYQ', '', '', 'default', '', 'k8s v1.25.6', NULL, 'kubernetes', 0, 2, '11', '4', NULL, 0, '2024-02-29 17:23:20', 0, '2024-05-06 09:57:22'); +INSERT INTO `t_cluster` VALUES (1766856565336487987, 1752857389213683712, 'aliyun-old', '阿里云老集群', '阿里云老集群', 'https://121.89.194.135:6443', 'http://121.89.194.135:31965', NULL, NULL, 'eyJhbGciOiJSUzI1NiIsImtpZCI6IjdyeU1HdUxNYTVxLWRzMWY1UGdOV1pjVnQxUXRETXRXZzJyczlIeHVtLXMifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJkZWZhdWx0Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9zZWNyZXQubmFtZSI6InBjbS1hZG1pbiIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50Lm5hbWUiOiJwY20tYWRtaW4iLCJrdWJlcm5ldGVzLmlvL3NlcnZpY2VhY2NvdW50L3NlcnZpY2UtYWNjb3VudC51aWQiOiI3Zjg3OTY0My0yZWQzLTQ0YmItYmNiZi1hMjQ0YmJhOGY3YzEiLCJzdWIiOiJzeXN0ZW06c2VydmljZWFjY291bnQ6ZGVmYXVsdDpwY20tYWRtaW4ifQ.PZSlB9_hO433Df7ROVZmaT5YAdva7ZoK9Uh7xgL8qEuJXtH0vSij3uzCE3oElNmuwZYAFRK8cCGatZByos-qdh_ucpW_XAcNPxEG_O3Z3k05svKshVzwkKQi0jdqHwkZ9EWtxTWYzz4ieYdqw0NtptCsjvyIbw9lagx0HKCCF2lmcDCQl5aLOFi_0du0qc8XHWGQt1OPP8OWOREHlD-NO7eNLWQcX08N2CA7iBPHf9AbTmvR6rK0SWaNspOeq2bCEsH0UBER7cwSy7j9ttkSWGGT6k2LAiGX9gfw-ULxftMSEuYtFGTNLTZzVNeQbW6ZG_hXTzbQ3BbJxlX6rSJ3nw', NULL, NULL, NULL, NULL, 'k8s v1.23.15', NULL, 'kubernetes', NULL, 2, NULL, '7', NULL, 0, '2024-03-19 10:00:53', 0, '2024-05-06 09:57:23'); +INSERT INTO `t_cluster` VALUES (1770703902472146944, 1770658294298316800, 'tencent-sealos', '腾讯云数算', '腾讯云数算集群', 'https://119.45.100.73:6443', 'http://119.45.100.73:32755', '', '', 'eyJhbGciOiJSUzI1NiIsImtpZCI6IkNzNXRMOE5VdWdiVHJ2U2JtU3ZKWk5razRwZlJHWWZmV3M0aVNHLUJJOHMifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJrdWJlLXN5c3RlbSIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VjcmV0Lm5hbWUiOiJhZG1pbi11c2VyLXRva2VuLTg0bW5sIiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9zZXJ2aWNlLWFjY291bnQubmFtZSI6ImFkbWluLXVzZXIiLCJrdWJlcm5ldGVzLmlvL3NlcnZpY2VhY2NvdW50L3NlcnZpY2UtYWNjb3VudC51aWQiOiJjOWU1NjU1OC1lZTRhLTQ1MGUtYTljNy03NGNhNDU4NzEyNGEiLCJzdWIiOiJzeXN0ZW06c2VydmljZWFjY291bnQ6a3ViZS1zeXN0ZW06YWRtaW4tdXNlciJ9.IxXITCqR8Yv-C3mkC3ItwkDLhNueFk_HMF7QhFtjch8miVhUYH3g2Uh70EB5M_3F8vZIF3CoYd3TLG_1acg2JR9Tf7Ipiwzol3npXIqG27QQJ-px3q2i3CMqwjogKjCSEMWTxHS03CDOCJUFLL2qKIa4U-QmEUYnbOFnNsoXDr7zkgRyREi5QUqlEB1ODMlEy8wb6n1g8E9AqNxnYBeHywAAS8ZMkTiKlEdhi-7Jgblkcssmb_P_5xbWelIy6HfBZuumJICzd8b5JRrkX7m7MaIx4TgNETa17kCFi1JnC6MvC1u3UGQQ7MKiXrud06cN9Sphgnu5nIkFjF5TWpSuaA', '', '', 'default', '', 'k8s v1.25.6', NULL, 'kubernetes', 0, 2, '2', '5', NULL, 0, '2024-03-21 14:48:03', 0, '2024-05-06 09:57:25'); +INSERT INTO `t_cluster` VALUES (1777157653982613504, 1777144940459986944, 'octopus', 'hanwuji', '启智章鱼智算', '172.26.184.143:31031', '', 'c2net2@pcl.ac.cn', 'c2net123', '', '', '', '', '', '', NULL, '', 0, 2, '', '7', NULL, 0, '2024-04-08 10:12:57', 0, '2024-05-06 09:57:27'); +INSERT INTO `t_cluster` VALUES (1777240145309732864, 1777144940459986944, 'shuguangAi', 'shuguangAi', '曙光智算', 'pcm-ac:2001', '', 'acgnnmfbwo', 'Pcl@2020', '', '', '', '', '', '', NULL, '', 0, 2, '', '0', NULL, 0, '2024-04-08 15:40:44', 0, '2024-05-06 09:57:29'); -- ---------------------------- -- Table structure for t_cluster_resource @@ -2247,16 +2070,39 @@ CREATE TABLE `t_cluster_resource` ( `disk_total` float NULL DEFAULT NULL, `gpu_avail` float NULL DEFAULT NULL, `gpu_total` float NULL DEFAULT NULL, + `card_total` int NULL DEFAULT NULL COMMENT '算力卡数量', + `card_tops_total` float NULL DEFAULT NULL COMMENT '算力总量tops', PRIMARY KEY (`cluster_id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of t_cluster_resource -- ---------------------------- -INSERT INTO `t_cluster_resource` VALUES (1, 'cluster1', 2, 4, 16, 31, 64, 1926, 2048, 1, 4); -INSERT INTO `t_cluster_resource` VALUES (2, 'cluster2', 2, 7, 16, 23, 128, 3694, 4096, 3, 6); -INSERT INTO `t_cluster_resource` VALUES (3, 'cluster3', 2, 10, 16, 101, 256, 7791, 8192, 3, 8); -INSERT INTO `t_cluster_resource` VALUES (4, 'cluster4', 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_cluster_resource` VALUES (1, 'cluster1', 2, 4, 16, 31, 64, 1926, 2048, 1, 4, NULL, NULL); +INSERT INTO `t_cluster_resource` VALUES (2, 'cluster2', 2, 7, 16, 23, 128, 3694, 4096, 3, 6, NULL, NULL); +INSERT INTO `t_cluster_resource` VALUES (3, 'cluster3', 2, 10, 16, 101, 256, 7791, 8192, 3, 8, NULL, NULL); +INSERT INTO `t_cluster_resource` VALUES (4, 'cluster4', 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `t_cluster_resource` VALUES (1777157653982613504, 'octopus', 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); +INSERT INTO `t_cluster_resource` VALUES (1777240145309732864, 'shuguangAi', 1, 320, 320, 132683000000, 132683000000, 43722800000, 107374000000, 0, 0, 8, 196); + +-- ---------------------------- +-- Table structure for t_cluster_task_queue +-- ---------------------------- +DROP TABLE IF EXISTS `t_cluster_task_queue`; +CREATE TABLE `t_cluster_task_queue` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', + `adapter_id` bigint NOT NULL COMMENT '适配器id', + `cluster_id` bigint NOT NULL COMMENT '集群id', + `queue_num` int NOT NULL COMMENT '任务排队数量', + `date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '集群排队状况' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of t_cluster_task_queue +-- ---------------------------- +INSERT INTO `t_cluster_task_queue` VALUES (1, 1777144940459986944, 1777240145309732864, 1, '2024-04-30 15:52:07'); +INSERT INTO `t_cluster_task_queue` VALUES (2, 1777144940459986944, 1777157653982613504, 0, '2024-04-30 15:54:47'); -- ---------------------------- -- Table structure for t_dict @@ -2273,10 +2119,10 @@ CREATE TABLE `t_dict` ( `created_by` int NULL DEFAULT 0 COMMENT '创建人', `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `updated_by` int NULL DEFAULT 0 COMMENT '更新人', - `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `update_time` datetime NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `t_dict_dict_code_uindex`(`dict_code` ASC) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1782227471131742209 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '字典表' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 1787789698911965185 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '字典表' ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of t_dict @@ -2286,6 +2132,7 @@ INSERT INTO `t_dict` VALUES (2, '集群厂商', 'cluster_producer_dict', '集群 INSERT INTO `t_dict` VALUES (1767132427647455232, '适配器类型', 'adapter_type', '适配器类型', 1, 0, NULL, 0, '2024-03-11 18:16:17', 0, '2024-04-28 09:44:36'); INSERT INTO `t_dict` VALUES (1773274626395213824, '集群类型', 'cluster_type', '集群类型', 1, 1, NULL, 0, '2024-03-28 17:03:11', 0, '2024-04-28 09:44:36'); INSERT INTO `t_dict` VALUES (1782227471131742208, '调度策略', 'schedule_Strategy', '调度策略', 0, 1, NULL, 0, '2024-04-22 09:58:35', 0, '2024-04-28 09:41:57'); +INSERT INTO `t_dict` VALUES (1787789698911965184, '虚拟机规格', 'vm_flavor', '', 0, 1, NULL, 0, '2024-05-07 18:20:54', 0, '2024-05-07 18:20:54'); -- ---------------------------- -- Table structure for t_dict_item @@ -2304,7 +2151,7 @@ CREATE TABLE `t_dict_item` ( `created_by` int NULL DEFAULT 0 COMMENT '创建人', `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `updated_by` int NULL DEFAULT 0 COMMENT '更新人', - `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `update_time` datetime NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE, INDEX `index_table_dict_id`(`dict_id` ASC) USING BTREE, INDEX `index_table_dict_status`(`status` ASC) USING BTREE, @@ -2314,14 +2161,14 @@ CREATE TABLE `t_dict_item` ( -- ---------------------------- -- Records of t_dict_item -- ---------------------------- -INSERT INTO `t_dict_item` VALUES (1, 1, '东北区域', '1', '集群地域', 1, NULL, 1, NULL, NULL, '2023-07-30 10:31:24', NULL, NULL); -INSERT INTO `t_dict_item` VALUES (2, 1, '华东区域', '2', '集群地域', 2, NULL, 1, NULL, 0, '2024-03-07 15:19:49', 0, '2024-03-07 15:19:49'); -INSERT INTO `t_dict_item` VALUES (3, 1, '华北区域', '3', '集群地域', 3, NULL, 1, NULL, 0, '2024-03-07 15:19:50', 0, '2024-03-07 15:19:50'); -INSERT INTO `t_dict_item` VALUES (4, 1, '华中区域', '4', '集群地域', 4, NULL, 1, NULL, 0, '2024-03-07 15:19:50', 0, '2024-03-07 15:19:50'); -INSERT INTO `t_dict_item` VALUES (5, 1, '华南区域', '5', '集群地域', 5, NULL, 1, NULL, 0, '2024-03-07 15:19:50', 0, '2024-03-07 15:19:50'); -INSERT INTO `t_dict_item` VALUES (6, 1, '西南区域', '6', '集群地域', 6, NULL, 1, NULL, 0, '2024-03-07 15:19:50', 0, '2024-03-07 15:19:50'); -INSERT INTO `t_dict_item` VALUES (7, 1, '西北区域', '7', '集群地域', 7, NULL, 1, NULL, 0, '2024-03-07 15:19:50', 0, '2024-03-07 15:19:50'); -INSERT INTO `t_dict_item` VALUES (8, 1, '海外区域', '8', '集群地域', 8, NULL, 1, NULL, 0, '2024-03-07 15:19:50', 0, '2024-03-07 15:19:50'); +INSERT INTO `t_dict_item` VALUES (1, 1, '东北区域', '0', '集群地域', 1, NULL, 1, NULL, NULL, '2023-07-30 10:31:24', NULL, '2024-05-06 09:55:02'); +INSERT INTO `t_dict_item` VALUES (2, 1, '华东区域', '1', '集群地域', 2, NULL, 1, NULL, 0, '2024-03-07 15:19:49', 0, '2024-05-06 09:55:03'); +INSERT INTO `t_dict_item` VALUES (3, 1, '华北区域', '2', '集群地域', 3, NULL, 1, NULL, 0, '2024-03-07 15:19:50', 0, '2024-05-06 09:55:04'); +INSERT INTO `t_dict_item` VALUES (4, 1, '华中区域', '3', '集群地域', 4, NULL, 1, NULL, 0, '2024-03-07 15:19:50', 0, '2024-05-06 09:55:06'); +INSERT INTO `t_dict_item` VALUES (5, 1, '华南区域', '4', '集群地域', 5, NULL, 1, NULL, 0, '2024-03-07 15:19:50', 0, '2024-05-06 09:55:07'); +INSERT INTO `t_dict_item` VALUES (6, 1, '西南区域', '5', '集群地域', 6, NULL, 1, NULL, 0, '2024-03-07 15:19:50', 0, '2024-05-06 09:55:09'); +INSERT INTO `t_dict_item` VALUES (7, 1, '西北区域', '6', '集群地域', 7, NULL, 1, NULL, 0, '2024-03-07 15:19:50', 0, '2024-05-06 09:55:13'); +INSERT INTO `t_dict_item` VALUES (8, 1, '海外区域', '7', '集群地域', 8, NULL, 1, NULL, 0, '2024-03-07 15:19:50', 0, '2024-05-06 09:55:18'); INSERT INTO `t_dict_item` VALUES (9, 2, '腾讯云', '1', '集群厂商', 1, NULL, 1, NULL, 0, '2024-03-07 15:21:55', 0, '2024-03-07 15:21:55'); INSERT INTO `t_dict_item` VALUES (10, 2, '华为云', '2', '集群厂商', 2, NULL, 1, NULL, 0, '2024-03-07 15:21:55', 0, '2024-03-07 15:21:55'); INSERT INTO `t_dict_item` VALUES (11, 2, '阿里云', '3', '集群厂商', 3, NULL, 1, NULL, 0, '2024-03-07 15:21:56', 0, '2024-03-07 15:21:56'); @@ -2572,19 +2419,34 @@ CREATE TABLE `t_notice` ( `cluster_id` bigint NULL DEFAULT NULL COMMENT '任务id', `cluster_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, `notice_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '容器id', + `task_id` bigint NULL DEFAULT NULL, `task_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '状态', `incident` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, `created_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1717451637989052421 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 1717451637989052562 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of t_notice -- ---------------------------- -INSERT INTO `t_notice` VALUES (1717451637989052417, 123, '超算适配器-并行', 123, '并行A', 'create', 'hashcat_job_20240418003', '任务创建成功！', '2024-04-18 01:04:05'); -INSERT INTO `t_notice` VALUES (1717451637989052418, 123, '超算适配器-曙光', 123, '曙光C', 'success', 'hpc_test_job_20240417038', '任务执行成功！', '2024-04-17 23:44:18'); -INSERT INTO `t_notice` VALUES (1717451637989052419, 123, '数算适配器-sealos', 123, 'sealos-guangzhou', 'failed', 'sealos_job_20240417233', '任务执行失败！', '2024-04-17 12:03:11'); -INSERT INTO `t_notice` VALUES (1717451637989052420, 123, '智算适配器-鹏程', 123, '鹏程-深圳', 'suspend', 'octopus_job_test_20240417231', '任务等待中！', '2024-04-18 05:55:03'); +INSERT INTO `t_notice` VALUES (1717451637989052544, 1706858330967773111, '超算适配器', 1758770005, '华为云slurm测试环境', 'create', 0, 'HPC_slurm_testjob0325', '任务创建中', '2024-05-10 22:31:02'); +INSERT INTO `t_notice` VALUES (1717451637989052545, 1706858330967773111, '', 1758770005, '', 'running', 0, 'HPC_slurm_testjob0325', '任务状态切换为运行中！', '2024-05-10 22:31:13'); +INSERT INTO `t_notice` VALUES (1717451637989052546, 1706858330967773111, '', 1758770005, '', 'succeeded', 0, 'HPC_slurm_testjob0325', '任务执行完成！', '2024-05-10 22:32:50'); +INSERT INTO `t_notice` VALUES (1717451637989052547, 1752857389213683712, '阿里云数算', 0, '', 'create', 0, 'hello-world', '任务创建中', '2024-05-11 09:21:14'); +INSERT INTO `t_notice` VALUES (1717451637989052548, 1752857389213683712, '阿里云数算', 0, '', 'create', 0, 'hello-world', '任务创建中', '2024-05-11 09:37:34'); +INSERT INTO `t_notice` VALUES (1717451637989052549, 1752857389213683712, '阿里云数算', 1763132837495574528, 'aliyun-sealos', 'running', 0, 'hello-world', '任务状态切换为运行中！', '2024-05-11 09:58:01'); +INSERT INTO `t_notice` VALUES (1717451637989052550, 1770658294298316800, '腾讯云数算', 0, '', 'create', 0, 'hello-world', '任务创建中', '2024-05-11 11:42:21'); +INSERT INTO `t_notice` VALUES (1717451637989052551, 1770658294298316800, '腾讯云数算', 1770703902472146944, 'tencent-sealos', 'running', 0, 'hello-world', '任务状态切换为运行中！', '2024-05-11 11:42:26'); +INSERT INTO `t_notice` VALUES (1717451637989052552, 1706858330967773111, '超算适配器', 1758770010, '并行科技账号', 'create', 0, 'HPC_paratera_testjob032501', '任务创建中', '2024-05-11 15:14:36'); +INSERT INTO `t_notice` VALUES (1717451637989052553, 1706858330967773111, '', 1758770010, '', 'running', 0, 'HPC_paratera_testjob032501', '任务状态切换为运行中！', '2024-05-11 15:14:37'); +INSERT INTO `t_notice` VALUES (1717451637989052554, 1706858330967773111, '超算适配器', 1758770011, '并行科技账号', 'create', 0, 'HPC_paratera_testjob032501', '任务创建中', '2024-05-11 15:25:49'); +INSERT INTO `t_notice` VALUES (1717451637989052555, 1706858330967773111, '', 1758770011, '', 'running', 0, 'HPC_paratera_testjob032501', '任务状态切换为运行中！', '2024-05-11 15:25:57'); +INSERT INTO `t_notice` VALUES (1717451637989052556, 1706858330967773113, '虚拟机适配器-修改测试', 0, '', 'create', 0, '跨域创建虚拟机', '任务创建中', '2024-05-11 15:39:56'); +INSERT INTO `t_notice` VALUES (1717451637989052557, 1752857389213683712, '阿里云数算', 0, '', 'create', 0, 'hello-nginx', '任务创建中', '2024-05-11 15:47:46'); +INSERT INTO `t_notice` VALUES (1717451637989052558, 1752857389213683712, '阿里云数算', 1763132837495574528, 'aliyun-sealos', 'running', 0, 'hello-nginx', '任务状态切换为运行中！', '2024-05-11 15:47:50'); +INSERT INTO `t_notice` VALUES (1717451637989052559, 1706858330967773111, '超算适配器', 1758770005, '华为云slurm测试环境', 'create', 0, 'HPC_slurm_testjob0325', '任务创建中', '2024-05-11 15:49:14'); +INSERT INTO `t_notice` VALUES (1717451637989052560, 1752857389213683712, '阿里云数算', 0, '', 'create', 0, 'nginx-test', '任务创建中', '2024-05-11 15:49:26'); +INSERT INTO `t_notice` VALUES (1717451637989052561, 1752857389213683712, '阿里云数算', 1766856565336487987, 'aliyun-old', 'running', 0, 'nginx-test', '任务状态切换为运行中！', '2024-05-11 17:15:42'); -- ---------------------------- -- Table structure for t_storage_device @@ -2627,15 +2489,15 @@ INSERT INTO `t_storage_device` VALUES (5, 1, NULL, 'ceph-cluster-01', 4, 8, 1, ' -- ---------------------------- DROP TABLE IF EXISTS `task`; CREATE TABLE `task` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id', `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '作业名称', `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '作业描述', `status` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '作业状态', `strategy` int NULL DEFAULT 0 COMMENT '策略', `synergy_status` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '0' COMMENT '协同状态（0-未协同、1-已协同）', `commit_time` datetime NULL DEFAULT NULL COMMENT '提交时间', - `start_time` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '开始时间', - `end_time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '结束运行时间', + `start_time` datetime NULL DEFAULT NULL COMMENT '开始时间', + `end_time` datetime NULL DEFAULT NULL COMMENT '结束运行时间', `running_time` int NULL DEFAULT 0 COMMENT '已运行时间（单位秒）', `yaml_string` varchar(10000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, `result` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '作业结果', @@ -2646,44 +2508,52 @@ CREATE TABLE `task` ( `updated_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间', `tenant_id` int NULL DEFAULT NULL COMMENT '租户id', `ns_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, - `task_type_dict` tinyint UNSIGNED NULL DEFAULT NULL COMMENT '任务类型（对应字典表的值）', + `adapter_type_dict` tinyint UNSIGNED NULL DEFAULT NULL COMMENT '适配器类型（对应字典表的值）', + `task_type_dict` tinyint UNSIGNED NULL DEFAULT 0 COMMENT '任务类型（对应字典表的值）', PRIMARY KEY (`id`) USING BTREE, INDEX `task_status_index`(`status` ASC) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1374 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 1789201130505375752 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of task -- ---------------------------- -INSERT INTO `task` VALUES (1264, 'hello-world', '', 'Succeeded', 0, '0', '2024-01-03 14:57:18', '', '', 0, '[{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"labels\":{\"cloud.sealos.io/app-deploy-manager\":\"hello-world\"},\"name\":\"hello-world\"},\"spec\":{\"ports\":[{\"name\":\"kjedmtyuwuiu\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"hello-world\"}}},{\"apiVersion\":\"apps/v1\",\"kind\":\"StatefulSet\",\"metadata\":{\"annotations\":{\"deploy.cloud.sealos.io/maxReplicas\":\"1\",\"deploy.cloud.sealos.io/minReplicas\":\"1\",\"originImageName\":\"nginx\"},\"labels\":{\"app\":\"hello-world\",\"cloud.sealos.io/app-deploy-manager\":\"hello-world\"},\"name\":\"hello-world\"},\"spec\":{\"minReadySeconds\":10,\"replicas\":1,\"revisionHistoryLimit\":1,\"selector\":{\"matchLabels\":{\"app\":\"hello-world\"}},\"serviceName\":\"hello-world\",\"strategy\":{\"rollingUpdate\":{\"maxSurge\":0,\"maxUnavailable\":1},\"type\":\"RollingUpdate\"},\"template\":{\"metadata\":{\"labels\":{\"app\":\"hello-world\",\"restartTime\":\"20240103144807\"}},\"spec\":{\"containers\":[{\"env\":[],\"image\":\"nginx\",\"imagePullPolicy\":\"Always\",\"name\":\"hello-world\",\"ports\":[{\"containerPort\":80,\"name\":\"kjedmtyuwuiu\"}],\"resources\":{\"limits\":{\"cpu\":\"100m\",\"memory\":\"64Mi\"},\"requests\":{\"cpu\":\"10m\",\"memory\":\"6Mi\"}},\"volumeMounts\":[{\"mountPath\":\"/data\",\"name\":\"vn-data\"}]}],\"terminationGracePeriodSeconds\":10,\"volumes\":[]}},\"volumeClaimTemplates\":[{\"metadata\":{\"annotations\":{\"path\":\"/data\",\"value\":\"1\"},\"name\":\"vn-data\"},\"spec\":{\"accessModes\":[\"ReadWriteOnce\"],\"resources\":{\"requests\":{\"storage\":\"1Gi\"}}}}]}}]', '', '2024-01-03 17:22:38', 0, '2024-01-03 14:57:17', 0, '2024-01-03 14:57:17', NULL, 'ns-admin', NULL); -INSERT INTO `task` VALUES (1265, 'hello-nginx', '', 'Succeeded', 0, '0', '2024-01-03 14:57:46', '', '', 0, '[{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"labels\":{\"cloud.sealos.io/app-deploy-manager\":\"hello-nginx\"},\"name\":\"hello-nginx\"},\"spec\":{\"ports\":[{\"name\":\"kjedmtyuwuiu\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"hello-nginx\"}}},{\"apiVersion\":\"apps/v1\",\"kind\":\"StatefulSet\",\"metadata\":{\"annotations\":{\"deploy.cloud.sealos.io/maxReplicas\":\"1\",\"deploy.cloud.sealos.io/minReplicas\":\"1\",\"originImageName\":\"nginx\"},\"labels\":{\"app\":\"hello-nginx\",\"cloud.sealos.io/app-deploy-manager\":\"hello-nginx\"},\"name\":\"hello-nginx\"},\"spec\":{\"minReadySeconds\":10,\"replicas\":1,\"revisionHistoryLimit\":1,\"selector\":{\"matchLabels\":{\"app\":\"hello-nginx\"}},\"serviceName\":\"hello-nginx\",\"strategy\":{\"rollingUpdate\":{\"maxSurge\":0,\"maxUnavailable\":1},\"type\":\"RollingUpdate\"},\"template\":{\"metadata\":{\"labels\":{\"app\":\"hello-nginx\",\"restartTime\":\"20240103144807\"}},\"spec\":{\"containers\":[{\"env\":[],\"image\":\"nginx\",\"imagePullPolicy\":\"Always\",\"name\":\"hello-nginx\",\"ports\":[{\"containerPort\":80,\"name\":\"kjedmtyuwuiu\"}],\"resources\":{\"limits\":{\"cpu\":\"100m\",\"memory\":\"64Mi\"},\"requests\":{\"cpu\":\"10m\",\"memory\":\"6Mi\"}},\"volumeMounts\":[{\"mountPath\":\"/data\",\"name\":\"vn-data\"}]}],\"terminationGracePeriodSeconds\":10,\"volumes\":[]}},\"volumeClaimTemplates\":[{\"metadata\":{\"annotations\":{\"path\":\"/data\",\"value\":\"1\"},\"name\":\"vn-data\"},\"spec\":{\"accessModes\":[\"ReadWriteOnce\"],\"resources\":{\"requests\":{\"storage\":\"1Gi\"}}}}]}}]', '', '2024-01-03 15:01:23', 0, '2024-01-03 14:57:46', 0, '2024-01-03 14:57:46', NULL, 'ns-admin', NULL); -INSERT INTO `task` VALUES (1266, 'hello-busybox', '', 'Succeeded', 0, '0', '2024-01-03 16:22:55', '', '', 0, '[{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"labels\":{\"cloud.sealos.io/app-deploy-manager\":\"hello-busybox\"},\"name\":\"hello-busybox\"},\"spec\":{\"ports\":[{\"name\":\"tcbqrlvshjie\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"hello-busybox\"}}},{\"apiVersion\":\"apps/v1\",\"kind\":\"Deployment\",\"metadata\":{\"annotations\":{\"deploy.cloud.sealos.io/maxReplicas\":\"1\",\"deploy.cloud.sealos.io/minReplicas\":\"1\",\"originImageName\":\"nginx\"},\"labels\":{\"app\":\"hello-busybox\",\"cloud.sealos.io/app-deploy-manager\":\"hello-busybox\"},\"name\":\"hello-busybox\"},\"spec\":{\"replicas\":1,\"revisionHistoryLimit\":1,\"selector\":{\"matchLabels\":{\"app\":\"hello-busybox\"}},\"strategy\":{\"rollingUpdate\":{\"maxSurge\":0,\"maxUnavailable\":1},\"type\":\"RollingUpdate\"},\"template\":{\"metadata\":{\"labels\":{\"app\":\"hello-busybox\",\"restartTime\":\"20231213180841\"}},\"spec\":{\"containers\":[{\"env\":[],\"image\":\"nginx\",\"imagePullPolicy\":\"Always\",\"name\":\"hello-busybox\",\"ports\":[{\"containerPort\":80,\"name\":\"tcbqrlvshjie\"}],\"resources\":{\"limits\":{\"cpu\":\"200m\",\"memory\":\"64Mi\"},\"requests\":{\"cpu\":\"20m\",\"memory\":\"6Mi\"}},\"volumeMounts\":[]}],\"volumes\":[]}}}}]', '', '2024-01-03 16:25:17', 0, '2024-01-03 16:22:54', 0, '2024-01-03 16:22:54', NULL, 'ns-admin', NULL); -INSERT INTO `task` VALUES (1267, 'hello-busybox', '', 'Succeeded', 0, '0', '2024-01-04 09:01:06', '', '', 0, '[{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"labels\":{\"cloud.sealos.io/app-deploy-manager\":\"hello-busybox\"},\"name\":\"hello-busybox\"},\"spec\":{\"ports\":[{\"name\":\"tcbqrlvshjie\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"hello-busybox\"}}},{\"apiVersion\":\"apps/v1\",\"kind\":\"Deployment\",\"metadata\":{\"annotations\":{\"deploy.cloud.sealos.io/maxReplicas\":\"1\",\"deploy.cloud.sealos.io/minReplicas\":\"1\",\"originImageName\":\"nginx\"},\"labels\":{\"app\":\"hello-busybox\",\"cloud.sealos.io/app-deploy-manager\":\"hello-busybox\"},\"name\":\"hello-busybox\"},\"spec\":{\"replicas\":1,\"revisionHistoryLimit\":1,\"selector\":{\"matchLabels\":{\"app\":\"hello-busybox\"}},\"strategy\":{\"rollingUpdate\":{\"maxSurge\":0,\"maxUnavailable\":1},\"type\":\"RollingUpdate\"},\"template\":{\"metadata\":{\"labels\":{\"app\":\"hello-busybox\",\"restartTime\":\"20231213180841\"}},\"spec\":{\"containers\":[{\"env\":[],\"image\":\"nginx\",\"imagePullPolicy\":\"Always\",\"name\":\"hello-busybox\",\"ports\":[{\"containerPort\":80,\"name\":\"tcbqrlvshjie\"}],\"resources\":{\"limits\":{\"cpu\":\"200m\",\"memory\":\"64Mi\"},\"requests\":{\"cpu\":\"20m\",\"memory\":\"6Mi\"}},\"volumeMounts\":[]}],\"volumes\":[]}}}}]', '', '2024-01-04 09:09:39', 0, '2024-01-04 09:01:06', 0, '2024-01-04 09:01:06', NULL, 'ns-admin', NULL); -INSERT INTO `task` VALUES (1268, 'hello-nginx', '', 'Succeeded', 0, '0', '2024-01-04 09:02:00', '', '', 0, '[{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"labels\":{\"cloud.sealos.io/app-deploy-manager\":\"hello-nginx\"},\"name\":\"hello-nginx\"},\"spec\":{\"ports\":[{\"name\":\"tcbqrlvshjie\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"hello-nginx\"}}},{\"apiVersion\":\"apps/v1\",\"kind\":\"Deployment\",\"metadata\":{\"annotations\":{\"deploy.cloud.sealos.io/maxReplicas\":\"1\",\"deploy.cloud.sealos.io/minReplicas\":\"1\",\"originImageName\":\"nginx\"},\"labels\":{\"app\":\"hello-nginx\",\"cloud.sealos.io/app-deploy-manager\":\"hello-nginx\"},\"name\":\"hello-nginx\"},\"spec\":{\"replicas\":1,\"revisionHistoryLimit\":1,\"selector\":{\"matchLabels\":{\"app\":\"hello-nginx\"}},\"strategy\":{\"rollingUpdate\":{\"maxSurge\":0,\"maxUnavailable\":1},\"type\":\"RollingUpdate\"},\"template\":{\"metadata\":{\"labels\":{\"app\":\"hello-nginx\",\"restartTime\":\"20231213180841\"}},\"spec\":{\"containers\":[{\"env\":[],\"image\":\"nginx\",\"imagePullPolicy\":\"Always\",\"name\":\"hello-nginx\",\"ports\":[{\"containerPort\":80,\"name\":\"tcbqrlvshjie\"}],\"resources\":{\"limits\":{\"cpu\":\"200m\",\"memory\":\"64Mi\"},\"requests\":{\"cpu\":\"20m\",\"memory\":\"6Mi\"}},\"volumeMounts\":[]}],\"volumes\":[]}}}}]', '', '2024-01-04 09:09:58', 0, '2024-01-04 09:02:00', 0, '2024-01-04 09:02:00', NULL, 'ns-admin', NULL); -INSERT INTO `task` VALUES (1269, 'hello-busybox', '', 'Succeeded', 0, '0', '2024-01-04 09:11:06', '', '', 0, '[{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"labels\":{\"cloud.sealos.io/app-deploy-manager\":\"hello-busybox\"},\"name\":\"hello-busybox\"},\"spec\":{\"ports\":[{\"name\":\"tcbqrlvshjie\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"hello-busybox\"}}},{\"apiVersion\":\"apps/v1\",\"kind\":\"Deployment\",\"metadata\":{\"annotations\":{\"deploy.cloud.sealos.io/maxReplicas\":\"1\",\"deploy.cloud.sealos.io/minReplicas\":\"1\",\"originImageName\":\"nginx\"},\"labels\":{\"app\":\"hello-busybox\",\"cloud.sealos.io/app-deploy-manager\":\"hello-busybox\"},\"name\":\"hello-busybox\"},\"spec\":{\"replicas\":1,\"revisionHistoryLimit\":1,\"selector\":{\"matchLabels\":{\"app\":\"hello-busybox\"}},\"strategy\":{\"rollingUpdate\":{\"maxSurge\":0,\"maxUnavailable\":1},\"type\":\"RollingUpdate\"},\"template\":{\"metadata\":{\"labels\":{\"app\":\"hello-busybox\",\"restartTime\":\"20231213180841\"}},\"spec\":{\"containers\":[{\"env\":[],\"image\":\"nginx\",\"imagePullPolicy\":\"Always\",\"name\":\"hello-busybox\",\"ports\":[{\"containerPort\":80,\"name\":\"tcbqrlvshjie\"}],\"resources\":{\"limits\":{\"cpu\":\"200m\",\"memory\":\"64Mi\"},\"requests\":{\"cpu\":\"20m\",\"memory\":\"6Mi\"}},\"volumeMounts\":[]}],\"volumes\":[]}}}}]', '', '2024-01-09 18:20:20', 0, '2024-01-04 09:11:06', 0, '2024-01-04 09:11:06', NULL, 'ns-admin', NULL); -INSERT INTO `task` VALUES (1270, 'hello-nginx', '', 'Saved', 0, '0', '2024-01-04 09:11:28', '', '', 0, '[{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"labels\":{\"cloud.sealos.io/app-deploy-manager\":\"hello-nginx\"},\"name\":\"hello-nginx\"},\"spec\":{\"ports\":[{\"name\":\"tcbqrlvshjie\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"hello-nginx\"}}},{\"apiVersion\":\"apps/v1\",\"kind\":\"Deployment\",\"metadata\":{\"annotations\":{\"deploy.cloud.sealos.io/maxReplicas\":\"1\",\"deploy.cloud.sealos.io/minReplicas\":\"1\",\"originImageName\":\"nginx\"},\"labels\":{\"app\":\"hello-nginx\",\"cloud.sealos.io/app-deploy-manager\":\"hello-nginx\"},\"name\":\"hello-nginx\"},\"spec\":{\"replicas\":1,\"revisionHistoryLimit\":1,\"selector\":{\"matchLabels\":{\"app\":\"hello-nginx\"}},\"strategy\":{\"rollingUpdate\":{\"maxSurge\":0,\"maxUnavailable\":1},\"type\":\"RollingUpdate\"},\"template\":{\"metadata\":{\"labels\":{\"app\":\"hello-nginx\",\"restartTime\":\"20231213180841\"}},\"spec\":{\"containers\":[{\"env\":[],\"image\":\"nginx\",\"imagePullPolicy\":\"Always\",\"name\":\"hello-nginx\",\"ports\":[{\"containerPort\":80,\"name\":\"tcbqrlvshjie\"}],\"resources\":{\"limits\":{\"cpu\":\"200m\",\"memory\":\"64Mi\"},\"requests\":{\"cpu\":\"20m\",\"memory\":\"6Mi\"}},\"volumeMounts\":[]}],\"volumes\":[]}}}}]', '', NULL, 0, '2024-01-04 09:11:27', 0, '2024-01-04 09:11:27', NULL, 'ns-admin', NULL); -INSERT INTO `task` VALUES (1271, 'hello-tt', '', 'Failed', 0, '0', '2024-01-04 10:57:34', '', '', 0, '[{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"labels\":{\"cloud.sealos.io/app-deploy-manager\":\"hello-tt\"},\"name\":\"hello-tt\"},\"spec\":{\"ports\":[{\"name\":\"tcbqrlvshjie\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"hello-tt\"}}},{\"apiVersion\":\"apps/v1\",\"kind\":\"Deployment\",\"metadata\":{\"annotations\":{\"deploy.cloud.sealos.io/maxReplicas\":\"1\",\"deploy.cloud.sealos.io/minReplicas\":\"1\",\"originImageName\":\"nginx1\"},\"labels\":{\"app\":\"hello-tt\",\"cloud.sealos.io/app-deploy-manager\":\"hello-tt\"},\"name\":\"hello-tt\"},\"spec\":{\"replicas\":1,\"revisionHistoryLimit\":1,\"selector\":{\"matchLabels\":{\"app\":\"hello-tt\"}},\"strategy\":{\"rollingUpdate\":{\"maxSurge\":0,\"maxUnavailable\":1},\"type\":\"RollingUpdate\"},\"template\":{\"metadata\":{\"labels\":{\"app\":\"hello-tt\",\"restartTime\":\"20231213180841\"}},\"spec\":{\"containers\":[{\"env\":[],\"image\":\"nginx1\",\"imagePullPolicy\":\"Always\",\"name\":\"hello-tt\",\"ports\":[{\"containerPort\":80,\"name\":\"tcbqrlvshjie\"}],\"resources\":{\"limits\":{\"cpu\":\"200m\",\"memory\":\"64Mi\"},\"requests\":{\"cpu\":\"20m\",\"memory\":\"6Mi\"}},\"volumeMounts\":[]}],\"volumes\":[]}}}}]', '', '2024-01-04 10:58:26', 0, '2024-01-04 10:57:33', 0, '2024-01-04 10:57:33', NULL, 'ns-admin', NULL); -INSERT INTO `task` VALUES (1272, 'hello-busybox', '', 'Saved', 0, '0', '2024-01-09 18:21:12', '', '', 0, '[{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"labels\":{\"cloud.sealos.io/app-deploy-manager\":\"hello-busybox\"},\"name\":\"hello-busybox\"},\"spec\":{\"ports\":[{\"name\":\"tcbqrlvshjie\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"hello-busybox\"}}},{\"apiVersion\":\"apps/v1\",\"kind\":\"Deployment\",\"metadata\":{\"annotations\":{\"deploy.cloud.sealos.io/maxReplicas\":\"1\",\"deploy.cloud.sealos.io/minReplicas\":\"1\",\"originImageName\":\"nginx\"},\"labels\":{\"app\":\"hello-busybox\",\"cloud.sealos.io/app-deploy-manager\":\"hello-busybox\"},\"name\":\"hello-busybox\"},\"spec\":{\"replicas\":1,\"revisionHistoryLimit\":1,\"selector\":{\"matchLabels\":{\"app\":\"hello-busybox\"}},\"strategy\":{\"rollingUpdate\":{\"maxSurge\":0,\"maxUnavailable\":1},\"type\":\"RollingUpdate\"},\"template\":{\"metadata\":{\"labels\":{\"app\":\"hello-busybox\",\"restartTime\":\"20231213180841\"}},\"spec\":{\"containers\":[{\"env\":[],\"image\":\"nginx\",\"imagePullPolicy\":\"Always\",\"name\":\"hello-busybox\",\"ports\":[{\"containerPort\":80,\"name\":\"tcbqrlvshjie\"}],\"resources\":{\"limits\":{\"cpu\":\"200m\",\"memory\":\"64Mi\"},\"requests\":{\"cpu\":\"20m\",\"memory\":\"6Mi\"}},\"volumeMounts\":[]}],\"volumes\":[]}}}}]', '', NULL, 0, '2024-01-09 18:21:11', 0, '2024-01-09 18:21:11', NULL, 'ns-admin', NULL); -INSERT INTO `task` VALUES (1273, 'hello-world', '', 'Failed', 0, '0', '2024-01-12 11:54:49', '', '', 0, '[{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"labels\":{\"cloud.sealos.io/app-deploy-manager\":\"hello-world\"},\"name\":\"hello-world\"},\"spec\":{\"ports\":[{\"name\":\"tcbqrlvshjie\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"hello-world\"}}},{\"apiVersion\":\"apps/v1\",\"kind\":\"Deployment\",\"metadata\":{\"annotations\":{\"deploy.cloud.sealos.io/maxReplicas\":\"1\",\"deploy.cloud.sealos.io/minReplicas\":\"1\",\"originImageName\":\"nginx\"},\"labels\":{\"app\":\"hello-world\",\"cloud.sealos.io/app-deploy-manager\":\"hello-world\"},\"name\":\"hello-world\"},\"spec\":{\"replicas\":1,\"revisionHistoryLimit\":1,\"selector\":{\"matchLabels\":{\"app\":\"hello-world\"}},\"strategy\":{\"rollingUpdate\":{\"maxSurge\":0,\"maxUnavailable\":1},\"type\":\"RollingUpdate\"},\"template\":{\"metadata\":{\"labels\":{\"app\":\"hello-world\",\"restartTime\":\"20231213180841\"}},\"spec\":{\"containers\":[{\"env\":[],\"image\":\"nginx\",\"imagePullPolicy\":\"Always\",\"name\":\"hello-world\",\"ports\":[{\"containerPort\":80,\"name\":\"tcbqrlvshjie\"}],\"resources\":{\"limits\":{\"cpu\":\"200m\",\"memory\":\"64Mi\"},\"requests\":{\"cpu\":\"20m\",\"memory\":\"6Mi\"}},\"volumeMounts\":[]}],\"volumes\":[]}}}}]', '', NULL, 0, '2024-01-12 11:54:49', 0, '2024-01-12 11:54:49', NULL, 'ns-admin', NULL); -INSERT INTO `task` VALUES (1306, 'HPC_ac_testjob0325', 'ac test job ', 'Failed', 0, '0', '2024-03-25 10:28:46', '', '', 0, '', '', NULL, 0, '2024-03-25 10:28:46', 0, '2024-03-25 10:28:46', NULL, '', NULL); -INSERT INTO `task` VALUES (1307, 'testjob', 'teeet', 'Saved', 0, '0', '2024-03-25 10:48:10', '', '', 0, '', '', NULL, 0, '2024-03-25 10:48:10', 0, '2024-03-25 10:48:10', NULL, '', NULL); -INSERT INTO `task` VALUES (1308, 'HPC_slurm_testjob0325', 'slurm test job ', 'Running', 0, '0', '2024-03-25 10:48:50', '', '', 0, '', '', NULL, 0, '2024-03-25 10:48:49', 0, '2024-03-25 10:48:49', NULL, '', NULL); -INSERT INTO `task` VALUES (1309, 'HPC_paratera_testjob032501', 'paratera test job ', 'Running', 0, '0', '2024-03-25 10:50:09', '', '', 0, '', '', NULL, 0, '2024-03-25 10:50:09', 0, '2024-03-25 10:50:09', NULL, '', NULL); -INSERT INTO `task` VALUES (1310, 'HPC_slurm_testjob0325', 'slurm test job ', 'Running', 0, '0', '2024-03-25 15:59:40', '', '', 0, '', '', NULL, 0, '2024-03-25 15:59:40', 0, '2024-03-25 15:59:40', NULL, '', NULL); -INSERT INTO `task` VALUES (1311, 'HPC_ac_testjob0325', 'ac test job ', 'Running', 0, '0', '2024-03-25 16:00:14', '', '', 0, '', '', NULL, 0, '2024-03-25 16:00:13', 0, '2024-03-25 16:00:13', NULL, '', NULL); -INSERT INTO `task` VALUES (1312, 'HPC_paratera_testjob032501', 'paratera test job ', 'Running', 0, '0', '2024-03-25 16:00:17', '', '', 0, '', '', NULL, 0, '2024-03-25 16:00:16', 0, '2024-03-25 16:00:16', NULL, '', NULL); -INSERT INTO `task` VALUES (1313, 'HPC_slurm_testjob0325', 'slurm test job ', 'Running', 0, '0', '2024-03-26 08:46:02', '', '', 0, '', '', NULL, 0, '2024-03-26 08:46:01', 0, '2024-03-26 08:46:01', NULL, '', NULL); -INSERT INTO `task` VALUES (1314, 'HPC_paratera_testjob032501', 'paratera test job ', 'Running', 0, '0', '2024-04-02 10:49:47', '', '', 0, '', '', NULL, 0, '2024-04-02 10:49:46', 0, '2024-04-02 10:49:46', NULL, '', NULL); -INSERT INTO `task` VALUES (1315, 'hpc-test', 'slurm test job ', 'Running', 0, '0', '2024-04-02 10:50:53', '', '', 0, '', '', NULL, 0, '2024-04-02 10:50:53', 0, '2024-04-02 10:50:53', NULL, '', NULL); -INSERT INTO `task` VALUES (1319, 'test1', 'ai task', 'Running', 0, '0', '2024-04-02 18:31:31', '', '', 0, '', '', NULL, 0, '2024-04-02 18:31:30', 0, '2024-04-02 18:31:30', NULL, '', NULL); -INSERT INTO `task` VALUES (1320, 'HPC_test040301', 'paratera test job ', 'Running', 0, '0', '2024-04-03 08:59:44', '', '', 0, '', '', NULL, 0, '2024-04-03 08:59:44', 0, '2024-04-03 08:59:44', NULL, '', NULL); -INSERT INTO `task` VALUES (1321, 'HPC_slurm_testjob0325', 'slurm test job ', 'Running', 1, '1', '2024-04-03 09:06:41', '', '', 998112, '', '', NULL, 0, '2024-04-03 09:06:40', 0, '2024-04-03 09:06:40', NULL, '', NULL); -INSERT INTO `task` VALUES (1329, '图像分类测试1', 'ai task', 'Running', 0, '0', '2024-04-11 19:27:31', '', '', 7794881, '', '', NULL, 0, '2024-04-11 19:27:31', 0, '2024-04-11 19:27:31', NULL, '', NULL); -INSERT INTO `task` VALUES (1330, 'HPC_slurm_testjob0325', 'slurm test job ', 'Running', 0, '0', '2024-04-12 09:05:48', '', '', 844041, '', '', NULL, 0, '2024-04-12 09:05:47', 0, '2024-04-12 09:05:47', NULL, '', NULL); -INSERT INTO `task` VALUES (1333, 'test', '', 'Running', 0, '0', '2024-04-12 15:07:27', '', '', 66, '', '', NULL, 0, '2024-04-12 15:07:27', 0, '2024-04-12 15:07:27', NULL, '', 3); -INSERT INTO `task` VALUES (1338, 'HPC_slurm_testjob0325', 'slurm test job ', 'Running', 0, '0', '2024-04-20 16:27:03', '', '', 10000000, '', '', NULL, 0, '2024-04-20 16:27:02', 0, '2024-04-20 16:27:02', NULL, '', NULL); -INSERT INTO `task` VALUES (1356, 'HPC_slurm_testjob0325', 'slurm test job ', 'Saved', 0, '0', '2024-04-22 10:45:30', '', '', 30050021, '', '', NULL, 0, '2024-04-22 10:45:30', 0, '2024-04-22 10:45:30', NULL, '', NULL); -INSERT INTO `task` VALUES (1361, 'hello-busybox', '', 'Saved', 0, '0', '2024-04-22 10:52:35', '', '', 3000, '[{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"labels\":{\"cloud.sealos.io/app-deploy-manager\":\"hello-busybox\"},\"name\":\"hello-busybox\"},\"spec\":{\"ports\":[{\"name\":\"tcbqrlvshjie\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"hello-busybox\"}}},{\"apiVersion\":\"apps/v1\",\"kind\":\"Deployment\",\"metadata\":{\"annotations\":{\"deploy.cloud.sealos.io/maxReplicas\":\"1\",\"deploy.cloud.sealos.io/minReplicas\":\"1\",\"originImageName\":\"nginx\"},\"labels\":{\"app\":\"hello-busybox\",\"cloud.sealos.io/app-deploy-manager\":\"hello-busybox\"},\"name\":\"hello-busybox\"},\"spec\":{\"replicas\":1,\"revisionHistoryLimit\":1,\"selector\":{\"matchLabels\":{\"app\":\"hello-busybox\"}},\"strategy\":{\"rollingUpdate\":{\"maxSurge\":0,\"maxUnavailable\":1},\"type\":\"RollingUpdate\"},\"template\":{\"metadata\":{\"labels\":{\"app\":\"hello-busybox\",\"restartTime\":\"20231213180841\"}},\"spec\":{\"containers\":[{\"env\":[],\"image\":\"nginx\",\"imagePullPolicy\":\"Always\",\"name\":\"hello-busybox\",\"ports\":[{\"containerPort\":80,\"name\":\"tcbqrlvshjie\"}],\"resources\":{\"limits\":{\"cpu\":\"200m\",\"memory\":\"64Mi\"},\"requests\":{\"cpu\":\"20m\",\"memory\":\"6Mi\"}},\"volumeMounts\":[]}],\"volumes\":[]}}}}]', '', NULL, 0, '2024-04-22 10:52:35', 0, '2024-04-22 10:52:35', NULL, 'ns-admin', NULL); -INSERT INTO `task` VALUES (1372, '图像分类测试1', 'ai task', 'Saved', 0, '0', '2024-04-26 11:10:33', '', '', 66915, '', '', NULL, 0, '2024-04-26 11:10:32', 0, '2024-04-26 11:10:32', NULL, '', NULL); +INSERT INTO `task` VALUES (1788473864037077003, 'HPC_slurm_testjob0325', 'slurm test job ', 'Succeeded', 0, '0', '2024-05-10 22:31:02', '2024-05-10 22:31:13', '2024-05-10 22:32:50', 0, '', '', NULL, 0, '2024-05-10 22:31:02', 0, '2024-05-10 22:31:02', NULL, '', 2, 0); +INSERT INTO `task` VALUES (1789107548582842368, 'hello-world', '', 'Running', 0, '1', '2024-05-11 09:37:34', '2024-05-11 09:57:59', NULL, 0, 'apiVersion: v1\nkind: Service\nmetadata:\n name: hello-world\n labels:\n cloud.sealos.io/app-deploy-manager: hello-world\nspec:\n ports:\n - port: 80\n targetPort: 80\n name: tugaknbdhcrf\n selector:\n app: hello-world\n\n---\napiVersion: apps/v1\nkind: Deployment\nmetadata:\n name: hello-world\n annotations:\n originImageName: nginx\n deploy.cloud.sealos.io/minReplicas: \'1\'\n deploy.cloud.sealos.io/maxReplicas: \'1\'\n labels:\n cloud.sealos.io/app-deploy-manager: hello-world\n app: hello-world\nspec:\n replicas: 1\n revisionHistoryLimit: 1\n selector:\n matchLabels:\n app: hello-world\n strategy:\n type: RollingUpdate\n rollingUpdate:\n maxUnavailable: 0\n maxSurge: 1\n template:\n metadata:\n labels:\n app: hello-world\n restartTime: 202405Sa093734\n spec:\n containers:\n - name: hello-world\n image: nginx\n env: []\n resources:\n requests:\n cpu: 10m\n memory: 6Mi\n limits:\n cpu: 100m\n memory: 64Mi\n ports:\n - containerPort: 80\n name: tugaknbdhcrf\n imagePullPolicy: Always\n volumeMounts: []\n volumes: []\n', '', NULL, 0, '2024-05-11 09:37:34', 0, '2024-05-11 09:37:34', NULL, '', 0, 0); +INSERT INTO `task` VALUES (1789107548582842369, 'vm task', NULL, NULL, 0, '0', NULL, NULL, NULL, 0, NULL, '', NULL, 0, '2024-05-11 10:54:54', 0, '2024-05-11 10:54:54', NULL, NULL, NULL, 0); +INSERT INTO `task` VALUES (1789107548582842370, 'vm task', NULL, NULL, 0, '0', NULL, NULL, NULL, 0, NULL, '', NULL, 0, '2024-05-11 11:00:15', 0, '2024-05-11 11:00:15', NULL, NULL, NULL, 0); +INSERT INTO `task` VALUES (1789107548582842371, 'vm task', NULL, NULL, 0, '0', NULL, NULL, NULL, 0, NULL, '', NULL, 0, '2024-05-11 11:06:12', 0, '2024-05-11 11:06:12', NULL, NULL, NULL, 0); +INSERT INTO `task` VALUES (1789107548582842372, 'vm task', NULL, NULL, 0, '0', NULL, NULL, NULL, 0, NULL, '', NULL, 0, '2024-05-11 11:08:11', 0, '2024-05-11 11:08:11', NULL, NULL, NULL, 0); +INSERT INTO `task` VALUES (1789107548582842373, 'vm task', NULL, NULL, 0, '0', NULL, NULL, NULL, 0, NULL, '', NULL, 0, '2024-05-11 11:16:04', 0, '2024-05-11 11:16:04', NULL, NULL, NULL, 0); +INSERT INTO `task` VALUES (1789107548582842374, 'vm task', NULL, NULL, 0, '0', NULL, NULL, NULL, 0, NULL, '', NULL, 0, '2024-05-11 11:16:31', 0, '2024-05-11 11:16:31', NULL, NULL, NULL, 0); +INSERT INTO `task` VALUES (1789107548582842375, 'vm task', NULL, NULL, 0, '0', NULL, NULL, NULL, 0, NULL, '', NULL, 0, '2024-05-11 11:20:42', 0, '2024-05-11 11:20:42', NULL, NULL, NULL, 0); +INSERT INTO `task` VALUES (1789107548582842376, 'vm task', NULL, NULL, 0, '0', NULL, NULL, NULL, 0, NULL, '', NULL, 0, '2024-05-11 11:21:29', 0, '2024-05-11 11:21:29', NULL, NULL, NULL, 0); +INSERT INTO `task` VALUES (1789107548582842377, 'vm task', NULL, NULL, 0, '0', NULL, NULL, NULL, 0, NULL, '', NULL, 0, '2024-05-11 11:27:18', 0, '2024-05-11 11:27:18', NULL, NULL, NULL, 0); +INSERT INTO `task` VALUES (1789107548582842378, 'vm task', NULL, NULL, 0, '0', NULL, NULL, NULL, 0, NULL, '', NULL, 0, '2024-05-11 11:31:52', 0, '2024-05-11 11:31:52', NULL, NULL, NULL, 0); +INSERT INTO `task` VALUES (1789138950200233984, 'hello-world', '', 'Running', 0, '0', '2024-05-11 11:42:21', '2024-05-11 11:42:26', NULL, 0, 'apiVersion: v1\nkind: Service\nmetadata:\n name: hello-world\n labels:\n cloud.sealos.io/app-deploy-manager: hello-world\nspec:\n ports:\n - port: 80\n targetPort: 80\n name: ytabbxlicrnu\n selector:\n app: hello-world\n\n---\napiVersion: apps/v1\nkind: Deployment\nmetadata:\n name: hello-world\n annotations:\n originImageName: nginx\n deploy.cloud.sealos.io/minReplicas: \'1\'\n deploy.cloud.sealos.io/maxReplicas: \'1\'\n labels:\n cloud.sealos.io/app-deploy-manager: hello-world\n app: hello-world\nspec:\n replicas: 1\n revisionHistoryLimit: 1\n selector:\n matchLabels:\n app: hello-world\n strategy:\n type: RollingUpdate\n rollingUpdate:\n maxUnavailable: 0\n maxSurge: 1\n template:\n metadata:\n labels:\n app: hello-world\n restartTime: 202405Sa114218\n spec:\n containers:\n - name: hello-world\n image: nginx\n env: []\n resources:\n requests:\n cpu: 10m\n memory: 6Mi\n limits:\n cpu: 100m\n memory: 64Mi\n ports:\n - containerPort: 80\n name: ytabbxlicrnu\n imagePullPolicy: Always\n volumeMounts: []\n volumes: []\n', '', NULL, 0, '2024-05-11 11:42:20', 0, '2024-05-11 11:42:20', NULL, '', 0, 0); +INSERT INTO `task` VALUES (1789143380308004864, '跨域创建虚拟机', 'vm task', 'Saved', 2, '0', '2024-05-11 11:59:57', NULL, NULL, 0, '', '', NULL, 0, '2024-05-11 11:59:58', 0, '2024-05-11 11:59:58', NULL, '', 0, 0); +INSERT INTO `task` VALUES (1789143807132962816, '跨域创建虚拟机', 'vm task', 'Saved', 2, '0', '2024-05-11 12:01:39', NULL, NULL, 0, '', '', NULL, 0, '2024-05-11 12:01:52', 0, '2024-05-11 12:01:52', NULL, '', 0, 0); +INSERT INTO `task` VALUES (1789144507183271936, '跨域创建虚拟机', 'vm task', 'Saved', 2, '0', '2024-05-11 12:04:26', NULL, NULL, 0, '', '', NULL, 0, '2024-05-11 12:08:51', 0, '2024-05-11 12:08:51', NULL, '', 0, 0); +INSERT INTO `task` VALUES (1789146239091085312, '跨域创建虚拟机', 'vm task', 'Saved', 2, '0', '2024-05-11 12:11:19', NULL, NULL, 0, '', '', NULL, 0, '2024-05-11 12:17:05', 0, '2024-05-11 12:17:05', NULL, '', 0, 0); +INSERT INTO `task` VALUES (1789146239091085313, 'HPC_paratera_testjob032501', 'paratera test job ', 'Running', 0, '0', '2024-05-11 15:14:20', '2024-05-11 15:14:37', NULL, 0, '', '', NULL, 0, '2024-05-11 15:14:19', 0, '2024-05-11 15:14:19', NULL, '', 2, 0); +INSERT INTO `task` VALUES (1789146239091085314, 'HPC_paratera_testjob032501', 'paratera test job ', 'Saved', 0, '0', '2024-05-11 15:22:43', NULL, NULL, 0, '', '', NULL, 0, '2024-05-11 15:22:43', 0, '2024-05-11 15:22:43', NULL, '', 2, 0); +INSERT INTO `task` VALUES (1789146239091085315, 'HPC_paratera_testjob032501', 'paratera test job ', 'Saved', 0, '0', '2024-05-11 15:22:46', NULL, NULL, 0, '', '', NULL, 0, '2024-05-11 15:22:45', 0, '2024-05-11 15:22:45', NULL, '', 2, 0); +INSERT INTO `task` VALUES (1789146239091085316, 'HPC_paratera_testjob032501', 'paratera test job ', 'Saved', 0, '0', '2024-05-11 15:22:55', NULL, NULL, 0, '', '', NULL, 0, '2024-05-11 15:22:55', 0, '2024-05-11 15:22:55', NULL, '', 2, 0); +INSERT INTO `task` VALUES (1789146239091085317, 'HPC_paratera_testjob032501', 'paratera test job ', 'Saved', 0, '0', '2024-05-11 15:23:18', NULL, NULL, 0, '', '', NULL, 0, '2024-05-11 15:23:17', 0, '2024-05-11 15:23:17', NULL, '', 2, 0); +INSERT INTO `task` VALUES (1789146239091085318, 'HPC_paratera_testjob032501', 'paratera test job ', 'Saved', 0, '0', '2024-05-11 15:23:42', NULL, NULL, 0, '', '', NULL, 0, '2024-05-11 15:23:42', 0, '2024-05-11 15:23:42', NULL, '', 2, 0); +INSERT INTO `task` VALUES (1789146239091085319, 'HPC_paratera_testjob032501', 'paratera test job ', 'Saved', 0, '0', '2024-05-11 15:24:54', NULL, NULL, 0, '', '', NULL, 0, '2024-05-11 15:24:54', 0, '2024-05-11 15:24:54', NULL, '', 2, 0); +INSERT INTO `task` VALUES (1789146239091085320, 'HPC_paratera_testjob032501', 'paratera test job ', 'Running', 0, '0', '2024-05-11 15:25:49', '2024-05-11 15:25:57', NULL, 0, '', '', NULL, 0, '2024-05-11 15:25:48', 0, '2024-05-11 15:25:48', NULL, '', 2, 0); +INSERT INTO `task` VALUES (1789146239091085321, 'HPC_paratera_testjob032501', 'paratera test job ', 'Saved', 0, '0', '2024-05-11 15:30:51', NULL, NULL, 0, '', '', NULL, 0, '2024-05-11 15:30:50', 0, '2024-05-11 15:30:50', NULL, '', 2, 0); +INSERT INTO `task` VALUES (1789146239091085322, 'HPC_paratera_testjob032501', 'paratera test job ', 'Saved', 0, '0', '2024-05-11 15:31:39', NULL, NULL, 0, '', '', NULL, 0, '2024-05-11 15:31:38', 0, '2024-05-11 15:31:38', NULL, '', 2, 0); +INSERT INTO `task` VALUES (1789146239091085323, 'HPC_paratera_testjob032501', 'paratera test job ', 'Saved', 0, '0', '2024-05-11 15:31:41', NULL, NULL, 0, '', '', NULL, 0, '2024-05-11 15:31:40', 0, '2024-05-11 15:31:40', NULL, '', 2, 0); +INSERT INTO `task` VALUES (1789146239091085324, 'HPC_slurm_testjob0325', 'slurm test job ', 'Saved', 0, '0', '2024-05-11 15:32:17', NULL, NULL, 0, '', '', NULL, 0, '2024-05-11 15:32:17', 0, '2024-05-11 15:32:17', NULL, '', 2, 0); +INSERT INTO `task` VALUES (1789146239091085325, 'HPC_slurm_testjob0325', 'slurm test job ', 'Saved', 0, '0', '2024-05-11 15:33:30', NULL, NULL, 0, '', '', NULL, 0, '2024-05-11 15:33:29', 0, '2024-05-11 15:33:29', NULL, '', 2, 0); +INSERT INTO `task` VALUES (1789146239091085326, 'HPC_slurm_testjob0325', 'slurm test job ', 'Saved', 0, '0', '2024-05-11 15:34:16', NULL, NULL, 0, '', '', NULL, 0, '2024-05-11 15:34:14', 0, '2024-05-11 15:34:14', NULL, '', 2, 0); +INSERT INTO `task` VALUES (1789197068019961856, '跨域创建虚拟机', 'vm task', 'Saved', 2, '0', '2024-05-11 15:33:17', NULL, NULL, 0, '', '', NULL, 0, '2024-05-11 15:38:34', 0, '2024-05-11 15:38:34', NULL, '', 3, 0); +INSERT INTO `task` VALUES (1789198739060035584, '跨域创建虚拟机', 'vm task', 'Saved', 2, '0', '2024-05-11 15:39:56', NULL, NULL, 0, '', '', NULL, 0, '2024-05-11 15:39:57', 0, '2024-05-11 15:39:57', NULL, '', 3, 0); +INSERT INTO `task` VALUES (1789200710793957376, 'hello-nginx', '', 'Running', 0, '1', '2024-05-11 15:47:46', '2024-05-11 15:47:50', NULL, 0, 'apiVersion: v1\nkind: Service\nmetadata:\n name: hello-nginx\n labels:\n cloud.sealos.io/app-deploy-manager: hello-nginx\nspec:\n ports:\n - port: 80\n targetPort: 80\n name: naqvxiwsafvn\n selector:\n app: hello-nginx\n\n---\napiVersion: apps/v1\nkind: Deployment\nmetadata:\n name: hello-nginx\n annotations:\n originImageName: nginx\n deploy.cloud.sealos.io/minReplicas: \'1\'\n deploy.cloud.sealos.io/maxReplicas: \'1\'\n labels:\n cloud.sealos.io/app-deploy-manager: hello-nginx\n app: hello-nginx\nspec:\n replicas: 1\n revisionHistoryLimit: 1\n selector:\n matchLabels:\n app: hello-nginx\n strategy:\n type: RollingUpdate\n rollingUpdate:\n maxUnavailable: 0\n maxSurge: 1\n template:\n metadata:\n labels:\n app: hello-nginx\n restartTime: 202405Sa154745\n spec:\n containers:\n - name: hello-nginx\n image: nginx\n env: []\n resources:\n requests:\n cpu: 10m\n memory: 6Mi\n limits:\n cpu: 100m\n memory: 64Mi\n ports:\n - containerPort: 80\n name: naqvxiwsafvn\n imagePullPolicy: Always\n volumeMounts: []\n volumes: []\n', '', NULL, 0, '2024-05-11 15:47:45', 0, '2024-05-11 15:47:45', NULL, '', 0, 0); +INSERT INTO `task` VALUES (1789200710793957377, 'HPC_slurm_testjob0325', 'slurm test job ', 'Saved', 0, '0', '2024-05-11 15:49:14', NULL, NULL, 0, '', '', NULL, 0, '2024-05-11 15:49:14', 0, '2024-05-11 15:49:14', NULL, '', 2, 0); +INSERT INTO `task` VALUES (1789201130505375744, 'nginx-test', '', 'Running', 2, '1', '2024-05-11 15:49:26', '2024-05-11 17:15:42', NULL, 0, 'apiVersion: v1\nkind: Service\nmetadata:\n name: nginx-test\n labels:\n cloud.sealos.io/app-deploy-manager: nginx-test\nspec:\n ports:\n - port: 80\n targetPort: 80\n name: lngbzntacgmx\n selector:\n app: nginx-test\n\n---\napiVersion: apps/v1\nkind: Deployment\nmetadata:\n name: nginx-test\n annotations:\n originImageName: nginx\n deploy.cloud.sealos.io/minReplicas: \'1\'\n deploy.cloud.sealos.io/maxReplicas: \'1\'\n labels:\n cloud.sealos.io/app-deploy-manager: nginx-test\n app: nginx-test\nspec:\n replicas: 1\n revisionHistoryLimit: 1\n selector:\n matchLabels:\n app: nginx-test\n strategy:\n type: RollingUpdate\n rollingUpdate:\n maxUnavailable: 0\n maxSurge: 1\n template:\n metadata:\n labels:\n app: nginx-test\n restartTime: 202405Sa154925\n spec:\n containers:\n - name: nginx-test\n image: nginx\n env: []\n resources:\n requests:\n cpu: 10m\n memory: 6Mi\n limits:\n cpu: 100m\n memory: 64Mi\n ports:\n - containerPort: 80\n name: lngbzntacgmx\n imagePullPolicy: Always\n volumeMounts: []\n volumes: []\n', '', NULL, 0, '2024-05-11 15:49:25', 0, '2024-05-11 15:49:25', NULL, '', 0, 0); +INSERT INTO `task` VALUES (1789201130505375751, '图像分类测试1', 'ai task', 'Saved', 0, '1', '2024-05-12 14:14:36', NULL, NULL, 0, '', '', NULL, 0, '2024-05-12 14:14:36', 0, '2024-05-12 14:14:36', NULL, '', 1, 0); -- ---------------------------- -- Table structure for task_ai @@ -2691,25 +2561,32 @@ INSERT INTO `task` VALUES (1372, '图像分类测试1', 'ai task', 'Saved', 0, ' DROP TABLE IF EXISTS `task_ai`; CREATE TABLE `task_ai` ( `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', - `task_id` int NOT NULL COMMENT '任务id', - `adapter_id` bigint NOT NULL COMMENT '设配器id', + `task_id` bigint NOT NULL COMMENT '任务id', + `adapter_id` bigint NOT NULL COMMENT '适配器id', + `adapter_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '适配器名称', `cluster_id` bigint NOT NULL COMMENT '集群id', + `cluster_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '集群名称', `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '任务名', `replica` smallint NOT NULL COMMENT '执行数', - `c_task_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '集群返回任务id', + `job_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '集群返回任务id', `strategy` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '主任务使用策略', `status` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '任务状态', - `msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '集群返回任务信息', - `commit_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '提交时间', - `start_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '开始时间', - `end_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '结束时间', + `msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '集群返回任务信息', + `commit_time` datetime NOT NULL COMMENT '提交时间', + `start_time` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '开始时间', + `end_time` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '结束时间', + `task_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL, + `deleted_at` datetime NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 24 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of task_ai -- ---------------------------- -INSERT INTO `task_ai` VALUES (1, 123, 1123, 123, 'asd', 1, 'czxzc', 'dscxz', 'dsads', NULL, '2024-04-29 10:20:25', '2024-04-29 10:20:25', '2024-04-29 10:20:25'); +INSERT INTO `task_ai` VALUES (13, 1788473864037076993, 1777144940459986944, NULL, 1777157653982613504, NULL, '图像分类测试1', 1, 'ne1da7a301f1490f864a83dd3a01b234', 'replication', 'Completed', '', '2024-05-09 16:44:30', '2024-05-09 16:44:30', '2024-05-09 16:44:55', 'pytorch', NULL); +INSERT INTO `task_ai` VALUES (14, 1788473864037076993, 1777144940459986944, NULL, 1777240145309732864, NULL, '图像分类测试1', 1, '953b60822b0f4e1bb84428f306139126', 'replication', 'Completed', '', '2024-05-09 16:44:30', '2024-05-09 16:44:33', '2024-05-09 16:45:31', 'pytorch', NULL); +INSERT INTO `task_ai` VALUES (22, 1789201130505375751, 1777144940459986944, NULL, 1777157653982613504, NULL, '图像分类测试1', 1, 'm1daa1e940b441a7b4b6a0e3726373cb', 'replication', 'Completed', '', '2024-05-12 14:14:36', '2024-05-12 14:14:36', '2024-05-12 14:21:58', 'pytorch', NULL); +INSERT INTO `task_ai` VALUES (23, 1789201130505375751, 1777144940459986944, NULL, 1777240145309732864, NULL, '图像分类测试1', 1, '11fe891a96d44a46a009cc2578db706d', 'replication', 'Completed', '', '2024-05-12 14:14:36', '2024-05-12 14:14:37', '2024-05-12 14:21:05', 'pytorch', NULL); -- ---------------------------- -- Table structure for task_cloud @@ -2719,15 +2596,15 @@ CREATE TABLE `task_cloud` ( `id` bigint NOT NULL COMMENT 'id', `task_id` bigint UNSIGNED NOT NULL COMMENT 'task表id', `adapter_id` bigint UNSIGNED NOT NULL COMMENT '适配器id', + `adapter_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '适配器名称', `cluster_id` bigint UNSIGNED NOT NULL COMMENT '集群id', - `cluster_name` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '集群名称', + `cluster_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '集群名称', `kind` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '种类', `status` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '状态', - `start_time` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '开始时间', + `start_time` datetime NULL DEFAULT NULL COMMENT '开始时间', `yaml_string` varchar(10000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '任务入参', `result` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '运行结果', `namespace` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT 'default' COMMENT '命名空间', - `replica` int NULL DEFAULT NULL COMMENT '副本数', `deleted_at` datetime NULL DEFAULT NULL COMMENT '删除时间', `created_by` int NULL DEFAULT 0 COMMENT '创建人', `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', @@ -2739,6 +2616,20 @@ CREATE TABLE `task_cloud` ( -- ---------------------------- -- Records of task_cloud -- ---------------------------- +INSERT INTO `task_cloud` VALUES (1789107548587036672, 1789107548582842368, 1752857389213683712, '阿里云数算', 1763132837495574528, 'aliyun-sealos', 'Service', 'Running', '2024-05-11 17:15:40', '{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"labels\":{\"cloud.sealos.io/app-deploy-manager\":\"hello-world\"},\"name\":\"hello-world\",\"namespace\":\"default\"},\"spec\":{\"ports\":[{\"name\":\"tugaknbdhcrf\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"hello-world\"}}}\n', '', 'default', NULL, 0, '2024-05-11 09:37:34', 0, '2024-05-11 09:37:34'); +INSERT INTO `task_cloud` VALUES (1789107548587036673, 1789107548582842368, 1752857389213683712, '阿里云数算', 1763132837495574528, 'aliyun-sealos', 'Deployment', 'Running', '2024-05-11 17:15:40', '{\"apiVersion\":\"apps/v1\",\"kind\":\"Deployment\",\"metadata\":{\"annotations\":{\"deploy.cloud.sealos.io/maxReplicas\":\"1\",\"deploy.cloud.sealos.io/minReplicas\":\"1\",\"originImageName\":\"nginx\"},\"labels\":{\"app\":\"hello-world\",\"cloud.sealos.io/app-deploy-manager\":\"hello-world\"},\"name\":\"hello-world\",\"namespace\":\"default\"},\"spec\":{\"replicas\":1,\"revisionHistoryLimit\":1,\"selector\":{\"matchLabels\":{\"app\":\"hello-world\"}},\"strategy\":{\"rollingUpdate\":{\"maxSurge\":1,\"maxUnavailable\":0},\"type\":\"RollingUpdate\"},\"template\":{\"metadata\":{\"labels\":{\"app\":\"hello-world\",\"restartTime\":\"202405Sa093734\"}},\"spec\":{\"containers\":[{\"env\":[],\"image\":\"nginx\",\"imagePullPolicy\":\"Always\",\"name\":\"hello-world\",\"ports\":[{\"containerPort\":80,\"name\":\"tugaknbdhcrf\"}],\"resources\":{\"limits\":{\"cpu\":\"100m\",\"memory\":\"64Mi\"},\"requests\":{\"cpu\":\"10m\",\"memory\":\"6Mi\"}},\"volumeMounts\":[]}],\"volumes\":[]}}}}\n', '', 'default', NULL, 0, '2024-05-11 09:37:34', 0, '2024-05-11 09:37:34'); +INSERT INTO `task_cloud` VALUES (1789107548587036674, 1789107548582842368, 1752857389213683712, '阿里云数算', 1766856565336487987, 'aliyun-old', 'Service', 'Running', '2024-05-11 17:15:40', '{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"labels\":{\"cloud.sealos.io/app-deploy-manager\":\"hello-world\"},\"name\":\"hello-world\",\"namespace\":\"default\"},\"spec\":{\"ports\":[{\"name\":\"tugaknbdhcrf\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"hello-world\"}}}\n', '', 'default', NULL, 0, '2024-05-11 09:37:34', 0, '2024-05-11 09:37:34'); +INSERT INTO `task_cloud` VALUES (1789107548587036675, 1789107548582842368, 1752857389213683712, '阿里云数算', 1766856565336487987, 'aliyun-old', 'Deployment', 'Running', '2024-05-11 17:15:40', '{\"apiVersion\":\"apps/v1\",\"kind\":\"Deployment\",\"metadata\":{\"annotations\":{\"deploy.cloud.sealos.io/maxReplicas\":\"1\",\"deploy.cloud.sealos.io/minReplicas\":\"1\",\"originImageName\":\"nginx\"},\"labels\":{\"app\":\"hello-world\",\"cloud.sealos.io/app-deploy-manager\":\"hello-world\"},\"name\":\"hello-world\",\"namespace\":\"default\"},\"spec\":{\"replicas\":1,\"revisionHistoryLimit\":1,\"selector\":{\"matchLabels\":{\"app\":\"hello-world\"}},\"strategy\":{\"rollingUpdate\":{\"maxSurge\":1,\"maxUnavailable\":0},\"type\":\"RollingUpdate\"},\"template\":{\"metadata\":{\"labels\":{\"app\":\"hello-world\",\"restartTime\":\"202405Sa093734\"}},\"spec\":{\"containers\":[{\"env\":[],\"image\":\"nginx\",\"imagePullPolicy\":\"Always\",\"name\":\"hello-world\",\"ports\":[{\"containerPort\":80,\"name\":\"tugaknbdhcrf\"}],\"resources\":{\"limits\":{\"cpu\":\"100m\",\"memory\":\"64Mi\"},\"requests\":{\"cpu\":\"10m\",\"memory\":\"6Mi\"}},\"volumeMounts\":[]}],\"volumes\":[]}}}}\n', '', 'default', NULL, 0, '2024-05-11 09:37:34', 0, '2024-05-11 09:37:34'); +INSERT INTO `task_cloud` VALUES (1789138950200233985, 1789138950200233984, 1770658294298316800, '腾讯云数算', 1770703902472146944, 'tencent-sealos', 'Service', 'Running', '2024-05-11 17:15:40', '{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"labels\":{\"cloud.sealos.io/app-deploy-manager\":\"hello-world\"},\"name\":\"hello-world\",\"namespace\":\"default\"},\"spec\":{\"ports\":[{\"name\":\"ytabbxlicrnu\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"hello-world\"}}}\n', '', 'default', NULL, 0, '2024-05-11 11:42:21', 0, '2024-05-11 11:42:21'); +INSERT INTO `task_cloud` VALUES (1789138950200233986, 1789138950200233984, 1770658294298316800, '腾讯云数算', 1770703902472146944, 'tencent-sealos', 'Deployment', 'Running', '2024-05-11 17:15:40', '{\"apiVersion\":\"apps/v1\",\"kind\":\"Deployment\",\"metadata\":{\"annotations\":{\"deploy.cloud.sealos.io/maxReplicas\":\"1\",\"deploy.cloud.sealos.io/minReplicas\":\"1\",\"originImageName\":\"nginx\"},\"labels\":{\"app\":\"hello-world\",\"cloud.sealos.io/app-deploy-manager\":\"hello-world\"},\"name\":\"hello-world\",\"namespace\":\"default\"},\"spec\":{\"replicas\":1,\"revisionHistoryLimit\":1,\"selector\":{\"matchLabels\":{\"app\":\"hello-world\"}},\"strategy\":{\"rollingUpdate\":{\"maxSurge\":1,\"maxUnavailable\":0},\"type\":\"RollingUpdate\"},\"template\":{\"metadata\":{\"labels\":{\"app\":\"hello-world\",\"restartTime\":\"202405Sa114218\"}},\"spec\":{\"containers\":[{\"env\":[],\"image\":\"nginx\",\"imagePullPolicy\":\"Always\",\"name\":\"hello-world\",\"ports\":[{\"containerPort\":80,\"name\":\"ytabbxlicrnu\"}],\"resources\":{\"limits\":{\"cpu\":\"100m\",\"memory\":\"64Mi\"},\"requests\":{\"cpu\":\"10m\",\"memory\":\"6Mi\"}},\"volumeMounts\":[]}],\"volumes\":[]}}}}\n', '', 'default', NULL, 0, '2024-05-11 11:42:21', 0, '2024-05-11 11:42:21'); +INSERT INTO `task_cloud` VALUES (1789200710798151680, 1789200710793957376, 1752857389213683712, '阿里云数算', 1763132837495574528, 'aliyun-sealos', 'Service', 'Running', '2024-05-11 17:15:40', '{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"labels\":{\"cloud.sealos.io/app-deploy-manager\":\"hello-nginx\"},\"name\":\"hello-nginx\",\"namespace\":\"default\"},\"spec\":{\"ports\":[{\"name\":\"naqvxiwsafvn\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"hello-nginx\"}}}\n', '', 'default', NULL, 0, '2024-05-11 15:47:46', 0, '2024-05-11 15:47:46'); +INSERT INTO `task_cloud` VALUES (1789200710798151681, 1789200710793957376, 1752857389213683712, '阿里云数算', 1763132837495574528, 'aliyun-sealos', 'Deployment', 'Running', '2024-05-11 17:15:40', '{\"apiVersion\":\"apps/v1\",\"kind\":\"Deployment\",\"metadata\":{\"annotations\":{\"deploy.cloud.sealos.io/maxReplicas\":\"1\",\"deploy.cloud.sealos.io/minReplicas\":\"1\",\"originImageName\":\"nginx\"},\"labels\":{\"app\":\"hello-nginx\",\"cloud.sealos.io/app-deploy-manager\":\"hello-nginx\"},\"name\":\"hello-nginx\",\"namespace\":\"default\"},\"spec\":{\"replicas\":1,\"revisionHistoryLimit\":1,\"selector\":{\"matchLabels\":{\"app\":\"hello-nginx\"}},\"strategy\":{\"rollingUpdate\":{\"maxSurge\":1,\"maxUnavailable\":0},\"type\":\"RollingUpdate\"},\"template\":{\"metadata\":{\"labels\":{\"app\":\"hello-nginx\",\"restartTime\":\"202405Sa154745\"}},\"spec\":{\"containers\":[{\"env\":[],\"image\":\"nginx\",\"imagePullPolicy\":\"Always\",\"name\":\"hello-nginx\",\"ports\":[{\"containerPort\":80,\"name\":\"naqvxiwsafvn\"}],\"resources\":{\"limits\":{\"cpu\":\"100m\",\"memory\":\"64Mi\"},\"requests\":{\"cpu\":\"10m\",\"memory\":\"6Mi\"}},\"volumeMounts\":[]}],\"volumes\":[]}}}}\n', '', 'default', NULL, 0, '2024-05-11 15:47:46', 0, '2024-05-11 15:47:46'); +INSERT INTO `task_cloud` VALUES (1789200710798151682, 1789200710793957376, 1752857389213683712, '阿里云数算', 1766856565336487987, 'aliyun-old', 'Service', 'Running', '2024-05-11 17:15:40', '{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"labels\":{\"cloud.sealos.io/app-deploy-manager\":\"hello-nginx\"},\"name\":\"hello-nginx\",\"namespace\":\"default\"},\"spec\":{\"ports\":[{\"name\":\"naqvxiwsafvn\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"hello-nginx\"}}}\n', '', 'default', NULL, 0, '2024-05-11 15:47:46', 0, '2024-05-11 15:47:46'); +INSERT INTO `task_cloud` VALUES (1789200710802345984, 1789200710793957376, 1752857389213683712, '阿里云数算', 1766856565336487987, 'aliyun-old', 'Deployment', 'Running', '2024-05-11 17:15:40', '{\"apiVersion\":\"apps/v1\",\"kind\":\"Deployment\",\"metadata\":{\"annotations\":{\"deploy.cloud.sealos.io/maxReplicas\":\"1\",\"deploy.cloud.sealos.io/minReplicas\":\"1\",\"originImageName\":\"nginx\"},\"labels\":{\"app\":\"hello-nginx\",\"cloud.sealos.io/app-deploy-manager\":\"hello-nginx\"},\"name\":\"hello-nginx\",\"namespace\":\"default\"},\"spec\":{\"replicas\":1,\"revisionHistoryLimit\":1,\"selector\":{\"matchLabels\":{\"app\":\"hello-nginx\"}},\"strategy\":{\"rollingUpdate\":{\"maxSurge\":1,\"maxUnavailable\":0},\"type\":\"RollingUpdate\"},\"template\":{\"metadata\":{\"labels\":{\"app\":\"hello-nginx\",\"restartTime\":\"202405Sa154745\"}},\"spec\":{\"containers\":[{\"env\":[],\"image\":\"nginx\",\"imagePullPolicy\":\"Always\",\"name\":\"hello-nginx\",\"ports\":[{\"containerPort\":80,\"name\":\"naqvxiwsafvn\"}],\"resources\":{\"limits\":{\"cpu\":\"100m\",\"memory\":\"64Mi\"},\"requests\":{\"cpu\":\"10m\",\"memory\":\"6Mi\"}},\"volumeMounts\":[]}],\"volumes\":[]}}}}\n', '', 'default', NULL, 0, '2024-05-11 15:47:46', 0, '2024-05-11 15:47:46'); +INSERT INTO `task_cloud` VALUES (1789201130505375745, 1789201130505375744, 1752857389213683712, '阿里云数算', 1766856565336487987, 'aliyun-old', 'Service', 'Running', '2024-05-11 17:15:40', '{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"labels\":{\"cloud.sealos.io/app-deploy-manager\":\"nginx-test\"},\"name\":\"nginx-test\",\"namespace\":\"default\"},\"spec\":{\"ports\":[{\"name\":\"lngbzntacgmx\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"nginx-test\"}}}\n', '', 'default', NULL, 0, '2024-05-11 15:49:26', 0, '2024-05-11 15:49:26'); +INSERT INTO `task_cloud` VALUES (1789201130509570048, 1789201130505375744, 1752857389213683712, '阿里云数算', 1766856565336487987, 'aliyun-old', 'Deployment', 'Running', '2024-05-11 17:15:40', '{\"apiVersion\":\"apps/v1\",\"kind\":\"Deployment\",\"metadata\":{\"annotations\":{\"deploy.cloud.sealos.io/maxReplicas\":\"1\",\"deploy.cloud.sealos.io/minReplicas\":\"1\",\"originImageName\":\"nginx\"},\"labels\":{\"app\":\"nginx-test\",\"cloud.sealos.io/app-deploy-manager\":\"nginx-test\"},\"name\":\"nginx-test\",\"namespace\":\"default\"},\"spec\":{\"replicas\":1,\"revisionHistoryLimit\":1,\"selector\":{\"matchLabels\":{\"app\":\"nginx-test\"}},\"strategy\":{\"rollingUpdate\":{\"maxSurge\":1,\"maxUnavailable\":0},\"type\":\"RollingUpdate\"},\"template\":{\"metadata\":{\"labels\":{\"app\":\"nginx-test\",\"restartTime\":\"202405Sa154925\"}},\"spec\":{\"containers\":[{\"env\":[],\"image\":\"nginx\",\"imagePullPolicy\":\"Always\",\"name\":\"nginx-test\",\"ports\":[{\"containerPort\":80,\"name\":\"lngbzntacgmx\"}],\"resources\":{\"limits\":{\"cpu\":\"100m\",\"memory\":\"64Mi\"},\"requests\":{\"cpu\":\"10m\",\"memory\":\"6Mi\"}},\"volumeMounts\":[]}],\"volumes\":[]}}}}\n', '', 'default', NULL, 0, '2024-05-11 15:49:26', 0, '2024-05-11 15:49:26'); +INSERT INTO `task_cloud` VALUES (1789201130509570049, 1789201130505375744, 1752857389213683712, '阿里云数算', 1763132837495574528, 'aliyun-sealos', 'Service', 'Running', '2024-05-11 17:15:40', '{\"apiVersion\":\"v1\",\"kind\":\"Service\",\"metadata\":{\"labels\":{\"cloud.sealos.io/app-deploy-manager\":\"nginx-test\"},\"name\":\"nginx-test\",\"namespace\":\"default\"},\"spec\":{\"ports\":[{\"name\":\"lngbzntacgmx\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"nginx-test\"}}}\n', '', 'default', NULL, 0, '2024-05-11 15:49:26', 0, '2024-05-11 15:49:26'); +INSERT INTO `task_cloud` VALUES (1789201130509570050, 1789201130505375744, 1752857389213683712, '阿里云数算', 1763132837495574528, 'aliyun-sealos', 'Deployment', 'Running', '2024-05-11 17:15:40', '{\"apiVersion\":\"apps/v1\",\"kind\":\"Deployment\",\"metadata\":{\"annotations\":{\"deploy.cloud.sealos.io/maxReplicas\":\"1\",\"deploy.cloud.sealos.io/minReplicas\":\"1\",\"originImageName\":\"nginx\"},\"labels\":{\"app\":\"nginx-test\",\"cloud.sealos.io/app-deploy-manager\":\"nginx-test\"},\"name\":\"nginx-test\",\"namespace\":\"default\"},\"spec\":{\"replicas\":1,\"revisionHistoryLimit\":1,\"selector\":{\"matchLabels\":{\"app\":\"nginx-test\"}},\"strategy\":{\"rollingUpdate\":{\"maxSurge\":1,\"maxUnavailable\":0},\"type\":\"RollingUpdate\"},\"template\":{\"metadata\":{\"labels\":{\"app\":\"nginx-test\",\"restartTime\":\"202405Sa154925\"}},\"spec\":{\"containers\":[{\"env\":[],\"image\":\"nginx\",\"imagePullPolicy\":\"Always\",\"name\":\"nginx-test\",\"ports\":[{\"containerPort\":80,\"name\":\"lngbzntacgmx\"}],\"resources\":{\"limits\":{\"cpu\":\"100m\",\"memory\":\"64Mi\"},\"requests\":{\"cpu\":\"10m\",\"memory\":\"6Mi\"}},\"volumeMounts\":[]}],\"volumes\":[]}}}}\n', '', 'default', NULL, 0, '2024-05-11 15:49:26', 0, '2024-05-11 15:49:26'); -- ---------------------------- -- Table structure for task_hpc @@ -2746,10 +2637,12 @@ CREATE TABLE `task_cloud` ( DROP TABLE IF EXISTS `task_hpc`; CREATE TABLE `task_hpc` ( `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id', - `task_id` int NULL DEFAULT NULL COMMENT '任务id', + `task_id` bigint NULL DEFAULT NULL COMMENT '任务id', `job_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '作业id(在第三方系统中的作业id)', `adapter_id` bigint NULL DEFAULT NULL COMMENT '执行任务的适配器id', + `adapter_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '适配器名称', `cluster_id` bigint NULL DEFAULT NULL COMMENT '执行任务的集群id', + `cluster_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '集群名称', `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '名称', `status` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '状态', `cmd_script` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL, @@ -2785,32 +2678,28 @@ CREATE TABLE `task_hpc` ( `updated_by` int NULL DEFAULT NULL COMMENT '更新人', `updated_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1751892493806342171 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 1751892493806342187 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of task_hpc -- ---------------------------- -INSERT INTO `task_hpc` VALUES (1751892493806342159, 1308, '786', 1706858330967773111, 1758770005, 'HPC_slurm_testjob032501', 'FAILED', '#!/bin/bash\nsleep 30', '2024-03-25 10:48:50.0214623 +0800 CST m=+2368.584898201', 0, '', '', 0, 0, 0, 0, '', '', '/home/slurmrestd', 0, 0, '24:00:00', '', NULL, '', '', '', '', '', '', '/home/slurmrestd/test.out', '/home/slurmrestd/test_error.out', '/dev/null', '{\"PATH\": \"/bin:/usr/bin/:/usr/local/bin/\", \"LD_LIBRARY_PATH\": \"/lib/:/lib64/:/usr/local/lib\"}', 0, 0, '2024-03-25 10:48:50', 0, '2024-03-25 10:48:50'); -INSERT INTO `task_hpc` VALUES (1751892493806342161, 1310, '787', 1706858330967773111, 1758770005, 'HPC_slurm_testjob032502', 'FAILED', '#!/bin/bash\nsleep 40', '2024-03-25 15:59:40.385166348 +0800 CST m=+148.868162684', 0, '', '', 0, 0, 0, 0, '', '', '/home/slurmrestd', 0, 0, '24:00:00', '', NULL, '', '', '', '', '', '1', '/home/slurmrestd/test.out', '/home/slurmrestd/test_error.out', '/dev/null', '{\"PATH\": \"/bin:/usr/bin/:/usr/local/bin/\", \"LD_LIBRARY_PATH\": \"/lib/:/lib64/:/usr/local/lib\"}', 0, 0, '2024-03-25 15:59:40', 0, '2024-03-25 15:59:40'); -INSERT INTO `task_hpc` VALUES (1751892493806342164, 1313, '788', 1706858330967773111, 1758770005, 'HPC_slurm_testjob032503', 'FAILED', '#!/bin/bash\nsleep 50', '2024-03-26 08:46:01.545051812 +0800 CST m=+60530.028048142', 0, '', '', 0, 0, 0, 0, '', '', '/home/slurmrestd', 0, 0, '24:00:00', '', NULL, '', '', '', '', '', '1', '/home/slurmrestd/test.out', '/home/slurmrestd/test_error.out', '/dev/null', '{\"PATH\": \"/bin:/usr/bin/:/usr/local/bin/\", \"LD_LIBRARY_PATH\": \"/lib/:/lib64/:/usr/local/lib\"}', 0, 0, '2024-03-26 08:46:02', 0, '2024-03-26 08:46:02'); -INSERT INTO `task_hpc` VALUES (1751892493806342165, 1314, '5000317', NULL, 1758770010, 'HPC_paratera_testjob032501', 'FAIL', 'jobsubmit.sh', '2024-04-02 10:49:46.866478053 +0800 CST m=+410518.850755030', 0, '', '', 0, 0, 0, 0, '', '', 'prn:pcs:sftp:BSCC-A:BSCC-A:sc56516:file:/public4/home/sc56516/jobs/VNCView_20240203180350', 0, 0, '24:00:00', '', NULL, '', 'BASIC', 'vasp', 'wzhdtest', '', '1', '', '', '', '{\"PATH\": \"/bin:/usr/bin/:/usr/local/bin/\", \"LD_LIBRARY_PATH\": \"/lib/:/lib64/:/usr/local/lib\"}', 0, 0, '2024-04-02 10:49:47', 0, '2024-04-02 10:49:47'); -INSERT INTO `task_hpc` VALUES (1751892493806342166, 1320, '5000319', NULL, 1758770011, 'HPC_test040301', 'FAIL', 'jobsubmit.sh', '2024-04-03 08:59:44.355425194 +0800 CST m=+30.409397159', 0, '', '', 0, 0, 0, 0, '', '', 'prn:pcs:sftp:BSCC-A:BSCC-A:sc56516:file:/public4/home/sc56516/jobs/VNCView_20240203180350', 0, 0, '24:00:00', '', NULL, '', 'BASIC', 'vasp', 'wzhdtest', '', '1', '', '', '', '{\"PATH\": \"/bin:/usr/bin/:/usr/local/bin/\", \"LD_LIBRARY_PATH\": \"/lib/:/lib64/:/usr/local/lib\"}', 0, 0, '2024-04-03 08:59:44', 0, '2024-04-03 08:59:44'); -INSERT INTO `task_hpc` VALUES (1751892493806342167, 1321, '0', NULL, 1758770005, 'HPC_slurm_testjob0325', 'Issued', '#!/bin/bash\nsleep 30', '2024-04-03 09:06:40.511481685 +0800 CST m=+446.565453638', 0, '', '', 0, 0, 0, 0, '', '', '/home/slurmrestd', 0, 0, '24:00:00', '', NULL, '', 'test', 'test', '', '', '1', '/home/slurmrestd/test.out', '/home/slurmrestd/test_error.out', '/dev/null', '{}', 0, 0, '2024-04-03 09:06:41', 0, '2024-04-03 09:06:41'); -INSERT INTO `task_hpc` VALUES (1751892493806342168, 1330, '0', NULL, 1758770005, 'HPC_slurm_testjob0325', 'Issued', '#!/bin/bash\nsleep 30', '2024-04-12 09:05:47.980667072 +0800 CST m=+51346.975539219', 0, '', '', 0, 0, 0, 0, '', '', '/home/slurmrestd', 0, 0, '24:00:00', '', NULL, '', '', '', '', '', '1', '/home/slurmrestd/test.out', '/home/slurmrestd/test_error.out', '/dev/null', '{}', 0, 0, '2024-04-12 09:05:48', 0, '2024-04-12 09:05:48'); -INSERT INTO `task_hpc` VALUES (1751892493806342169, 1338, '', NULL, 1758770005, 'HPC_slurm_testjob0325', 'Saved', '#!/bin/bash\nsleep 30', '2024-04-20 16:27:02.686357351 +0800 CST m=+81206.973633566', 0, '', '', 0, 0, 0, 0, '', '', '/home/slurmrestd', 0, 0, '24:00:00', '', NULL, '', '', '', '', '', '', '/home/slurmrestd/test.out', '/home/slurmrestd/test_error.out', '/dev/null', '{}', 0, 0, '2024-04-20 16:27:03', 0, '2024-04-20 16:27:03'); -INSERT INTO `task_hpc` VALUES (1751892493806342170, 1356, '', NULL, 1758770005, 'HPC_slurm_testjob0325', 'Saved', '#!/bin/bash\nsleep 30', '2024-04-22 10:45:30.417160138 +0800 CST m=+233514.704436359', 0, '', '', 0, 0, 0, 0, '', '', '/home/slurmrestd', 0, 0, '24:00:00', '', NULL, '', '11', '11', '', '', '', '/home/slurmrestd/test.out', '/home/slurmrestd/test_error.out', '/dev/null', '{}', 0, 0, '2024-04-22 10:45:30', 0, '2024-04-22 10:45:30'); +INSERT INTO `task_hpc` VALUES (1751892493806342183, 1788473864037077003, '46', 1706858330967773111, '超算适配器', 1758770005, '华为云slurm测试环境', 'HPC_slurm_testjob0325', 'COMPLETED', '#!/bin/bash\nsleep 100', '2024-05-10 22:31:02.358519653 +0800 CST m=+696.775338078', 0, '', '', 0, 0, 0, 0, '', '', '/home/slurmrestd', 0, 0, '24:00:00', '', NULL, '', '', '', '', '', '1', '/home/slurmrestd/test.out', '/home/slurmrestd/test_error.out', '/dev/null', '{\"PATH\": \"/bin:/usr/bin/:/usr/local/bin/\", \"LD_LIBRARY_PATH\": \"/lib/:/lib64/:/usr/local/lib\"}', 0, 0, '2024-05-10 22:31:02', 0, '2024-05-10 22:31:02'); +INSERT INTO `task_hpc` VALUES (1751892493806342184, 1789146239091085313, '5130797', 1706858330967773111, '超算适配器', 1758770010, '并行科技账号', 'HPC_paratera_testjob032501', 'FAIL', 'jobsubmit.sh', '2024-05-11 15:14:35.513227 +0800 CST m=+471.788246101', 0, '', '', 0, 0, 0, 0, '', '', 'prn:pcs:sftp:BSCC-A:BSCC-A:sc56516:file:/public4/home/sc56516/jobs/VNCView_20240203180350', 0, 0, '24:00:00', '', NULL, '', 'BASIC', 'vasp', 'wzhdtest', '', '1', '', '', '', '{\"PATH\": \"/bin:/usr/bin/:/usr/local/bin/\", \"LD_LIBRARY_PATH\": \"/lib/:/lib64/:/usr/local/lib\"}', 0, 0, '2024-05-11 15:14:36', 0, '2024-05-11 15:14:36'); +INSERT INTO `task_hpc` VALUES (1751892493806342185, 1789146239091085320, '5130855', 1706858330967773111, '超算适配器', 1758770011, '并行科技账号', 'HPC_paratera_testjob032501', 'FAIL', 'jobsubmit.sh', '2024-05-11 15:25:49.3129108 +0800 CST m=+9.393055701', 0, '', '', 0, 0, 0, 0, '', '', 'prn:pcs:sftp:BSCC-A:BSCC-A:sc56516:file:/public4/home/sc56516/jobs/VNCView_20240203180350', 0, 0, '24:00:00', '', NULL, '', 'BASIC', 'vasp', 'wzhdtest', '', '1', '', '', '', '{\"PATH\": \"/bin:/usr/bin/:/usr/local/bin/\", \"LD_LIBRARY_PATH\": \"/lib/:/lib64/:/usr/local/lib\"}', 0, 0, '2024-05-11 15:25:49', 0, '2024-05-11 15:25:49'); +INSERT INTO `task_hpc` VALUES (1751892493806342186, 1789200710793957377, '', 1706858330967773111, '超算适配器', 1758770005, '华为云slurm测试环境', 'HPC_slurm_testjob0325', 'Saved', '#!/bin/bash\nsleep 100', '2024-05-11 15:49:14.039101167 +0800 CST m=+41.902973609', 0, '', '', 0, 0, 0, 0, '', '', '/home/slurmrestd', 0, 0, '24:00:00', '', NULL, '', '', '', '', '', '1', '/home/slurmrestd/test.out', '/home/slurmrestd/test_error.out', '/dev/null', '{\"PATH\": \"/bin:/usr/bin/:/usr/local/bin/\", \"LD_LIBRARY_PATH\": \"/lib/:/lib64/:/usr/local/lib\"}', 0, 0, '2024-05-11 15:49:14', 0, '2024-05-11 15:49:14'); -- ---------------------------- -- Table structure for task_vm -- ---------------------------- DROP TABLE IF EXISTS `task_vm`; CREATE TABLE `task_vm` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', - `participant_id` bigint NULL DEFAULT NULL COMMENT 'p端id', - `task_id` int NULL DEFAULT NULL COMMENT '任务id', + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id', + `task_id` bigint NULL DEFAULT NULL COMMENT '任务id', `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '虚拟机名称', `adapter_id` bigint NULL DEFAULT NULL COMMENT '执行任务的适配器id', + `adapter_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '适配器名称', `cluster_id` bigint NULL DEFAULT NULL COMMENT '执行任务的集群id', + `cluster_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '集群名称', `flavor_ref` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '规格索引', `image_ref` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '镜像索引', `status` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '状态', @@ -2824,13 +2713,14 @@ CREATE TABLE `task_vm` ( `result` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '运行结果', `deleted_at` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '删除时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 49 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of task_vm -- ---------------------------- -INSERT INTO `task_vm` VALUES (1, 0, 1333, 'test', 0, 1758770004, '4096MB_2C_50GB', '67bb503c-cbb7-49de-824a-96b39788a77c', 'Saved', 'DianKe_Openstack_R', '', '', 1, 'e84e7629-83e8-4df4-811f-9489e6444a6c', '2024-04-12 15:07:27.6644278 +0800 CST m=+32.981900601', '', '', ''); -INSERT INTO `task_vm` VALUES (2, 0, 1333, 'test', 0, 1758770004, '2', '47f6c106-36ea-4282-b1b0-fac2cc86b493', 'Saved', 'Keylin_Openstack_T', '', '', 1, 'aa1af235-f1ab-455d-b0b9-21df58c71c5d', '2024-04-12 15:07:27.8505298 +0800 CST m=+33.168002601', '', '', ''); +INSERT INTO `task_vm` VALUES (46, 0, 'createServer', 0, '', 0, '', '', '', 'Saved', 'DianKe_Openstack_R', '', '', 4, '7d8c6cf7-249b-4bb8-b04e-c25fa4d82e1f', '2024-05-11 15:33:17.4191795 +0800 CST m=+41.483075801', '', '', ''); +INSERT INTO `task_vm` VALUES (47, NULL, 'createServer', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `task_vm` VALUES (48, 0, 'createServer', 0, '', 0, '', '', '', 'Saved', 'DianKe_Openstack_R', '', '', 4, '7d8c6cf7-249b-4bb8-b04e-c25fa4d82e1f', '2024-05-11 15:39:55.8237378 +0800 CST m=+16.658617201', '', '', ''); -- ---------------------------- -- Table structure for vm @@ -2856,6 +2746,138 @@ CREATE TABLE `vm` ( -- Records of vm -- ---------------------------- +-- ---------------------------- +-- Table structure for vm_flavor +-- ---------------------------- +DROP TABLE IF EXISTS `vm_flavor`; +CREATE TABLE `vm_flavor` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `flavor_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '规格id', + `flavor_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '规格名称', + `vcpus` int NULL DEFAULT NULL COMMENT 'CPU', + `ram` int NULL DEFAULT NULL COMMENT '内存', + `disk` int NULL DEFAULT NULL COMMENT '硬盘', + `public_flavor_id` bigint NULL DEFAULT NULL COMMENT '自定义规格id', + `cluster_id` bigint NULL DEFAULT NULL COMMENT '集群id', + `cluster_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '集群名', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of vm_flavor +-- ---------------------------- +INSERT INTO `vm_flavor` VALUES (1, '16384MB_8C_150GB', '16384MB_8C_150GB', 8, 16384, 150, NULL, 1758770004, NULL); +INSERT INTO `vm_flavor` VALUES (2, '2048MB_2C_5GB', '2048MB_2C_5GB', 2, 2048, 5, NULL, 1758770004, NULL); +INSERT INTO `vm_flavor` VALUES (3, '4096MB_2C_100GB', '4096MB_2C_100GB', 2, 4096, 100, NULL, 1758770004, NULL); +INSERT INTO `vm_flavor` VALUES (4, '4096MB_2C_50GB', '4096MB_2C_50GB', 2, 4096, 50, 10001, 1758770004, NULL); +INSERT INTO `vm_flavor` VALUES (5, '4096MB_4C_100GB', '4096MB_4C_100GB', 4, 4096, 100, NULL, 1758770004, NULL); +INSERT INTO `vm_flavor` VALUES (6, '8192MB_8C_100GB', '8192MB_8C_100GB', 8, 8192, 100, NULL, 1758770004, NULL); +INSERT INTO `vm_flavor` VALUES (7, '8192MB_8C_200GB', '8192MB_8C_200GB', 8, 8192, 200, NULL, 1758770004, NULL); +INSERT INTO `vm_flavor` VALUES (8, '1', 'm1.tiny', 1, 512, 1, NULL, 1758770004, NULL); +INSERT INTO `vm_flavor` VALUES (9, '2', 'm1.small', 1, 2048, 20, NULL, 1758770003, NULL); +INSERT INTO `vm_flavor` VALUES (10, '3', 'm1.medium', 2, 4096, 40, 10001, 1758770003, NULL); +INSERT INTO `vm_flavor` VALUES (11, '4', 'm1.large', 4, 8192, 80, NULL, 1758770003, NULL); +INSERT INTO `vm_flavor` VALUES (12, '5', 'm1.xlarge', 8, 16384, 160, NULL, 1758770003, NULL); + +-- ---------------------------- +-- Table structure for vm_flavor_dict +-- ---------------------------- +DROP TABLE IF EXISTS `vm_flavor_dict`; +CREATE TABLE `vm_flavor_dict` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `public_flavor_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '规格名称', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 10002 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of vm_flavor_dict +-- ---------------------------- +INSERT INTO `vm_flavor_dict` VALUES (10001, '2核4G'); + +-- ---------------------------- +-- Table structure for vm_image +-- ---------------------------- +DROP TABLE IF EXISTS `vm_image`; +CREATE TABLE `vm_image` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `image_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '镜像id', + `image_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '镜像名称', + `image_status` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '镜像状态', + `cluster_id` bigint NULL DEFAULT NULL COMMENT '集群id', + `cluster_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '集群名称', + `public_image_id` bigint NULL DEFAULT NULL COMMENT '自定义镜像id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 12 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of vm_image +-- ---------------------------- +INSERT INTO `vm_image` VALUES (1, '75fbb39a-0840-4773-abdc-11583757512a', 'Cirros', 'active', 1758770004, 'DianKe_Openstack_R', 20001); +INSERT INTO `vm_image` VALUES (2, '28960d59-e55b-4872-881c-ec6098a2138e', 'DKY_Kylin_Desktop_V10_SP1_Release_2107_x86_64_20230629.qcow2', 'active', 1758770004, 'DianKe_Openstack_R', NULL); +INSERT INTO `vm_image` VALUES (3, 'dfcd1288-56eb-4a3f-b61d-6bc47df8295b', 'KylinV10', 'active', 1758770004, 'DianKe_Openstack_R', NULL); +INSERT INTO `vm_image` VALUES (4, '2e54c634-bfc0-43b1-8401-457271002504', 'ubuntu_20_04_6', 'active', 1758770004, 'DianKe_Openstack_R', NULL); +INSERT INTO `vm_image` VALUES (5, '92fa5b1f-1573-4337-aa9c-4b3b5947c6aa', 'win10', 'active', 1758770004, 'DianKe_Openstack_R', NULL); +INSERT INTO `vm_image` VALUES (6, '67bb503c-cbb7-49de-824a-96b39788a77c', 'win10-qxl', 'active', 1758770004, 'DianKe_Openstack_R', NULL); +INSERT INTO `vm_image` VALUES (7, '1aefe6b2-49e7-41b0-b6e6-59f715b34e40', 'win2012', 'active', 1758770004, 'DianKe_Openstack_R', NULL); +INSERT INTO `vm_image` VALUES (8, '39372c3f-ffac-411e-971f-e86899ee6c38', 'win2016', 'active', 1758770004, 'DianKe_Openstack_R', NULL); +INSERT INTO `vm_image` VALUES (9, '45e2a307-5d0e-4162-bff9-7c5e0f2c48cc', 'win2019', 'active', 1758770004, 'DianKe_Openstack_R', NULL); +INSERT INTO `vm_image` VALUES (10, '955bb17a-7c3b-4293-9ab6-399f3f115773', 'win7', 'active', 1758770004, 'DianKe_Openstack_R', NULL); +INSERT INTO `vm_image` VALUES (11, '50719fb7-009e-4e52-b41f-28b4f3f97158', 'cirros', 'active', 1758770003, 'Keylin_Openstack_T', 20001); + +-- ---------------------------- +-- Table structure for vm_image_dict +-- ---------------------------- +DROP TABLE IF EXISTS `vm_image_dict`; +CREATE TABLE `vm_image_dict` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `public_image_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '镜像名', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 20002 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of vm_image_dict +-- ---------------------------- +INSERT INTO `vm_image_dict` VALUES (20001, 'cirros'); + +-- ---------------------------- +-- Table structure for vm_network +-- ---------------------------- +DROP TABLE IF EXISTS `vm_network`; +CREATE TABLE `vm_network` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `network_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '网络名', + `subnets` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '子网', + `network_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '网络id', + `cluster_id` bigint NULL DEFAULT NULL COMMENT '集群id', + `cluster_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '集群名', + `public_network_id` bigint NULL DEFAULT NULL COMMENT '自定义网络id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of vm_network +-- ---------------------------- +INSERT INTO `vm_network` VALUES (1, 'Private', '57000a91-16f2-4045-ae70-3ebf36455c56', '7d8c6cf7-249b-4bb8-b04e-c25fa4d82e1f', 1758770004, 'DianKe_Openstack_R', 30001); +INSERT INTO `vm_network` VALUES (2, 'Public', '528d1870-6e36-42a7-ad49-120883e10aaf', 'e84e7629-83e8-4df4-811f-9489e6444a6c', 1758770004, 'DianKe_Openstack_R', 30002); +INSERT INTO `vm_network` VALUES (3, 'public', '37968ad4-cee0-407e-8e4f-0f55018d56d5', '4bf24ded-6529-46a5-9762-0a756df882a9', 1758770003, 'Keylin_Openstack_T', 30002); +INSERT INTO `vm_network` VALUES (4, 'private', '51174baf-389b-4b1b-820f-abf2f3d12e86', 'e8c84b4d-0850-4767-a0f6-5ab3b4f4b8be', 1758770003, 'Keylin_Openstack_T', 30001); + +-- ---------------------------- +-- Table structure for vm_network_dict +-- ---------------------------- +DROP TABLE IF EXISTS `vm_network_dict`; +CREATE TABLE `vm_network_dict` ( + `id` bigint NOT NULL, + `public_network_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '网络名称', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of vm_network_dict +-- ---------------------------- +INSERT INTO `vm_network_dict` VALUES (30001, 'private'); +INSERT INTO `vm_network_dict` VALUES (30002, 'public'); + -- ---------------------------- -- Table structure for vm_openstack_overview -- ---------------------------- diff --git a/pkg/tracker/tracker.go b/pkg/tracker/tracker.go index fdc094c0..7941f74b 100644 --- a/pkg/tracker/tracker.go +++ b/pkg/tracker/tracker.go @@ -78,6 +78,18 @@ var ( Name: "cluster_pod_total", Help: "Cluster Pod total.", }, []string{"cluster_name", "adapter_id"}) + ClusterCpuCoreHoursGauge = prometheus.NewGaugeVec(prometheus.GaugeOpts{ + Name: "cluster_cpu_core_hours", + Help: "Cluster Cpu Core Hours.", + }, []string{"cluster_name", "adapter_id"}) + ClusterCardsAvailGauge = prometheus.NewGaugeVec(prometheus.GaugeOpts{ + Name: "cluster_cards_avail", + Help: "Cluster Cards Available.", + }, []string{"cluster_name", "adapter_id"}) + ClusterGpuAvailGauge = prometheus.NewGaugeVec(prometheus.GaugeOpts{ + Name: "cluster_gpu_avail", + Help: "Cluster Gpu Available.", + }, []string{"cluster_name", "adapter_id"}) metrics = []prometheus.Collector{ ClusterCpuUtilisationGauge, diff --git a/rpc/Dockerfile b/rpc/Dockerfile index 9c211753..fb0fb43a 100644 --- a/rpc/Dockerfile +++ b/rpc/Dockerfile @@ -1,37 +1,27 @@ FROM golang:1.21.2-alpine3.18 AS builder -LABEL stage=gobuilder - -ENV CGO_ENABLED 0 -ENV GOARCH amd64 -ENV GOPROXY https://goproxy.cn,direct - -RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.sjtug.sjtu.edu.cn/g' /etc/apk/repositories && \ - apk update --no-cache && apk add --no-cache tzdata - WORKDIR /app -ADD go.mod . -ADD go.sum . -RUN go mod download COPY . . -COPY rpc/etc/ /app/ + +RUN go env -w GO111MODULE=on \ +&& go env -w GOPROXY=https://goproxy.cn,direct \ +&& go env -w CGO_ENABLED=0 \ +&& go mod download RUN go build -o pcm-coordinator-rpc /app/rpc/pcmcore.go -FROM alpine:3.16.2 +FROM alpine:3.18 + WORKDIR /app - #修改alpine源为上海交通大学 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.sjtug.sjtu.edu.cn/g' /etc/apk/repositories && \ - apk update && \ - apk upgrade && \ - apk add --no-cache ca-certificates && update-ca-certificates && \ - apk add --update tzdata && \ - rm -rf /var/cache/apk/* + apk add --no-cache ca-certificates tzdata && \ + update-ca-certificates && \ + rm -rf /var/cache/apk/* -COPY --from=builder /app/pcm-coordinator-rpc . -COPY rpc/etc/pcmcore.yaml . +COPY --from=builder /app/pcm-coordinator-api /app/ +COPY --from=builder /app/api/etc/pcm.yaml /app/ ENV TZ=Asia/Shanghai