diff --git a/agent/app/api/v2/alert.go b/agent/app/api/v2/alert.go index 6686261c2..9bdaf932e 100644 --- a/agent/app/api/v2/alert.go +++ b/agent/app/api/v2/alert.go @@ -243,7 +243,11 @@ func (b *BaseApi) GetCronJobs(c *gin.Context) { // @Security Timestamp // @Router /alert/config/info [post] func (b *BaseApi) GetAlertConfig(c *gin.Context) { - config, err := alertService.GetAlertConfig() + var req dto.AlertConfigQuery + if err := helper.CheckBindAndValidate(&req, c); err != nil { + return + } + config, err := alertService.GetAlertConfig(req) if err != nil { helper.InternalServer(c, err) return @@ -254,13 +258,13 @@ func (b *BaseApi) GetAlertConfig(c *gin.Context) { // @Tags Alert // @Summary Page alert config // @Accept json -// @Param request body dto.PageInfo true "request" +// @Param request body dto.AlertConfigPageReq true "request" // @Success 200 // @Security ApiKeyAuth // @Security Timestamp // @Router /alert/config/search [post] func (b *BaseApi) PageAlertConfig(c *gin.Context) { - var req dto.PageInfo + var req dto.AlertConfigPageReq if err := helper.CheckBindAndValidate(&req, c); err != nil { return } diff --git a/agent/app/dto/alert.go b/agent/app/dto/alert.go index f04a6d24a..cc955b3e2 100644 --- a/agent/app/dto/alert.go +++ b/agent/app/dto/alert.go @@ -35,6 +35,15 @@ type AlertSearch struct { Method string `json:"method"` } +type AlertConfigQuery struct { + ExcludeTypes []string `json:"excludeTypes"` +} + +type AlertConfigPageReq struct { + PageInfo + ExcludeTypes []string `json:"excludeTypes"` +} + type AlertDTO struct { ID uint `json:"id"` Type string `json:"type"` diff --git a/agent/app/service/alert.go b/agent/app/service/alert.go index c4f4cb5b4..2b3096683 100644 --- a/agent/app/service/alert.go +++ b/agent/app/service/alert.go @@ -26,7 +26,6 @@ import ( type AlertService struct{} var eeHiddenAlertTypes = []string{"licenseException", "panelUpdate", "panelPwdEndTime"} -var hiddenAlertConfigTypes = []string{"sms"} type IAlertService interface { PageAlert(req dto.AlertSearch) (int64, []dto.AlertDTO, error) @@ -44,8 +43,8 @@ type IAlertService interface { GetClams() ([]dto.ClamDTO, error) GetCronJobs(req dto.CronJobReq) ([]dto.CronJobDTO, error) - GetAlertConfig() ([]model.AlertConfig, error) - PageAlertConfig(req dto.PageInfo) (int64, []model.AlertConfig, error) + GetAlertConfig(req dto.AlertConfigQuery) ([]model.AlertConfig, error) + PageAlertConfig(req dto.AlertConfigPageReq) (int64, []model.AlertConfig, error) UpdateAlertConfig(req dto.AlertConfigUpdate, operator string) error DeleteAlertConfig(id uint) error TestAlertConfig(req dto.AlertConfigTest) (bool, error) @@ -469,26 +468,26 @@ func (a AlertService) GetCronJobs(req dto.CronJobReq) ([]dto.CronJobDTO, error) return cronJobs, err } -func (a AlertService) GetAlertConfig() ([]model.AlertConfig, error) { +func (a AlertService) GetAlertConfig(req dto.AlertConfigQuery) ([]model.AlertConfig, error) { var ( opts []repo.DBOption configs []model.AlertConfig ) - if global.CONF.Base.IsEnterprise || global.CONF.Base.Edition == "intl" { - opts = append(opts, alertRepo.WithByTypeNotIn(hiddenAlertConfigTypes)) + if len(req.ExcludeTypes) > 0 { + opts = append(opts, alertRepo.WithByTypeNotIn(req.ExcludeTypes)) } opts = append(opts, repo.WithByStatus(constant.AlertEnable)) configs, err := alertRepo.AlertConfigList(opts...) return configs, err } -func (a AlertService) PageAlertConfig(req dto.PageInfo) (int64, []model.AlertConfig, error) { +func (a AlertService) PageAlertConfig(req dto.AlertConfigPageReq) (int64, []model.AlertConfig, error) { opts := []repo.DBOption{ alertRepo.WithByTypeNotIn([]string{"common"}), repo.WithOrderDesc("created_at"), } - if global.CONF.Base.IsEnterprise || global.CONF.Base.Edition == "intl" { - opts = append(opts, alertRepo.WithByTypeNotIn(hiddenAlertConfigTypes)) + if len(req.ExcludeTypes) > 0 { + opts = append(opts, alertRepo.WithByTypeNotIn(req.ExcludeTypes)) } return alertRepo.PageAlertConfig(req.Page, req.PageSize, opts...) } @@ -585,7 +584,7 @@ func (a AlertService) DeleteAlertConfig(id uint) error { usedAlerts = append(usedAlerts, legacyAlerts...) } if len(usedAlerts) > 0 { - return fmt.Errorf("alert config is in use") + return buserr.New("ErrAlertConfigInUse") } return alertRepo.DeleteAlertConfig(repo.WithByID(id)) } diff --git a/agent/app/service/container.go b/agent/app/service/container.go index 05a776a4e..7d7372753 100644 --- a/agent/app/service/container.go +++ b/agent/app/service/container.go @@ -297,14 +297,14 @@ func (u *ContainerService) ContainerListStats() ([]dto.ContainerListStats, error if err != nil { return nil, err } - var datas []dto.ContainerListStats + datas := make([]dto.ContainerListStats, len(list)) var wg sync.WaitGroup wg.Add(len(list)) for i := 0; i < len(list); i++ { - go func(item container.Summary) { - datas = append(datas, loadCpuAndMem(client, item.ID)) + go func(index int, item container.Summary) { + datas[index] = loadCpuAndMem(client, item.ID) wg.Done() - }(list[i]) + }(i, list[i]) } wg.Wait() return datas, nil diff --git a/agent/i18n/lang/en.yaml b/agent/i18n/lang/en.yaml index 910e97a2b..858c2b143 100644 --- a/agent/i18n/lang/en.yaml +++ b/agent/i18n/lang/en.yaml @@ -74,6 +74,7 @@ ErrBackupInUsed: 'Backup account is in use by a scheduled task' ErrBackupCheck: 'Backup account connectivity test failed: {{ .err }}' ErrBackupLocalDelete: 'Local backup accounts cannot be deleted' ErrBackupLocalCreate: 'Local backup accounts cannot be created' +ErrAlertConfigInUse: 'Alert configuration is in use and cannot be deleted' #app ErrPortInUsed: '{{ .detail }} port is already occupied!' diff --git a/agent/i18n/lang/es-ES.yaml b/agent/i18n/lang/es-ES.yaml index c93803e5b..0d363a2f1 100644 --- a/agent/i18n/lang/es-ES.yaml +++ b/agent/i18n/lang/es-ES.yaml @@ -75,6 +75,7 @@ ErrBackupInUsed: 'Cuenta de respaldo en uso por tarea programada' ErrBackupCheck: 'Conexión de respaldo falló: {{ .err }}' ErrBackupLocalDelete: 'No se puede eliminar cuentas de respaldo locales' ErrBackupLocalCreate: 'No se pueden crear cuentas de respaldo locales' +ErrAlertConfigInUse: 'La configuración de alertas está en uso y no se puede eliminar' ErrPortInUsed: 'El puerto {{ .detail }} ya está ocupado' ErrAppLimit: 'El número de aplicaciones instaladas ha superado el límite' ErrNotInstall: 'Aplicación no instalada' diff --git a/agent/i18n/lang/ja.yaml b/agent/i18n/lang/ja.yaml index 8fffc9c46..cbc045a61 100644 --- a/agent/i18n/lang/ja.yaml +++ b/agent/i18n/lang/ja.yaml @@ -75,6 +75,7 @@ ErrBackupInUsed: 'バックアップアカウントがスケジュールで使 ErrBackupCheck: '接続テストに失敗しました: {{ .err }}' ErrBackupLocalDelete: 'ローカルバックアップは削除できません' ErrBackupLocalCreate: 'ローカルバックアップは作成できません' +ErrAlertConfigInUse: 'アラート設定は使用中のため削除できません' ErrPortInUsed: '{{ .detail }} ポートはすでに使用されています' ErrAppLimit: 'インストールされているアプリケーションの数が制限を超えました' ErrNotInstall: 'アプリケーションがインストールされていません' diff --git a/agent/i18n/lang/ko.yaml b/agent/i18n/lang/ko.yaml index fd76983f7..7471f62fe 100644 --- a/agent/i18n/lang/ko.yaml +++ b/agent/i18n/lang/ko.yaml @@ -75,6 +75,7 @@ ErrBackupInUsed: '백업 계정이 예약에 사용 중' ErrBackupCheck: '연결 테스트 실패: {{ .err }}' ErrBackupLocalDelete: '로컬 백업은 삭제할 수 없습니다' ErrBackupLocalCreate: '로컬 백업은 만들 수 없습니다' +ErrAlertConfigInUse: '경고 설정이 사용 중이므로 삭제할 수 없습니다' ErrPortInUsed: '{{ .detail }} 포트가 이미 사용 중입니다' ErrAppLimit: '설치된 애플리케이션 수가 한도를 초과했습니다' ErrNotInstall: '응용 프로그램이 설치되지 않았습니다' diff --git a/agent/i18n/lang/ms.yaml b/agent/i18n/lang/ms.yaml index 3d6f02c58..98e2040cc 100644 --- a/agent/i18n/lang/ms.yaml +++ b/agent/i18n/lang/ms.yaml @@ -75,6 +75,7 @@ ErrBackupInUsed: 'Akaun sandaran sedang digunakan oleh tugas' ErrBackupCheck: 'Ujian sambungan gagal: {{ .err }}' ErrBackupLocalDelete: 'Tidak boleh padam sandaran tempatan' ErrBackupLocalCreate: 'Tidak boleh buat sandaran tempatan' +ErrAlertConfigInUse: 'Konfigurasi amaran sedang digunakan dan tidak boleh dipadamkan' ErrPortInUsed: 'Port {{ .detail }} sudah diduduki' ErrAppLimit: 'Bilangan aplikasi yang dipasang telah melebihi had' ErrNotInstall: 'Aplikasi tidak dipasang' diff --git a/agent/i18n/lang/pt-BR.yaml b/agent/i18n/lang/pt-BR.yaml index 3513d6771..bdd2e8d96 100644 --- a/agent/i18n/lang/pt-BR.yaml +++ b/agent/i18n/lang/pt-BR.yaml @@ -75,6 +75,7 @@ ErrBackupInUsed: 'Conta de backup em uso por tarefa' ErrBackupCheck: 'Teste de conexão falhou: {{ .err }}' ErrBackupLocalDelete: 'Não é permitido excluir contas locais' ErrBackupLocalCreate: 'Não é permitido criar contas locais' +ErrAlertConfigInUse: 'A configuração de alerta está em uso e não pode ser excluída' ErrPortInUsed: 'A porta {{ .detail }} já está ocupada' ErrAppLimit: 'O número de aplicativos instalados excedeu o limite' ErrNotInstall: 'Aplicativo não instalado' diff --git a/agent/i18n/lang/ru.yaml b/agent/i18n/lang/ru.yaml index 9eae4f9d2..d9ccb942c 100644 --- a/agent/i18n/lang/ru.yaml +++ b/agent/i18n/lang/ru.yaml @@ -75,6 +75,7 @@ ErrBackupInUsed: 'Аккаунт бэкапа занят задачей' ErrBackupCheck: 'Проверка подключения не удалась: {{ .err }}' ErrBackupLocalDelete: 'Нельзя удалить локальные бэкапы' ErrBackupLocalCreate: 'Нельзя создать локальные бэкапы' +ErrAlertConfigInUse: 'Конфигурация оповещений используется и не может быть удалена' ErrPortInUsed: '{{ .detail }} порт уже занят' ErrAppLimit: 'Количество установленных приложений превысило лимит' ErrNotInstall: 'Приложение не установлено' diff --git a/agent/i18n/lang/tr.yaml b/agent/i18n/lang/tr.yaml index a1ee7a240..d255270f8 100644 --- a/agent/i18n/lang/tr.yaml +++ b/agent/i18n/lang/tr.yaml @@ -75,6 +75,7 @@ ErrBackupInUsed: 'Yedek hesabı görevde kullanılıyor' ErrBackupCheck: 'Bağlantı testi başarısız: {{ .err }}' ErrBackupLocalDelete: 'Yerel yedek silme yok' ErrBackupLocalCreate: 'Yerel yedek oluşturma yok' +ErrAlertConfigInUse: 'Uyarı yapılandırması kullanımda ve silinemez' ErrPortInUsed: '{{ .detail }} portu zaten kullanılıyor' ErrAppLimit: 'Yüklenen uygulama sayısı sınırı aştı' ErrNotInstall: 'Uygulama yüklenmedi' diff --git a/agent/i18n/lang/zh-Hant.yaml b/agent/i18n/lang/zh-Hant.yaml index 4bdd39239..dfe902488 100644 --- a/agent/i18n/lang/zh-Hant.yaml +++ b/agent/i18n/lang/zh-Hant.yaml @@ -75,6 +75,7 @@ ErrBackupInUsed: '此備份帳號已在排程任務中使用,無法刪除' ErrBackupCheck: '備份帳號測試連線失敗{{ .err }}' ErrBackupLocalDelete: '暫時不支援刪除本機伺服器備份帳號' ErrBackupLocalCreate: '暫時不支援建立本機伺服器備份帳號' +ErrAlertConfigInUse: '告警配置正在使用中,無法刪除' ErrPortInUsed: '{{ .detail }} 連接埠已被佔用!' ErrAppLimit: '應用程式超出安裝數量限制' ErrNotInstall: '應用程式未安裝' diff --git a/agent/i18n/lang/zh.yaml b/agent/i18n/lang/zh.yaml index 0b0c89777..94f61f15c 100644 --- a/agent/i18n/lang/zh.yaml +++ b/agent/i18n/lang/zh.yaml @@ -74,6 +74,7 @@ ErrBackupInUsed: "该备份账号已在计划任务中使用,无法删除" ErrBackupCheck: "备份账号测试连接失败 {{ .err }}" ErrBackupLocalDelete: "暂不支持删除本地服务器备份账号" ErrBackupLocalCreate: "暂不支持创建本地服务器备份账号" +ErrAlertConfigInUse: "告警配置正在使用中,无法删除" #app ErrPortInUsed: "{{ .detail }} 端口已被占用!" diff --git a/core/app/auth/api_auth.go b/core/app/auth/api_auth.go index a218a6d9c..2378fc72c 100644 --- a/core/app/auth/api_auth.go +++ b/core/app/auth/api_auth.go @@ -120,7 +120,7 @@ func isValid1PanelToken(panelToken string, panelTimestamp string, apiKey string) } func isIPInWhiteList(clientIP string, ipWhiteString string) bool { - if len(ipWhiteString) == 0 { + if strings.TrimSpace(ipWhiteString) == "" { global.LOG.Error("IP whitelist is empty") return false } @@ -136,9 +136,17 @@ func isIPInWhiteList(clientIP string, ipWhiteString string) bool { iPv4 := clientParsedIP.To4() iPv6 := clientParsedIP.To16() for _, cidr := range ipWhiteList { + cidr = strings.TrimSpace(cidr) + if cidr == "" { + continue + } if (iPv4 != nil && (cidr == "0.0.0.0" || cidr == "0.0.0.0/0" || iPv4.String() == cidr)) || (iPv6 != nil && (cidr == "::/0" || iPv6.String() == cidr)) { return true } + whiteIP := net.ParseIP(cidr) + if whiteIP != nil && whiteIP.Equal(clientParsedIP) { + return true + } _, ipNet, err := net.ParseCIDR(cidr) if err != nil { continue diff --git a/core/constant/common.go b/core/constant/common.go index c97e90aba..cf5b12540 100644 --- a/core/constant/common.go +++ b/core/constant/common.go @@ -201,6 +201,7 @@ var WebUrlMap = map[string]struct{}{ "/enterprise/ops-report/website": {}, "/enterprise/ops-report/resource": {}, "/enterprise/ops-report/cronjob": {}, + "/enterprise/ops-report/alert": {}, "/enterprise/ops-report/history": {}, "/enterprise/ops-report/settings": {}, } diff --git a/core/utils/common/common.go b/core/utils/common/common.go index 46a821419..8f3a254b8 100644 --- a/core/utils/common/common.go +++ b/core/utils/common/common.go @@ -230,6 +230,7 @@ func HandleIPList(content string) ([]string, error) { ipList := strings.Split(content, "\n") var res []string for _, ip := range ipList { + ip = strings.TrimSpace(ip) if ip == "" { continue } diff --git a/frontend/src/api/interface/alert.ts b/frontend/src/api/interface/alert.ts index ed5d0bd29..b61c71c7b 100644 --- a/frontend/src/api/interface/alert.ts +++ b/frontend/src/api/interface/alert.ts @@ -147,6 +147,11 @@ export namespace Alert { export interface AlertConfigPageReq { page: number; pageSize: number; + excludeTypes?: string[]; + } + + export interface AlertConfigFilterReq { + excludeTypes?: string[]; } export interface AlertConfigUpdateReq { diff --git a/frontend/src/api/modules/alert.ts b/frontend/src/api/modules/alert.ts index 868d58934..cd9c7d0c0 100644 --- a/frontend/src/api/modules/alert.ts +++ b/frontend/src/api/modules/alert.ts @@ -2,6 +2,18 @@ import http from '@/api'; import { ResPage } from '@/api/interface'; import { Alert } from '../interface/alert'; import { deepCopy } from '@/utils/misc'; +import { GlobalStore } from '@/store'; + +const alertConfigHiddenTypes = ['sms']; + +const resolveAlertConfigExcludeTypes = (excludeTypes: string[] = []) => { + const globalStore = GlobalStore(); + const types = new Set(excludeTypes); + if (!(globalStore.isProductPro && !globalStore.isIntl && !globalStore.isEE)) { + alertConfigHiddenTypes.forEach((type) => types.add(type)); + } + return Array.from(types); +}; export const SearchAlerts = (req: Alert.AlertSearch, currentNode?: string) => { return http.post>( `/alert/search`, @@ -53,19 +65,27 @@ export const ListCronJob = (req: Alert.CronJobReq) => { return http.post(`/alert/cronjob/list`, req); }; -export const ListAlertConfigs = (currentNode?: string) => { +export const ListAlertConfigs = (req: Alert.AlertConfigFilterReq = {}, currentNode?: string) => { + const request = { + ...req, + excludeTypes: resolveAlertConfigExcludeTypes(req.excludeTypes), + }; return http.post( `/alert/config/info`, - {}, + request, undefined, currentNode ? { CurrentNode: currentNode } : undefined, ); }; export const PageAlertConfigs = (req: Alert.AlertConfigPageReq, currentNode?: string) => { + const request = { + ...req, + excludeTypes: resolveAlertConfigExcludeTypes(req.excludeTypes), + }; return http.post>( `/alert/config/search`, - req, + request, undefined, currentNode ? { CurrentNode: currentNode } : undefined, ); diff --git a/frontend/src/api/modules/container.ts b/frontend/src/api/modules/container.ts index 90c6ec177..0cffc7e93 100644 --- a/frontend/src/api/modules/container.ts +++ b/frontend/src/api/modules/container.ts @@ -89,8 +89,12 @@ export const containerItemStats = (containerID: string, currentNode?: string) => currentNode ? { CurrentNode: currentNode } : undefined, ); }; -export const containerListStats = () => { - return http.get>(`/containers/list/stats`); +export const containerListStats = (currentNode?: string) => { + return http.get>( + `/containers/list/stats`, + {}, + currentNode ? { headers: { CurrentNode: currentNode } } : {}, + ); }; export const containerStats = (id: string) => { return http.get(`/containers/stats/${id}`); diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 67cf6b8dc..2432b80f5 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -2069,7 +2069,7 @@ const message = { aiSearchSizeGte1gb: '≥ 1 GB', aiSearchSizeCustom: 'Custom (bytes)', aiSearchPlaceholder: 'Keywords or a short question, e.g. files related to logs', - aiSearchContainSub: 'Include subdirectories', + aiSearchContainSub: 'Recursive', aiSearchMaxItems: 'Cap on paths/files included in search (directory listing, 1–2000)', aiSearchRun: 'Analyze', aiSearchTruncated: 'Too many entries; only part of the listing was sent. Results may be incomplete.', @@ -2171,7 +2171,7 @@ const message = { infoDetail: 'File properties', root: 'Root directory', list: 'File list', - sub: 'Include subdirectories', + sub: 'Recursive', downloadSuccess: 'Successfully downloaded', theme: 'Theme', language: 'Language', @@ -4037,13 +4037,13 @@ const message = { scoreSSHLoginFailedMedium: 'SSH login failed {0} times', scoreMFADisabled: 'MFA is disabled', scoreAllowIPsOpen: 'Allowed IPs and bound domain are not configured or access is unrestricted', - scorePasswordExpired: 'Panel password has expired', - scorePasswordExpiring: 'Panel password expires in {0} days', scorePanelHTTPSDisabled: 'Panel HTTPS is disabled', scoreSSHRootLogin: 'SSH root login is allowed', scoreSSHPasswordAuth: 'SSH password auth is enabled without key auth', + scoreSSLExpired: '{0} certificate has expired', scoreSSLHigh: '{0} certificate expires in {1} days', scoreSSLMedium: '{0} certificate expires in {1} days', + scoreWebsiteExpired: '{0} website has expired', scoreWebsiteExpire: '{0} website expires in {1} days', scoreWebsiteHTTP: '{0} does not use HTTPS', scoreWebsiteStopped: '{0} status is abnormal', @@ -4057,6 +4057,7 @@ const message = { scoreContainerHigh: '{0} container status is abnormal', scoreContainerExited: '{0} container has stopped', scoreContainerResource: '{0} container resource usage is high', + scoreContainerPublicPort: '{0} container has public exposed ports', scoreAlertNoTask: 'No alert tasks are configured', scoreAlertNoEnabledTask: 'All alert tasks are disabled', scoreAlertDisabledTask: '{0} alert tasks are disabled', @@ -4083,7 +4084,7 @@ const message = { statAlertDesc: '{0} enabled tasks · {1} channels', assetHostDesc: 'Max disk usage {0}%', assetWebsiteDesc: '{0} certificates expiring soon, {1} abnormal websites', - assetResourceDesc: '{0} abnormal apps, {1} stopped apps, {2} abnormal containers', + assetResourceDesc: '{0} abnormal apps, {1} abnormal containers', assetCronjobDesc: '{0} failure records in the last 7 days, {1} disabled jobs', assetAlertDesc: '{0} failed logs, {1} pending sync logs', app: 'Apps', @@ -4096,6 +4097,7 @@ const message = { panelLogin: 'Panel Login', sshLogin: 'SSH Login', failedRecord: 'Failed Records', + expired: 'Expired', expiredDays: 'Expired {0} days ago', remainingDays: '{0} · {1} days left', enabled: 'Enabled', @@ -4182,11 +4184,6 @@ const message = { mfa: 'MFA', mfaNormalDesc: 'MFA is enabled, improving login security', mfaRiskDesc: 'MFA is disabled. Enable multi-factor authentication', - passwordExpiration: 'Password expiration', - passwordExpirationNormalDesc: 'Password expiration is within a safer range', - passwordExpirationUnsetDesc: 'Password expiration is not set. Configure it as soon as possible', - passwordExpirationRiskDesc: 'Password expires in {0} days. Review it early', - passwordExpirationExpiredDesc: 'Password expired {0} days ago. Handle it as soon as possible', sessionTimeoutNormalDesc: 'Session timeout is within a safer range', sessionTimeoutRiskDesc: 'Session timeout is long. Limit idle session lifetime', sshServiceNormalDesc: 'SSH service is running normally', @@ -4357,7 +4354,6 @@ const message = { abnormalSites: 'Abnormal Sites', count5xxSource: 'Counted by 5xx requests', wafIntercept: 'WAF Blocks', - highRiskHit: 'High-risk Hits', websiteMonitorDisabledOrNoData: 'Website monitoring is disabled or no monitor data is available', wafDisabledOrNoData: 'WAF is disabled or no block data is available', noWafData: 'No WAF block data', @@ -4393,6 +4389,9 @@ const message = { '{0} attention items detected. Prioritize stopped resources and public exposed ports.', resourceHealthRiskDesc: '{0} high-risk items detected. Prioritize abnormal containers or failed applications.', + resourceThresholdContainers: 'CPU / Memory Threshold Containers', + noThresholdExceededContainer: 'No containers exceeded the threshold', + triggerMetric: 'Triggered Metric', resourceReasonAppFailed: '{0} applications failed to start', resourceReasonAppStopped: '{0} applications stopped', resourceReasonContainerAbnormal: '{0} containers are abnormal', diff --git a/frontend/src/lang/modules/es-es.ts b/frontend/src/lang/modules/es-es.ts index e6d4052b8..2f89a0b2a 100644 --- a/frontend/src/lang/modules/es-es.ts +++ b/frontend/src/lang/modules/es-es.ts @@ -2140,7 +2140,7 @@ const message = { aiSearchSizeGte1gb: '≥ 1 GB', aiSearchSizeCustom: 'Personalizado (bytes)', aiSearchPlaceholder: 'Introduce el contenido de la búsqueda', - aiSearchContainSub: 'Incluir subdirectorios', + aiSearchContainSub: 'Recursivo', aiSearchMaxItems: 'Límite de rutas/archivos incluidos en la búsqueda (enumeración de directorio, 1–2000)', aiSearchRun: 'Iniciar análisis', aiSearchTruncated: 'Hay demasiados elementos del directorio; solo se incluyó parte de la lista.', @@ -2224,7 +2224,7 @@ const message = { infoDetail: 'Propiedades del archivo', root: 'Directorio raíz', list: 'Lista de archivos', - sub: 'Incluir subdirectorios', + sub: 'Recursivo', downloadSuccess: 'Descarga completada correctamente', theme: 'Tema', language: 'Idioma', @@ -4099,8 +4099,6 @@ const message = { scoreSSHLoginFailedMedium: 'Acceso SSH fallido {0} veces', scoreMFADisabled: 'MFA deshabilitado', scoreAllowIPsOpen: 'IPs autorizadas y dominio vinculado no configurados o acceso sin restricciones', - scorePasswordExpired: 'La contraseña del panel ha expirado', - scorePasswordExpiring: 'La contraseña del panel expira en {0} días', scorePanelHTTPSDisabled: 'HTTPS del panel deshabilitado', scoreSSHRootLogin: 'El acceso SSH como root está permitido', scoreSSHPasswordAuth: 'Autenticación por contraseña SSH habilitada sin autenticación por clave', @@ -4120,6 +4118,7 @@ const message = { scoreContainerHigh: 'Estado anormal del contenedor {0}', scoreContainerExited: 'El contenedor {0} se ha detenido', scoreContainerResource: 'Alto uso de recursos del contenedor {0}', + scoreContainerPublicPort: 'El contenedor {0} tiene puertos expuestos públicamente', attentionItems: 'Elementos de atención', attentionAssets: 'Activos de atención', riskItems: 'Elementos de riesgo', @@ -4138,7 +4137,7 @@ const message = { statContainerDesc: '{0} contenedores verificados', assetHostDesc: 'Uso máximo de disco {0}%', assetWebsiteDesc: '{0} certificados por vencer, {1} sitios web anómalos', - assetResourceDesc: '{0} aplicaciones anómalas, {1} aplicaciones detenidas, {2} contenedores anómalos', + assetResourceDesc: '{0} aplicaciones anómalas, {1} contenedores anómalos', assetCronjobDesc: '{0} registros de fallos en los últimos 7 días, {1} tareas deshabilitadas', app: 'Aplicaciones', website: 'Sitios web', @@ -4238,14 +4237,6 @@ const message = { mfa: 'Autenticación MFA', mfaNormalDesc: 'Autenticación MFA habilitada, mayor seguridad de acceso', mfaRiskDesc: 'Autenticación MFA deshabilitada. Se recomienda habilitar la autenticación multifactor', - passwordExpiration: 'Fecha de vencimiento de contraseña', - passwordExpirationNormalDesc: 'La fecha de vencimiento de contraseña está en un rango seguro', - passwordExpirationUnsetDesc: - 'Fecha de vencimiento de contraseña no configurada. Se recomienda configurarla pronto', - passwordExpirationRiskDesc: - 'La contraseña vence en {0} días. Se recomienda gestionarla con anticipación', - passwordExpirationExpiredDesc: - 'La contraseña expiró hace {0} días. Por favor, gestionar lo antes posible', sessionTimeoutNormalDesc: 'El tiempo de espera de sesión está en un rango seguro', sessionTimeoutRiskDesc: 'Tiempo de espera de sesión largo. Se recomienda limitar la duración de sesiones inactivas', @@ -4467,6 +4458,9 @@ const message = { 'Se detectaron {0} elementos de atención. Prioriza recursos detenidos y puertos públicos.', resourceHealthRiskDesc: 'Se detectaron {0} elementos de alto riesgo. Prioriza contenedores anómalos o apps fallidas.', + resourceThresholdContainers: 'Contenedores que superan el umbral de CPU / memoria', + noThresholdExceededContainer: 'No hay contenedores que superen el umbral', + triggerMetric: 'Métrica activada', resourceReasonAppFailed: '{0} aplicaciones no iniciaron', resourceReasonAppStopped: '{0} aplicaciones detenidas', resourceReasonContainerAbnormal: '{0} contenedores anómalos', diff --git a/frontend/src/lang/modules/ja.ts b/frontend/src/lang/modules/ja.ts index e12536675..14d426cff 100644 --- a/frontend/src/lang/modules/ja.ts +++ b/frontend/src/lang/modules/ja.ts @@ -2116,7 +2116,7 @@ const message = { aiSearchSizeGte1gb: '1 GB 以上', aiSearchSizeCustom: 'カスタム(バイト)', aiSearchPlaceholder: '検索内容を入力してください', - aiSearchContainSub: 'サブディレクトリを含む', + aiSearchContainSub: 'サブフォルダ', aiSearchMaxItems: '検索対象のパス/ファイル数上限(1~2000)', aiSearchRun: '分析開始', aiSearchTruncated: 'ディレクトリ項目が多すぎるため、一部のみを対象にしています。', @@ -2200,7 +2200,7 @@ const message = { infoDetail: 'ファイルプロパティ', root: 'ルートディレクトリ', list: 'ファイルリスト', - sub: 'サブフォルダー', + sub: 'サブフォルダ', downloadSuccess: 'ダウンロードに成功しました', theme: 'テーマ', language: '言語', @@ -4079,8 +4079,6 @@ const message = { scoreSSHLoginFailedMedium: 'SSHログイン失敗 {0} 回', scoreMFADisabled: 'MFA が無効です', scoreAllowIPsOpen: '許可IPとバインドドメインが未設定またはアクセス制限がありません', - scorePasswordExpired: 'パネルパスワードの有効期限が切れています', - scorePasswordExpiring: 'パネルパスワードの残り {0} 日', scorePanelHTTPSDisabled: 'パネルHTTPSが無効です', scoreSSHRootLogin: 'SSH Rootログインが許可されています', scoreSSHPasswordAuth: 'SSHパスワード認証が有効で、鍵認証が無効です', @@ -4099,6 +4097,7 @@ const message = { scoreContainerHigh: '{0} コンテナの状態が異常です', scoreContainerExited: '{0} コンテナが停止しています', scoreContainerResource: '{0} コンテナのリソース使用率が高いです', + scoreContainerPublicPort: '{0} コンテナに公開ポートがあります', attentionItems: '要注意項目', attentionAssets: '要注意アセット', riskItems: 'リスク項目', @@ -4117,7 +4116,7 @@ const message = { statContainerDesc: 'コンテナ {0} 個を検査', assetHostDesc: 'ディスク最大使用率 {0}%', assetWebsiteDesc: '{0} 枚の証明書が期限間近、{1} 個のWebサイトの状態が異常', - assetResourceDesc: '{0} 個のアプリが異常、{1} 個のアプリが停止、{2} 個のコンテナが異常', + assetResourceDesc: '{0} 個のアプリが異常、{1} 個のコンテナが異常', assetCronjobDesc: '過去7日間に {0} 件の失敗記録、{1} 個のタスクが無効', app: 'アプリ', website: 'Webサイト', @@ -4217,11 +4216,6 @@ const message = { mfa: 'MFA 認証', mfaNormalDesc: 'MFA認証が有効で、ログインセキュリティが強化されています', mfaRiskDesc: 'MFA認証が無効です。多要素認証の有効化をお勧めします', - passwordExpiration: 'パスワード有効期限', - passwordExpirationNormalDesc: 'パスワードの有効期限は安全な範囲内です', - passwordExpirationUnsetDesc: 'パスワードの有効期限が未設定です。早めの設定をお勧めします', - passwordExpirationRiskDesc: 'パスワードが{0}日以内に期限切れになります。事前に対応してください', - passwordExpirationExpiredDesc: 'パスワードが{0}日前に期限切れになりました。至急対応してください', sessionTimeoutNormalDesc: 'セッションタイムアウトは安全な範囲内です', sessionTimeoutRiskDesc: 'セッションタイムアウトが長めです。アイドルセッションの有効期間を制限することをお勧めします', @@ -4440,6 +4434,9 @@ const message = { '{0} 件の注意項目があります。停止中リソースと公開ポートを優先して確認してください。', resourceHealthRiskDesc: '{0} 件の高リスク項目があります。異常コンテナまたは起動失敗アプリを優先して対応してください。', + resourceThresholdContainers: 'CPU / メモリ閾値超過コンテナ', + noThresholdExceededContainer: '閾値を超えたコンテナはありません', + triggerMetric: '検出項目', resourceReasonAppFailed: '{0} 個のアプリが起動に失敗', resourceReasonAppStopped: '{0} 個のアプリが停止中', resourceReasonContainerAbnormal: '{0} 個のコンテナが異常', diff --git a/frontend/src/lang/modules/ko.ts b/frontend/src/lang/modules/ko.ts index 1718a6e43..412b8733a 100644 --- a/frontend/src/lang/modules/ko.ts +++ b/frontend/src/lang/modules/ko.ts @@ -2074,7 +2074,7 @@ const message = { aiSearchSizeGte1gb: '1 GB 이상', aiSearchSizeCustom: '사용자 지정(바이트)', aiSearchPlaceholder: '검색 내용을 입력하세요', - aiSearchContainSub: '하위 디렉터리 포함', + aiSearchContainSub: '하위 폴더', aiSearchMaxItems: '검색 대상 경로/파일 수 상한(디렉터리 열람, 1–2000)', aiSearchRun: '분석 시작', aiSearchTruncated: '디렉터리 항목이 너무 많아 일부만 포함되었습니다. 결과가 완전하지 않을 수 있습니다.', @@ -3991,8 +3991,6 @@ const message = { scoreSSHLoginFailedMedium: 'SSH 로그인 실패 {0}회', scoreMFADisabled: 'MFA 미활성화', scoreAllowIPsOpen: '허용 IP 및 바인딩 도메인이 미구성되었거나 접근 제한이 설정되지 않음', - scorePasswordExpired: '패널 비밀번호 만료됨', - scorePasswordExpiring: '패널 비밀번호 만료까지 {0}일 남음', scorePanelHTTPSDisabled: '패널 HTTPS 미활성화', scoreSSHRootLogin: 'SSH Root 로그인 허용됨', scoreSSHPasswordAuth: 'SSH 비밀번호 인증 활성화, 키 인증 미활성화', @@ -4011,6 +4009,7 @@ const message = { scoreContainerHigh: '{0} 컨테이너 상태 비정상', scoreContainerExited: '{0} 컨테이너 중지됨', scoreContainerResource: '{0} 컨테이너 리소스 사용량 과다', + scoreContainerPublicPort: '{0} 컨테이너에 공개 포트가 있습니다', attentionItems: '주의 필요 항목', attentionAssets: '주의 필요 자산', riskItems: '위험 항목', @@ -4029,7 +4028,7 @@ const message = { statContainerDesc: '총 {0}개 컨테이너 검사', assetHostDesc: '디스크 최대 사용률 {0}%', assetWebsiteDesc: '{0}매 인증서 만료 임박, {1}개 웹사이트 상태 비정상', - assetResourceDesc: '{0}개 앱 비정상, {1}개 앱 중지, {2}개 컨테이너 비정상', + assetResourceDesc: '{0}개 앱 비정상, {1}개 컨테이너 비정상', assetCronjobDesc: '최근 7일간 {0}건 실패 기록, {1}개 작업 미활성화', app: '애플리케이션', website: '웹사이트', @@ -4125,11 +4124,6 @@ const message = { mfa: 'MFA 인증', mfaNormalDesc: 'MFA 인증이 활성화되어 로그인 보안이 강화됩니다', mfaRiskDesc: 'MFA 인증이 비활성화되어 있습니다. 다중 인증 활성화를 권장합니다', - passwordExpiration: '비밀번호 만료 시간', - passwordExpirationNormalDesc: '비밀번호 만료 시간이 안전한 범위 내에 있습니다', - passwordExpirationUnsetDesc: '비밀번호 만료 시간이 설정되지 않았습니다. 조속히 설정을 권장합니다', - passwordExpirationRiskDesc: '비밀번호가 {0}일 이내에 만료됩니다. 사전 처리를 권장합니다', - passwordExpirationExpiredDesc: '비밀번호가 {0}일 전 만료되었습니다. 조속히 처리하세요', sessionTimeoutNormalDesc: '세션 타임아웃이 안전한 범위 내에 있습니다', sessionTimeoutRiskDesc: '세션 타임아웃이 깁니다. 유휴 세션 유효기간을 제한하는 것을 권장합니다', sshServiceNormalDesc: 'SSH 서비스가 정상 실행 중입니다', @@ -4347,6 +4341,9 @@ const message = { '{0}개의 주의 항목이 감지되었습니다. 중지된 리소스와 공개 포트를 우선 확인하세요.', resourceHealthRiskDesc: '{0}개의 고위험 항목이 감지되었습니다. 비정상 컨테이너 또는 시작 실패 애플리케이션을 우선 처리하세요.', + resourceThresholdContainers: 'CPU / 메모리 임계치 초과 컨테이너', + noThresholdExceededContainer: '임계치를 초과한 컨테이너가 없습니다', + triggerMetric: '트리거 항목', resourceReasonAppFailed: '애플리케이션 {0}개 시작 실패', resourceReasonAppStopped: '애플리케이션 {0}개 중지됨', resourceReasonContainerAbnormal: '컨테이너 {0}개 상태 비정상', diff --git a/frontend/src/lang/modules/ms.ts b/frontend/src/lang/modules/ms.ts index 789bd11e5..8eb0b1119 100644 --- a/frontend/src/lang/modules/ms.ts +++ b/frontend/src/lang/modules/ms.ts @@ -2143,7 +2143,7 @@ const message = { aiSearchSizeGte1gb: '≥ 1 GB', aiSearchSizeCustom: 'Tersuai (bait)', aiSearchPlaceholder: 'Masukkan kandungan carian', - aiSearchContainSub: 'Termasuk subdirektori', + aiSearchContainSub: 'Subfolder', aiSearchMaxItems: 'Had maksimum laluan/fail yang terlibat dalam carian (enumerasi direktori, 1–2000)', aiSearchRun: 'Mula analisis', aiSearchTruncated: 'Terlalu banyak item direktori, hanya sebahagian senarai disertakan.', @@ -4137,8 +4137,6 @@ const message = { scoreSSHLoginFailedMedium: 'Log masuk SSH gagal {0} kali', scoreMFADisabled: 'MFA dilumpuhkan', scoreAllowIPsOpen: 'IP dibenarkan dan domain terikat tidak dikonfigurasi atau akses tidak terhad', - scorePasswordExpired: 'Kata laluan panel telah tamat tempoh', - scorePasswordExpiring: 'Kata laluan panel tamat tempoh dalam {0} hari', scorePanelHTTPSDisabled: 'Panel HTTPS dilumpuhkan', scoreSSHRootLogin: 'Log masuk root SSH dibenarkan', scoreSSHPasswordAuth: 'Kata laluan SSH didayakan tanpa pengesahan kunci', @@ -4157,6 +4155,7 @@ const message = { scoreContainerHigh: 'Status bekas {0} tidak normal', scoreContainerExited: 'Bekas {0} telah berhenti', scoreContainerResource: 'Penggunaan sumber bekas {0} terlalu tinggi', + scoreContainerPublicPort: 'Bekas {0} mempunyai port awam terdedah', attentionItems: 'Item Perhatian', attentionAssets: 'Aset Perhatian', riskItems: 'Item Risiko', @@ -4175,7 +4174,7 @@ const message = { statContainerDesc: '{0} bekas diperiksa', assetHostDesc: 'Penggunaan cakera maksimum {0}%', assetWebsiteDesc: '{0} sijil hampir tamat tempoh, {1} laman web tidak normal', - assetResourceDesc: '{0} aplikasi tidak normal, {1} aplikasi berhenti, {2} bekas tidak normal', + assetResourceDesc: '{0} aplikasi tidak normal, {1} bekas tidak normal', assetCronjobDesc: '{0} rekod kegagalan dalam 7 hari terakhir, {1} tugas dilumpuhkan', app: 'Aplikasi', website: 'Laman Web', @@ -4270,13 +4269,6 @@ const message = { mfaNormalDesc: 'MFA telah diaktifkan', mfaRiskDesc: 'MFA belum diaktifkan. Disyorkan untuk mengaktifkannya bagi meningkatkan keselamatan akaun', - passwordExpiration: 'Tempoh Tamat Kata Laluan', - passwordExpirationNormalDesc: 'Kata laluan akan tamat tempoh dalam {days} hari', - passwordExpirationUnsetDesc: 'Tiada tempoh tamat ditetapkan untuk kata laluan', - passwordExpirationRiskDesc: - 'Kata laluan akan tamat tempoh dalam masa {days} hari. Sila tukar kata laluan anda secepat mungkin', - passwordExpirationExpiredDesc: - 'Kata laluan telah tamat tempoh selama {days} hari. Sila tukar kata laluan anda dengan segera', panelHTTPSNormalDesc: 'Panel HTTPS didayakan', panelHTTPSRiskDesc: 'Panel HTTPS dilumpuhkan. Laluan log masuk mungkin terdedah', passwordComplexityNormalDesc: 'Pengesahan kerumitan kata laluan didayakan', @@ -4498,6 +4490,9 @@ const message = { resourceHealthAttentionDesc: '{0} item perhatian dikesan. Utamakan sumber terhenti dan port awam.', resourceHealthRiskDesc: '{0} item berisiko tinggi dikesan. Utamakan bekas tidak normal atau aplikasi gagal mula.', + resourceThresholdContainers: 'Bekas melebihi ambang CPU / memori', + noThresholdExceededContainer: 'Tiada bekas melebihi ambang', + triggerMetric: 'Metrik dicetuskan', resourceReasonAppFailed: '{0} aplikasi gagal dimulakan', resourceReasonAppStopped: '{0} aplikasi terhenti', resourceReasonContainerAbnormal: '{0} bekas tidak normal', diff --git a/frontend/src/lang/modules/pt-br.ts b/frontend/src/lang/modules/pt-br.ts index 3e7ad8e1b..3851baa07 100644 --- a/frontend/src/lang/modules/pt-br.ts +++ b/frontend/src/lang/modules/pt-br.ts @@ -2257,7 +2257,7 @@ const message = { aiSearchSizeGte1gb: '≥ 1 GB', aiSearchSizeCustom: 'Personalizado (bytes)', aiSearchPlaceholder: 'Digite o conteúdo da busca', - aiSearchContainSub: 'Incluir subdiretórios', + aiSearchContainSub: 'Subpastas', aiSearchMaxItems: 'Limite de caminhos/arquivos incluídos na busca (enumeração de diretório, 1–2000)', aiSearchRun: 'Iniciar análise', aiSearchTruncated: 'Há muitos itens no diretório; apenas parte da lista foi incluída.', @@ -4276,8 +4276,6 @@ const message = { scoreSSHLoginFailedMedium: 'Falha no login SSH {0} vezes', scoreMFADisabled: 'MFA desativado', scoreAllowIPsOpen: 'IPs autorizados e domínio vinculado não configurados ou acesso irrestrito', - scorePasswordExpired: 'Senha do painel expirada', - scorePasswordExpiring: 'Senha do painel expira em {0} dias', scorePanelHTTPSDisabled: 'HTTPS do painel desativado', scoreSSHRootLogin: 'Login SSH como Root permitido', scoreSSHPasswordAuth: 'Autenticação por senha SSH ativada sem autenticação por chave', @@ -4296,6 +4294,7 @@ const message = { scoreContainerHigh: 'Contêiner {0} com status anormal', scoreContainerExited: 'Contêiner {0} foi parado', scoreContainerResource: 'Uso de recursos do contêiner {0} está alto', + scoreContainerPublicPort: 'Contêiner {0} possui portas expostas publicamente', attentionItems: 'Itens de atenção', attentionAssets: 'Ativos em atenção', riskItems: 'Itens de risco', @@ -4314,7 +4313,7 @@ const message = { statContainerDesc: '{0} contêineres verificados', assetHostDesc: 'Uso máximo de disco {0}%', assetWebsiteDesc: '{0} certificados prestes a vencer, {1} sites anormais', - assetResourceDesc: '{0} aplicações anormais, {1} aplicações paradas, {2} contêineres anormais', + assetResourceDesc: '{0} aplicações anormais, {1} contêineres anormais', assetCronjobDesc: '{0} registros de falha nos últimos 7 dias, {1} tarefas desativadas', app: 'Aplicações', website: 'Sites', @@ -4628,6 +4627,9 @@ const message = { '{0} itens de atenção detectados. Priorize recursos parados e portas públicas.', resourceHealthRiskDesc: '{0} itens de alto risco detectados. Priorize contêineres anormais ou aplicações com falha.', + resourceThresholdContainers: 'Contêineres com CPU / memória acima do limite', + noThresholdExceededContainer: 'Nenhum contêiner ultrapassou o limite', + triggerMetric: 'Métrica acionada', resourceReasonAppFailed: '{0} aplicações falharam ao iniciar', resourceReasonAppStopped: '{0} aplicações paradas', resourceReasonContainerAbnormal: '{0} contêineres anormais', @@ -4741,11 +4743,6 @@ const message = { mfa: 'MFA', mfaNormalDesc: 'MFA ativado', mfaRiskDesc: 'MFA não ativado. Recomendamos ativá-lo para aumentar a segurança da conta', - passwordExpiration: 'Expiração da senha', - passwordExpirationNormalDesc: 'A senha expirará em {days} dias', - passwordExpirationUnsetDesc: 'Nenhum prazo de expiração foi definido para a senha', - passwordExpirationRiskDesc: 'A senha expirará em {days} dias. Altere-a o quanto antes', - passwordExpirationExpiredDesc: 'A senha expirou há {days} dias. Altere-a imediatamente', }, }, user: { diff --git a/frontend/src/lang/modules/ru.ts b/frontend/src/lang/modules/ru.ts index 9036182e4..1b2c1ec7b 100644 --- a/frontend/src/lang/modules/ru.ts +++ b/frontend/src/lang/modules/ru.ts @@ -2130,7 +2130,7 @@ const message = { aiSearchSizeGte1gb: '≥ 1 GB', aiSearchSizeCustom: 'Произвольно (байты)', aiSearchPlaceholder: 'Введите содержимое поиска', - aiSearchContainSub: 'Включая подкаталоги', + aiSearchContainSub: 'Подпапки', aiSearchMaxItems: 'Максимум путей/файлов в поиске (перечисление каталогов, 1–2000)', aiSearchRun: 'Начать анализ', aiSearchTruncated: 'Слишком много элементов каталога, включена только часть списка.', @@ -4127,8 +4127,6 @@ const message = { scoreSSHLoginFailedMedium: 'Неудачных SSH-входов — {0}', scoreMFADisabled: 'MFA не включён', scoreAllowIPsOpen: 'Доверенные IP и привязанный домен не настроены или доступ не ограничен', - scorePasswordExpired: 'Срок действия пароля панели истёк', - scorePasswordExpiring: 'Срок действия пароля панели истекает через {0} дней', scorePanelHTTPSDisabled: 'HTTPS для панели не включён', scoreSSHRootLogin: 'SSH-вход под root разрешён', scoreSSHPasswordAuth: 'SSH-аутентификация по паролю включена без ключевой аутентификации', @@ -4147,6 +4145,7 @@ const message = { scoreContainerHigh: '{0} — аномальное состояние контейнера', scoreContainerExited: '{0} — контейнер остановлен', scoreContainerResource: '{0} — высокое потребление ресурсов контейнером', + scoreContainerPublicPort: '{0} — есть публично открытые порты контейнера', attentionItems: 'Требующие внимания', attentionAssets: 'Активы для проверки', riskItems: 'Рисковые элементы', @@ -4165,7 +4164,7 @@ const message = { statContainerDesc: 'Проверено контейнеров: {0}', assetHostDesc: 'Максимальная заполненность диска — {0}%', assetWebsiteDesc: '{0} сертификатов скоро истекут, {1} сайтов с аномалиями', - assetResourceDesc: '{0} приложений с аномалиями, {1} остановлено, {2} аномальных контейнеров', + assetResourceDesc: '{0} приложений с аномалиями, {1} аномальных контейнеров', assetCronjobDesc: '{0} записей о сбоях за 7 дней, {1} задач отключено', app: 'Приложения', website: 'Сайты', @@ -4264,12 +4263,6 @@ const message = { mfa: 'MFA-аутентификация', mfaNormalDesc: 'MFA-аутентификация включена, вход более защищён', mfaRiskDesc: 'MFA-аутентификация отключена, рекомендуется включить многофакторную аутентификацию', - passwordExpiration: 'Срок действия пароля', - passwordExpirationNormalDesc: 'Срок действия пароля находится в безопасном диапазоне', - passwordExpirationUnsetDesc: 'Срок действия пароля не задан, рекомендуется скорее настроить', - passwordExpirationRiskDesc: - 'Срок действия пароля истекает через {0} дней, рекомендуется заблаговременно продлить', - passwordExpirationExpiredDesc: 'Срок действия пароля истёк {0} дней назад, продлите как можно скорее', sessionTimeoutNormalDesc: 'Тайм-аут сессии находится в безопасном диапазоне', sessionTimeoutRiskDesc: 'Тайм-аут сессии слишком велик. Рекомендуется ограничить срок неактивных сессий', @@ -4488,6 +4481,9 @@ const message = { 'Обнаружено {0} пунктов внимания. Сначала проверьте остановленные ресурсы и публичные порты.', resourceHealthRiskDesc: 'Обнаружено {0} пунктов высокого риска. Сначала обработайте сбойные контейнеры или приложения.', + resourceThresholdContainers: 'Контейнеры с превышением CPU / памяти', + noThresholdExceededContainer: 'Нет контейнеров, превысивших порог', + triggerMetric: 'Сработавший показатель', resourceReasonAppFailed: '{0} приложений не запустились', resourceReasonAppStopped: '{0} приложений остановлены', resourceReasonContainerAbnormal: '{0} контейнеров в аномальном состоянии', diff --git a/frontend/src/lang/modules/tr.ts b/frontend/src/lang/modules/tr.ts index c7b65fb3b..f18fd4b20 100644 --- a/frontend/src/lang/modules/tr.ts +++ b/frontend/src/lang/modules/tr.ts @@ -2134,7 +2134,7 @@ const message = { aiSearchSizeGte1gb: '≥ 1 GB', aiSearchSizeCustom: 'Özel (bayt)', aiSearchPlaceholder: 'Arama içeriğini girin', - aiSearchContainSub: 'Alt dizinleri dahil et', + aiSearchContainSub: 'Alt dizin', aiSearchMaxItems: 'Aramaya dahil edilen yol/dosya sayısı üst sınırı (dizin listesi, 1–2000)', aiSearchRun: 'Analizi başlat', aiSearchTruncated: 'Dizin öğesi çok fazla; yalnızca listenin bir kısmı dahil edildi.', @@ -2218,7 +2218,7 @@ const message = { infoDetail: 'Dosya özellikleri', root: 'Kök dizin', list: 'Dosya listesi', - sub: 'Alt dizinleri dahil et', + sub: 'Alt dizin', downloadSuccess: 'Başarıyla indirildi', theme: 'Tema', language: 'Dil', @@ -4129,8 +4129,6 @@ const message = { scoreSSHLoginFailedMedium: 'SSH girişi {0} kez başarısız oldu', scoreMFADisabled: 'MFA devre dışı', scoreAllowIPsOpen: "İzin verilen IP'ler ve bağlı alan adı yapılandırılmamış veya erişim kısıtlanmamış", - scorePasswordExpired: 'Panel şifresi süresi dolmuş', - scorePasswordExpiring: 'Panel şifresi {0} gün içinde sona eriyor', scorePanelHTTPSDisabled: 'Panel HTTPS devre dışı', scoreSSHRootLogin: 'SSH root girişi etkin', scoreSSHPasswordAuth: 'SSH şifre doğrulaması etkin, anahtar doğrulaması devre dışı', @@ -4149,6 +4147,7 @@ const message = { scoreContainerHigh: '{0} konteyner durumu anormal', scoreContainerExited: '{0} konteyner durdu', scoreContainerResource: '{0} konteyner kaynak kullanımı yüksek', + scoreContainerPublicPort: '{0} konteynerinde herkese açık portlar var', attentionItems: 'Dikkat Öğeleri', attentionAssets: 'Dikkat Varlıkları', riskItems: 'Risk Öğeleri', @@ -4167,7 +4166,7 @@ const message = { statContainerDesc: '{0} konteyner kontrol edildi', assetHostDesc: 'Disk en yüksek kullanım %{0}', assetWebsiteDesc: '{0} sertifika süresi dolmak üzere, {1} anormal web sitesi', - assetResourceDesc: '{0} anormal uygulama, {1} durmuş uygulama, {2} anormal konteyner', + assetResourceDesc: '{0} anormal uygulama, {1} anormal konteyner', assetCronjobDesc: 'Son 7 günde {0} başarısızlık kaydı, {1} görev devre dışı', app: 'Uygulamalar', website: 'Web Siteleri', @@ -4479,6 +4478,9 @@ const message = { '{0} dikkat gerektiren öğe algılandı. Duran kaynakları ve açık portları önceliklendirin.', resourceHealthRiskDesc: '{0} yüksek riskli öğe algılandı. Anormal konteynerleri veya başlatılamayan uygulamaları önceliklendirin.', + resourceThresholdContainers: 'CPU / bellek eşiğini aşan konteynerler', + noThresholdExceededContainer: 'Eşiği aşan konteyner yok', + triggerMetric: 'Tetiklenen ölçüm', resourceReasonAppFailed: '{0} uygulama başlatılamadı', resourceReasonAppStopped: '{0} uygulama durdu', resourceReasonContainerAbnormal: '{0} konteyner anormal', @@ -4592,12 +4594,6 @@ const message = { mfa: 'MFA', mfaNormalDesc: 'MFA etkinleştirildi', mfaRiskDesc: 'MFA etkinleştirilmemiş. Hesap güvenliğini artırmak için etkinleştirmeniz önerilir', - passwordExpiration: 'Parola Süresi Dolumu', - passwordExpirationNormalDesc: 'Parolanın süresi {days} gün sonra dolacak', - passwordExpirationUnsetDesc: 'Parola için bir son kullanma süresi ayarlanmamış', - passwordExpirationRiskDesc: - 'Parolanın süresi {days} gün içinde dolacak. Lütfen en kısa sürede değiştirin', - passwordExpirationExpiredDesc: 'Parolanın süresi {days} gün önce doldu. Lütfen hemen değiştirin', }, }, user: { diff --git a/frontend/src/lang/modules/zh-Hant.ts b/frontend/src/lang/modules/zh-Hant.ts index 2a7de85b0..7a78c3001 100644 --- a/frontend/src/lang/modules/zh-Hant.ts +++ b/frontend/src/lang/modules/zh-Hant.ts @@ -1985,7 +1985,7 @@ const message = { aiSearchSizeGte1gb: '≥ 1 GB', aiSearchSizeCustom: '自訂(位元組)', aiSearchPlaceholder: '請輸入搜尋內容', - aiSearchContainSub: '包含子目錄', + aiSearchContainSub: '含子目錄', aiSearchMaxItems: '參與檢索的路徑/檔案條數上限(目錄列舉,1–2000)', aiSearchRun: '開始分析', aiSearchTruncated: '目錄項過多,僅納入部分清單,結果可能不完整。', @@ -3767,13 +3767,13 @@ const message = { scoreSSHLoginFailedMedium: 'SSH 登入失敗 {0} 次', scoreMFADisabled: 'MFA 未開啟', scoreAllowIPsOpen: '授權 IP 與綁定域名均未配置或未限制訪問', - scorePasswordExpired: '面板密碼已過期', - scorePasswordExpiring: '面板密碼剩餘 {0} 天到期', scorePanelHTTPSDisabled: '面板 HTTPS 未啟用', scoreSSHRootLogin: 'SSH 允許 Root 登入', scoreSSHPasswordAuth: 'SSH 開啟密碼認證且未啟用金鑰認證', + scoreSSLExpired: '{0} 憑證已到期', scoreSSLHigh: '{0} 憑證剩餘 {1} 天', scoreSSLMedium: '{0} 憑證剩餘 {1} 天', + scoreWebsiteExpired: '{0} 網站已到期', scoreWebsiteExpire: '{0} 網站剩餘 {1} 天到期', scoreWebsiteHTTP: '{0} 未啟用 HTTPS', scoreWebsiteStopped: '{0} 狀態異常', @@ -3787,6 +3787,7 @@ const message = { scoreContainerHigh: '{0} 容器狀態異常', scoreContainerExited: '{0} 容器已停止', scoreContainerResource: '{0} 容器資源使用率過高', + scoreContainerPublicPort: '{0} 容器存在公網暴露端口', attentionItems: '待關注項', attentionAssets: '待關注資產', riskItems: '風險項', @@ -3805,7 +3806,7 @@ const message = { statContainerDesc: '共檢查 {0} 個容器', assetHostDesc: '磁碟最高使用率 {0}%', assetWebsiteDesc: '{0} 張憑證即將到期,{1} 個網站狀態異常', - assetResourceDesc: '{0} 個應用異常,{1} 個應用已停止,{2} 個容器異常', + assetResourceDesc: '{0} 個應用異常,{1} 個容器異常', assetCronjobDesc: '近 7 天 {0} 條失敗記錄,{1} 個任務未啟用', app: '應用', website: '網站', @@ -3818,6 +3819,7 @@ const message = { sshLogin: 'SSH 登入', failedRecord: '失敗記錄', successRecord: '成功記錄', + expired: '已到期', expiredDays: '已過期 {0} 天', remainingDays: '{0} · 剩餘 {1} 天', enabled: '已開啟', @@ -3900,11 +3902,6 @@ const message = { mfa: 'MFA 認證', mfaNormalDesc: '已開啟 MFA 認證,登入安全性更高', mfaRiskDesc: '未開啟 MFA 認證,建議啟用多因素認證', - passwordExpiration: '密碼逾期時間', - passwordExpirationNormalDesc: '密碼逾期時間處於較安全範圍', - passwordExpirationUnsetDesc: '密碼逾期時間未設定,建議盡快配置', - passwordExpirationRiskDesc: '密碼將於 {0} 天內到期,建議提前處理', - passwordExpirationExpiredDesc: '密碼已過期 {0} 天,請盡快處理', sessionTimeoutNormalDesc: '會話逾時時間處於較安全範圍', sessionTimeoutRiskDesc: '會話逾時時間較長,建議控制空閒會話有效期', sshServiceNormalDesc: 'SSH 服務運行正常', @@ -4084,7 +4081,6 @@ const message = { abnormalSites: '異常站點', count5xxSource: '按 5xx 請求統計', wafIntercept: 'WAF 攔截', - highRiskHit: '高危命中', websiteMonitorDisabledOrNoData: '網站監控未啟用或暫無監控資料', wafDisabledOrNoData: 'WAF 未啟用或暫無攔截資料', noWafData: '暫無 WAF 攔截資料', @@ -4118,6 +4114,9 @@ const message = { resourceHealthNormalDesc: '目前應用、資料庫和容器資源處於正常狀態', resourceHealthAttentionDesc: '檢測到 {0} 個需關注項,建議優先處理停止資源和公網暴露端口', resourceHealthRiskDesc: '檢測到 {0} 個高風險項,請優先處理異常容器或啟動失敗應用', + resourceThresholdContainers: 'CPU / 記憶體超閾值容器', + noThresholdExceededContainer: '暫無超閾值容器', + triggerMetric: '觸發項', resourceReasonAppFailed: '{0} 個應用啟動失敗', resourceReasonAppStopped: '{0} 個應用已停止', resourceReasonContainerAbnormal: '{0} 個容器狀態異常', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 81e6ad40f..093b7f50e 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -4352,13 +4352,13 @@ const message = { scoreSSHLoginFailedMedium: 'SSH 登录失败 {0} 次', scoreMFADisabled: 'MFA 未开启', scoreAllowIPsOpen: '授权 IP 与绑定域名均未配置或未限制访问', - scorePasswordExpired: '面板密码已过期', - scorePasswordExpiring: '面板密码剩余 {0} 天到期', scorePanelHTTPSDisabled: '面板 HTTPS 未启用', scoreSSHRootLogin: 'SSH 允许 Root 登录', scoreSSHPasswordAuth: 'SSH 开启密码认证且未启用密钥认证', + scoreSSLExpired: '{0} 证书已到期', scoreSSLHigh: '{0} 证书剩余 {1} 天', scoreSSLMedium: '{0} 证书剩余 {1} 天', + scoreWebsiteExpired: '{0} 网站已到期', scoreWebsiteExpire: '{0} 网站剩余 {1} 天到期', scoreWebsiteHTTP: '{0} 未启用 HTTPS', scoreWebsiteStopped: '{0} 状态异常', @@ -4372,6 +4372,7 @@ const message = { scoreContainerHigh: '{0} 容器状态异常', scoreContainerExited: '{0} 容器已停止', scoreContainerResource: '{0} 容器资源使用率过高', + scoreContainerPublicPort: '{0} 容器存在公网暴露端口', scoreAlertNoTask: '未配置告警任务', scoreAlertNoEnabledTask: '告警任务均未启用', scoreAlertDisabledTask: '存在 {0} 个停用告警任务', @@ -4398,7 +4399,7 @@ const message = { statAlertDesc: '启用任务 {0} 个 · 通道 {1} 个', assetHostDesc: '磁盘最高使用率 {0}%', assetWebsiteDesc: '{0} 张证书即将到期,{1} 个网站状态异常', - assetResourceDesc: '{0} 个应用异常,{1} 个应用已停止,{2} 个容器异常', + assetResourceDesc: '{0} 个应用异常,{1} 个容器异常', assetCronjobDesc: '近 7 天 {0} 条失败记录,{1} 个任务未启用', assetAlertDesc: '{0} 条失败日志,{1} 条待同步日志', app: '应用', @@ -4411,6 +4412,7 @@ const message = { panelLogin: '面板登录', sshLogin: 'SSH 登录', failedRecord: '失败记录', + expired: '已到期', expiredDays: '已过期 {0} 天', remainingDays: '{0} · 剩余 {1} 天', enabled: '已开启', @@ -4493,11 +4495,6 @@ const message = { mfa: 'MFA 认证', mfaNormalDesc: '已开启 MFA 认证,登录安全性更高', mfaRiskDesc: '未开启 MFA 认证,建议启用多因素认证', - passwordExpiration: '密码到期时间', - passwordExpirationNormalDesc: '密码到期时间处于较安全范围', - passwordExpirationUnsetDesc: '密码到期时间未设置,建议尽快配置', - passwordExpirationRiskDesc: '密码将在 {0} 天内到期,建议提前处理', - passwordExpirationExpiredDesc: '密码已过期 {0} 天,请尽快处理', sessionTimeoutNormalDesc: '会话超时时间处于较安全范围', sessionTimeoutRiskDesc: '会话超时时间较长,建议控制空闲会话有效期', sshServiceNormalDesc: 'SSH 服务运行正常', @@ -4666,7 +4663,6 @@ const message = { abnormalSites: '异常站点', count5xxSource: '按 5xx 请求统计', wafIntercept: 'WAF 拦截', - highRiskHit: '高危命中', websiteMonitorDisabledOrNoData: '网站监控未启用或暂无监控数据', wafDisabledOrNoData: 'WAF 未启用或暂无拦截数据', noWafData: '暂无 WAF 拦截数据', @@ -4700,6 +4696,9 @@ const message = { resourceHealthNormalDesc: '当前应用、数据库和容器资源处于正常状态', resourceHealthAttentionDesc: '检测到 {0} 个需关注项,建议优先处理停止资源和公网暴露端口', resourceHealthRiskDesc: '检测到 {0} 个高风险项,请优先处理异常容器或启动失败应用', + resourceThresholdContainers: 'CPU / 内存超阈值容器', + noThresholdExceededContainer: '暂无超阈值容器', + triggerMetric: '触发项', resourceReasonAppFailed: '{0} 个应用启动失败', resourceReasonAppStopped: '{0} 个应用已停止', resourceReasonContainerAbnormal: '{0} 个容器状态异常', diff --git a/frontend/src/views/cronjob/cronjob/operate/index.vue b/frontend/src/views/cronjob/cronjob/operate/index.vue index 367490dba..7a35c4864 100644 --- a/frontend/src/views/cronjob/cronjob/operate/index.vue +++ b/frontend/src/views/cronjob/cronjob/operate/index.vue @@ -872,7 +872,7 @@ import { routerToName, routerToPath } from '@/utils/router'; import { loadBaseDir } from '@/api/modules/setting'; const router = useRouter(); -const { docsUrl, isFxplay, isIntl, isEE, isProductPro } = useGlobalStore(); +const { docsUrl, isFxplay, isProductPro } = useGlobalStore(); const licenseRef = ref(); const scriptFileRef = ref(); const dirRef = ref(); @@ -889,7 +889,7 @@ const alertConfigs = ref([]); const loadAlertConfigs = async () => { try { const res = await ListAlertConfigs(); - alertConfigs.value = res.data || []; + alertConfigs.value = res.data?.filter((item: Alert.AlertConfigInfo) => item.type !== 'common') || []; } catch {} }; onMounted(() => { @@ -897,10 +897,8 @@ onMounted(() => { }); const alertConfigOptions = computed(() => { - const hiddenTypes: string[] = []; - if (isIntl.value || isEE.value) hiddenTypes.push('sms'); return alertConfigs.value - .filter((c) => c.status === 'Enable' && c.type !== 'common' && !hiddenTypes.includes(c.type)) + .filter((c) => c.status === 'Enable' && c.type !== 'common') .map((c) => ({ value: String(c.id), label: getAlertConfigOptionLabel(c), diff --git a/frontend/src/views/host/file-management/index.vue b/frontend/src/views/host/file-management/index.vue index 6969b6819..468a36429 100644 --- a/frontend/src/views/host/file-management/index.vue +++ b/frontend/src/views/host/file-management/index.vue @@ -205,7 +205,7 @@
-
+
- - - - {{ $t('file.paste') }}({{ fileMove.count }}) - - - - - -
{ min-width: 290px; } +.file-search-input-shell { + flex: 1 1 320px; + min-width: 240px; + max-width: 420px; +} + .file-ai-button { flex-shrink: 0; } @@ -2833,6 +2819,10 @@ onBeforeUnmount(() => { min-width: 0; } + .file-search-input-shell { + max-width: none; + } + .file-batch-actions { justify-content: flex-start; } diff --git a/frontend/src/views/setting/alert/dash/task/index.vue b/frontend/src/views/setting/alert/dash/task/index.vue index 5e3554751..c121bf407 100644 --- a/frontend/src/views/setting/alert/dash/task/index.vue +++ b/frontend/src/views/setting/alert/dash/task/index.vue @@ -390,7 +390,7 @@ import { reactive, ref, onMounted, computed } from 'vue'; import { ElForm } from 'element-plus'; import { Alert } from '@/api/interface/alert'; import { listSSL, listWebsites } from '@/api/modules/website'; -import { CreateAlert, ListDisks, UpdateAlert, ListClams, ListCronJob, PageAlertConfigs } from '@/api/modules/alert'; +import { CreateAlert, ListDisks, UpdateAlert, ListClams, ListCronJob, ListAlertConfigs } from '@/api/modules/alert'; import { MsgSuccess } from '@/utils/message'; import { Rules } from '@/global/form-rules'; import i18n from '@/lang'; @@ -398,13 +398,13 @@ import { routerToName } from '@/utils/router'; import { checkCidr, checkCidrV6, checkIpV4V6 } from '@/utils/validate'; import { useGlobalStore } from '@/composables/useGlobalStore'; -const { isMaster, isProductPro, isIntl, isEE } = useGlobalStore(); +const { isMaster, isProductPro, isEE } = useGlobalStore(); const alertConfigs = ref([]); const loadAlertConfigs = async () => { try { - const res = await PageAlertConfigs({ page: 1, pageSize: 1000 }); - alertConfigs.value = res.data?.items || []; + const res = await ListAlertConfigs(); + alertConfigs.value = res.data?.filter((item: Alert.AlertConfigInfo) => item.type !== 'common') || []; } catch {} }; onMounted(() => { @@ -414,12 +414,8 @@ onMounted(() => { const ALL_SEND_METHOD = '__all__'; const configOptions = computed(() => { - const hiddenTypes: string[] = []; - if (isIntl.value || isEE.value) { - hiddenTypes.push('sms'); - } return alertConfigs.value - .filter((c) => c.type !== 'common' && !hiddenTypes.includes(c.type)) + .filter((c) => c.type !== 'common') .map((c) => ({ value: String(c.id), label: getConfigOptionLabel(c), diff --git a/frontend/src/views/setting/alert/setting/drawer/index.vue b/frontend/src/views/setting/alert/setting/drawer/index.vue index ad2fe8739..95184ccb3 100644 --- a/frontend/src/views/setting/alert/setting/drawer/index.vue +++ b/frontend/src/views/setting/alert/setting/drawer/index.vue @@ -137,7 +137,7 @@ import { computed, onMounted, reactive, ref, watch } from 'vue'; import i18n from '@/lang'; import { MsgError, MsgSuccess } from '@/utils/message'; import { FormInstance } from 'element-plus'; -import { PageAlertConfigs, TestAlertConfig, UpdateAlertConfig } from '@/api/modules/alert'; +import { ListAlertConfigs, TestAlertConfig, UpdateAlertConfig } from '@/api/modules/alert'; import { Rules, checkNumberRange } from '@/global/form-rules'; import { useGlobalStore } from '@/composables/useGlobalStore'; import { Alert } from '@/api/interface/alert'; @@ -200,8 +200,8 @@ const alertConfigs = ref([]); const loadAlertConfigs = async () => { try { - const res = await PageAlertConfigs({ page: 1, pageSize: 1000 }); - alertConfigs.value = res.data?.items?.filter((item: Alert.AlertConfigInfo) => item.type !== 'common') || []; + const res = await ListAlertConfigs(); + alertConfigs.value = res.data?.filter((item: Alert.AlertConfigInfo) => item.type !== 'common') || []; } catch { alertConfigs.value = []; } @@ -397,7 +397,7 @@ const onTest = async (formEl: FormInstance | undefined) => { const testConfig = { ...form.config, recipient: form.recipient, - }; + } as Alert.AlertConfigTest; const res = await TestAlertConfig(testConfig); loading.value = false; if (res.data) { diff --git a/frontend/src/views/setting/alert/setting/index.vue b/frontend/src/views/setting/alert/setting/index.vue index 4d7451a50..809867502 100644 --- a/frontend/src/views/setting/alert/setting/index.vue +++ b/frontend/src/views/setting/alert/setting/index.vue @@ -323,10 +323,18 @@ const getTypeTagType = (type: string) => { return map[type] || 'info'; }; -const searchCommonConfig = async () => { +const searchConfigs = async () => { + loading.value = true; try { - const res = await ListAlertConfigs(); - const commonFound = res.data.find((s: Alert.AlertConfigInfo) => s.type === 'common'); + const [configRes, pageRes] = await Promise.all([ + ListAlertConfigs(), + PageAlertConfigs({ + page: paginationConfig.currentPage, + pageSize: paginationConfig.pageSize, + }), + ]); + + const commonFound = configRes.data?.find((s: Alert.AlertConfigInfo) => s.type === 'common'); if (commonFound) { const parsedConfig = parseConfig(commonFound, defaultCommonConfig.config); commonConfig.value = { @@ -347,42 +355,29 @@ const searchCommonConfig = async () => { i18n.global.t('xpack.alert.resourceAlert') + ': ' + resourceTimeRange; + } else { + commonConfig.value = { ...defaultCommonConfig }; + sendTimeRangeValue.value = commonConfig.value.config.alertSendTimeRange; + sendTimeRange.value = commonConfig.value.config.alertSendTimeRange; } isInitialized.value = true; - } catch {} -}; -const searchConfigs = async () => { - loading.value = true; - try { - const res = await PageAlertConfigs({ - page: paginationConfig.currentPage, - pageSize: paginationConfig.pageSize, - }); - allConfigs.value = res.data.items || []; - paginationConfig.total = res.data.total || 0; + allConfigs.value = pageRes.data?.items || []; + paginationConfig.total = pageRes.data?.total || 0; } catch { - try { - const res = await ListAlertConfigs(); - allConfigs.value = res.data.filter((s: Alert.AlertConfigInfo) => s.type !== 'common'); - paginationConfig.total = allConfigs.value.length; - } catch {} + allConfigs.value = []; + paginationConfig.total = 0; } finally { loading.value = false; } }; const search = async () => { - loading.value = true; - try { - await Promise.all([searchCommonConfig(), searchConfigs()]); - } finally { - loading.value = false; - } + await searchConfigs(); }; const onDrawerSearch = () => { - searchConfigs(); + void searchConfigs(); }; const onChangeCommon = (id: any) => { @@ -418,7 +413,7 @@ const onChangeOffline = async () => { config.value.config = JSON.stringify(commonConfig.value.config); await UpdateAlertConfig(config.value); loading.value = false; - await search(); + await searchConfigs(); MsgSuccess(i18n.global.t('commons.msg.operationSuccess')); } catch { loading.value = false; @@ -494,7 +489,7 @@ const buttons = computed(() => [ ]); onMounted(async () => { - await search(); + await searchConfigs(); }); diff --git a/frontend/src/views/toolbox/clam/operate/index.vue b/frontend/src/views/toolbox/clam/operate/index.vue index 6539c4716..5441ddefb 100644 --- a/frontend/src/views/toolbox/clam/operate/index.vue +++ b/frontend/src/views/toolbox/clam/operate/index.vue @@ -121,17 +121,7 @@
-
- - - {{ $t('toolbox.clam.alertHelper') }} - - {{ $t('license.levelUpPro') }} - - - -
-
+
{{ $t('xpack.alert.clamHelper') }} @@ -247,13 +237,13 @@ import { Alert } from '@/api/interface/alert'; import { ListAlertConfigs } from '@/api/modules/alert'; import { specOptions, transObjToSpec, transSpecToObj, weekOptions } from '@/views/cronjob/cronjob/helper'; import { splitTimeFromSecond, transferTimeToSecond } from '@/utils/validate'; -const { isIntl, isProductPro, isEE } = useGlobalStore(); +const { isProductPro } = useGlobalStore(); const alertConfigs = ref([]); const loadAlertConfigs = async () => { try { const res = await ListAlertConfigs(); - alertConfigs.value = res.data || []; + alertConfigs.value = res.data?.filter((item: Alert.AlertConfigInfo) => item.type !== 'common') || []; } catch {} }; onMounted(() => { @@ -261,10 +251,8 @@ onMounted(() => { }); const alertConfigOptions = computed(() => { - const hiddenTypes: string[] = []; - if (isIntl.value || isEE.value) hiddenTypes.push('sms'); return alertConfigs.value - .filter((c) => c.status === 'Enable' && c.type !== 'common' && !hiddenTypes.includes(c.type)) + .filter((c) => c.status === 'Enable' && c.type !== 'common') .map((c) => ({ value: String(c.id), label: getAlertConfigOptionLabel(c),