File tree Expand file tree Collapse file tree 1 file changed +8
-4
lines changed
web/console/src/modules/alarmPolicy/actions Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -161,7 +161,7 @@ export const validatorActions = {
161161 }
162162 return { status, message } ;
163163 } ,
164- _validateEvaluatorValue ( value : string ) {
164+ _validateEvaluatorValue ( value : string , canOver100 = false ) {
165165 let status = 0 ,
166166 message = '' ;
167167 if ( ! value ) {
@@ -170,7 +170,7 @@ export const validatorActions = {
170170 } else if ( isNaN ( + value ) ) {
171171 status = 2 ;
172172 message = t ( '阈值的格式错误' ) ;
173- } else if ( + value > 100 || + value <= 0 ) {
173+ } else if ( ( + value > 100 && ! canOver100 ) || + value <= 0 ) {
174174 status = 2 ;
175175 message = t ( '阈值的范围错误' ) ;
176176 } else {
@@ -210,7 +210,8 @@ export const validatorActions = {
210210 ) ;
211211 } else {
212212 newAlarmMetrics [ index ] . v_evaluatorValue = validatorActions . _validateEvaluatorValue (
213- newAlarmMetrics [ index ] . evaluatorValue
213+ newAlarmMetrics [ index ] . evaluatorValue ,
214+ newAlarmMetrics ?. [ index ] ?. metricName === 'vm_cpu_usage_rate'
214215 ) ;
215216 }
216217
@@ -234,7 +235,10 @@ export const validatorActions = {
234235 if ( item . type === 'sumCpu' || item . type === 'sumMem' ) {
235236 isOk = isOk && validatorActions . _validateEvaluatorSumValue ( item . evaluatorValue + '' ) . status === 1 ;
236237 } else if ( item . type === 'times' || item . type === 'percent' ) {
237- isOk = isOk && validatorActions . _validateEvaluatorValue ( item . evaluatorValue + '' ) . status === 1 ;
238+ isOk =
239+ isOk &&
240+ validatorActions . _validateEvaluatorValue ( item . evaluatorValue + '' , item ?. metricName === 'vm_cpu_usage_rate' )
241+ . status === 1 ;
238242 }
239243 }
240244 } ) ;
You can’t perform that action at this time.
0 commit comments