gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NEZ-1984 fix： 限制 alertRule Evaluation interval 为 15 s - 24h

Browse Source
This commit is contained in:
zhangyu
2022-06-27 17:35:24 +08:00
parent 4dff6fc940
commit 9f932b5c4c
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue
View File

@@ -15,7 +15,7 @@
> >
<template v-slot:title><span :title="obj.name">{{obj.name}}</span></template> <template v-slot:title><span :title="obj.name">{{obj.name}}</span></template>
<template v-slot:top-tool-right> <template v-slot:top-tool-right>
<button id="account-add" v-has="'ipam_add'" :title="$t('overall.createipam')" class="top-tool-btn margin-r-10" <button id="account-add" v-has="'ipam_add'" :title="$t('overall.createipamDetail')" class="top-tool-btn margin-r-10"
type="button" @click="add"> type="button" @click="add">
<i class="nz-icon-create-square nz-icon"></i> <i class="nz-icon-create-square nz-icon"></i>
</button> </button>

4
nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
View File

@@ -112,7 +112,7 @@
</el-form-item> </el-form-item>
<!--inr--> <!--inr-->
<el-form-item v-if="showSnmpTrap" :label="$t('alert.config.inr')" prop="inr" class="half-form-item"> <el-form-item v-if="showSnmpTrap" :label="$t('alert.config.inr')" prop="inr" class="half-form-item">
<el-input-number id="alert-box-input-inr" :controls="false" v-model="editAlertRule.inr" :placeholder="$t('alert.config.inrPlaceholder')" size="small" type="text" :disabled="!showSnmpTrap"></el-input-number> <el-input-number :min="15" :max="86400" id="alert-box-input-inr" :controls="false" v-model="editAlertRule.inr" :placeholder="$t('alert.config.inrPlaceholder')" size="small" type="text" :disabled="!showSnmpTrap"></el-input-number>
</el-form-item> </el-form-item>
<!--last--> <!--last-->
<el-form-item v-if="showSnmpTrap" :label="$t('alert.config.for')" prop="last" class="half-form-item alert-box-duration" :rules=" [ <el-form-item v-if="showSnmpTrap" :label="$t('alert.config.for')" prop="last" class="half-form-item alert-box-duration" :rules=" [
@@ -378,6 +378,8 @@ export default {
} }
if (value < 15) { if (value < 15) {
callback(new Error(this.$t('alert.config.inrError'))) callback(new Error(this.$t('alert.config.inrError')))
} else if (value > 86400) {
callback(new Error(this.$t('alert.config.inrErrorMax')))
} else { } else {
callback() callback()
} }

2
nezha-fronted/src/components/common/rightBox/setting/globalizationBox.vue
View File

@@ -29,7 +29,7 @@
</template> </template>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label='$t("overall.labels")' prop="value"> <el-form-item :label='$t("overall.value")' prop="value">
<el-input placeholder="" maxlength="128" show-word-limit v-model="editGlobalization.value" size="small" id="dc-box-input-value"></el-input> <el-input placeholder="" maxlength="128" show-word-limit v-model="editGlobalization.value" size="small" id="dc-box-input-value"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item :label='$t("i18n.remark")' prop="remark">--> <!-- <el-form-item :label='$t("i18n.remark")' prop="remark">-->

2
nezha-fronted/src/components/page/config/globalization.vue
View File

@@ -11,7 +11,7 @@
@getTableData="getTableData" @getTableData="getTableData"
> >
<template v-slot:top-tool-right> <template v-slot:top-tool-right>
<button id="dc-add" v-has="'dc_add'" :title="$t('overall.createDatacenter')" class="top-tool-btn margin-r-10" <button id="dc-add" v-has="'dc_add'" class="top-tool-btn margin-r-10"
type="button" @click="add"> type="button" @click="add">
<i class="nz-icon-create-square nz-icon"></i> <i class="nz-icon-create-square nz-icon"></i>
</button> </button>