", "",
+ " ", " ",
+ )
+ return r.Replace(s)
+}
+
+func BuildWebhookPayload(method string, title string, text string) (any, error) {
+ switch method {
+ case constant.WeCom:
+ return map[string]any{
+ "msgtype": "markdown",
+ "markdown": map[string]any{
+ "content": fmt.Sprintf("**%s**\n%s", title, text),
+ },
+ }, nil
+ case constant.DingTalk:
+ return map[string]any{
+ "msgtype": "text",
+ "text": map[string]any{
+ "content": fmt.Sprintf("%s\n%s", title, text),
+ },
+ }, nil
+ case constant.FeiShu:
+ return map[string]any{
+ "msg_type": "text",
+ "content": map[string]any{
+ "text": fmt.Sprintf("%s\n%s", title, text),
+ },
+ }, nil
+ case constant.Custom:
+ return map[string]any{
+ "title": title,
+ "message": text,
+ "type": "1panel_alert",
+ "ts": time.Now().Unix(),
+ }, nil
+ default:
+ return nil, fmt.Errorf("unsupported webhook method: %s", method)
+ }
+}
+
+func SendWebhookRequest(method string, url string, payload any, transport *http.Transport) error {
+ return sendLegacyWebhookRequest(method, url, payload, transport)
+}
+
+func sendLegacyWebhookRequest(method string, url string, payload any, transport *http.Transport) error {
+ if url == "" {
+ return fmt.Errorf("send webhook request failed: url is empty")
+ }
+ if payload == nil {
+ return fmt.Errorf("send webhook request failed: payload is nil")
+ }
+ body, err := json.Marshal(payload)
+ if err != nil {
+ return fmt.Errorf("marshal webhook payload failed")
+ }
+ client := &http.Client{Timeout: RequestTimeout}
+ if transport != nil {
+ client.Transport = transport
+ }
+ ctx, cancel := context.WithTimeout(context.Background(), RequestTimeout)
+ defer cancel()
+ req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, bytes.NewReader(body))
+ if err != nil {
+ return fmt.Errorf("create webhook request failed")
+ }
+ req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ resp, err := client.Do(req)
+ if err != nil {
+ return fmt.Errorf("webhook request failed")
+ }
+ defer resp.Body.Close()
+ if resp.StatusCode < http.StatusOK || resp.StatusCode >= http.StatusMultipleChoices {
+ return fmt.Errorf("webhook response status code: %d", resp.StatusCode)
+ }
+ respBody, err := io.ReadAll(resp.Body)
+ if err != nil {
+ return fmt.Errorf("read webhook response failed")
+ }
+ switch method {
+ case constant.WeCom, constant.DingTalk:
+ var result struct {
+ Errcode int `json:"errcode"`
+ Errmsg string `json:"errmsg"`
+ }
+ if err := json.Unmarshal(respBody, &result); err != nil {
+ return nil
+ }
+ if result.Errcode != 0 {
+ return fmt.Errorf("webhook provider rejected response")
+ }
+ case constant.FeiShu:
+ var result struct {
+ StatusCode int `json:"StatusCode"`
+ Code int `json:"code"`
+ }
+ if err := json.Unmarshal(respBody, &result); err != nil {
+ return nil
+ }
+ if result.StatusCode != 0 || result.Code != 0 {
+ return fmt.Errorf("webhook provider rejected response")
+ }
+ }
+ return nil
+}
diff --git a/agent/utils/xpack/alert_delivery.go b/agent/utils/xpack/alert_delivery.go
new file mode 100644
index 000000000..bf6c13f62
--- /dev/null
+++ b/agent/utils/xpack/alert_delivery.go
@@ -0,0 +1,57 @@
+package xpack
+
+import (
+ "fmt"
+ "net/http"
+
+ "github.com/1Panel-dev/1Panel/agent/app/dto"
+ "github.com/1Panel-dev/1Panel/agent/app/model"
+ "github.com/1Panel-dev/1Panel/agent/utils/xpack/providers"
+)
+
+func DeliverCustomWebhookAlertLog(
+ alertType string,
+ info dto.AlertDTO,
+ create dto.AlertLogCreate,
+ project string,
+ params []dto.Param,
+ config model.AlertConfig,
+ transport *http.Transport,
+ agentInfo *dto.AgentInfo,
+ task dto.AlertTaskMetadata,
+) (providers.DeliveryResult, error) {
+ if provider, ok := AlertProvider.(providers.CustomWebhookDeliveryProvider); ok {
+ result, err := provider.CreateCustomWebhookAlertLog(alertType, info, create, project, params, config, transport, agentInfo, task)
+ return validateCustomWebhookDeliveryResult(result, err)
+ }
+ err := AlertProvider.CreateWebhookAlertLog(alertType, info, create, project, params, config, transport, agentInfo)
+ return providers.DeliveryResult{}, err
+}
+
+func DeliverTaskScanCustomWebhookAlertLog(
+ alert dto.AlertDTO,
+ alertType string,
+ create dto.AlertLogCreate,
+ pushAlert dto.PushAlert,
+ config model.AlertConfig,
+ transport *http.Transport,
+ agentInfo *dto.AgentInfo,
+ task dto.AlertTaskMetadata,
+) (providers.DeliveryResult, error) {
+ if provider, ok := AlertProvider.(providers.CustomWebhookDeliveryProvider); ok {
+ result, err := provider.CreateTaskScanCustomWebhookAlertLog(alert, alertType, create, pushAlert, config, transport, agentInfo, task)
+ return validateCustomWebhookDeliveryResult(result, err)
+ }
+ err := AlertProvider.CreateTaskScanWebhookAlertLog(alert, alertType, create, pushAlert, config, transport, agentInfo)
+ return providers.DeliveryResult{}, err
+}
+
+func validateCustomWebhookDeliveryResult(result providers.DeliveryResult, err error) (providers.DeliveryResult, error) {
+ if err != nil {
+ return result, err
+ }
+ if result.Queued && result.LogID == 0 {
+ return providers.DeliveryResult{}, fmt.Errorf("custom webhook provider queued a delivery without a log ID")
+ }
+ return result, nil
+}
diff --git a/agent/utils/xpack/helper/alert.go b/agent/utils/xpack/helper/alert.go
index b35693c80..5e7d72e7b 100644
--- a/agent/utils/xpack/helper/alert.go
+++ b/agent/utils/xpack/helper/alert.go
@@ -5,11 +5,24 @@ import (
"github.com/1Panel-dev/1Panel/agent/app/dto"
"github.com/1Panel-dev/1Panel/agent/app/model"
+ "github.com/1Panel-dev/1Panel/agent/constant"
+ alertUtil "github.com/1Panel-dev/1Panel/agent/utils/alert"
"github.com/1Panel-dev/1Panel/agent/utils/xpack/providers"
)
type alertHelper struct{}
+var (
+ _ providers.CustomWebhookTester = (*alertHelper)(nil)
+ _ providers.CustomWebhookDeliveryProvider = (*alertHelper)(nil)
+)
+
+var loadCommunityCustomWebhookContext = func() (*http.Transport, *dto.AgentInfo) {
+ multiNode := &multiNodeHelper{}
+ agentInfo, _ := multiNode.GetAgentInfo()
+ return multiNode.LoadRequestTransport(), agentInfo
+}
+
func NewIAlertProvider() providers.AlertProvider {
return &alertHelper{}
}
@@ -23,13 +36,34 @@ func (a *alertHelper) CreateSMSAlertLog(alertType string, info dto.AlertDTO, cre
}
func (a *alertHelper) CreateTaskScanWebhookAlertLog(alert dto.AlertDTO, alertType string, create dto.AlertLogCreate, pushAlert dto.PushAlert, config model.AlertConfig, transport *http.Transport, agentInfo *dto.AgentInfo) error {
+ if config.Type == constant.Custom {
+ return alertUtil.CreateTaskScanCustomWebhookAlertLog(alert, alertType, create, pushAlert, config, transport, agentInfo)
+ }
return nil
}
func (a *alertHelper) CreateWebhookAlertLog(alertType string, info dto.AlertDTO, create dto.AlertLogCreate, project string, params []dto.Param, config model.AlertConfig, transport *http.Transport, agentInfo *dto.AgentInfo) error {
+ if config.Type == constant.Custom {
+ return alertUtil.CreateCustomWebhookAlertLog(alertType, info, create, project, params, config, transport, agentInfo)
+ }
return nil
}
+func (a *alertHelper) CreateCustomWebhookAlertLog(alertType string, info dto.AlertDTO, create dto.AlertLogCreate, project string, params []dto.Param, config model.AlertConfig, transport *http.Transport, agentInfo *dto.AgentInfo, _ dto.AlertTaskMetadata) (providers.DeliveryResult, error) {
+ err := alertUtil.CreateCustomWebhookAlertLog(alertType, info, create, project, params, config, transport, agentInfo)
+ return providers.DeliveryResult{}, err
+}
+
+func (a *alertHelper) CreateTaskScanCustomWebhookAlertLog(alert dto.AlertDTO, alertType string, create dto.AlertLogCreate, pushAlert dto.PushAlert, config model.AlertConfig, transport *http.Transport, agentInfo *dto.AgentInfo, _ dto.AlertTaskMetadata) (providers.DeliveryResult, error) {
+ err := alertUtil.CreateTaskScanCustomWebhookAlertLog(alert, alertType, create, pushAlert, config, transport, agentInfo)
+ return providers.DeliveryResult{}, err
+}
+
+func (a *alertHelper) TestCustomWebhook(config dto.AlertCustomWebhookResolvedConfig) (dto.AlertConfigTestResult, error) {
+ transport, agentInfo := loadCommunityCustomWebhookContext()
+ return alertUtil.TestCustomWebhook(config, transport, agentInfo)
+}
+
func (a *alertHelper) GetLicenseErrorAlert() (uint, error) {
return 0, nil
}
diff --git a/agent/utils/xpack/providers/alert.go b/agent/utils/xpack/providers/alert.go
index 8f885866d..ed9a19246 100644
--- a/agent/utils/xpack/providers/alert.go
+++ b/agent/utils/xpack/providers/alert.go
@@ -1,12 +1,15 @@
package providers
import (
+ "errors"
"net/http"
"github.com/1Panel-dev/1Panel/agent/app/dto"
"github.com/1Panel-dev/1Panel/agent/app/model"
)
+var ErrCustomWebhookUnsupported = errors.New("custom webhook sender is unavailable")
+
type AlertProvider interface {
GetNodeErrorAlert() (uint, error)
GetLicenseErrorAlert() (uint, error)
@@ -16,3 +19,17 @@ type AlertProvider interface {
CreateTaskScanWebhookAlertLog(alert dto.AlertDTO, alertType string, create dto.AlertLogCreate, pushAlert dto.PushAlert, config model.AlertConfig, transport *http.Transport, agentInfo *dto.AgentInfo) error
CreateWebhookAlertLog(alertType string, info dto.AlertDTO, create dto.AlertLogCreate, project string, params []dto.Param, config model.AlertConfig, transport *http.Transport, agentInfo *dto.AgentInfo) error
}
+
+type CustomWebhookTester interface {
+ TestCustomWebhook(config dto.AlertCustomWebhookResolvedConfig) (dto.AlertConfigTestResult, error)
+}
+
+type DeliveryResult struct {
+ Queued bool
+ LogID uint
+}
+
+type CustomWebhookDeliveryProvider interface {
+ CreateCustomWebhookAlertLog(alertType string, info dto.AlertDTO, create dto.AlertLogCreate, project string, params []dto.Param, config model.AlertConfig, transport *http.Transport, agentInfo *dto.AgentInfo, task dto.AlertTaskMetadata) (DeliveryResult, error)
+ CreateTaskScanCustomWebhookAlertLog(alert dto.AlertDTO, alertType string, create dto.AlertLogCreate, pushAlert dto.PushAlert, config model.AlertConfig, transport *http.Transport, agentInfo *dto.AgentInfo, task dto.AlertTaskMetadata) (DeliveryResult, error)
+}
diff --git a/core/app/model/alert.go b/core/app/model/alert.go
index 2043cb521..cbdffc575 100644
--- a/core/app/model/alert.go
+++ b/core/app/model/alert.go
@@ -2,8 +2,10 @@ package model
type AlertConfig struct {
BaseModel
- Type string `json:"type"`
- Title string `json:"title"`
- Status string `json:"status"`
- Config string `json:"config"`
+ UID string `json:"uid"`
+ Type string `json:"type"`
+ Title string `json:"title"`
+ Status string `json:"status"`
+ Config string `json:"config"`
+ SecretConfig string `json:"-"`
}
diff --git a/core/cmd/server/docs/x-log.json b/core/cmd/server/docs/x-log.json
index 2a27c52c6..b3ac1bc15 100644
--- a/core/cmd/server/docs/x-log.json
+++ b/core/cmd/server/docs/x-log.json
@@ -5787,4 +5787,4 @@
"formatZH": "从主节点同步设置",
"formatEN": "sync settings from master"
}
-}
\ No newline at end of file
+}
diff --git a/core/init/router/proxy.go b/core/init/router/proxy.go
index 3be526474..1564f3e83 100644
--- a/core/init/router/proxy.go
+++ b/core/init/router/proxy.go
@@ -1,8 +1,10 @@
package router
import (
+ "errors"
"net/http"
"net/url"
+ "path"
"strconv"
"strings"
@@ -18,6 +20,8 @@ import (
"github.com/gin-gonic/gin"
)
+var errInternalOnlyAgentEndpoint = errors.New("internal agent endpoint cannot be proxied")
+
func Proxy() gin.HandlerFunc {
return func(c *gin.Context) {
reqPath := c.Request.URL.Path
@@ -51,6 +55,11 @@ func Proxy() gin.HandlerFunc {
c.Request.Header.Set("X-Panel-User", url.QueryEscape(userName))
}
+ if isInternalOnlyAgentEndpoint(reqPath) {
+ helper.ErrorWithDetail(c, http.StatusForbidden, "ErrProxy", errInternalOnlyAgentEndpoint)
+ return
+ }
+
if reqPath == "/api/v2/hosts/terminal/local" && (currentNode == "local" || len(currentNode) == 0) {
proxyLocalAgent(c)
return
@@ -65,6 +74,12 @@ func Proxy() gin.HandlerFunc {
}
}
+func isInternalOnlyAgentEndpoint(reqPath string) bool {
+ normalizedPath := path.Clean(reqPath)
+ return normalizedPath == "/api/v2/xpack/alert/offline/email" ||
+ normalizedPath == "/api/v2/xpack/alert/offline/webhook"
+}
+
func proxyLocalAgent(c *gin.Context) {
defer func() {
if err := recover(); err != nil && err != http.ErrAbortHandler {
diff --git a/core/utils/alert_webhook/secret.go b/core/utils/alert_webhook/secret.go
new file mode 100644
index 000000000..edb849d0d
--- /dev/null
+++ b/core/utils/alert_webhook/secret.go
@@ -0,0 +1,135 @@
+package alert_webhook
+
+import (
+ "encoding/json"
+ "fmt"
+ "io"
+ "net/url"
+ "strconv"
+ "strings"
+
+ "github.com/1Panel-dev/1Panel/core/app/model"
+ "github.com/1Panel-dev/1Panel/core/constant"
+ "github.com/1Panel-dev/1Panel/core/global"
+ "github.com/1Panel-dev/1Panel/core/utils/encrypt"
+ "github.com/google/uuid"
+)
+
+const (
+ coreKeyPrefix = "core:v1:"
+ secretSchemaV1 = 1
+ maxSecretLength = 256 * 1024
+ maxSecretHeaders = 64
+ maxSecretValueSize = 16 * 1024
+)
+
+type secretConfig struct {
+ SchemaVersion int `json:"schemaVersion"`
+ URL string `json:"url"`
+ Headers map[string]string `json:"headers,omitempty"`
+}
+
+func ExportSecretPlain(config model.AlertConfig) (string, error) {
+ if config.Type != constant.Custom {
+ return "", fmt.Errorf("alert config %d is not a custom webhook", config.ID)
+ }
+ if !strings.HasPrefix(config.SecretConfig, coreKeyPrefix) {
+ return "", fmt.Errorf("custom webhook secret is not encrypted with the core key")
+ }
+ payload := strings.TrimPrefix(config.SecretConfig, coreKeyPrefix)
+ if payload == "" {
+ return "", fmt.Errorf("custom webhook secret ciphertext is empty")
+ }
+ key, err := loadEncryptKey()
+ if err != nil {
+ return "", err
+ }
+ plainText, err := encrypt.StringDecryptWithKey(payload, key)
+ if err != nil {
+ return "", fmt.Errorf("decrypt custom webhook secret: %w", err)
+ }
+ secret, err := decodeAndValidateSecret(plainText)
+ if err != nil {
+ return "", err
+ }
+ canonical, err := json.Marshal(secret)
+ if err != nil {
+ return "", fmt.Errorf("encode custom webhook secret: %w", err)
+ }
+ return string(canonical), nil
+}
+
+func loadEncryptKey() (string, error) {
+ if key := strings.TrimSpace(global.CONF.Base.EncryptKey); key != "" {
+ return key, nil
+ }
+ if global.DB != nil {
+ var setting model.Setting
+ if err := global.DB.Where("key = ?", "EncryptKey").First(&setting).Error; err == nil {
+ if key := strings.TrimSpace(setting.Value); key != "" {
+ return key, nil
+ }
+ }
+ }
+ return "", fmt.Errorf("custom webhook core encrypt key is empty")
+}
+
+func decodeAndValidateSecret(plainText string) (secretConfig, error) {
+ if len(plainText) == 0 || len(plainText) > maxSecretLength {
+ return secretConfig{}, fmt.Errorf("custom webhook secret has an invalid size")
+ }
+ var secret secretConfig
+ decoder := json.NewDecoder(strings.NewReader(plainText))
+ decoder.DisallowUnknownFields()
+ if err := decoder.Decode(&secret); err != nil {
+ return secretConfig{}, fmt.Errorf("decode custom webhook secret: %w", err)
+ }
+ if err := decoder.Decode(&struct{}{}); err != io.EOF {
+ return secretConfig{}, fmt.Errorf("decode custom webhook secret: multiple JSON values are not allowed")
+ }
+ if secret.SchemaVersion != secretSchemaV1 {
+ return secretConfig{}, fmt.Errorf("unsupported custom webhook secret schemaVersion: %d", secret.SchemaVersion)
+ }
+ if err := validateSecretURL(secret.URL); err != nil {
+ return secretConfig{}, err
+ }
+ if len(secret.Headers) > maxSecretHeaders {
+ return secretConfig{}, fmt.Errorf("custom webhook secret headers exceed the limit")
+ }
+ if secret.Headers == nil {
+ secret.Headers = map[string]string{}
+ }
+ for uid, value := range secret.Headers {
+ if _, err := uuid.Parse(strings.TrimSpace(uid)); err != nil {
+ return secretConfig{}, fmt.Errorf("custom webhook secret header uid must be a UUID")
+ }
+ if value == "" || len(value) > maxSecretValueSize || strings.ContainsAny(value, "\r\n") {
+ return secretConfig{}, fmt.Errorf("custom webhook secret header is invalid")
+ }
+ }
+ return secret, nil
+}
+
+func validateSecretURL(rawURL string) error {
+ if rawURL == "" {
+ return nil
+ }
+ parsed, err := url.Parse(rawURL)
+ if err != nil {
+ return fmt.Errorf("invalid custom webhook URL")
+ }
+ hostname := strings.TrimSuffix(strings.TrimSpace(parsed.Hostname()), ".")
+ if (parsed.Scheme != "http" && parsed.Scheme != "https") || parsed.Host == "" || hostname == "" || strings.Contains(hostname, "%") || parsed.User != nil || parsed.Fragment != "" {
+ return fmt.Errorf("invalid custom webhook URL")
+ }
+ if strings.HasSuffix(parsed.Host, ":") {
+ return fmt.Errorf("invalid custom webhook URL")
+ }
+ if port := parsed.Port(); port != "" {
+ value, err := strconv.Atoi(port)
+ if err != nil || value < 1 || value > 65535 {
+ return fmt.Errorf("invalid custom webhook URL")
+ }
+ }
+ return nil
+}
diff --git a/core/utils/req_helper/proxy_local/req_to_local.go b/core/utils/req_helper/proxy_local/req_to_local.go
index df202ce92..1e65f6e90 100644
--- a/core/utils/req_helper/proxy_local/req_to_local.go
+++ b/core/utils/req_helper/proxy_local/req_to_local.go
@@ -11,6 +11,7 @@ import (
"net/url"
"os"
"strings"
+ "time"
"github.com/gin-gonic/gin"
@@ -24,6 +25,12 @@ func NewLocalClient(reqUrl, reqMethod string, body io.Reader, ctx *gin.Context)
return client.Request(reqUrl, reqMethod, body, ctx)
}
+func NewLocalClientWithContext(requestContext context.Context, reqURL, reqMethod string, body io.Reader, ctx *gin.Context, timeout time.Duration) (interface{}, error) {
+ client := newReusableClientWithTimeout("/etc/1panel/agent.sock", timeout)
+ defer client.CloseIdleConnections()
+ return client.RequestWithContext(requestContext, reqURL, reqMethod, body, ctx)
+}
+
type ReusableClient struct {
client *http.Client
sockPath string
@@ -34,17 +41,19 @@ func NewReusableClient() *ReusableClient {
}
func newReusableClient(sockPath string) *ReusableClient {
- dialUnix := func() (conn net.Conn, err error) {
- return net.Dial("unix", sockPath)
- }
+ return newReusableClientWithTimeout(sockPath, 0)
+}
+
+func newReusableClientWithTimeout(sockPath string, timeout time.Duration) *ReusableClient {
+ dialer := &net.Dialer{Timeout: timeout}
transport := &http.Transport{
MaxIdleConns: 12,
MaxIdleConnsPerHost: 6,
DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
- return dialUnix()
+ return dialer.DialContext(ctx, "unix", sockPath)
},
}
- return &ReusableClient{client: &http.Client{Transport: transport}, sockPath: sockPath}
+ return &ReusableClient{client: &http.Client{Transport: transport, Timeout: timeout}, sockPath: sockPath}
}
func (c *ReusableClient) CloseIdleConnections() {
@@ -55,6 +64,10 @@ func (c *ReusableClient) CloseIdleConnections() {
}
func (c *ReusableClient) Request(reqUrl, reqMethod string, body io.Reader, ctx *gin.Context) (interface{}, error) {
+ return c.RequestWithContext(context.Background(), reqUrl, reqMethod, body, ctx)
+}
+
+func (c *ReusableClient) RequestWithContext(requestContext context.Context, reqUrl, reqMethod string, body io.Reader, ctx *gin.Context) (interface{}, error) {
if c == nil || c.client == nil {
return nil, errors.New("local agent client is not initialized")
}
@@ -71,7 +84,7 @@ func (c *ReusableClient) Request(reqUrl, reqMethod string, body io.Reader, ctx *
Host: parsedURL.Host,
}
- req, err := http.NewRequest(reqMethod, rURL.String(), body)
+ req, err := http.NewRequestWithContext(requestContext, reqMethod, rURL.String(), body)
if err != nil {
return nil, fmt.Errorf("creating request failed, err: %v", err)
}
diff --git a/frontend/src/api/index.ts b/frontend/src/api/index.ts
index 449f53dba..6329d1d36 100644
--- a/frontend/src/api/index.ts
+++ b/frontend/src/api/index.ts
@@ -206,7 +206,7 @@ class RequestHttp {
return this.service.delete(url, { params, ..._object });
}
download
(url: string, params?: object, _object = {}): Promise {
- return this.service.post(url, params, _object);
+ return this.service.post(url, params, _object) as unknown as Promise;
}
upload(url: string, params: object = {}, config?: RequestConfig): Promise> {
return this.service.post(url, params, config);
diff --git a/frontend/src/api/interface/alert.ts b/frontend/src/api/interface/alert.ts
index 4d1535895..77d5bf5d9 100644
--- a/frontend/src/api/interface/alert.ts
+++ b/frontend/src/api/interface/alert.ts
@@ -156,6 +156,7 @@ export namespace Alert {
export interface AlertConfigUpdateReq {
id: number;
+ revision?: string;
type: string;
title: string;
config: string;
@@ -163,9 +164,17 @@ export namespace Alert {
displayName: string;
}
+ export interface AlertConfigStatusReq {
+ id: number;
+ status: string;
+ }
+
export interface AlertConfigTest {
- port: number;
+ id?: number;
+ type: 'email';
+ config: string;
host: string;
+ port: number;
sender: string;
userName: string;
password: string;
@@ -174,6 +183,20 @@ export namespace Alert {
recipient: string;
}
+ export interface AlertConfigCustomTest {
+ id?: number;
+ type: 'custom';
+ config: string;
+ }
+
+ export interface AlertConfigCustomTestResult {
+ success: boolean;
+ statusCode?: number;
+ duration?: number;
+ message?: string;
+ response?: string;
+ }
+
export interface CommonAlertConfig {
id?: number;
type: string;
diff --git a/frontend/src/api/modules/alert.ts b/frontend/src/api/modules/alert.ts
index 78f60dfc5..4242e7e18 100644
--- a/frontend/src/api/modules/alert.ts
+++ b/frontend/src/api/modules/alert.ts
@@ -14,6 +14,7 @@ const resolveAlertConfigExcludeTypes = (excludeTypes: string[] = []) => {
}
return Array.from(types);
};
+
export const SearchAlerts = (req: Alert.AlertSearch, currentNode?: string) => {
return http.post>(
`/alert/search`,
@@ -99,10 +100,18 @@ export const UpdateAlertConfig = (req: Alert.AlertConfigUpdateReq) => {
return http.post(`/alert/config/update`, req);
};
+export const UpdateAlertConfigStatus = (req: Alert.AlertConfigStatusReq) => {
+ return http.post(`/alert/config/status`, req);
+};
+
export const TestAlertConfig = (req: Alert.AlertConfigTest) => {
return http.post(`/alert/config/test`, req);
};
+export const TestCustomAlertConfig = (req: Alert.AlertConfigCustomTest) => {
+ return http.post(`/alert/config/test`, req);
+};
+
export const SyncAlertInfo = (req: Alert.AlertLogId) => {
return http.post(`/xpack/alert/logs/sync`, req);
};
diff --git a/frontend/src/components/app-status/index.vue b/frontend/src/components/app-status/index.vue
index b5f29e4ad..8adb41ada 100644
--- a/frontend/src/components/app-status/index.vue
+++ b/frontend/src/components/app-status/index.vue
@@ -199,6 +199,6 @@ defineExpose({
border: 1px solid var(--el-color-warning);
background-color: transparent;
padding: 8px 8px;
- width: 70px;
+ width: 71px;
}
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
index 2df1411ef..7ce2b80d7 100644
--- a/frontend/src/lang/modules/en.ts
+++ b/frontend/src/lang/modules/en.ts
@@ -946,7 +946,6 @@ const message = {
from_remote: 'This model was not downloaded via 1Panel, no related pull logs.',
no_logs: 'The pull logs for this model have been deleted and cannot be viewed.',
vllmVersionHelper: 'For FusionXpark GB 10 servers, please select the -cu130 version.',
- ascendVisibleDevices: 'Ascend Visible Devices',
vllmCommandPortHelper:
'The startup command must use port {0}; otherwise, the service will be inaccessible.',
ascendVisibleDevices: 'Ascend visible devices (ASCEND_RT_VISIBLE_DEVICES)',
@@ -1140,7 +1139,6 @@ const message = {
cachedToken: 'Cached Tokens',
cacheHitRate: 'Cache Hit Rate',
activeUsers: 'Active Users',
- activeStreamingRequests: 'Active Streaming Requests',
activeModels: 'Active Models',
failedRequests: 'Failed Requests',
averageTokenPerRequest: 'Avg Tokens/Request',
@@ -6703,7 +6701,57 @@ const message = {
feiShuConfigHelper: 'Feishu alert notification configuration',
webhookName: 'Bot name',
webhookUrl: 'Webhook URL',
- alertConfigProHelper: 'Commercial Edition also supports WeCom, DingTalk, Feishu, and SMS alerts.',
+ custom: 'Webhook',
+ webhookPreset: 'Preset',
+ genericJsonPreset: 'Generic JSON',
+ customPreset: 'Custom',
+ webhookUrlSecretHelper: 'The Webhook URL is encrypted at rest and can be viewed and edited here',
+ webhookPublicAddressHelper:
+ 'Only publicly reachable HTTP/HTTPS addresses are supported; local, private, and reserved addresses are blocked',
+ customWebhookRecoveryRequired:
+ 'This configuration is invalid or from an older version. Re-enter the Webhook URL and any required secret headers, then save.',
+ clearSecret: 'Clear',
+ keepSecret: 'Keep unchanged',
+ secretCleared: 'This secret will be cleared when you save',
+ bodyType: 'Body Type',
+ bodyTemplate: 'Body Template',
+ formFieldName: 'Field name',
+ formFieldValue: 'Field value',
+ addFormField: 'Add Field',
+ webhookAdvanced: 'Advanced',
+ headers: 'Headers',
+ headerName: 'Header name',
+ headerValue: 'Header value',
+ secretValue: 'Secret value',
+ addHeader: 'Add Header',
+ templateVariables: 'Template Variables',
+ templateVariableTitle: 'Alert title',
+ templateVariableMessage: 'Alert content',
+ templateVariableType: 'Alert type',
+ templateVariableNodeName: 'Node name',
+ templateVariableTimestamp: 'Event time',
+ templateVariablesHelper:
+ 'title=alert title, message=alert content, type=alert type, nodeName=node name, timestamp=event time. Click a variable to insert it into the body.',
+ testResultStale: 'The configuration changed, so the previous test result is no longer valid',
+ alertConfigChanged: 'The configuration was updated. Refresh and try again.',
+ presetOverwriteHelper: 'Switching presets will replace the current body configuration. Continue?',
+ customWebhookValidation: {
+ displayNameRequired: 'Enter a display name',
+ urlRequired: 'Enter a Webhook URL',
+ urlInvalid: 'The Webhook URL must be a valid HTTP or HTTPS URL',
+ bodyRequired: 'Configure the request body',
+ jsonInvalid: 'The JSON body template is invalid',
+ formFieldRequired: 'Form field names are required',
+ formFieldDuplicate: 'Form field names must be unique',
+ headerRequired: 'Header names are required',
+ headerInvalid: 'The header name is invalid',
+ headerDuplicate: 'Header names must be unique',
+ headerReserved: 'This header is managed by the system and cannot be customized',
+ headerMustBeSecret: 'Authentication or credential headers must be marked as secret values',
+ templateVariableInvalid: 'The body contains an unsupported template variable',
+ secretRequired: 'Enter a secret value, or choose Keep unchanged or Clear',
+ },
+ alertConfigProHelper: 'Commercial Edition adds more notification channels.',
recipientPlaceholder: 'Please enter recipient email address',
addRecipient: 'Add Recipient',
webhookItem: 'Webhook',
diff --git a/frontend/src/lang/modules/es-es.ts b/frontend/src/lang/modules/es-es.ts
index 9ffce81a7..40135c4b6 100644
--- a/frontend/src/lang/modules/es-es.ts
+++ b/frontend/src/lang/modules/es-es.ts
@@ -950,7 +950,6 @@ const message = {
from_remote: 'Este modelo no fue descargado vía 1Panel, no hay registros de descarga relacionados.',
no_logs: 'Los registros de descarga de este modelo han sido eliminados y no se pueden consultar.',
vllmVersionHelper: 'Para servidores FusionXpark GB 10, seleccione la versión -cu130.',
- ascendVisibleDevices: 'Dispositivos Ascend visibles',
vllmCommandPortHelper:
'El comando de inicio debe usar el puerto {0}; de lo contrario, no se podrá acceder al servicio.',
ascendVisibleDevices: 'Dispositivos Ascend visibles (ASCEND_RT_VISIBLE_DEVICES)',
@@ -1146,7 +1145,6 @@ const message = {
cachedToken: 'Tokens en caché',
cacheHitRate: 'Tasa de acierto de caché',
activeUsers: 'Usuarios activos',
- activeStreamingRequests: 'Solicitudes de streaming activas',
activeModels: 'Modelos activos',
failedRequests: 'Solicitudes fallidas',
averageTokenPerRequest: 'Tokens promedio/solicitud',
@@ -6809,7 +6807,58 @@ const message = {
barkConfigHelper: 'Configuración de notificación de alerta Bark',
webhookName: 'Nombre del bot',
webhookUrl: 'URL de Webhook',
- alertConfigProHelper: 'La edición comercial también admite alertas mediante WeCom, DingTalk, Feishu y SMS.',
+ custom: 'Webhook',
+ webhookPreset: 'Preajuste',
+ genericJsonPreset: 'JSON genérico',
+ customPreset: 'Personalizado',
+ webhookUrlSecretHelper: 'La URL del Webhook se almacena cifrada y se puede ver y editar aquí',
+ webhookPublicAddressHelper:
+ 'Solo se admiten direcciones HTTP/HTTPS accesibles públicamente; se bloquean las direcciones locales, privadas y reservadas',
+ customWebhookRecoveryRequired:
+ 'Esta configuración no es válida o procede de una versión anterior. Vuelve a introducir la URL del Webhook y las cabeceras secretas necesarias y guarda los cambios.',
+ clearSecret: 'Borrar',
+ keepSecret: 'Mantener sin cambios',
+ secretCleared: 'Este secreto se borrará al guardar',
+ bodyType: 'Tipo de Body',
+ bodyTemplate: 'Plantilla del Body',
+ formFieldName: 'Nombre del campo',
+ formFieldValue: 'Valor del campo',
+ addFormField: 'Añadir campo',
+ webhookAdvanced: 'Avanzado',
+ headers: 'Headers',
+ headerName: 'Nombre del Header',
+ headerValue: 'Valor del Header',
+ secretValue: 'Valor secreto',
+ addHeader: 'Añadir Header',
+ templateVariables: 'Variables de plantilla',
+ templateVariableTitle: 'Título de alerta',
+ templateVariableMessage: 'Contenido de alerta',
+ templateVariableType: 'Tipo de alerta',
+ templateVariableNodeName: 'Nombre del nodo',
+ templateVariableTimestamp: 'Hora del evento',
+ templateVariablesHelper:
+ 'title=título de la alerta, message=contenido, type=tipo, nodeName=nombre del nodo, timestamp=hora del evento. Haz clic para insertar una variable en el Body.',
+ testResultStale: 'La configuración cambió; el resultado de la prueba anterior ya no es válido',
+ alertConfigChanged: 'La configuración se actualizó. Actualice la página e inténtelo de nuevo.',
+ presetOverwriteHelper: 'Cambiar el preajuste reemplazará la configuración actual del Body. ¿Continuar?',
+ customWebhookValidation: {
+ displayNameRequired: 'Introduce un nombre para mostrar',
+ urlRequired: 'Introduce una URL de Webhook',
+ urlInvalid: 'La URL del Webhook debe ser una URL HTTP o HTTPS válida',
+ bodyRequired: 'Configura el Body de la solicitud',
+ jsonInvalid: 'La plantilla JSON del Body no es válida',
+ formFieldRequired: 'Los nombres de los campos Form son obligatorios',
+ formFieldDuplicate: 'Los nombres de los campos Form deben ser únicos',
+ headerRequired: 'Los nombres de los Headers son obligatorios',
+ headerInvalid: 'El nombre del Header no es válido',
+ headerDuplicate: 'Los nombres de los Headers deben ser únicos',
+ headerReserved: 'Este Header lo gestiona el sistema y no se puede personalizar',
+ headerMustBeSecret:
+ 'Las cabeceras de autenticación o credenciales deben marcarse como valores secretos',
+ templateVariableInvalid: 'El Body contiene una variable de plantilla no compatible',
+ secretRequired: 'Introduce un secreto o elige Mantener sin cambios o Borrar',
+ },
+ alertConfigProHelper: 'La edición comercial añade más canales de notificación.',
},
theme: {
lingXiaGold: 'LXware Gold',
diff --git a/frontend/src/lang/modules/fa.ts b/frontend/src/lang/modules/fa.ts
index af706b1e0..cec435e21 100644
--- a/frontend/src/lang/modules/fa.ts
+++ b/frontend/src/lang/modules/fa.ts
@@ -933,7 +933,6 @@ const message = {
from_remote: 'این مدل از طریق 1Panel دانلود نشده است، لاگ مربوط به دریافت وجود ندارد.',
no_logs: 'لاگ دریافت این مدل حذف شده است و قابل مشاهده نیست.',
vllmVersionHelper: 'برای سرورهای FusionXpark GB 10، لطفاً نسخه -cu130 را انتخاب کنید.',
- ascendVisibleDevices: 'دستگاههای Ascend قابل مشاهده',
vllmCommandPortHelper:
'فرمان راهاندازی باید از پورت {0} استفاده کند؛ در غیر این صورت سرویس قابل دسترسی نخواهد بود.',
ascendVisibleDevices: 'دستگاههای قابل مشاهده Ascend (ASCEND_RT_VISIBLE_DEVICES)',
@@ -1126,7 +1125,6 @@ const message = {
cachedToken: 'توکنهای کش شده',
cacheHitRate: 'نرخ برخورد کش',
activeUsers: 'کاربران فعال',
- activeStreamingRequests: 'درخواستهای جریانی فعال',
activeModels: 'مدلهای فعال',
failedRequests: 'درخواستهای ناموفق',
averageTokenPerRequest: 'میانگین توکن در هر درخواست',
@@ -6657,7 +6655,57 @@ const message = {
feiShuConfigHelper: 'پیکربندی اعلان هشدار فیشو',
webhookName: 'نام ربات',
webhookUrl: 'URL وبهوک',
- alertConfigProHelper: 'نسخه تجاری همچنین از هشدارهای WeCom، دینگتاک، فیشو و پیامک پشتیبانی میکند.',
+ custom: 'Webhook',
+ webhookPreset: 'پیشتنظیم',
+ genericJsonPreset: 'JSON عمومی',
+ customPreset: 'سفارشی',
+ webhookUrlSecretHelper: 'URL وبهوک بهصورت رمزگذاریشده ذخیره میشود و در اینجا قابل مشاهده و ویرایش است',
+ webhookPublicAddressHelper:
+ 'فقط نشانیهای HTTP/HTTPS قابل دسترس از اینترنت عمومی پشتیبانی میشوند؛ نشانیهای محلی، خصوصی و رزروشده مسدود میشوند',
+ customWebhookRecoveryRequired:
+ 'این پیکربندی نامعتبر یا مربوط به نسخهای قدیمی است. URL وبهوک و Headerهای محرمانه موردنیاز را دوباره وارد و ذخیره کنید.',
+ clearSecret: 'پاک کردن',
+ keepSecret: 'بدون تغییر',
+ secretCleared: 'این مقدار محرمانه هنگام ذخیره پاک میشود',
+ bodyType: 'نوع Body',
+ bodyTemplate: 'قالب Body',
+ formFieldName: 'نام فیلد',
+ formFieldValue: 'مقدار فیلد',
+ addFormField: 'افزودن فیلد',
+ webhookAdvanced: 'پیشرفته',
+ headers: 'Headers',
+ headerName: 'نام Header',
+ headerValue: 'مقدار Header',
+ secretValue: 'مقدار محرمانه',
+ addHeader: 'افزودن Header',
+ templateVariables: 'متغیرهای قالب',
+ templateVariableTitle: 'عنوان هشدار',
+ templateVariableMessage: 'محتوای هشدار',
+ templateVariableType: 'نوع هشدار',
+ templateVariableNodeName: 'نام گره',
+ templateVariableTimestamp: 'زمان رخداد',
+ templateVariablesHelper:
+ 'title=عنوان هشدار، message=محتوا، type=نوع، nodeName=نام گره، timestamp=زمان رخداد. برای درج در Body روی متغیر کلیک کنید.',
+ testResultStale: 'پیکربندی تغییر کرده و نتیجه آزمایش قبلی دیگر معتبر نیست',
+ alertConfigChanged: 'پیکربندی بهروزرسانی شده است. صفحه را تازهسازی کرده و دوباره تلاش کنید.',
+ presetOverwriteHelper: 'تغییر پیشتنظیم، پیکربندی فعلی Body را جایگزین میکند. ادامه میدهید؟',
+ customWebhookValidation: {
+ displayNameRequired: 'نام نمایشی را وارد کنید',
+ urlRequired: 'URL وبهوک را وارد کنید',
+ urlInvalid: 'URL وبهوک باید یک آدرس معتبر HTTP یا HTTPS باشد',
+ bodyRequired: 'Body درخواست را پیکربندی کنید',
+ jsonInvalid: 'قالب JSON Body معتبر نیست',
+ formFieldRequired: 'نام فیلدهای Form الزامی است',
+ formFieldDuplicate: 'نام فیلدهای Form باید یکتا باشد',
+ headerRequired: 'نام Headers الزامی است',
+ headerInvalid: 'نام Header معتبر نیست',
+ headerDuplicate: 'نام Headers باید یکتا باشد',
+ headerReserved: 'این Header توسط سیستم مدیریت میشود و قابل سفارشیسازی نیست',
+ headerMustBeSecret: 'Headerهای احراز هویت یا اطلاعات دسترسی باید محرمانه تنظیم شوند',
+ templateVariableInvalid: 'Body شامل متغیر قالب پشتیبانینشده است',
+ secretRequired: 'مقدار محرمانه را وارد کنید یا بدون تغییر/پاک کردن را انتخاب کنید',
+ },
+ alertConfigProHelper: 'نسخه تجاری کانالهای اعلان بیشتری ارائه میکند.',
recipientPlaceholder: 'لطفاً آدرس ایمیل گیرنده را وارد کنید',
addRecipient: 'افزودن گیرنده',
webhookItem: 'وبهوک',
diff --git a/frontend/src/lang/modules/ja.ts b/frontend/src/lang/modules/ja.ts
index 2d51a4287..6fe2c82cb 100644
--- a/frontend/src/lang/modules/ja.ts
+++ b/frontend/src/lang/modules/ja.ts
@@ -937,7 +937,6 @@ const message = {
from_remote: 'このモデルは1Panelを介してダウンロードされておらず、関連するプルログはありません。',
no_logs: 'このモデルのプルログは削除されており、関連するログを表示できません。',
vllmVersionHelper: 'FusionXpark GB 10 サーバーでは -cu130 バージョンを選択してください。',
- ascendVisibleDevices: 'Ascend 可視デバイス',
vllmCommandPortHelper:
'起動コマンドではポート {0} を使用する必要があります。使用しない場合、サービスにアクセスできません。',
ascendVisibleDevices: 'Ascend 可視デバイス（ASCEND_RT_VISIBLE_DEVICES）',
@@ -1129,7 +1128,6 @@ const message = {
cachedToken: 'キャッシュ Token',
cacheHitRate: 'キャッシュヒット率',
activeUsers: 'アクティブユーザー',
- activeStreamingRequests: 'アクティブなストリーミングリクエスト',
activeModels: 'アクティブモデル',
failedRequests: '失敗リクエスト',
averageTokenPerRequest: '平均 Token/リクエスト',
@@ -6699,7 +6697,57 @@ const message = {
barkConfigHelper: 'Barkアラート通知設定',
webhookName: 'ボット名',
webhookUrl: 'Webhook URL',
- alertConfigProHelper: '商用版では、WeCom、DingTalk、Feishu、SMS 通知も利用できます。',
+ custom: 'Webhook',
+ webhookPreset: 'プリセット',
+ genericJsonPreset: '汎用 JSON',
+ customPreset: 'カスタム',
+ webhookUrlSecretHelper: 'Webhook URL は暗号化して保存され、ここで表示および編集できます',
+ webhookPublicAddressHelper:
+ '公開ネットワークから到達可能な HTTP/HTTPS アドレスのみ対応し、ローカル、プライベート、予約済みアドレスは拒否されます',
+ customWebhookRecoveryRequired:
+ 'この設定は無効か旧バージョンのものです。Webhook URL と必要なシークレット Header を再入力して保存してください。',
+ clearSecret: 'クリア',
+ keepSecret: '変更しない',
+ secretCleared: '保存するとこのシークレットはクリアされます',
+ bodyType: 'Body タイプ',
+ bodyTemplate: 'Body テンプレート',
+ formFieldName: 'フィールド名',
+ formFieldValue: 'フィールド値',
+ addFormField: 'フィールドを追加',
+ webhookAdvanced: '詳細設定',
+ headers: 'Headers',
+ headerName: 'Header 名',
+ headerValue: 'Header 値',
+ secretValue: 'シークレット値',
+ addHeader: 'Header を追加',
+ templateVariables: 'テンプレート変数',
+ templateVariableTitle: 'アラートタイトル',
+ templateVariableMessage: 'アラート内容',
+ templateVariableType: 'アラートタイプ',
+ templateVariableNodeName: 'ノード名',
+ templateVariableTimestamp: '発生時刻',
+ templateVariablesHelper:
+ 'title=アラートタイトル、message=アラート内容、type=アラートタイプ、nodeName=ノード名、timestamp=発生時刻。変数をクリックすると Body に挿入できます。',
+ testResultStale: '設定が変更されたため、前回のテスト結果は無効です',
+ alertConfigChanged: '設定が更新されました。更新してからもう一度お試しください',
+ presetOverwriteHelper: 'プリセットを切り替えると現在の Body 設定が上書きされます。続行しますか？',
+ customWebhookValidation: {
+ displayNameRequired: '表示名を入力してください',
+ urlRequired: 'Webhook URL を入力してください',
+ urlInvalid: 'Webhook URL には有効な HTTP または HTTPS URL を指定してください',
+ bodyRequired: 'リクエスト Body を設定してください',
+ jsonInvalid: 'JSON Body テンプレートが無効です',
+ formFieldRequired: 'Form フィールド名は必須です',
+ formFieldDuplicate: 'Form フィールド名は重複できません',
+ headerRequired: 'Header 名は必須です',
+ headerInvalid: 'Header 名が無効です',
+ headerDuplicate: 'Header 名は重複できません',
+ headerReserved: 'この Header はシステム管理のためカスタマイズできません',
+ headerMustBeSecret: '認証情報を含む Header はシークレット値に設定してください',
+ templateVariableInvalid: 'Body に未対応のテンプレート変数が含まれています',
+ secretRequired: 'シークレット値を入力するか、変更しない/クリアを選択してください',
+ },
+ alertConfigProHelper: '商用版では、追加の通知チャネルを利用できます。',
},
theme: {
lingXiaGold: 'LXware Gold',
diff --git a/frontend/src/lang/modules/ko.ts b/frontend/src/lang/modules/ko.ts
index 08303312d..cca8af5c5 100644
--- a/frontend/src/lang/modules/ko.ts
+++ b/frontend/src/lang/modules/ko.ts
@@ -927,7 +927,6 @@ const message = {
from_remote: '이 모델은 1Panel을 통해 다운로드되지 않았으며 관련 풀 로그가 없습니다.',
no_logs: '이 모델의 풀 로그가 삭제되어 관련 로그를 볼 수 없습니다.',
vllmVersionHelper: 'FusionXpark GB 10 서버는 -cu130 버전을 선택하세요.',
- ascendVisibleDevices: 'Ascend 표시 장치',
vllmCommandPortHelper: '시작 명령은 {0} 포트를 사용해야 하며, 그렇지 않으면 서비스에 접근할 수 없습니다.',
ascendVisibleDevices: 'Ascend 표시 장치 (ASCEND_RT_VISIBLE_DEVICES)',
syncModelAccount: '모델 계정에 동기화',
@@ -1118,7 +1117,6 @@ const message = {
cachedToken: '캐시 Token',
cacheHitRate: '캐시 적중률',
activeUsers: '활성 사용자',
- activeStreamingRequests: '활성 스트리밍 요청',
activeModels: '활성 모델',
failedRequests: '실패한 요청',
averageTokenPerRequest: '평균 Token/요청',
@@ -6563,7 +6561,57 @@ const message = {
barkConfigHelper: 'Bark 알림 구성',
webhookName: '봇 이름',
webhookUrl: 'Webhook URL',
- alertConfigProHelper: '상용 버전에서는 WeCom, DingTalk, Feishu, SMS 알림도 지원합니다.',
+ custom: 'Webhook',
+ webhookPreset: '프리셋',
+ genericJsonPreset: '일반 JSON',
+ customPreset: '사용자 지정',
+ webhookUrlSecretHelper: 'Webhook URL은 암호화되어 저장되며 여기에서 확인하고 편집할 수 있습니다',
+ webhookPublicAddressHelper:
+ '공개 네트워크에서 접근 가능한 HTTP/HTTPS 주소만 지원하며 로컬, 사설 및 예약 주소는 차단됩니다',
+ customWebhookRecoveryRequired:
+ '이 설정은 유효하지 않거나 이전 버전에서 생성되었습니다. Webhook URL과 필요한 비밀 Header를 다시 입력한 후 저장하세요.',
+ clearSecret: '지우기',
+ keepSecret: '변경하지 않음',
+ secretCleared: '저장하면 이 비밀 값이 지워집니다',
+ bodyType: 'Body 유형',
+ bodyTemplate: 'Body 템플릿',
+ formFieldName: '필드 이름',
+ formFieldValue: '필드 값',
+ addFormField: '필드 추가',
+ webhookAdvanced: '고급 설정',
+ headers: 'Headers',
+ headerName: 'Header 이름',
+ headerValue: 'Header 값',
+ secretValue: '비밀 값',
+ addHeader: 'Header 추가',
+ templateVariables: '템플릿 변수',
+ templateVariableTitle: '알림 제목',
+ templateVariableMessage: '알림 내용',
+ templateVariableType: '알림 유형',
+ templateVariableNodeName: '노드 이름',
+ templateVariableTimestamp: '발생 시간',
+ templateVariablesHelper:
+ 'title=알림 제목, message=알림 내용, type=알림 유형, nodeName=노드 이름, timestamp=발생 시간. 변수를 클릭하면 Body에 삽입됩니다.',
+ testResultStale: '설정이 변경되어 이전 테스트 결과가 더 이상 유효하지 않습니다',
+ alertConfigChanged: '구성이 업데이트되었습니다. 새로 고친 후 다시 시도하세요.',
+ presetOverwriteHelper: '프리셋을 전환하면 현재 Body 설정을 덮어씁니다. 계속하시겠습니까?',
+ customWebhookValidation: {
+ displayNameRequired: '표시 이름을 입력하세요',
+ urlRequired: 'Webhook URL을 입력하세요',
+ urlInvalid: 'Webhook URL은 유효한 HTTP 또는 HTTPS URL이어야 합니다',
+ bodyRequired: '요청 Body를 설정하세요',
+ jsonInvalid: 'JSON Body 템플릿이 올바르지 않습니다',
+ formFieldRequired: 'Form 필드 이름은 필수입니다',
+ formFieldDuplicate: 'Form 필드 이름은 중복될 수 없습니다',
+ headerRequired: 'Header 이름은 필수입니다',
+ headerInvalid: 'Header 이름이 올바르지 않습니다',
+ headerDuplicate: 'Header 이름은 중복될 수 없습니다',
+ headerReserved: '이 Header는 시스템에서 관리하므로 사용자 지정할 수 없습니다',
+ headerMustBeSecret: '인증 또는 자격 증명 Header는 비밀 값으로 설정해야 합니다',
+ templateVariableInvalid: 'Body에 지원되지 않는 템플릿 변수가 있습니다',
+ secretRequired: '비밀 값을 입력하거나 변경하지 않음/지우기를 선택하세요',
+ },
+ alertConfigProHelper: '상용 버전에서는 더 많은 알림 채널을 지원합니다.',
},
theme: {
lingXiaGold: 'LXware Gold',
diff --git a/frontend/src/lang/modules/lo.ts b/frontend/src/lang/modules/lo.ts
index e3f4681c3..0591bbcce 100644
--- a/frontend/src/lang/modules/lo.ts
+++ b/frontend/src/lang/modules/lo.ts
@@ -927,7 +927,6 @@ const message = {
from_remote: 'ໂມເດວນີ້ບໍ່ໄດ້ດາວໂຫຼດຜ່ານ 1Panel, ບໍ່ມີລັອກການດຶງຂໍ້ມູນທີ່ກ່ຽວຂ້ອງ.',
no_logs: 'ລັອກການດຶງຂໍ້ມູນຂອງໂມເດວນີ້ຖືກລຶບແລ້ວ ແລະ ບໍ່ສາມາດເບິ່ງໄດ້.',
vllmVersionHelper: 'ສຳລັບເຊີເວີ FusionXpark GB 10, ກະລຸນາເລືອກເວີຊັນ -cu130.',
- ascendVisibleDevices: 'ອຸປະກອນ Ascend ທີ່ເຫັນໄດ້',
vllmCommandPortHelper: 'ຄຳສັ່ງເລີ່ມຕົ້ນຕ້ອງໃຊ້ພອດ {0}; ບໍ່ດັ່ງນັ້ນຈະບໍ່ສາມາດເຂົ້າເຖິງບໍລິການໄດ້.',
ascendVisibleDevices: 'ອຸປະກອນ Ascend ທີ່ເຫັນໄດ້ (ASCEND_RT_VISIBLE_DEVICES)',
syncModelAccount: 'ຊິ້ງຄ໌ໄປຍັງບັນຊີໂມເດວ',
@@ -1037,7 +1036,6 @@ const message = {
gatewayConcurrency: 'ການເຮັດວຽກພ້ອມກັນຂອງເກດເວປັດຈຸບັນ',
waitingQueue: 'ຄິວລໍຖ້າປັດຈຸບັນ',
currentActiveUsers: 'ຜູ້ໃຊ້ທີ່ກຳລັງໃຊ້ງານ',
- activeStreamingRequests: 'ຄຳຮ້ອງຂໍສະຕຣີມທີ່ກຳລັງໃຊ້ງານ',
modelAccountConcurrency: 'ການເຮັດວຽກພ້ອມກັນຂອງບັນຊີໂມເດວ',
accountAvailability: 'ຄວາມພ້ອມໃຊ້ງານຂອງບັນຊີໂມເດວ',
capacityFull: 'ຄວາມຈຸເຕັມ',
@@ -6476,7 +6474,57 @@ const message = {
feiShuConfigHelper: 'ຕັ້ງຄ່າການແຈ້ງເຕືອນ Feishu',
webhookName: 'ຊື່ບັອດ',
webhookUrl: 'Webhook URL',
- alertConfigProHelper: 'ເວີຊັນ Commercial ຮອງຮັບ WeCom, DingTalk, Feishu ແລະ SMS.',
+ custom: 'Webhook',
+ webhookPreset: 'ຄ່າສຳເລັດ',
+ genericJsonPreset: 'JSON ທົ່ວໄປ',
+ customPreset: 'ກຳນົດເອງ',
+ webhookUrlSecretHelper: 'Webhook URL ຈະຖືກເກັບແບບເຂົ້າລະຫັດ ແລະ ສາມາດເບິ່ງ ຫຼື ແກ້ໄຂໄດ້ຢູ່ບ່ອນນີ້',
+ webhookPublicAddressHelper:
+ 'ຮອງຮັບສະເພາະທີ່ຢູ່ HTTP/HTTPS ທີ່ເຂົ້າເຖິງໄດ້ຈາກເຄືອຂ່າຍສາທາລະນະ; ທີ່ຢູ່ພາຍໃນ, ສ່ວນຕົວ ແລະ ສຳຮອງຈະຖືກບລັອກ',
+ customWebhookRecoveryRequired:
+ 'ການຕັ້ງຄ່ານີ້ບໍ່ຖືກຕ້ອງ ຫຼື ມາຈາກເວີຊັນເກົ່າ. ກະລຸນາປ້ອນ Webhook URL ແລະ Header ລັບທີ່ຈຳເປັນໃໝ່ ແລ້ວບັນທຶກ.',
+ clearSecret: 'ລ້າງ',
+ keepSecret: 'ບໍ່ປ່ຽນແປງ',
+ secretCleared: 'ຄ່າລັບນີ້ຈະຖືກລ້າງເມື່ອບັນທຶກ',
+ bodyType: 'ປະເພດ Body',
+ bodyTemplate: 'ແມ່ແບບ Body',
+ formFieldName: 'ຊື່ຟິວ',
+ formFieldValue: 'ຄ່າຟິວ',
+ addFormField: 'ເພີ່ມຟິວ',
+ webhookAdvanced: 'ຂັ້ນສູງ',
+ headers: 'Headers',
+ headerName: 'ຊື່ Header',
+ headerValue: 'ຄ່າ Header',
+ secretValue: 'ຄ່າລັບ',
+ addHeader: 'ເພີ່ມ Header',
+ templateVariables: 'ຕົວແປແມ່ແບບ',
+ templateVariableTitle: 'ຫົວຂໍ້ແຈ້ງເຕືອນ',
+ templateVariableMessage: 'ເນື້ອຫາແຈ້ງເຕືອນ',
+ templateVariableType: 'ປະເພດແຈ້ງເຕືອນ',
+ templateVariableNodeName: 'ຊື່ໂນດ',
+ templateVariableTimestamp: 'ເວລາເກີດເຫດ',
+ templateVariablesHelper:
+ 'title=ຫົວຂໍ້ແຈ້ງເຕືອນ, message=ເນື້ອຫາ, type=ປະເພດ, nodeName=ຊື່ໂນດ, timestamp=ເວລາເກີດເຫດ. ຄລິກຕົວແປເພື່ອແຊກໃນ Body.',
+ testResultStale: 'ການຕັ້ງຄ່າປ່ຽນແລ້ວ; ຜົນທົດສອບກ່ອນໜ້າບໍ່ຖືກຕ້ອງອີກ',
+ alertConfigChanged: 'ການຕັ້ງຄ່າຖືກອັບເດດແລ້ວ. ໂຫຼດໃໝ່ແລ້ວລອງອີກຄັ້ງ.',
+ presetOverwriteHelper: 'ການປ່ຽນຄ່າສຳເລັດຈະແທນການຕັ້ງຄ່າ Body ປັດຈຸບັນ. ສືບຕໍ່ບໍ?',
+ customWebhookValidation: {
+ displayNameRequired: 'ປ້ອນຊື່ສະແດງ',
+ urlRequired: 'ປ້ອນ Webhook URL',
+ urlInvalid: 'Webhook URL ຕ້ອງເປັນ HTTP ຫຼື HTTPS ທີ່ຖືກຕ້ອງ',
+ bodyRequired: 'ຕັ້ງຄ່າ Body ຂອງຄຳຂໍ',
+ jsonInvalid: 'ແມ່ແບບ JSON Body ບໍ່ຖືກຕ້ອງ',
+ formFieldRequired: 'ຊື່ຟິວ Form ແມ່ນຈຳເປັນ',
+ formFieldDuplicate: 'ຊື່ຟິວ Form ຕ້ອງບໍ່ຊ້ຳກັນ',
+ headerRequired: 'ຊື່ Headers ແມ່ນຈຳເປັນ',
+ headerInvalid: 'ຊື່ Header ບໍ່ຖືກຕ້ອງ',
+ headerDuplicate: 'ຊື່ Headers ຕ້ອງບໍ່ຊ້ຳກັນ',
+ headerReserved: 'Header ນີ້ຖືກຈັດການໂດຍລະບົບ ແລະ ປັບແຕ່ງບໍ່ໄດ້',
+ headerMustBeSecret: 'Header ການຢືນຢັນ ຫຼື ຂໍ້ມູນຮັບຮອງຕ້ອງຕັ້ງເປັນຄ່າລັບ',
+ templateVariableInvalid: 'Body ມີຕົວແປແມ່ແບບທີ່ບໍ່ຮອງຮັບ',
+ secretRequired: 'ປ້ອນຄ່າລັບ ຫຼື ເລືອກບໍ່ປ່ຽນແປງ/ລ້າງ',
+ },
+ alertConfigProHelper: 'ເວີຊັນ Commercial ເພີ່ມຊ່ອງທາງແຈ້ງເຕືອນອື່ນໆ.',
recipientPlaceholder: 'ກະລຸນາປ້ອນທີ່ຢູ່ອີເມລຜູ້ຮັບ',
addRecipient: 'ເພີ່ມຜູ້ຮັບ',
webhookItem: 'Webhook',
diff --git a/frontend/src/lang/modules/ms.ts b/frontend/src/lang/modules/ms.ts
index 78ad94245..09ced39dc 100644
--- a/frontend/src/lang/modules/ms.ts
+++ b/frontend/src/lang/modules/ms.ts
@@ -958,7 +958,6 @@ const message = {
from_remote: 'Model ini tidak dimuat turun melalui 1Panel; tiada log muat turun berkaitan.',
no_logs: 'Log muat turun model ini telah dipadam dan tidak boleh dilihat.',
vllmVersionHelper: 'Untuk pelayan FusionXpark GB 10, sila pilih versi -cu130.',
- ascendVisibleDevices: 'Peranti Ascend yang kelihatan',
vllmCommandPortHelper:
'Perintah permulaan mesti menggunakan port {0}; jika tidak, perkhidmatan tidak dapat diakses.',
ascendVisibleDevices: 'Peranti Ascend boleh dilihat (ASCEND_RT_VISIBLE_DEVICES)',
@@ -1151,7 +1150,6 @@ const message = {
cachedToken: 'Token cache',
cacheHitRate: 'Kadar hit cache',
activeUsers: 'Pengguna aktif',
- activeStreamingRequests: 'Permintaan penstriman aktif',
activeModels: 'Model aktif',
failedRequests: 'Permintaan gagal',
averageTokenPerRequest: 'Purata Token/permintaan',
@@ -6809,7 +6807,57 @@ const message = {
barkConfigHelper: 'Konfigurasi pemberitahuan amaran Bark',
webhookName: 'Nama bot',
webhookUrl: 'URL Webhook',
- alertConfigProHelper: 'Edisi Komersial turut menyokong amaran WeCom, DingTalk, Feishu dan SMS.',
+ custom: 'Webhook',
+ webhookPreset: 'Pratetap',
+ genericJsonPreset: 'JSON umum',
+ customPreset: 'Tersuai',
+ webhookUrlSecretHelper: 'URL Webhook disimpan secara disulitkan dan boleh dilihat serta diedit di sini',
+ webhookPublicAddressHelper:
+ 'Hanya alamat HTTP/HTTPS yang boleh dicapai secara awam disokong; alamat setempat, peribadi dan simpanan disekat',
+ customWebhookRecoveryRequired:
+ 'Konfigurasi ini tidak sah atau daripada versi lama. Masukkan semula URL Webhook dan Header rahsia yang diperlukan, kemudian simpan.',
+ clearSecret: 'Kosongkan',
+ keepSecret: 'Kekalkan',
+ secretCleared: 'Rahsia ini akan dikosongkan apabila disimpan',
+ bodyType: 'Jenis Body',
+ bodyTemplate: 'Templat Body',
+ formFieldName: 'Nama medan',
+ formFieldValue: 'Nilai medan',
+ addFormField: 'Tambah medan',
+ webhookAdvanced: 'Lanjutan',
+ headers: 'Headers',
+ headerName: 'Nama Header',
+ headerValue: 'Nilai Header',
+ secretValue: 'Nilai rahsia',
+ addHeader: 'Tambah Header',
+ templateVariables: 'Pemboleh ubah templat',
+ templateVariableTitle: 'Tajuk amaran',
+ templateVariableMessage: 'Kandungan amaran',
+ templateVariableType: 'Jenis amaran',
+ templateVariableNodeName: 'Nama nod',
+ templateVariableTimestamp: 'Masa kejadian',
+ templateVariablesHelper:
+ 'title=tajuk amaran, message=kandungan, type=jenis, nodeName=nama nod, timestamp=masa kejadian. Klik pemboleh ubah untuk memasukkannya ke dalam Body.',
+ testResultStale: 'Konfigurasi telah berubah; keputusan ujian sebelumnya tidak lagi sah',
+ alertConfigChanged: 'Konfigurasi telah dikemas kini. Muat semula dan cuba lagi.',
+ presetOverwriteHelper: 'Menukar pratetap akan menggantikan konfigurasi Body semasa. Teruskan?',
+ customWebhookValidation: {
+ displayNameRequired: 'Masukkan nama paparan',
+ urlRequired: 'Masukkan URL Webhook',
+ urlInvalid: 'URL Webhook mestilah URL HTTP atau HTTPS yang sah',
+ bodyRequired: 'Konfigurasikan Body permintaan',
+ jsonInvalid: 'Templat JSON Body tidak sah',
+ formFieldRequired: 'Nama medan Form diperlukan',
+ formFieldDuplicate: 'Nama medan Form mestilah unik',
+ headerRequired: 'Nama Headers diperlukan',
+ headerInvalid: 'Nama Header tidak sah',
+ headerDuplicate: 'Nama Headers mestilah unik',
+ headerReserved: 'Header ini diurus oleh sistem dan tidak boleh disesuaikan',
+ headerMustBeSecret: 'Header pengesahan atau kelayakan mesti ditandai sebagai nilai rahsia',
+ templateVariableInvalid: 'Body mengandungi pemboleh ubah templat yang tidak disokong',
+ secretRequired: 'Masukkan nilai rahsia atau pilih Kekalkan atau Kosongkan',
+ },
+ alertConfigProHelper: 'Edisi Komersial menambah lebih banyak saluran pemberitahuan.',
},
theme: {
lingXiaGold: 'LXware Gold',
diff --git a/frontend/src/lang/modules/pt-br.ts b/frontend/src/lang/modules/pt-br.ts
index b5c4c2f1a..52eb90409 100644
--- a/frontend/src/lang/modules/pt-br.ts
+++ b/frontend/src/lang/modules/pt-br.ts
@@ -954,7 +954,6 @@ const message = {
from_remote: 'Este modelo não foi baixado pelo 1Panel; não há logs de download relacionados.',
no_logs: 'Os logs de download deste modelo foram excluídos e não podem ser visualizados.',
vllmVersionHelper: 'Para servidores FusionXpark GB 10, selecione a versão -cu130.',
- ascendVisibleDevices: 'Dispositivos Ascend visíveis',
vllmCommandPortHelper:
'O comando de inicialização deve usar a porta {0}; caso contrário, o serviço ficará inacessível.',
ascendVisibleDevices: 'Dispositivos Ascend visíveis (ASCEND_RT_VISIBLE_DEVICES)',
@@ -1148,7 +1147,6 @@ const message = {
cachedToken: 'Tokens em cache',
cacheHitRate: 'Taxa de acerto do cache',
activeUsers: 'Usuários ativos',
- activeStreamingRequests: 'Solicitações de streaming ativas',
activeModels: 'Modelos ativos',
failedRequests: 'Requisições com falha',
averageTokenPerRequest: 'Média de Token/requisição',
@@ -6848,8 +6846,57 @@ const message = {
barkConfigHelper: 'Configuração de notificação de alerta Bark',
webhookName: 'Nome do bot',
webhookUrl: 'URL do Webhook',
- alertConfigProHelper:
- 'A edição comercial também oferece suporte a alertas via WeCom, DingTalk, Feishu e SMS.',
+ custom: 'Webhook',
+ webhookPreset: 'Predefinição',
+ genericJsonPreset: 'JSON genérico',
+ customPreset: 'Personalizado',
+ webhookUrlSecretHelper: 'A URL do Webhook é armazenada criptografada e pode ser vista e editada aqui',
+ webhookPublicAddressHelper:
+ 'Somente endereços HTTP/HTTPS acessíveis publicamente são aceitos; endereços locais, privados e reservados são bloqueados',
+ customWebhookRecoveryRequired:
+ 'Esta configuração é inválida ou veio de uma versão anterior. Informe novamente a URL do Webhook e os headers secretos necessários e salve.',
+ clearSecret: 'Limpar',
+ keepSecret: 'Manter inalterado',
+ secretCleared: 'Este segredo será limpo ao salvar',
+ bodyType: 'Tipo do Body',
+ bodyTemplate: 'Modelo do Body',
+ formFieldName: 'Nome do campo',
+ formFieldValue: 'Valor do campo',
+ addFormField: 'Adicionar campo',
+ webhookAdvanced: 'Avançado',
+ headers: 'Headers',
+ headerName: 'Nome do Header',
+ headerValue: 'Valor do Header',
+ secretValue: 'Valor secreto',
+ addHeader: 'Adicionar Header',
+ templateVariables: 'Variáveis do modelo',
+ templateVariableTitle: 'Título do alerta',
+ templateVariableMessage: 'Conteúdo do alerta',
+ templateVariableType: 'Tipo de alerta',
+ templateVariableNodeName: 'Nome do nó',
+ templateVariableTimestamp: 'Hora do evento',
+ templateVariablesHelper:
+ 'title=título do alerta, message=conteúdo, type=tipo, nodeName=nome do nó, timestamp=hora do evento. Clique para inserir a variável no Body.',
+ testResultStale: 'A configuração foi alterada; o resultado do teste anterior não é mais válido',
+ alertConfigChanged: 'A configuração foi atualizada. Atualize a página e tente novamente.',
+ presetOverwriteHelper: 'Trocar a predefinição substituirá a configuração atual do Body. Continuar?',
+ customWebhookValidation: {
+ displayNameRequired: 'Informe um nome de exibição',
+ urlRequired: 'Informe uma URL de Webhook',
+ urlInvalid: 'A URL do Webhook deve ser uma URL HTTP ou HTTPS válida',
+ bodyRequired: 'Configure o Body da solicitação',
+ jsonInvalid: 'O modelo JSON do Body é inválido',
+ formFieldRequired: 'Os nomes dos campos Form são obrigatórios',
+ formFieldDuplicate: 'Os nomes dos campos Form devem ser únicos',
+ headerRequired: 'Os nomes dos Headers são obrigatórios',
+ headerInvalid: 'O nome do Header é inválido',
+ headerDuplicate: 'Os nomes dos Headers devem ser únicos',
+ headerReserved: 'Este Header é gerenciado pelo sistema e não pode ser personalizado',
+ headerMustBeSecret: 'Headers de autenticação ou credenciais devem ser marcados como valores secretos',
+ templateVariableInvalid: 'O Body contém uma variável de modelo não compatível',
+ secretRequired: 'Informe um segredo ou escolha Manter inalterado ou Limpar',
+ },
+ alertConfigProHelper: 'A edição comercial adiciona mais canais de notificação.',
},
theme: {
lingXiaGold: 'LXware Gold',
diff --git a/frontend/src/lang/modules/ru.ts b/frontend/src/lang/modules/ru.ts
index 9c66e0b9d..f8c7a10f4 100644
--- a/frontend/src/lang/modules/ru.ts
+++ b/frontend/src/lang/modules/ru.ts
@@ -947,7 +947,6 @@ const message = {
from_remote: 'Эта модель не была загружена через 1Panel, нет связанных журналов извлечения.',
no_logs: 'Журналы извлечения для этой модели были удалены и не могут быть просмотрены.',
vllmVersionHelper: 'Для серверов FusionXpark GB 10 выберите версию -cu130.',
- ascendVisibleDevices: 'Видимые устройства Ascend',
vllmCommandPortHelper: 'Команда запуска должна использовать порт {0}, иначе сервис будет недоступен.',
ascendVisibleDevices: 'Видимые устройства Ascend (ASCEND_RT_VISIBLE_DEVICES)',
syncModelAccount: 'Синхронизировать с аккаунтом модели',
@@ -1139,7 +1138,6 @@ const message = {
cachedToken: 'Кэшированные Token',
cacheHitRate: 'Попадания в кэш',
activeUsers: 'Активные пользователи',
- activeStreamingRequests: 'Активные потоковые запросы',
activeModels: 'Активные модели',
failedRequests: 'Неуспешные запросы',
averageTokenPerRequest: 'Среднее Token/запрос',
@@ -6817,8 +6815,58 @@ const message = {
barkConfigHelper: 'Конфигурация уведомлений Bark',
webhookName: 'Имя бота',
webhookUrl: 'URL Webhook',
- alertConfigProHelper:
- 'Коммерческая версия дополнительно поддерживает уведомления через WeCom, DingTalk, Feishu и SMS.',
+ custom: 'Webhook',
+ webhookPreset: 'Предустановка',
+ genericJsonPreset: 'Универсальный JSON',
+ customPreset: 'Пользовательский',
+ webhookUrlSecretHelper:
+ 'URL Webhook хранится в зашифрованном виде; здесь его можно просматривать и изменять',
+ webhookPublicAddressHelper:
+ 'Поддерживаются только общедоступные адреса HTTP/HTTPS; локальные, частные и зарезервированные адреса блокируются',
+ customWebhookRecoveryRequired:
+ 'Эта конфигурация недействительна или создана в старой версии. Повторно укажите URL Webhook и необходимые секретные заголовки, затем сохраните.',
+ clearSecret: 'Очистить',
+ keepSecret: 'Не изменять',
+ secretCleared: 'Этот секрет будет очищен при сохранении',
+ bodyType: 'Тип Body',
+ bodyTemplate: 'Шаблон Body',
+ formFieldName: 'Имя поля',
+ formFieldValue: 'Значение поля',
+ addFormField: 'Добавить поле',
+ webhookAdvanced: 'Дополнительно',
+ headers: 'Headers',
+ headerName: 'Имя Header',
+ headerValue: 'Значение Header',
+ secretValue: 'Секретное значение',
+ addHeader: 'Добавить Header',
+ templateVariables: 'Переменные шаблона',
+ templateVariableTitle: 'Заголовок оповещения',
+ templateVariableMessage: 'Содержимое оповещения',
+ templateVariableType: 'Тип оповещения',
+ templateVariableNodeName: 'Имя узла',
+ templateVariableTimestamp: 'Время события',
+ templateVariablesHelper:
+ 'title=заголовок, message=содержимое, type=тип, nodeName=имя узла, timestamp=время события. Нажмите переменную, чтобы вставить её в Body.',
+ testResultStale: 'Конфигурация изменена, поэтому предыдущий результат теста больше недействителен',
+ alertConfigChanged: 'Конфигурация обновлена. Обновите страницу и повторите попытку.',
+ presetOverwriteHelper: 'Смена предустановки заменит текущую конфигурацию Body. Продолжить?',
+ customWebhookValidation: {
+ displayNameRequired: 'Введите отображаемое имя',
+ urlRequired: 'Введите URL Webhook',
+ urlInvalid: 'URL Webhook должен быть корректным адресом HTTP или HTTPS',
+ bodyRequired: 'Настройте Body запроса',
+ jsonInvalid: 'Недопустимый шаблон JSON Body',
+ formFieldRequired: 'Имена полей Form обязательны',
+ formFieldDuplicate: 'Имена полей Form не должны повторяться',
+ headerRequired: 'Имена Headers обязательны',
+ headerInvalid: 'Недопустимое имя Header',
+ headerDuplicate: 'Имена Headers не должны повторяться',
+ headerReserved: 'Этот Header управляется системой и не может быть изменён',
+ headerMustBeSecret: 'Заголовки аутентификации или учетных данных должны быть отмечены как секретные',
+ templateVariableInvalid: 'Body содержит неподдерживаемую переменную шаблона',
+ secretRequired: 'Введите секрет или выберите Не изменять либо Очистить',
+ },
+ alertConfigProHelper: 'Коммерческая версия добавляет дополнительные каналы уведомлений.',
},
theme: {
lingXiaGold: 'LXware Gold',
diff --git a/frontend/src/lang/modules/tr.ts b/frontend/src/lang/modules/tr.ts
index 7745bc810..751b2ab65 100644
--- a/frontend/src/lang/modules/tr.ts
+++ b/frontend/src/lang/modules/tr.ts
@@ -956,7 +956,6 @@ const message = {
from_remote: 'Bu model 1Panel aracılığıyla indirilmedi, ilgili çekme logları yok.',
no_logs: 'Bu modelin çekme logları silindi ve görüntülenemiyor.',
vllmVersionHelper: 'FusionXpark GB 10 sunucuları için lütfen -cu130 sürümünü seçin.',
- ascendVisibleDevices: 'Görünür Ascend cihazları',
vllmCommandPortHelper:
'Başlatma komutu {0} numaralı bağlantı noktasını kullanmalıdır; aksi halde hizmete erişilemez.',
ascendVisibleDevices: 'Görünür Ascend cihazları (ASCEND_RT_VISIBLE_DEVICES)',
@@ -1148,7 +1147,6 @@ const message = {
cachedToken: 'Önbellek Token',
cacheHitRate: 'Önbellek İsabet Oranı',
activeUsers: 'Aktif kullanıcılar',
- activeStreamingRequests: 'Etkin akış istekleri',
activeModels: 'Aktif modeller',
failedRequests: 'Başarısız istekler',
averageTokenPerRequest: 'Ortalama Token/istek',
@@ -6817,7 +6815,58 @@ const message = {
barkConfigHelper: 'Bark uyarı bildirim yapılandırması',
webhookName: 'Bot adı',
webhookUrl: 'Webhook URL',
- alertConfigProHelper: 'Ticari sürüm ayrıca WeCom, DingTalk, Feishu ve SMS bildirimlerini destekler.',
+ custom: 'Webhook',
+ webhookPreset: 'Ön ayar',
+ genericJsonPreset: 'Genel JSON',
+ customPreset: 'Özel',
+ webhookUrlSecretHelper: 'Webhook URL şifreli olarak saklanır ve burada görüntülenip düzenlenebilir',
+ webhookPublicAddressHelper:
+ 'Yalnızca genel ağdan erişilebilen HTTP/HTTPS adresleri desteklenir; yerel, özel ve ayrılmış adresler engellenir',
+ customWebhookRecoveryRequired:
+ 'Bu yapılandırma geçersiz veya eski bir sürümden geliyor. Webhook URL ve gerekli gizli Header değerlerini yeniden girip kaydedin.',
+ clearSecret: 'Temizle',
+ keepSecret: 'Değiştirme',
+ secretCleared: 'Kaydettiğinizde bu gizli değer temizlenecek',
+ bodyType: 'Body türü',
+ bodyTemplate: 'Body şablonu',
+ formFieldName: 'Alan adı',
+ formFieldValue: 'Alan değeri',
+ addFormField: 'Alan ekle',
+ webhookAdvanced: 'Gelişmiş',
+ headers: 'Headers',
+ headerName: 'Header adı',
+ headerValue: 'Header değeri',
+ secretValue: 'Gizli değer',
+ addHeader: 'Header ekle',
+ templateVariables: 'Şablon değişkenleri',
+ templateVariableTitle: 'Uyarı başlığı',
+ templateVariableMessage: 'Uyarı içeriği',
+ templateVariableType: 'Uyarı türü',
+ templateVariableNodeName: 'Düğüm adı',
+ templateVariableTimestamp: 'Olay zamanı',
+ templateVariablesHelper:
+ 'title=uyarı başlığı, message=içerik, type=tür, nodeName=düğüm adı, timestamp=olay zamanı. Body içine eklemek için değişkene tıklayın.',
+ testResultStale: 'Yapılandırma değişti; önceki test sonucu artık geçerli değil',
+ alertConfigChanged: 'Yapılandırma güncellendi. Yenileyip tekrar deneyin.',
+ presetOverwriteHelper: 'Ön ayarı değiştirmek mevcut Body yapılandırmasını değiştirecek. Devam edilsin mi?',
+ customWebhookValidation: {
+ displayNameRequired: 'Bir görünen ad girin',
+ urlRequired: 'Bir Webhook URL girin',
+ urlInvalid: 'Webhook URL geçerli bir HTTP veya HTTPS URL olmalıdır',
+ bodyRequired: 'İstek Body içeriğini yapılandırın',
+ jsonInvalid: 'JSON Body şablonu geçersiz',
+ formFieldRequired: 'Form alan adları zorunludur',
+ formFieldDuplicate: 'Form alan adları benzersiz olmalıdır',
+ headerRequired: 'Header adları zorunludur',
+ headerInvalid: 'Header adı geçersiz',
+ headerDuplicate: 'Header adları benzersiz olmalıdır',
+ headerReserved: 'Bu Header sistem tarafından yönetilir ve özelleştirilemez',
+ headerMustBeSecret:
+ 'Kimlik doğrulama veya kimlik bilgisi Header alanları gizli değer olarak işaretlenmelidir',
+ templateVariableInvalid: 'Body desteklenmeyen bir şablon değişkeni içeriyor',
+ secretRequired: 'Bir gizli değer girin veya Değiştirme ya da Temizle seçeneğini kullanın',
+ },
+ alertConfigProHelper: 'Ticari sürüm daha fazla bildirim kanalı ekler.',
},
theme: {
lingXiaGold: 'LXware Gold',
diff --git a/frontend/src/lang/modules/zh-Hant.ts b/frontend/src/lang/modules/zh-Hant.ts
index 32423c5c2..e72f95f21 100644
--- a/frontend/src/lang/modules/zh-Hant.ts
+++ b/frontend/src/lang/modules/zh-Hant.ts
@@ -898,7 +898,6 @@ const message = {
from_remote: '該模型並非透過 1Panel 下載，無相關拉取日誌。',
no_logs: '該模型的拉取日誌已被刪除，無法檢視相關日誌。',
vllmVersionHelper: 'FusionXpark GB 10 伺服器請選擇 -cu130 版本',
- ascendVisibleDevices: 'Ascend 可見裝置',
vllmCommandPortHelper: '啟動命令必須使用 {0} 連接埠，否則服務將無法存取。',
ascendVisibleDevices: 'Ascend 可見裝置（ASCEND_RT_VISIBLE_DEVICES）',
syncModelAccount: '同步到模型帳號',
@@ -1083,7 +1082,6 @@ const message = {
cachedToken: '快取 Token',
cacheHitRate: '快取命中率',
activeUsers: '活躍使用者',
- activeStreamingRequests: '活躍串流請求',
activeModels: '活躍模型',
failedRequests: '失敗請求',
averageTokenPerRequest: '平均 Token/請求',
@@ -6229,7 +6227,56 @@ const message = {
barkConfigHelper: 'Bark 告警通知設定',
webhookName: '機器人名稱',
webhookUrl: 'Webhook 位址',
- alertConfigProHelper: '商業版額外支援企業微信、釘釘、飛書及簡訊告警。',
+ custom: 'Webhook',
+ webhookPreset: '預設',
+ genericJsonPreset: '通用 JSON',
+ customPreset: '自訂',
+ webhookUrlSecretHelper: 'Webhook 位址會加密儲存，可在此檢視與編輯',
+ webhookPublicAddressHelper: '僅支援可由公網存取的 HTTP/HTTPS 位址；本機、內網和保留位址會被攔截',
+ customWebhookRecoveryRequired:
+ '目前設定已失效或來自舊版本，請重新填寫 Webhook 位址及所需的敏感 Header 後儲存',
+ clearSecret: '清除',
+ keepSecret: '保持不變',
+ secretCleared: '儲存後將清除此敏感值',
+ bodyType: 'Body 類型',
+ bodyTemplate: 'Body 範本',
+ formFieldName: '欄位名稱',
+ formFieldValue: '欄位值',
+ addFormField: '新增欄位',
+ webhookAdvanced: '進階設定',
+ headers: 'Headers',
+ headerName: 'Header 名稱',
+ headerValue: 'Header 值',
+ secretValue: '敏感值',
+ addHeader: '新增 Header',
+ templateVariables: '範本變數',
+ templateVariableTitle: '告警標題',
+ templateVariableMessage: '告警內容',
+ templateVariableType: '告警類型',
+ templateVariableNodeName: '節點名稱',
+ templateVariableTimestamp: '發生時間',
+ templateVariablesHelper:
+ 'title=告警標題，message=告警內容，type=告警類型，nodeName=節點名稱，timestamp=發生時間；點選變數可插入 Body。',
+ testResultStale: '設定已變更，先前的測試結果已失效',
+ alertConfigChanged: '設定已更新，請重新整理後再試',
+ presetOverwriteHelper: '切換預設將覆寫目前的 Body 設定，是否繼續？',
+ customWebhookValidation: {
+ displayNameRequired: '請輸入顯示名稱',
+ urlRequired: '請輸入 Webhook 位址',
+ urlInvalid: 'Webhook 位址必須是有效的 HTTP 或 HTTPS 位址',
+ bodyRequired: '請設定請求 Body',
+ jsonInvalid: 'JSON Body 範本格式無效',
+ formFieldRequired: 'Form 欄位名稱不能為空',
+ formFieldDuplicate: 'Form 欄位名稱不能重複',
+ headerRequired: 'Header 名稱不能為空',
+ headerInvalid: 'Header 名稱格式無效',
+ headerDuplicate: 'Header 名稱不能重複',
+ headerReserved: '此 Header 由系統管理，無法自訂',
+ headerMustBeSecret: '驗證或憑證類 Header 必須設為敏感值',
+ templateVariableInvalid: 'Body 包含不支援的範本變數',
+ secretRequired: '請輸入敏感值，或選擇保持不變/清除',
+ },
+ alertConfigProHelper: '商業版額外支援更多通知通道。',
},
theme: {
lingXiaGold: 'LXware Gold',
diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index 011386029..f06d92ee7 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -911,7 +911,6 @@ const message = {
from_remote: '该模型并非通过 1Panel 下载，无相关拉取日志。',
no_logs: '该模型的拉取日志已被删除，无法查看相关日志。',
vllmVersionHelper: 'FusionXpark GB 10 服务器请选择 -cu130 版本',
- ascendVisibleDevices: 'Ascend 可见设备',
vllmCommandPortHelper: '启动命令必须使用 {0} 端口，否则服务将无法访问。',
ascendVisibleDevices: 'Ascend 可见设备（ASCEND_RT_VISIBLE_DEVICES）',
syncModelAccount: '同步到模型账号',
@@ -1097,7 +1096,6 @@ const message = {
cachedToken: '缓存 Token',
cacheHitRate: '缓存命中率',
activeUsers: '活跃用户',
- activeStreamingRequests: '活跃流式请求',
activeModels: '活跃模型',
failedRequests: '失败请求',
averageTokenPerRequest: '平均 Token/请求',
@@ -6286,6 +6284,55 @@ const message = {
barkConfigHelper: 'Bark 告警通知配置',
webhookName: '机器人名称',
webhookUrl: 'Webhook 地址',
+ custom: 'Webhook',
+ webhookPreset: '预设',
+ genericJsonPreset: '通用 JSON',
+ customPreset: '自定义',
+ webhookUrlSecretHelper: 'Webhook 地址加密存储，可在此查看和编辑',
+ webhookPublicAddressHelper: '仅支持公网可访问的 HTTP/HTTPS 地址；本机、内网和保留地址会被拦截',
+ customWebhookRecoveryRequired:
+ '当前配置已失效或来自旧版本，请重新填写 Webhook 地址及所需的敏感 Header 后保存',
+ clearSecret: '清除',
+ keepSecret: '保持不变',
+ secretCleared: '保存后将清除此敏感值',
+ bodyType: 'Body 类型',
+ bodyTemplate: 'Body 模板',
+ formFieldName: '字段名',
+ formFieldValue: '字段值',
+ addFormField: '添加字段',
+ webhookAdvanced: '高级配置',
+ headers: 'Headers',
+ headerName: 'Header 名称',
+ headerValue: 'Header 值',
+ secretValue: '敏感值',
+ addHeader: '添加 Header',
+ templateVariables: '模板变量',
+ templateVariableTitle: '告警标题',
+ templateVariableMessage: '告警内容',
+ templateVariableType: '告警类型',
+ templateVariableNodeName: '节点名称',
+ templateVariableTimestamp: '发生时间',
+ templateVariablesHelper:
+ 'title=告警标题，message=告警内容，type=告警类型，nodeName=节点名称，timestamp=发生时间；点击变量可插入 Body。',
+ testResultStale: '配置已更改，之前的测试结果已失效',
+ alertConfigChanged: '配置已更新，请刷新后重试',
+ presetOverwriteHelper: '切换预设将覆盖当前 Body 配置，是否继续？',
+ customWebhookValidation: {
+ displayNameRequired: '请输入显示名称',
+ urlRequired: '请输入 Webhook 地址',
+ urlInvalid: 'Webhook 地址必须是有效的 HTTP 或 HTTPS 地址',
+ bodyRequired: '请配置请求 Body',
+ jsonInvalid: 'JSON Body 模板格式无效',
+ formFieldRequired: 'Form 字段名不能为空',
+ formFieldDuplicate: 'Form 字段名不能重复',
+ headerRequired: 'Header 名称不能为空',
+ headerInvalid: 'Header 名称格式无效',
+ headerDuplicate: 'Header 名称不能重复',
+ headerReserved: '该 Header 由系统管理，不能自定义',
+ headerMustBeSecret: '认证或凭证类 Header 必须设为敏感值',
+ templateVariableInvalid: 'Body 中包含不支持的模板变量',
+ secretRequired: '请输入敏感值，或选择保持不变/清除',
+ },
alertConfigProHelper: '商业版额外支持企业微信、钉钉、飞书及短信告警。',
recipientPlaceholder: '请输入收件人邮箱地址',
addRecipient: '添加收件人',
diff --git a/frontend/src/views/cronjob/cronjob/operate/index.vue b/frontend/src/views/cronjob/cronjob/operate/index.vue
index 131f25f84..96de8f0ef 100644
--- a/frontend/src/views/cronjob/cronjob/operate/index.vue
+++ b/frontend/src/views/cronjob/cronjob/operate/index.vue
@@ -870,6 +870,7 @@ import { splitTimeFromSecond, transferTimeToSecond } from '@/utils/validate';
import { getGroupList } from '@/api/modules/group';
import { routerToName, routerToPath } from '@/utils/router';
import { loadBaseDir } from '@/api/modules/setting';
+import { getAlertConfigDisplayName } from '@/views/setting/alert/setting/drawer/secret-field';
const router = useRouter();
const { docsUrl, isFxplay, isProductPro } = useGlobalStore();
@@ -914,6 +915,8 @@ const legacyAlertMethodTypeMap: Record = {
weCom: 'weCom',
dingTalk: 'dingTalk',
feiShu: 'feiShu',
+ webhook: 'custom',
+ custom: 'custom',
};
const normalizeAlertMethodItems = (methods: string[]) => {
@@ -935,7 +938,7 @@ const groupedAlertConfigOptions = computed(() => {
type: string;
options: { value: string; label: string; typeLabel: string }[];
}[] = [];
- const typeOrder = ['email', 'sms', 'weCom', 'dingTalk', 'feiShu', 'bark'];
+ const typeOrder = ['email', 'sms', 'weCom', 'dingTalk', 'feiShu', 'bark', 'custom'];
for (const t of typeOrder) {
if (typeMap.has(t)) {
const typeLabel = getConfigTypeLabel(t);
@@ -948,6 +951,14 @@ const groupedAlertConfigOptions = computed(() => {
});
}
}
+ for (const [type, options] of typeMap) {
+ if (typeOrder.includes(type)) continue;
+ const typeLabel = getConfigTypeLabel(type);
+ groups.push({
+ type,
+ options: options.map((item) => ({ ...item, typeLabel })),
+ });
+ }
return groups;
});
@@ -957,8 +968,11 @@ const getConfigTypeLabel = (type: string): string => {
const getAlertConfigOptionLabel = (c: Alert.AlertConfigInfo): string => {
try {
- const cfg = JSON.parse(c.config || '{}');
- return cfg.displayName || i18n.global.t(`xpack.alert.${c.type === 'email' ? 'mail' : c.type}`);
+ const cfg = JSON.parse(c.config || '{}') as Record;
+ return (
+ getAlertConfigDisplayName(c.type, cfg) ||
+ i18n.global.t(`xpack.alert.${c.type === 'email' ? 'mail' : c.type}`)
+ );
} catch {
return i18n.global.t(`xpack.alert.${c.type === 'email' ? 'mail' : c.type}`);
}
diff --git a/frontend/src/views/setting/alert/dash/index.vue b/frontend/src/views/setting/alert/dash/index.vue
index cbe1f0229..10ac7f699 100644
--- a/frontend/src/views/setting/alert/dash/index.vue
+++ b/frontend/src/views/setting/alert/dash/index.vue
@@ -160,6 +160,7 @@
+
+
diff --git a/frontend/src/views/setting/alert/setting/drawer/custom-webhook.ts b/frontend/src/views/setting/alert/setting/drawer/custom-webhook.ts
new file mode 100644
index 000000000..a36a5ab57
--- /dev/null
+++ b/frontend/src/views/setting/alert/setting/drawer/custom-webhook.ts
@@ -0,0 +1,653 @@
+export const CUSTOM_WEBHOOK_TYPE = 'custom';
+export const CUSTOM_WEBHOOK_SCHEMA_VERSION = 1 as const;
+export const CUSTOM_WEBHOOK_LIMITS = {
+ url: 8192,
+ headers: 64,
+ headerName: 256,
+ headerValue: 16 * 1024,
+ body: 256 * 1024,
+ formFields: 128,
+} as const;
+
+export type CustomWebhookPreset = 'genericJson' | 'slack' | 'discord' | 'teamsWorkflows' | 'custom';
+export type CustomWebhookBodyType = 'json' | 'form' | 'text';
+export type CustomWebhookSecretAction = 'keep' | 'replace' | 'clear';
+
+export interface CustomWebhookSecretView {
+ configured: boolean;
+ masked?: string;
+ value?: string;
+}
+
+export interface CustomWebhookSecretDraft extends CustomWebhookSecretView {
+ masked: string;
+ action: CustomWebhookSecretAction;
+ value: string;
+ originalValue?: string;
+}
+
+export interface CustomWebhookFormField {
+ uid: string;
+ key: string;
+ value: string;
+}
+
+export interface CustomWebhookFormFieldView {
+ uid?: string;
+ key: string;
+ value: string;
+}
+
+export interface CustomWebhookHeaderView {
+ uid: string;
+ key: string;
+ secret: boolean;
+ value?: string;
+ configured?: boolean;
+ masked?: string;
+}
+
+export interface CustomWebhookHeaderDraft {
+ uid: string;
+ key: string;
+ secret: boolean;
+ configured: boolean;
+ masked: string;
+ action: CustomWebhookSecretAction;
+ value: string;
+ originalValue?: string;
+}
+
+export interface CustomWebhookBody {
+ type: CustomWebhookBodyType;
+ template: string;
+ fields: CustomWebhookFormField[];
+}
+
+export interface CustomWebhookBodyView {
+ type: CustomWebhookBodyType;
+ template: string;
+ fields: CustomWebhookFormFieldView[];
+}
+
+export interface CustomWebhookConfigView {
+ schemaVersion: typeof CUSTOM_WEBHOOK_SCHEMA_VERSION;
+ state?: 'legacy' | 'invalid';
+ displayName: string;
+ preset: CustomWebhookPreset;
+ method?: 'POST';
+ url: CustomWebhookSecretView | string;
+ body: Partial;
+ headers: CustomWebhookHeaderView[];
+}
+
+export interface CustomWebhookDraft {
+ schemaVersion: typeof CUSTOM_WEBHOOK_SCHEMA_VERSION;
+ state?: 'legacy' | 'invalid';
+ displayName: string;
+ preset: CustomWebhookPreset;
+ url: CustomWebhookSecretDraft;
+ body: CustomWebhookBody;
+ headers: CustomWebhookHeaderDraft[];
+}
+
+export interface CustomWebhookSecretMutation {
+ action: CustomWebhookSecretAction;
+ value?: string;
+}
+
+export interface CustomWebhookConfigUpdate {
+ schemaVersion: typeof CUSTOM_WEBHOOK_SCHEMA_VERSION;
+ displayName: string;
+ preset: CustomWebhookPreset;
+ method: 'POST';
+ url: CustomWebhookSecretMutation;
+ body: {
+ type: CustomWebhookBodyType;
+ template: string;
+ fields: Array<{
+ key: string;
+ value: string;
+ }>;
+ };
+ headers: Array<{
+ uid: string;
+ key: string;
+ secret: boolean;
+ action: CustomWebhookSecretAction;
+ value?: string;
+ }>;
+}
+
+export interface CustomWebhookValidationIssue {
+ field: string;
+ code:
+ | 'displayNameRequired'
+ | 'urlRequired'
+ | 'urlInvalid'
+ | 'bodyRequired'
+ | 'jsonInvalid'
+ | 'formFieldRequired'
+ | 'formFieldDuplicate'
+ | 'headerRequired'
+ | 'headerInvalid'
+ | 'headerDuplicate'
+ | 'headerReserved'
+ | 'headerMustBeSecret'
+ | 'templateVariableInvalid'
+ | 'secretRequired';
+}
+
+interface PresetDefinition {
+ bodyType: CustomWebhookBodyType;
+ template: string;
+}
+
+const PRESET_DEFINITIONS: Record, PresetDefinition> = {
+ genericJson: {
+ bodyType: 'json',
+ template: `{
+ "schema_version": "1",
+ "title": "{{title}}",
+ "message": "{{message}}",
+ "type": "{{type}}",
+ "node_name": "{{nodeName}}",
+ "timestamp": "{{timestamp}}"
+}`,
+ },
+ slack: {
+ bodyType: 'json',
+ template: `{
+ "text": "*{{title}}*\\n{{message}}"
+}`,
+ },
+ discord: {
+ bodyType: 'json',
+ template: `{
+ "content": "**{{title}}**\\n{{message}}",
+ "allowed_mentions": { "parse": [] }
+}`,
+ },
+ teamsWorkflows: {
+ bodyType: 'json',
+ template: `{
+ "type": "message",
+ "attachments": [
+ {
+ "contentType": "application/vnd.microsoft.card.adaptive",
+ "contentUrl": null,
+ "content": {
+ "$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
+ "type": "AdaptiveCard",
+ "version": "1.4",
+ "body": [
+ { "type": "TextBlock", "weight": "Bolder", "text": "{{title}}" },
+ { "type": "TextBlock", "wrap": true, "text": "{{message}}" }
+ ]
+ }
+ }
+ ]
+}`,
+ },
+};
+
+export const CUSTOM_WEBHOOK_VARIABLES = ['{{title}}', '{{message}}', '{{type}}', '{{nodeName}}', '{{timestamp}}'];
+
+const RESERVED_HEADERS = new Set([
+ 'connection',
+ 'content-length',
+ 'content-type',
+ 'host',
+ 'proxy-connection',
+ 'proxy-authorization',
+ 'te',
+ 'trailer',
+ 'transfer-encoding',
+ 'upgrade',
+]);
+
+const CUSTOM_WEBHOOK_VARIABLE_TOKENS = new Set(CUSTOM_WEBHOOK_VARIABLES);
+
+const HEADER_NAME_PATTERN = /^[!#$%&'*+.^_`|~0-9A-Za-z-]+$/;
+
+export const contentTypeForBodyType = (type: CustomWebhookBodyType): string => {
+ if (type === 'form') return 'application/x-www-form-urlencoded';
+ if (type === 'text') return 'text/plain';
+ return 'application/json';
+};
+
+export const createCustomWebhookUid = (): string => {
+ if (typeof globalThis.crypto?.randomUUID === 'function') {
+ return globalThis.crypto.randomUUID();
+ }
+ const bytes = new Uint8Array(16);
+ if (typeof globalThis.crypto?.getRandomValues === 'function') {
+ globalThis.crypto.getRandomValues(bytes);
+ } else {
+ for (let index = 0; index < bytes.length; index += 1) {
+ bytes[index] = Math.floor(Math.random() * 256);
+ }
+ }
+ bytes[6] = (bytes[6] & 0x0f) | 0x40;
+ bytes[8] = (bytes[8] & 0x3f) | 0x80;
+ const hex = Array.from(bytes, (byte) => byte.toString(16).padStart(2, '0')).join('');
+ return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
+};
+
+export const isCustomWebhookSecretHeader = (key: string): boolean => {
+ const normalized = key.trim().toLowerCase();
+ const compact = normalized.replace(/[-_]/g, '');
+ return (
+ normalized === 'authorization' ||
+ normalized === 'cookie' ||
+ normalized.endsWith('-key') ||
+ normalized.endsWith('_key') ||
+ compact.includes('apikey') ||
+ compact.includes('token') ||
+ compact.includes('secret') ||
+ compact.includes('signature')
+ );
+};
+
+export const createCustomWebhookFormField = (): CustomWebhookFormField => ({
+ uid: createCustomWebhookUid(),
+ key: '',
+ value: '',
+});
+
+export const createCustomWebhookHeader = (): CustomWebhookHeaderDraft => ({
+ uid: createCustomWebhookUid(),
+ key: '',
+ secret: false,
+ configured: false,
+ masked: '',
+ action: 'replace',
+ value: '',
+});
+
+export const createDefaultCustomWebhookDraft = (): CustomWebhookDraft => {
+ const draft: CustomWebhookDraft = {
+ schemaVersion: CUSTOM_WEBHOOK_SCHEMA_VERSION,
+ displayName: '',
+ preset: 'genericJson',
+ url: {
+ configured: false,
+ masked: '',
+ action: 'replace',
+ value: '',
+ },
+ body: {
+ type: 'json',
+ template: '',
+ fields: [],
+ },
+ headers: [],
+ };
+ return applyCustomWebhookPreset(draft, 'genericJson');
+};
+
+const normalizePreset = (value: unknown): CustomWebhookPreset => {
+ if (value === 'genericJson' || value === 'slack' || value === 'discord' || value === 'teamsWorkflows') {
+ return value;
+ }
+ return 'custom';
+};
+
+const normalizeBodyType = (value: unknown): CustomWebhookBodyType => {
+ if (value === 'form' || value === 'text') return value;
+ return 'json';
+};
+
+export const maskCustomWebhookUrl = (value: string): string => {
+ return value ? '******' : '';
+};
+
+export const hydrateCustomWebhookDraft = (raw: Partial = {}): CustomWebhookDraft => {
+ const fallback = createDefaultCustomWebhookDraft();
+ const preset = normalizePreset(raw.preset);
+ const rawUrl = raw.url;
+ const hasSanitizedUrlView = typeof rawUrl === 'object' && rawUrl !== null;
+ const urlConfigured = typeof rawUrl === 'string' ? Boolean(rawUrl) : Boolean(rawUrl?.configured);
+ const urlValue = typeof rawUrl === 'string' ? rawUrl : '';
+ const urlMasked = typeof rawUrl === 'string' ? '' : rawUrl?.masked || '';
+ const bodyType = normalizeBodyType(raw.body?.type);
+ const headers = Array.isArray(raw.headers)
+ ? raw.headers.map((header) => {
+ const secret = Boolean(header.secret) || isCustomWebhookSecretHeader(header.key || '');
+ const secretValue = secret && typeof header.value === 'string' ? header.value : '';
+ const configured = secret ? Boolean(header.configured ?? secretValue) : false;
+ return {
+ uid: header.uid || createCustomWebhookUid(),
+ key: header.key || '',
+ secret,
+ configured,
+ masked: secret ? header.masked || (header.value ? '***' : '') : '',
+ action: secret
+ ? secretValue
+ ? ('keep' as const)
+ : configured
+ ? ('keep' as const)
+ : ('clear' as const)
+ : ('replace' as const),
+ value: secret ? secretValue : header.value || '',
+ ...(secretValue ? { originalValue: secretValue } : {}),
+ };
+ })
+ : [];
+
+ return {
+ schemaVersion: CUSTOM_WEBHOOK_SCHEMA_VERSION,
+ ...(raw.state === 'legacy' || raw.state === 'invalid' ? { state: raw.state } : {}),
+ displayName: raw.displayName || '',
+ preset,
+ url: {
+ configured: urlConfigured,
+ masked: urlMasked,
+ action:
+ typeof rawUrl === 'string' && rawUrl
+ ? 'keep'
+ : urlConfigured
+ ? 'keep'
+ : hasSanitizedUrlView
+ ? 'clear'
+ : 'replace',
+ value: urlValue,
+ ...(urlValue ? { originalValue: urlValue } : {}),
+ },
+ body: {
+ type: bodyType,
+ template:
+ bodyType === 'form'
+ ? ''
+ : raw.body?.template === undefined
+ ? bodyType === 'text'
+ ? '{{message}}'
+ : fallback.body.template
+ : raw.body.template,
+ fields: Array.isArray(raw.body?.fields)
+ ? raw.body.fields.map((field) => ({
+ uid: field.uid || createCustomWebhookUid(),
+ key: field.key || '',
+ value: field.value || '',
+ }))
+ : [],
+ },
+ headers,
+ };
+};
+
+export const applyCustomWebhookPreset = (
+ source: CustomWebhookDraft,
+ preset: CustomWebhookPreset,
+): CustomWebhookDraft => {
+ if (preset === 'custom') {
+ return { ...source, preset: 'custom' };
+ }
+ const definition = PRESET_DEFINITIONS[preset];
+ return {
+ ...source,
+ preset,
+ body: {
+ type: definition.bodyType,
+ template: definition.template,
+ fields: [],
+ },
+ };
+};
+
+export const isCustomWebhookPresetPristine = (draft: CustomWebhookDraft): boolean => {
+ if (draft.preset === 'custom') return false;
+ const expected = applyCustomWebhookPreset(draft, draft.preset);
+ return (
+ draft.body.type === expected.body.type &&
+ draft.body.template === expected.body.template &&
+ draft.body.fields.length === expected.body.fields.length
+ );
+};
+
+export const updateCustomWebhookBodyTemplate = (draft: CustomWebhookDraft, template: string): CustomWebhookDraft => ({
+ ...draft,
+ body: { ...draft.body, template },
+});
+
+const serializeSecret = (secret: CustomWebhookSecretDraft): CustomWebhookSecretMutation => {
+ if (secret.action === 'replace') {
+ return { action: 'replace', value: secret.value.trim() };
+ }
+ return { action: secret.action };
+};
+
+export const serializeCustomWebhookDraft = (draft: CustomWebhookDraft): CustomWebhookConfigUpdate => ({
+ schemaVersion: CUSTOM_WEBHOOK_SCHEMA_VERSION,
+ displayName: draft.displayName.trim(),
+ preset: draft.preset,
+ method: 'POST',
+ url: serializeSecret(draft.url),
+ body: {
+ type: draft.body.type,
+ template: draft.body.type === 'form' ? '' : draft.body.template,
+ fields:
+ draft.body.type === 'form'
+ ? draft.body.fields.map((field) => ({
+ key: field.key.trim(),
+ value: field.value,
+ }))
+ : [],
+ },
+ headers: draft.headers.map((header) => ({
+ uid: header.uid,
+ key: header.key.trim(),
+ secret: header.secret,
+ action: header.secret ? header.action : 'replace',
+ ...(header.secret && header.action !== 'replace' ? {} : { value: header.value }),
+ })),
+});
+
+const isValidHttpUrl = (value: string): boolean => {
+ try {
+ const parsed = new URL(value);
+ return (
+ (parsed.protocol === 'http:' || parsed.protocol === 'https:') &&
+ !parsed.username &&
+ !parsed.password &&
+ !parsed.hash
+ );
+ } catch {
+ return false;
+ }
+};
+
+const isJsonTemplateValid = (value: string): boolean => {
+ try {
+ JSON.parse(value);
+ return true;
+ } catch {
+ return false;
+ }
+};
+
+const hasTemplateJsonKey = (value: string): boolean => {
+ try {
+ const visit = (node: unknown): boolean => {
+ if (Array.isArray(node)) return node.some(visit);
+ if (node && typeof node === 'object') {
+ return Object.entries(node).some(
+ ([key, child]) => key.includes('{{') || key.includes('}}') || visit(child),
+ );
+ }
+ return false;
+ };
+ return visit(JSON.parse(value));
+ } catch {
+ return false;
+ }
+};
+
+const hasInvalidTemplateVariable = (value: string): boolean => {
+ let remainder = value;
+ while (remainder) {
+ const start = remainder.indexOf('{{');
+ if (start < 0) return remainder.includes('}}');
+ if (remainder.slice(0, start).includes('}}')) return true;
+ const endOffset = remainder.slice(start + 2).indexOf('}}');
+ if (endOffset < 0) return true;
+ const end = start + 2 + endOffset + 2;
+ if (!CUSTOM_WEBHOOK_VARIABLE_TOKENS.has(remainder.slice(start, end))) return true;
+ remainder = remainder.slice(end);
+ }
+ return false;
+};
+
+export interface CustomWebhookTemplateSelection {
+ start: number;
+ end: number;
+}
+
+export interface CustomWebhookTemplateInsertion {
+ template: string;
+ cursor: number;
+}
+
+export const insertCustomWebhookVariable = (
+ template: string,
+ variable: string,
+ bodyType: Exclude,
+ selection?: CustomWebhookTemplateSelection,
+): CustomWebhookTemplateInsertion => {
+ if (selection && selection.start >= 0 && selection.end >= selection.start && selection.end <= template.length) {
+ const next = template.slice(0, selection.start) + variable + template.slice(selection.end);
+ return { template: next, cursor: selection.start + variable.length };
+ }
+ if (bodyType === 'text') {
+ return { template: template + variable, cursor: template.length + variable.length };
+ }
+
+ const stringValuePattern = /("(?:message|text|content)"\s*:\s*")((?:\\.|[^"\\])*)(")/;
+ const anyStringValuePattern = /(:\s*")((?:\\.|[^"\\])*)(")/;
+ const match = stringValuePattern.exec(template) || anyStringValuePattern.exec(template);
+ if (match) {
+ const insertAt = match.index + match[0].length - 1;
+ return {
+ template: template.slice(0, insertAt) + variable + template.slice(insertAt),
+ cursor: insertAt + variable.length,
+ };
+ }
+
+ const trimmed = template.trim();
+ if (trimmed === '{}') {
+ const next = `{\n "message": "${variable}"\n}`;
+ return { template: next, cursor: next.indexOf(variable) + variable.length };
+ }
+ if (trimmed === '[]') {
+ const next = `[\n "${variable}"\n]`;
+ return { template: next, cursor: next.indexOf(variable) + variable.length };
+ }
+ return { template, cursor: template.length };
+};
+
+export const validateCustomWebhookDraft = (
+ draft: CustomWebhookDraft,
+ options: { allowClearedUrl?: boolean } = {},
+): CustomWebhookValidationIssue[] => {
+ const issues: CustomWebhookValidationIssue[] = [];
+ if (!draft.displayName.trim()) {
+ issues.push({ field: 'displayName', code: 'displayNameRequired' });
+ }
+ if (draft.url.action === 'keep') {
+ if (!draft.url.configured) issues.push({ field: 'url', code: 'urlRequired' });
+ } else if (draft.url.action === 'replace') {
+ if (!draft.url.value.trim()) {
+ issues.push({ field: 'url', code: 'urlRequired' });
+ } else if (!isValidHttpUrl(draft.url.value.trim())) {
+ issues.push({ field: 'url', code: 'urlInvalid' });
+ }
+ } else if (!options.allowClearedUrl) {
+ issues.push({ field: 'url', code: 'urlRequired' });
+ }
+
+ if (draft.body.type === 'form') {
+ if (draft.body.fields.length === 0) {
+ issues.push({ field: 'body', code: 'bodyRequired' });
+ }
+ const keys = new Set();
+ draft.body.fields.forEach((field, index) => {
+ const key = field.key.trim();
+ if (!key) {
+ issues.push({ field: `body.fields.${index}`, code: 'formFieldRequired' });
+ return;
+ }
+ if (key.includes('{{') || key.includes('}}')) {
+ issues.push({ field: `body.fields.${index}`, code: 'templateVariableInvalid' });
+ }
+ const normalized = key.toLowerCase();
+ if (keys.has(normalized)) {
+ issues.push({ field: `body.fields.${index}`, code: 'formFieldDuplicate' });
+ }
+ keys.add(normalized);
+ if (hasInvalidTemplateVariable(field.value)) {
+ issues.push({ field: `body.fields.${index}`, code: 'templateVariableInvalid' });
+ }
+ });
+ } else if (!draft.body.template.trim()) {
+ issues.push({ field: 'body', code: 'bodyRequired' });
+ } else if (draft.body.type === 'json' && !isJsonTemplateValid(draft.body.template)) {
+ issues.push({ field: 'body', code: 'jsonInvalid' });
+ } else if (draft.body.type === 'json' && hasTemplateJsonKey(draft.body.template)) {
+ issues.push({ field: 'body', code: 'templateVariableInvalid' });
+ }
+ if (draft.body.type !== 'form' && hasInvalidTemplateVariable(draft.body.template)) {
+ issues.push({ field: 'body', code: 'templateVariableInvalid' });
+ }
+
+ const headerKeys = new Set();
+ draft.headers.forEach((header, index) => {
+ const key = header.key.trim();
+ const normalized = key.toLowerCase();
+ if (!key) {
+ issues.push({ field: `headers.${index}`, code: 'headerRequired' });
+ } else if (!HEADER_NAME_PATTERN.test(key)) {
+ issues.push({ field: `headers.${index}`, code: 'headerInvalid' });
+ } else if (RESERVED_HEADERS.has(normalized)) {
+ issues.push({ field: `headers.${index}`, code: 'headerReserved' });
+ } else if (headerKeys.has(normalized)) {
+ issues.push({ field: `headers.${index}`, code: 'headerDuplicate' });
+ }
+ headerKeys.add(normalized);
+
+ if (isCustomWebhookSecretHeader(key) && !header.secret) {
+ issues.push({ field: `headers.${index}`, code: 'headerMustBeSecret' });
+ }
+
+ if (header.secret) {
+ if (header.action === 'keep' && !header.configured) {
+ issues.push({ field: `headers.${index}`, code: 'secretRequired' });
+ }
+ if (header.action === 'replace' && !header.value) {
+ issues.push({ field: `headers.${index}`, code: 'secretRequired' });
+ }
+ }
+ });
+ return issues;
+};
+
+export const formatCustomWebhookSafeSummary = (
+ config: Partial,
+ options: { includeUrl?: boolean } = {},
+): string => {
+ const bodyType = normalizeBodyType(config.body?.type).toUpperCase();
+ const headerCount = Array.isArray(config.headers) ? config.headers.length : 0;
+ const summary = `POST · ${bodyType} · ${headerCount} Headers`;
+ if (options.includeUrl === false) return summary;
+ const url = typeof config.url === 'string' ? maskCustomWebhookUrl(config.url) : config.url?.masked || '***';
+ return `${summary} · ${url}`;
+};
+
+export const formatCustomWebhookDetails = (
+ config: Partial | string,
+ missingUrl = '-',
+): string => {
+ const normalized = typeof config === 'string' ? { url: config } : config;
+ const summary = formatCustomWebhookSafeSummary(normalized, { includeUrl: false });
+ const url = typeof normalized.url === 'string' ? normalized.url : normalized.url?.value || '';
+ return `${summary} · ${url || missingUrl}`;
+};
diff --git a/frontend/src/views/setting/alert/setting/drawer/index.vue b/frontend/src/views/setting/alert/setting/drawer/index.vue
index be9ee76f6..5debe49af 100644
--- a/frontend/src/views/setting/alert/setting/drawer/index.vue
+++ b/frontend/src/views/setting/alert/setting/drawer/index.vue
@@ -1,5 +1,5 @@
-
+
-
+
{{ $t('xpack.alert.userNameHelper') }}
-
-
+
+
{{ $t('xpack.alert.passwordHelper') }}
@@ -90,6 +90,13 @@
+
+
@@ -107,7 +114,7 @@
-
+
{{ $t('xpack.alert.test') }}
@@ -122,6 +129,22 @@
{{ $t('commons.button.cancel') }}
@@ -135,16 +158,25 @@
+
+
diff --git a/frontend/src/views/setting/alert/setting/drawer/secret-field.ts b/frontend/src/views/setting/alert/setting/drawer/secret-field.ts
new file mode 100644
index 000000000..91610fbc6
--- /dev/null
+++ b/frontend/src/views/setting/alert/setting/drawer/secret-field.ts
@@ -0,0 +1,100 @@
+export type SecretAction = 'keep' | 'replace' | 'clear';
+
+export interface SecretView {
+ configured: boolean;
+ masked?: string;
+}
+
+export interface SecretDraft extends SecretView {
+ masked: string;
+ action: SecretAction;
+ value: string;
+ originalValue?: string;
+}
+
+export const secretEditorValue = (draft: SecretDraft): string => {
+ if (draft.action === 'keep' || draft.action === 'replace') return draft.value;
+ return '';
+};
+
+export const secretEditorPlaceholder = (draft: SecretDraft, fallback = ''): string => {
+ if (draft.action === 'keep' && draft.configured) return draft.masked || '******';
+ return fallback;
+};
+
+export const replaceSecretDraft = (draft: T, value: string): T => ({
+ ...draft,
+ action: 'replace',
+ value,
+});
+
+export const keepSecretDraft = (draft: T): T => ({
+ ...draft,
+ action: 'keep',
+ value: draft.originalValue || '',
+});
+
+export const clearSecretDraft = (draft: T): T => ({
+ ...draft,
+ action: 'clear',
+ value: '',
+});
+
+export const rawSecretValue = (source: unknown): string => {
+ if (typeof source === 'string') return source;
+ if (!source || typeof source !== 'object') return '';
+ const value = (source as Record).value;
+ return typeof value === 'string' ? value : '';
+};
+
+export const serializeLegacySecretValue = (value: string, trim = false): string => (trim ? value.trim() : value);
+
+export interface LegacyEmailTestFields {
+ host: string;
+ port: number;
+ sender: string;
+ userName: string;
+ password: string;
+ displayName: string;
+ encryption: string;
+ recipient: string;
+}
+
+const rawStringValue = (value: unknown): string => (typeof value === 'string' ? value : '');
+
+export const buildLegacyEmailTestFields = (config: Record): LegacyEmailTestFields => ({
+ host: rawStringValue(config.host),
+ port: Number(config.port) || 0,
+ sender: rawStringValue(config.sender),
+ userName: rawStringValue(config.userName),
+ password: rawSecretValue(config.password),
+ displayName: rawStringValue(config.displayName),
+ encryption: rawStringValue(config.encryption) || 'NONE',
+ recipient: rawStringValue(config.recipient),
+});
+
+export const getAlertConfigDisplayName = (type: string, config: Record): string => {
+ const displayName = typeof config.displayName === 'string' ? config.displayName.trim() : '';
+ if (displayName) return displayName;
+
+ const sender = typeof config.sender === 'string' ? config.sender.trim() : '';
+ if (sender) return sender;
+
+ if (type === 'sms') {
+ const phone = rawSecretValue(config.phone);
+ if (phone) return phone;
+ }
+
+ if (Array.isArray(config.webhooks)) {
+ return config.webhooks
+ .map((webhook) =>
+ webhook && typeof webhook === 'object' && typeof webhook.displayName === 'string'
+ ? webhook.displayName.trim()
+ : '',
+ )
+ .filter(Boolean)
+ .join(', ');
+ }
+
+ return '';
+};
diff --git a/frontend/src/views/setting/alert/setting/index.vue b/frontend/src/views/setting/alert/setting/index.vue
index 005ae8ada..ae2f8ea82 100644
--- a/frontend/src/views/setting/alert/setting/index.vue
+++ b/frontend/src/views/setting/alert/setting/index.vue
@@ -49,7 +49,7 @@
{{ $t('xpack.alert.alertConfigHelper') }}
-
+
{{ $t('commons.units.semicolon') }}{{ $t('xpack.alert.alertConfigProHelper') }}
-
-
- {{ getConfigDetails(row) }}
-
-
-
- {{ getConfigSummary(row) }}
-
-
+
+
+ {{ expandedIds.has(row.id!) ? getConfigDetails(row) : getConfigSummary(row) }}
+
+
+
+
+
@@ -107,7 +116,7 @@
v-model="row.status"
active-value="Enable"
inactive-value="Disable"
- :disabled="!isProductPro && ['weCom', 'dingTalk', 'feiShu', 'sms'].includes(row.type)"
+ :disabled="isStatusChangeDisabled(row)"
@change="onStatusChange(row)"
/>
@@ -142,14 +151,22 @@