center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #11870 from dataease/pr@dev-v2@perf_threshold_instance_clean

Browse Source 
perf(X-Pack): 阈值告警记录定时清理
This commit is contained in:
fit2cloud-chenyw 2024-08-30 12:29:29 +08:00 committed by GitHub
commit ca2cc0949d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/core-frontend/src/locales/zh-CN.ts
View File

@ -2442,6 +2442,7 @@ export default {
dsExecuteTime: '数据源检测频率',
frontTimeOut: '请求超时时间（秒）',
logLiveTime: '操作日志保留时间（天）',
thresholdLogLiveTime: '阈值告警记录保留时间（天）',
exportFileLiveTime: '后台导出文件保留时间（天）',
platformOid: '第三方平台用户组织',
platformRid: '第三方平台用户角色',

4
core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue
View File

@ -124,7 +124,7 @@ const edit = (list, orgOptions, roleOptions, loginOptions) => {
state.loginOptions = loginOptions || []
state.settingList = list.map(item => {
const pkey = item.pkey
if (pkey === 'basic.logLiveTime') {
if (pkey === 'basic.logLiveTime' || pkey === 'basic.thresholdLogLiveTime') {
rule[pkey.split('.')[1]] = [
{
required: true,
@ -272,7 +272,7 @@ defineExpose({
type="number"
/>
</div>
<div v-else-if="item.pkey === 'logLiveTime'">
<div v-else-if="item.pkey === 'logLiveTime' || item.pkey === 'thresholdLogLiveTime'">
<el-input-number
v-model="state.form[item.pkey]"
autocomplete="off"

2
de-xpack

@ -1 +1 @@
Subproject commit 6687d589719219603b02ae262e6671971a85cad5
Subproject commit 47251c7975cbee373fd183a3426b3b24526d1d65

1
sdk/common/src/main/java/io/dataease/constant/XpackSettingConstants.java
View File

@ -10,4 +10,5 @@ public class XpackSettingConstants {
public static final String DIP = "basic.dip";
public static final String PVP = "basic.pvp";
public static final String DEFAULT_LOGIN = "basic.defaultLogin";
public static final String THRSHOLD_LOG_LIVE_TIME = "basic.thresholdLogLiveTime";
}

3
sdk/common/src/main/java/io/dataease/utils/SystemSettingUtils.java
View File

@ -14,7 +14,8 @@ public class SystemSettingUtils {
XpackSettingConstants.DIP,
XpackSettingConstants.PVP,
XpackSettingConstants.PLATFORM_RID,
XpackSettingConstants.DEFAULT_LOGIN);
XpackSettingConstants.DEFAULT_LOGIN,
XpackSettingConstants.THRSHOLD_LOG_LIVE_TIME);
return xpackSettingList.contains(pkey);
}
}