tcjlj/nezha
1
0
Fork 0
mirror of https://github.com/nezhahq/nezha.git synced 2025-03-14 09:38:14 -04:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

feat: edit server config online (#980)

Browse Source 
* feat: edit server config online

* clean

* refactor

* generate template

* fix deadlocks

* fix
This commit is contained in:
UUBulb 2025-01-31 13:33:53 +08:00 committed by GitHub
parent 82d40d49fd
commit 7e8985a599
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 227 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/dashboard/controller/controller.go
View File

@ -110,6 +110,8 @@ func routers(r *gin.Engine, frontendDist fs.FS) {
auth.GET("/server", listHandler(listServer)) auth.GET("/server", listHandler(listServer))
auth.PATCH("/server/:id", commonHandler(updateServer)) auth.PATCH("/server/:id", commonHandler(updateServer))
auth.GET("/server/:id/config", commonHandler(getServerConfig))
auth.POST("/server/:id/config", commonHandler(setServerConfig))
auth.POST("/batch-delete/server", commonHandler(batchDeleteServer)) auth.POST("/batch-delete/server", commonHandler(batchDeleteServer))
auth.POST("/force-update/server", commonHandler(forceUpdateServer)) auth.POST("/force-update/server", commonHandler(forceUpdateServer))

97
cmd/dashboard/controller/server.go
View File

@ -2,6 +2,7 @@ package controller
import ( import (
"strconv" "strconv"
"time"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/jinzhu/copier" "github.com/jinzhu/copier"
@ -213,3 +214,99 @@ func forceUpdateServer(c *gin.Context) (*model.ForceUpdateResponse, error) {
return forceUpdateResp, nil return forceUpdateResp, nil
} }
// Get server config
// @Summary Get server config
// @Security BearerAuth
// @Schemes
// @Description Get server config
// @Tags auth required
// @Produce json
// @Success 200 {object} model.CommonResponse[string]
// @Router /server/{id}/config [get]
func getServerConfig(c *gin.Context) (string, error) {
idStr := c.Param("id")
id, err := strconv.ParseUint(idStr, 10, 64)
if err != nil {
return "", err
}
singleton.ServerLock.RLock()
s, ok := singleton.ServerList[id]
if !ok || s.TaskStream == nil {
singleton.ServerLock.RUnlock()
return "", nil
}
singleton.ServerLock.RUnlock()
if !s.HasPermission(c) {
return "", singleton.Localizer.ErrorT("permission denied")
}
if err := s.TaskStream.Send(&pb.Task{
Type: model.TaskTypeReportConfig,
}); err != nil {
return "", err
}
timeout := time.NewTimer(time.Second * 10)
select {
case <-timeout.C:
return "", singleton.Localizer.ErrorT("operation timeout")
case data := <-s.ConfigCache:
timeout.Stop()
switch data := data.(type) {
case string:
return data, nil
case error:
return "", singleton.Localizer.ErrorT("get server config failed: %v", data)
}
}
return "", singleton.Localizer.ErrorT("get server config failed")
}
// Set server config
// @Summary Set server config
// @Security BearerAuth
// @Schemes
// @Description Set server config
// @Tags auth required
// @Accept json
// @param request body string true "config"
// @Produce json
// @Success 200 {object} model.CommonResponse[any]
// @Router /server/{id}/config [post]
func setServerConfig(c *gin.Context) (any, error) {
idStr := c.Param("id")
id, err := strconv.ParseUint(idStr, 10, 64)
if err != nil {
return "", err
}
var configRaw string
if err := c.ShouldBindJSON(&configRaw); err != nil {
return nil, err
}
singleton.ServerLock.RLock()
s, ok := singleton.ServerList[id]
if !ok || s.TaskStream == nil {
singleton.ServerLock.RUnlock()
return "", nil
}
singleton.ServerLock.RUnlock()
if !s.HasPermission(c) {
return "", singleton.Localizer.ErrorT("permission denied")
}
if err := s.TaskStream.Send(&pb.Task{
Type: model.TaskTypeApplyConfig,
Data: configRaw,
}); err != nil {
return "", err
}
return nil, nil
}

8
model/server.go
View File

@ -33,11 +33,19 @@ type Server struct {
LastActive time.Time `gorm:"-" json:"last_active,omitempty"` LastActive time.Time `gorm:"-" json:"last_active,omitempty"`
TaskStream pb.NezhaService_RequestTaskServer `gorm:"-" json:"-"` TaskStream pb.NezhaService_RequestTaskServer `gorm:"-" json:"-"`
ConfigCache chan any `gorm:"-" json:"-"`
PrevTransferInSnapshot int64 `gorm:"-" json:"-"` // 上次数据点时的入站使用量 PrevTransferInSnapshot int64 `gorm:"-" json:"-"` // 上次数据点时的入站使用量
PrevTransferOutSnapshot int64 `gorm:"-" json:"-"` // 上次数据点时的出站使用量 PrevTransferOutSnapshot int64 `gorm:"-" json:"-"` // 上次数据点时的出站使用量
} }
func InitServer(s *Server) {
s.Host = &Host{}
s.State = &HostState{}
s.GeoIP = &GeoIP{}
s.ConfigCache = make(chan any, 1)
}
func (s *Server) CopyFromRunningServer(old *Server) { func (s *Server) CopyFromRunningServer(old *Server) {
s.Host = old.Host s.Host = old.Host
s.State = old.State s.State = old.State

11
model/service.go
View File

@ -24,6 +24,8 @@ const (
TaskTypeNAT TaskTypeNAT
TaskTypeReportHostInfoDeprecated TaskTypeReportHostInfoDeprecated
TaskTypeFM TaskTypeFM
TaskTypeReportConfig
TaskTypeApplyConfig
) )
type TerminalTask struct { type TerminalTask struct {
@ -127,5 +129,12 @@ func (m *Service) AfterFind(tx *gorm.DB) error {
// IsServiceSentinelNeeded 判断该任务类型是否需要进行服务监控 需要则返回true // IsServiceSentinelNeeded 判断该任务类型是否需要进行服务监控 需要则返回true
func IsServiceSentinelNeeded(t uint64) bool { func IsServiceSentinelNeeded(t uint64) bool {
return t != TaskTypeCommand && t != TaskTypeTerminalGRPC && t != TaskTypeUpgrade && t != TaskTypeKeepalive switch t {
case TaskTypeCommand, TaskTypeTerminalGRPC, TaskTypeUpgrade,
TaskTypeKeepalive, TaskTypeNAT, TaskTypeFM,
TaskTypeReportConfig, TaskTypeApplyConfig:
return false
default:
return true
}
} }

74
pkg/i18n/template.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-12-31 21:25+0800\n" "POT-Creation-Date: 2025-01-30 21:58+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -25,28 +25,28 @@ msgstr ""
#: cmd/dashboard/controller/alertrule.go:108 #: cmd/dashboard/controller/alertrule.go:108
#: cmd/dashboard/controller/alertrule.go:156 #: cmd/dashboard/controller/alertrule.go:156
#: cmd/dashboard/controller/alertrule.go:176 #: cmd/dashboard/controller/alertrule.go:176
#: cmd/dashboard/controller/controller.go:216 #: cmd/dashboard/controller/controller.go:226
#: cmd/dashboard/controller/cron.go:58 cmd/dashboard/controller/cron.go:124 #: cmd/dashboard/controller/cron.go:58 cmd/dashboard/controller/cron.go:124
#: cmd/dashboard/controller/cron.go:136 cmd/dashboard/controller/cron.go:195 #: cmd/dashboard/controller/cron.go:136 cmd/dashboard/controller/cron.go:195
#: cmd/dashboard/controller/cron.go:224 cmd/dashboard/controller/ddns.go:131 #: cmd/dashboard/controller/cron.go:224 cmd/dashboard/controller/ddns.go:131
#: cmd/dashboard/controller/ddns.go:192 cmd/dashboard/controller/fm.go:43 #: cmd/dashboard/controller/ddns.go:192 cmd/dashboard/controller/fm.go:43
#: cmd/dashboard/controller/nat.go:59 cmd/dashboard/controller/nat.go:110 #: cmd/dashboard/controller/nat.go:59 cmd/dashboard/controller/nat.go:111
#: cmd/dashboard/controller/nat.go:121 cmd/dashboard/controller/nat.go:160 #: cmd/dashboard/controller/nat.go:122 cmd/dashboard/controller/nat.go:162
#: cmd/dashboard/controller/notification.go:112 #: cmd/dashboard/controller/notification.go:112
#: cmd/dashboard/controller/notification.go:166 #: cmd/dashboard/controller/notification.go:166
#: cmd/dashboard/controller/notification_group.go:76 #: cmd/dashboard/controller/notification_group.go:76
#: cmd/dashboard/controller/notification_group.go:152 #: cmd/dashboard/controller/notification_group.go:152
#: cmd/dashboard/controller/notification_group.go:164 #: cmd/dashboard/controller/notification_group.go:164
#: cmd/dashboard/controller/notification_group.go:233 #: cmd/dashboard/controller/notification_group.go:233
#: cmd/dashboard/controller/server.go:65 cmd/dashboard/controller/server.go:77 #: cmd/dashboard/controller/server.go:66 cmd/dashboard/controller/server.go:78
#: cmd/dashboard/controller/server.go:128 #: cmd/dashboard/controller/server.go:137
#: cmd/dashboard/controller/server.go:192 #: cmd/dashboard/controller/server.go:201
#: cmd/dashboard/controller/server_group.go:75 #: cmd/dashboard/controller/server_group.go:75
#: cmd/dashboard/controller/server_group.go:150 #: cmd/dashboard/controller/server_group.go:150
#: cmd/dashboard/controller/server_group.go:229 #: cmd/dashboard/controller/server_group.go:229
#: cmd/dashboard/controller/service.go:273 #: cmd/dashboard/controller/service.go:271
#: cmd/dashboard/controller/service.go:344 #: cmd/dashboard/controller/service.go:342
#: cmd/dashboard/controller/service.go:371 #: cmd/dashboard/controller/service.go:369
#: cmd/dashboard/controller/terminal.go:41 #: cmd/dashboard/controller/terminal.go:41
msgid "permission denied" msgid "permission denied"
msgstr "" msgstr ""
@ -71,15 +71,15 @@ msgstr ""
msgid "need to configure at least a single rule" msgid "need to configure at least a single rule"
msgstr "" msgstr ""
#: cmd/dashboard/controller/controller.go:210 #: cmd/dashboard/controller/controller.go:220
#: cmd/dashboard/controller/oauth2.go:152 #: cmd/dashboard/controller/oauth2.go:153
#: cmd/dashboard/controller/server_group.go:162 #: cmd/dashboard/controller/server_group.go:162
#: cmd/dashboard/controller/service.go:96 cmd/dashboard/controller/user.go:27 #: cmd/dashboard/controller/service.go:97 cmd/dashboard/controller/user.go:27
#: cmd/dashboard/controller/user.go:63 #: cmd/dashboard/controller/user.go:63
msgid "unauthorized" msgid "unauthorized"
msgstr "" msgstr ""
#: cmd/dashboard/controller/controller.go:233 #: cmd/dashboard/controller/controller.go:243
msgid "database error" msgid "database error"
msgstr "" msgstr ""
@ -100,7 +100,7 @@ msgstr ""
msgid "error parsing %s: %v" msgid "error parsing %s: %v"
msgstr "" msgstr ""
#: cmd/dashboard/controller/ddns.go:127 cmd/dashboard/controller/nat.go:117 #: cmd/dashboard/controller/ddns.go:127 cmd/dashboard/controller/nat.go:118
#, c-format #, c-format
msgid "profile id %d does not exist" msgid "profile id %d does not exist"
msgstr "" msgstr ""
@ -147,32 +147,44 @@ msgstr ""
msgid "code is required" msgid "code is required"
msgstr "" msgstr ""
#: cmd/dashboard/controller/oauth2.go:174 #: cmd/dashboard/controller/oauth2.go:175
msgid "oauth2 user not binded yet" msgid "oauth2 user not binded yet"
msgstr "" msgstr ""
#: cmd/dashboard/controller/oauth2.go:215 #: cmd/dashboard/controller/oauth2.go:217
#: cmd/dashboard/controller/oauth2.go:221 #: cmd/dashboard/controller/oauth2.go:223
#: cmd/dashboard/controller/oauth2.go:226 #: cmd/dashboard/controller/oauth2.go:228
msgid "invalid state key" msgid "invalid state key"
msgstr "" msgstr ""
#: cmd/dashboard/controller/server.go:73 #: cmd/dashboard/controller/server.go:74
#, c-format #, c-format
msgid "server id %d does not exist" msgid "server id %d does not exist"
msgstr "" msgstr ""
#: cmd/dashboard/controller/server.go:250
msgid "operation timeout"
msgstr ""
#: cmd/dashboard/controller/server.go:257
msgid "get server config failed: %v"
msgstr ""
#: cmd/dashboard/controller/server.go:261
msgid "get server config failed"
msgstr ""
#: cmd/dashboard/controller/server_group.go:92 #: cmd/dashboard/controller/server_group.go:92
#: cmd/dashboard/controller/server_group.go:172 #: cmd/dashboard/controller/server_group.go:172
msgid "have invalid server id" msgid "have invalid server id"
msgstr "" msgstr ""
#: cmd/dashboard/controller/service.go:89 #: cmd/dashboard/controller/service.go:90
#: cmd/dashboard/controller/service.go:165 #: cmd/dashboard/controller/service.go:165
msgid "server not found" msgid "server not found"
msgstr "" msgstr ""
#: cmd/dashboard/controller/service.go:269 #: cmd/dashboard/controller/service.go:267
#, c-format #, c-format
msgid "service id %d does not exist" msgid "service id %d does not exist"
msgstr "" msgstr ""
@ -185,19 +197,19 @@ msgstr ""
msgid "you don't have any oauth2 bindings" msgid "you don't have any oauth2 bindings"
msgstr "" msgstr ""
#: cmd/dashboard/controller/user.go:130 #: cmd/dashboard/controller/user.go:131
msgid "password length must be greater than 6" msgid "password length must be greater than 6"
msgstr "" msgstr ""
#: cmd/dashboard/controller/user.go:133 #: cmd/dashboard/controller/user.go:134
msgid "username can't be empty" msgid "username can't be empty"
msgstr "" msgstr ""
#: cmd/dashboard/controller/user.go:136 #: cmd/dashboard/controller/user.go:137
msgid "invalid role" msgid "invalid role"
msgstr "" msgstr ""
#: cmd/dashboard/controller/user.go:175 #: cmd/dashboard/controller/user.go:176
msgid "can't delete yourself" msgid "can't delete yourself"
msgstr "" msgstr ""
@ -213,23 +225,23 @@ msgstr ""
msgid "timeout: agent connection not established" msgid "timeout: agent connection not established"
msgstr "" msgstr ""
#: service/rpc/nezha.go:69 #: service/rpc/nezha.go:71
msgid "Scheduled Task Executed Successfully" msgid "Scheduled Task Executed Successfully"
msgstr "" msgstr ""
#: service/rpc/nezha.go:73 #: service/rpc/nezha.go:75
msgid "Scheduled Task Executed Failed" msgid "Scheduled Task Executed Failed"
msgstr "" msgstr ""
#: service/rpc/nezha.go:245 #: service/rpc/nezha.go:274
msgid "IP Changed" msgid "IP Changed"
msgstr "" msgstr ""
#: service/singleton/alertsentinel.go:170 #: service/singleton/alertsentinel.go:169
msgid "Incident" msgid "Incident"
msgstr "" msgstr ""
#: service/singleton/alertsentinel.go:180 #: service/singleton/alertsentinel.go:179
msgid "Resolved" msgid "Resolved"
msgstr "" msgstr ""

BIN
pkg/i18n/translations/en_US/LC_MESSAGES/nezha.mo
View File

Binary file not shown.

84
pkg/i18n/translations/en_US/LC_MESSAGES/nezha.po
View File

@ -1,23 +1,21 @@
# SOME DESCRIPTIVE TITLE. # English translations for PACKAGE package.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # Copyright (C) 2025 THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package. # This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # Automatically generated, 2025.
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-12-31 21:25+0800\n" "POT-Creation-Date: 2025-01-30 14:31+0800\n"
"PO-Revision-Date: 2024-12-31 15:18+0000\n" "PO-Revision-Date: 2025-01-30 14:31+0800\n"
"Last-Translator: UUBulb <uub@kuzu.uk>\n" "Last-Translator: Automatically generated\n"
"Language-Team: English (United States) <https://hosted.weblate.org/projects/" "Language-Team: none\n"
"nezha/nezha-dashboard/en_US/>\n"
"Language: en_US\n" "Language: en_US\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Weblate 5.10-dev\n"
#: cmd/dashboard/controller/alertrule.go:104 #: cmd/dashboard/controller/alertrule.go:104
#, c-format #, c-format
@ -27,28 +25,28 @@ msgstr "alert id %d does not exist"
#: cmd/dashboard/controller/alertrule.go:108 #: cmd/dashboard/controller/alertrule.go:108
#: cmd/dashboard/controller/alertrule.go:156 #: cmd/dashboard/controller/alertrule.go:156
#: cmd/dashboard/controller/alertrule.go:176 #: cmd/dashboard/controller/alertrule.go:176
#: cmd/dashboard/controller/controller.go:216 #: cmd/dashboard/controller/controller.go:226
#: cmd/dashboard/controller/cron.go:58 cmd/dashboard/controller/cron.go:124 #: cmd/dashboard/controller/cron.go:58 cmd/dashboard/controller/cron.go:124
#: cmd/dashboard/controller/cron.go:136 cmd/dashboard/controller/cron.go:195 #: cmd/dashboard/controller/cron.go:136 cmd/dashboard/controller/cron.go:195
#: cmd/dashboard/controller/cron.go:224 cmd/dashboard/controller/ddns.go:131 #: cmd/dashboard/controller/cron.go:224 cmd/dashboard/controller/ddns.go:131
#: cmd/dashboard/controller/ddns.go:192 cmd/dashboard/controller/fm.go:43 #: cmd/dashboard/controller/ddns.go:192 cmd/dashboard/controller/fm.go:43
#: cmd/dashboard/controller/nat.go:59 cmd/dashboard/controller/nat.go:110 #: cmd/dashboard/controller/nat.go:59 cmd/dashboard/controller/nat.go:111
#: cmd/dashboard/controller/nat.go:121 cmd/dashboard/controller/nat.go:160 #: cmd/dashboard/controller/nat.go:122 cmd/dashboard/controller/nat.go:162
#: cmd/dashboard/controller/notification.go:112 #: cmd/dashboard/controller/notification.go:112
#: cmd/dashboard/controller/notification.go:166 #: cmd/dashboard/controller/notification.go:166
#: cmd/dashboard/controller/notification_group.go:76 #: cmd/dashboard/controller/notification_group.go:76
#: cmd/dashboard/controller/notification_group.go:152 #: cmd/dashboard/controller/notification_group.go:152
#: cmd/dashboard/controller/notification_group.go:164 #: cmd/dashboard/controller/notification_group.go:164
#: cmd/dashboard/controller/notification_group.go:233 #: cmd/dashboard/controller/notification_group.go:233
#: cmd/dashboard/controller/server.go:65 cmd/dashboard/controller/server.go:77 #: cmd/dashboard/controller/server.go:66 cmd/dashboard/controller/server.go:78
#: cmd/dashboard/controller/server.go:128 #: cmd/dashboard/controller/server.go:137
#: cmd/dashboard/controller/server.go:192 #: cmd/dashboard/controller/server.go:201
#: cmd/dashboard/controller/server_group.go:75 #: cmd/dashboard/controller/server_group.go:75
#: cmd/dashboard/controller/server_group.go:150 #: cmd/dashboard/controller/server_group.go:150
#: cmd/dashboard/controller/server_group.go:229 #: cmd/dashboard/controller/server_group.go:229
#: cmd/dashboard/controller/service.go:273 #: cmd/dashboard/controller/service.go:271
#: cmd/dashboard/controller/service.go:344 #: cmd/dashboard/controller/service.go:342
#: cmd/dashboard/controller/service.go:371 #: cmd/dashboard/controller/service.go:369
#: cmd/dashboard/controller/terminal.go:41 #: cmd/dashboard/controller/terminal.go:41
msgid "permission denied" msgid "permission denied"
msgstr "permission denied" msgstr "permission denied"
@ -73,15 +71,15 @@ msgstr "cycle_start is a future value"
msgid "need to configure at least a single rule" msgid "need to configure at least a single rule"
msgstr "need to configure at least a single rule" msgstr "need to configure at least a single rule"
#: cmd/dashboard/controller/controller.go:210 #: cmd/dashboard/controller/controller.go:220
#: cmd/dashboard/controller/oauth2.go:152 #: cmd/dashboard/controller/oauth2.go:153
#: cmd/dashboard/controller/server_group.go:162 #: cmd/dashboard/controller/server_group.go:162
#: cmd/dashboard/controller/service.go:96 cmd/dashboard/controller/user.go:27 #: cmd/dashboard/controller/service.go:97 cmd/dashboard/controller/user.go:27
#: cmd/dashboard/controller/user.go:63 #: cmd/dashboard/controller/user.go:63
msgid "unauthorized" msgid "unauthorized"
msgstr "unauthorized" msgstr "unauthorized"
#: cmd/dashboard/controller/controller.go:233 #: cmd/dashboard/controller/controller.go:243
msgid "database error" msgid "database error"
msgstr "database error" msgstr "database error"
@ -102,7 +100,7 @@ msgstr "the retry count must be an integer between 1 and 10"
msgid "error parsing %s: %v" msgid "error parsing %s: %v"
msgstr "error parsing %s: %v" msgstr "error parsing %s: %v"
#: cmd/dashboard/controller/ddns.go:127 cmd/dashboard/controller/nat.go:117 #: cmd/dashboard/controller/ddns.go:127 cmd/dashboard/controller/nat.go:118
#, c-format #, c-format
msgid "profile id %d does not exist" msgid "profile id %d does not exist"
msgstr "profile id %d does not exist" msgstr "profile id %d does not exist"
@ -149,32 +147,36 @@ msgstr "operation not permitted"
msgid "code is required" msgid "code is required"
msgstr "code is required" msgstr "code is required"
#: cmd/dashboard/controller/oauth2.go:174 #: cmd/dashboard/controller/oauth2.go:175
msgid "oauth2 user not binded yet" msgid "oauth2 user not binded yet"
msgstr "oauth2 user not binded yet" msgstr "oauth2 user not binded yet"
#: cmd/dashboard/controller/oauth2.go:215 #: cmd/dashboard/controller/oauth2.go:217
#: cmd/dashboard/controller/oauth2.go:221 #: cmd/dashboard/controller/oauth2.go:223
#: cmd/dashboard/controller/oauth2.go:226 #: cmd/dashboard/controller/oauth2.go:228
msgid "invalid state key" msgid "invalid state key"
msgstr "invalid state key" msgstr "invalid state key"
#: cmd/dashboard/controller/server.go:73 #: cmd/dashboard/controller/server.go:74
#, c-format #, c-format
msgid "server id %d does not exist" msgid "server id %d does not exist"
msgstr "server id %d does not exist" msgstr "server id %d does not exist"
#: cmd/dashboard/controller/server.go:251
msgid "operation timeout"
msgstr "operation timeout"
#: cmd/dashboard/controller/server_group.go:92 #: cmd/dashboard/controller/server_group.go:92
#: cmd/dashboard/controller/server_group.go:172 #: cmd/dashboard/controller/server_group.go:172
msgid "have invalid server id" msgid "have invalid server id"
msgstr "have invalid server id" msgstr "have invalid server id"
#: cmd/dashboard/controller/service.go:89 #: cmd/dashboard/controller/service.go:90
#: cmd/dashboard/controller/service.go:165 #: cmd/dashboard/controller/service.go:165
msgid "server not found" msgid "server not found"
msgstr "server not found" msgstr "server not found"
#: cmd/dashboard/controller/service.go:269 #: cmd/dashboard/controller/service.go:267
#, c-format #, c-format
msgid "service id %d does not exist" msgid "service id %d does not exist"
msgstr "service id %d does not exist" msgstr "service id %d does not exist"
@ -187,19 +189,19 @@ msgstr "incorrect password"
msgid "you don't have any oauth2 bindings" msgid "you don't have any oauth2 bindings"
msgstr "you don't have any oauth2 bindings" msgstr "you don't have any oauth2 bindings"
#: cmd/dashboard/controller/user.go:130 #: cmd/dashboard/controller/user.go:131
msgid "password length must be greater than 6" msgid "password length must be greater than 6"
msgstr "password length must be greater than 6" msgstr "password length must be greater than 6"
#: cmd/dashboard/controller/user.go:133 #: cmd/dashboard/controller/user.go:134
msgid "username can't be empty" msgid "username can't be empty"
msgstr "username can't be empty" msgstr "username can't be empty"
#: cmd/dashboard/controller/user.go:136 #: cmd/dashboard/controller/user.go:137
msgid "invalid role" msgid "invalid role"
msgstr "invalid role" msgstr "invalid role"
#: cmd/dashboard/controller/user.go:175 #: cmd/dashboard/controller/user.go:176
msgid "can't delete yourself" msgid "can't delete yourself"
msgstr "can't delete yourself" msgstr "can't delete yourself"
@ -215,23 +217,23 @@ msgstr "timeout: user connection not established"
msgid "timeout: agent connection not established" msgid "timeout: agent connection not established"
msgstr "timeout: agent connection not established" msgstr "timeout: agent connection not established"
#: service/rpc/nezha.go:69 #: service/rpc/nezha.go:70
msgid "Scheduled Task Executed Successfully" msgid "Scheduled Task Executed Successfully"
msgstr "Scheduled Task Executed Successfully" msgstr "Scheduled Task Executed Successfully"
#: service/rpc/nezha.go:73 #: service/rpc/nezha.go:74
msgid "Scheduled Task Executed Failed" msgid "Scheduled Task Executed Failed"
msgstr "Scheduled Task Executed Failed" msgstr "Scheduled Task Executed Failed"
#: service/rpc/nezha.go:245 #: service/rpc/nezha.go:268
msgid "IP Changed" msgid "IP Changed"
msgstr "IP Changed" msgstr "IP Changed"
#: service/singleton/alertsentinel.go:170 #: service/singleton/alertsentinel.go:169
msgid "Incident" msgid "Incident"
msgstr "Incident" msgstr "Incident"
#: service/singleton/alertsentinel.go:180 #: service/singleton/alertsentinel.go:179
msgid "Resolved" msgid "Resolved"
msgstr "Resolved" msgstr "Resolved"

4
service/rpc/auth.go
View File

@ -67,9 +67,7 @@ func (a *authHandler) Check(ctx context.Context) (uint64, error) {
if err := singleton.DB.Create(&s).Error; err != nil { if err := singleton.DB.Create(&s).Error; err != nil {
return 0, status.Error(codes.Unauthenticated, err.Error()) return 0, status.Error(codes.Unauthenticated, err.Error())
} }
s.Host = &model.Host{} model.InitServer(&s)
s.State = &model.HostState{}
s.GeoIP = &model.GeoIP{}
singleton.ServerLock.Lock() singleton.ServerLock.Lock()
singleton.ServerList[s.ID] = &s singleton.ServerList[s.ID] = &s

19
service/rpc/nezha.go
View File

@ -2,6 +2,7 @@ package rpc
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"log" "log"
"net" "net"
@ -54,7 +55,8 @@ func (s *NezhaHandler) RequestTask(stream pb.NezhaService_RequestTaskServer) err
log.Printf("NEZHA>> RequestTask error: %v, clientID: %d\n", err, clientID) log.Printf("NEZHA>> RequestTask error: %v, clientID: %d\n", err, clientID)
return nil return nil
} }
if result.GetType() == model.TaskTypeCommand { switch result.GetType() {
case model.TaskTypeCommand:
// 处理上报的计划任务 // 处理上报的计划任务
singleton.CronLock.RLock() singleton.CronLock.RLock()
cr := singleton.Crons[result.GetId()] cr := singleton.Crons[result.GetId()]
@ -78,13 +80,26 @@ func (s *NezhaHandler) RequestTask(stream pb.NezhaService_RequestTaskServer) err
LastResult: result.GetSuccessful(), LastResult: result.GetSuccessful(),
}) })
} }
} else if model.IsServiceSentinelNeeded(result.GetType()) { case model.TaskTypeReportConfig:
singleton.ServerLock.RLock()
if len(singleton.ServerList[clientID].ConfigCache) < 1 {
if !result.GetSuccessful() {
singleton.ServerList[clientID].ConfigCache <- errors.New(result.Data)
singleton.ServerLock.RUnlock()
continue
}
singleton.ServerList[clientID].ConfigCache <- result.Data
}
singleton.ServerLock.RUnlock()
default:
if model.IsServiceSentinelNeeded(result.GetType()) {
singleton.ServiceSentinelShared.Dispatch(singleton.ReportData{ singleton.ServiceSentinelShared.Dispatch(singleton.ReportData{
Data: result, Data: result,
Reporter: clientID, Reporter: clientID,
}) })
} }
} }
}
} }
func (s *NezhaHandler) ReportSystemState(stream pb.NezhaService_ReportSystemStateServer) error { func (s *NezhaHandler) ReportSystemState(stream pb.NezhaService_ReportSystemStateServer) error {

4
service/singleton/server.go
View File

@ -31,9 +31,7 @@ func loadServers() {
DB.Find(&servers) DB.Find(&servers)
for _, s := range servers { for _, s := range servers {
innerS := s innerS := s
innerS.Host = &model.Host{} model.InitServer(&innerS)
innerS.State = &model.HostState{}
innerS.GeoIP = new(model.GeoIP)
ServerList[innerS.ID] = &innerS ServerList[innerS.ID] = &innerS
ServerUUIDToID[innerS.UUID] = innerS.ID ServerUUIDToID[innerS.UUID] = innerS.ID
} }