Skip to content

C
cat

梦中观雨 / cat
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
C
cat

体验新版 GitCode，发现更多精彩内容 >>

提交 28f045a9 编写于 作者: Y youyong205
浏览文件
操作

Merge pull request #345 from leonindy/master 

remove default rule, which will be done in code; change subcondition to sub-condition
上级 6cb77708 bad37857
展开全部 隐藏空白更改
内联 并排
Showing with 221 addition and 482 deletion
cat-home/src/main/java/com/dianping/cat/report/task/alert/DefaultDataChecker.java
浏览文件 @ 28f045a9
......@@ -9,7 +9,7 @@ import org.unidal.tuple.Pair;
import com.dianping.cat.home.rule.entity.Condition;
import com.dianping.cat.home.rule.entity.Config;
import com.dianping.cat.home.rule.entity.Subcondition;
import com.dianping.cat.home.rule.entity.SubCondition;
public class DefaultDataChecker implements DataChecker {
......@@ -102,9 +102,9 @@ public class DefaultDataChecker implements DataChecker {
}
private boolean checkDataByMinute(Condition condition, double value, double baseline) {
for (Subcondition subCondition : condition.getSubconditions()) {
for (SubCondition subCondition : condition.getSubConditions()) {
String ruleType = subCondition.getType();
double ruleValue = Double.parseDouble(subCondition.getText());
double ruleValue = subCondition.getText();
RuleType rule = RuleType.getByTypeId(ruleType);
if (rule != null) {
......
cat-home/src/main/java/com/dianping/cat/system/config/BusinessRuleConfigManager.java
浏览文件 @ 28f045a9
......@@ -12,7 +12,7 @@ import com.dianping.cat.core.config.Config;
import com.dianping.cat.core.config.ConfigEntity;
import com.dianping.cat.home.rule.entity.Condition;
import com.dianping.cat.home.rule.entity.MonitorRules;
import com.dianping.cat.home.rule.entity.Subcondition;
import com.dianping.cat.home.rule.entity.SubCondition;
import com.dianping.cat.home.rule.transform.DefaultSaxParser;
import com.dianping.cat.report.task.alert.MetricType;
......@@ -31,12 +31,12 @@ public class BusinessRuleConfigManager extends BaseRuleConfigManager implements
if (configs.size() == 0) {
com.dianping.cat.home.rule.entity.Config config = new com.dianping.cat.home.rule.entity.Config();
Condition condition = new Condition();
Subcondition descPerSubcon = new Subcondition();
Subcondition descValSubcon = new Subcondition();
SubCondition descPerSubcon = new SubCondition();
SubCondition descValSubcon = new SubCondition();
descPerSubcon.setType("DescPer").setText("50");
descValSubcon.setType("DescVal").setText("100");
condition.addSubcondition(descPerSubcon).addSubcondition(descValSubcon);
descPerSubcon.setType("DescPer").setText(50.0);
descValSubcon.setType("DescVal").setText(100.0);
condition.addSubCondition(descPerSubcon).addSubCondition(descValSubcon);
config.addCondition(condition);
configs.add(config);
}
......
cat-home/src/main/resources/META-INF/dal/model/monitor-rules-codegen.xml
浏览文件 @ 28f045a9
......@@ -22,9 +22,9 @@
</entity>
<entity name="condition">
<attribute name="minute" value-type="int" />
<entity-ref name="subcondition" />
<entity-ref name="sub-condition" />
</entity>
<entity name="subcondition">
<entity name="sub-condition">
<attribute name="type" value-type="String" />
<element name="text" value-type="String" text="true" />
</entity>
......
cat-home/src/main/resources/META-INF/dal/model/monitor-rules-model.xml
浏览文件 @ 28f045a9
......@@ -24,11 +24,11 @@
<entity name="condition">
<attribute name="title" value-type="String" />
<attribute name="minute" value-type="int" default-value="3" />
<entity-ref name="subcondition" type="list" names="subconditions" />
<entity-ref name="sub-condition" type="list" names="sub-conditions" />
</entity>
<entity name="subcondition">
<entity name="sub-condition">
<attribute name="type" value-type="String" />
<element name="text" value-type="String" text="true" />
<element name="text" value-type="double" text="true" />
</entity>
</model>
cat-home/src/main/resources/config/default-network-metric-rule-config.xml
浏览文件 @ 28f045a9
......@@ -6,7 +6,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="3">
<subcondition type="MaxVal">500</subcondition>
<sub-condition type="MaxVal">500</sub-condition>
</condition>
</config>
</rule>
......@@ -28,7 +28,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="3">
<subcondition type="MaxVal">30</subcondition>
<sub-condition type="MaxVal">30</sub-condition>
</condition>
</config>
</rule>
......@@ -38,7 +38,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">1179648000</subcondition>
<sub-condition type="MaxVal">1179648000</sub-condition>
</condition>
</config>
</rule>
......@@ -48,7 +48,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">2359296000</subcondition>
<sub-condition type="MaxVal">2359296000</sub-condition>
</condition>
</config>
</rule>
......@@ -59,7 +59,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">2359296000</subcondition>
<sub-condition type="MaxVal">2359296000</sub-condition>
</condition>
</config>
</rule>
......@@ -70,7 +70,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">1179648000</subcondition>
<sub-condition type="MaxVal">1179648000</sub-condition>
</condition>
</config>
</rule>
......@@ -80,7 +80,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">786432000</subcondition>
<sub-condition type="MaxVal">786432000</sub-condition>
</condition>
</config>
</rule>
......@@ -90,7 +90,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">1966080000</subcondition>
<sub-condition type="MaxVal">1966080000</sub-condition>
</condition>
</config>
</rule>
......@@ -100,7 +100,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">1966080000</subcondition>
<sub-condition type="MaxVal">1966080000</sub-condition>
</condition>
</config>
</rule>
......@@ -110,7 +110,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">786432000</subcondition>
<sub-condition type="MaxVal">786432000</sub-condition>
</condition>
</config>
</rule>
......@@ -120,7 +120,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">786432000</subcondition>
<sub-condition type="MaxVal">786432000</sub-condition>
</condition>
</config>
</rule>
......@@ -130,7 +130,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">1966080000</subcondition>
<sub-condition type="MaxVal">1966080000</sub-condition>
</condition>
</config>
</rule>
......@@ -140,7 +140,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">3179648000</subcondition>
<sub-condition type="MaxVal">3179648000</sub-condition>
</condition>
</config>
</rule>
......@@ -150,7 +150,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">2359296000</subcondition>
<sub-condition type="MaxVal">2359296000</sub-condition>
</condition>
</config>
</rule>
......@@ -160,7 +160,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">5505024000</subcondition>
<sub-condition type="MaxVal">5505024000</sub-condition>
</condition>
</config>
</rule>
......@@ -170,7 +170,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">3145728000</subcondition>
<sub-condition type="MaxVal">3145728000</sub-condition>
</condition>
</config>
</rule>
......@@ -181,7 +181,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">3145728000</subcondition>
<sub-condition type="MaxVal">3145728000</sub-condition>
</condition>
</config>
</rule>
......@@ -192,7 +192,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">5505024000</subcondition>
<sub-condition type="MaxVal">5505024000</sub-condition>
</condition>
</config>
</rule>
......@@ -203,7 +203,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">6291456000</subcondition>
<sub-condition type="MaxVal">6291456000</sub-condition>
</condition>
</config>
</rule>
......@@ -214,7 +214,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">393216000</subcondition>
<sub-condition type="MaxVal">393216000</sub-condition>
</condition>
</config>
</rule>
......@@ -224,7 +224,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">27525120000</subcondition>
<sub-condition type="MaxVal">27525120000</sub-condition>
</condition>
</config>
</rule>
......@@ -234,7 +234,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">27525120000</subcondition>
<sub-condition type="MaxVal">27525120000</sub-condition>
</condition>
</config>
</rule>
......@@ -244,7 +244,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">13369344000</subcondition>
<sub-condition type="MaxVal">13369344000</sub-condition>
</condition>
</config>
</rule>
......@@ -254,7 +254,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">13369344000</subcondition>
<sub-condition type="MaxVal">13369344000</sub-condition>
</condition>
</config>
</rule>
......@@ -264,7 +264,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">393216000</subcondition>
<sub-condition type="MaxVal">393216000</sub-condition>
</condition>
</config>
</rule>
......@@ -274,7 +274,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">6291456000</subcondition>
<sub-condition type="MaxVal">6291456000</sub-condition>
</condition>
</config>
</rule>
......@@ -284,7 +284,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">27525120000</subcondition>
<sub-condition type="MaxVal">27525120000</sub-condition>
</condition>
</config>
</rule>
......@@ -294,7 +294,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">27525120000</subcondition>
<sub-condition type="MaxVal">27525120000</sub-condition>
</condition>
</config>
</rule>
......@@ -304,7 +304,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">27525120000</subcondition>
<sub-condition type="MaxVal">27525120000</sub-condition>
</condition>
</config>
</rule>
......@@ -314,7 +314,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">27525120000</subcondition>
<sub-condition type="MaxVal">27525120000</sub-condition>
</condition>
</config>
</rule>
......@@ -327,7 +327,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">393216000</subcondition>
<sub-condition type="MaxVal">393216000</sub-condition>
</condition>
</config>
</rule>
......@@ -340,7 +340,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">393216000</subcondition>
<sub-condition type="MaxVal">393216000</sub-condition>
</condition>
</config>
</rule>
......@@ -353,7 +353,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">393216000</subcondition>
<sub-condition type="MaxVal">393216000</sub-condition>
</condition>
</config>
</rule>
......@@ -366,7 +366,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">393216000</subcondition>
<sub-condition type="MaxVal">393216000</sub-condition>
</condition>
</config>
</rule>
......@@ -376,7 +376,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">27525120000</subcondition>
<sub-condition type="MaxVal">27525120000</sub-condition>
</condition>
</config>
</rule>
......@@ -386,7 +386,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">27525120000</subcondition>
<sub-condition type="MaxVal">27525120000</sub-condition>
</condition>
</config>
</rule>
......
cat-home/src/test/java/com/dianping/cat/report/task/metric/AlertConfigTest.java
浏览文件 @ 28f045a9
......@@ -17,7 +17,7 @@ import com.dianping.cat.home.rule.entity.Condition;
import com.dianping.cat.home.rule.entity.Config;
import com.dianping.cat.home.rule.entity.MonitorRules;
import com.dianping.cat.home.rule.entity.Rule;
import com.dianping.cat.home.rule.entity.Subcondition;
import com.dianping.cat.home.rule.entity.SubCondition;
import com.dianping.cat.home.rule.transform.DefaultSaxParser;
import com.dianping.cat.report.task.alert.DataChecker;
import com.dianping.cat.report.task.alert.DefaultDataChecker;
......@@ -54,8 +54,8 @@ public class AlertConfigTest {
List<Config> configs = new ArrayList<Config>();
Config config = new Config();
Condition condition = new Condition();
Subcondition descPerSubcon = new Subcondition();
Subcondition descValSubcon = new Subcondition();
SubCondition descPerSubcon = new SubCondition();
SubCondition descValSubcon = new SubCondition();
double decreasePercent = metricItemConfig.getDecreasePercentage();
double decreaseValue = metricItemConfig.getDecreaseValue();
......@@ -67,10 +67,10 @@ public class AlertConfigTest {
decreaseValue = 100;
}
descPerSubcon.setType("DescPer").setText(String.valueOf(decreasePercent));
descValSubcon.setType("DescVal").setText(String.valueOf(decreaseValue));
descPerSubcon.setType("DescPer").setText(decreasePercent);
descValSubcon.setType("DescVal").setText(decreaseValue);
condition.addSubcondition(descPerSubcon).addSubcondition(descValSubcon);
condition.addSubCondition(descPerSubcon).addSubCondition(descValSubcon);
config.addCondition(condition);
configs.add(config);
return configs;
......
cat-home/src/test/resources/config/demo-rule-monitor.xml
浏览文件 @ 28f045a9
......@@ -9,36 +9,36 @@
<config starttime="00:00" endtime="24:00">
<condition>
<subcondition type="DescPer">40</subcondition>
<subcondition type="DescPer">40</subcondition>
<sub-condition type="DescPer">40</sub-condition>
<sub-condition type="DescPer">40</sub-condition>
</condition>
<condition>
<subcondition type="DescVal">200</subcondition>
<sub-condition type="DescVal">200</sub-condition>
</condition>
</config>
</rule>
<rule id="conditionCombination">
<config starttime="00:00" endtime="24:00">
<condition>
<subcondition type="DescPer">400</subcondition>
<sub-condition type="DescPer">400</sub-condition>
</condition>
<condition>
<subcondition type="DescPer">400</subcondition>
<subcondition type="DescVal">900</subcondition>
<sub-condition type="DescPer">400</sub-condition>
<sub-condition type="DescVal">900</sub-condition>
</condition>
<condition> <!-- trigger alert -->
<subcondition type="DescPer">40</subcondition>
<subcondition type="DescVal">100</subcondition>
<sub-condition type="DescPer">40</sub-condition>
<sub-condition type="DescVal">100</sub-condition>
</condition>
</config>
</rule>
<rule id="subconditionCombination">
<config starttime="00:00" endtime="24:00">
<condition>
<subcondition type="DescPer">40</subcondition>
<subcondition type="DescVal">80</subcondition>
<sub-condition type="DescPer">40</sub-condition>
<sub-condition type="DescVal">80</sub-condition>
<!-- block alert -->
<subcondition type="MinVal">10</subcondition>
<sub-condition type="MinVal">10</sub-condition>
</condition>
</config>
</rule>
......
cat-home/src/test/resources/config/monitor-rule.xml
浏览文件 @ 28f045a9
......@@ -5,7 +5,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="3">
<subcondition type="MaxVal">500</subcondition>
<sub-condition type="MaxVal">500</sub-condition>
</condition>
</config>
</rule>
......@@ -27,7 +27,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="3">
<subcondition type="MaxVal">30</subcondition>
<sub-condition type="MaxVal">30</sub-condition>
</condition>
</config>
</rule>
......@@ -37,7 +37,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">1179648000</subcondition>
<sub-condition type="MaxVal">1179648000</sub-condition>
</condition>
</config>
</rule>
......@@ -47,7 +47,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">2359296000</subcondition>
<sub-condition type="MaxVal">2359296000</sub-condition>
</condition>
</config>
</rule>
......@@ -58,7 +58,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">2359296000</subcondition>
<sub-condition type="MaxVal">2359296000</sub-condition>
</condition>
</config>
</rule>
......@@ -69,7 +69,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">1179648000</subcondition>
<sub-condition type="MaxVal">1179648000</sub-condition>
</condition>
</config>
</rule>
......@@ -79,7 +79,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">786432000</subcondition>
<sub-condition type="MaxVal">786432000</sub-condition>
</condition>
</config>
</rule>
......@@ -89,7 +89,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">1966080000</subcondition>
<sub-condition type="MaxVal">1966080000</sub-condition>
</condition>
</config>
</rule>
......@@ -99,7 +99,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">1966080000</subcondition>
<sub-condition type="MaxVal">1966080000</sub-condition>
</condition>
</config>
</rule>
......@@ -109,7 +109,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">786432000</subcondition>
<sub-condition type="MaxVal">786432000</sub-condition>
</condition>
</config>
</rule>
......@@ -119,7 +119,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">786432000</subcondition>
<sub-condition type="MaxVal">786432000</sub-condition>
</condition>
</config>
</rule>
......@@ -129,7 +129,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">1966080000</subcondition>
<sub-condition type="MaxVal">1966080000</sub-condition>
</condition>
</config>
</rule>
......@@ -139,7 +139,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">3179648000</subcondition>
<sub-condition type="MaxVal">3179648000</sub-condition>
</condition>
</config>
</rule>
......@@ -149,7 +149,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">2359296000</subcondition>
<sub-condition type="MaxVal">2359296000</sub-condition>
</condition>
</config>
</rule>
......@@ -159,7 +159,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">5505024000</subcondition>
<sub-condition type="MaxVal">5505024000</sub-condition>
</condition>
</config>
</rule>
......@@ -169,7 +169,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">3145728000</subcondition>
<sub-condition type="MaxVal">3145728000</sub-condition>
</condition>
</config>
</rule>
......@@ -180,7 +180,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">3145728000</subcondition>
<sub-condition type="MaxVal">3145728000</sub-condition>
</condition>
</config>
</rule>
......@@ -191,7 +191,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">5505024000</subcondition>
<sub-condition type="MaxVal">5505024000</sub-condition>
</condition>
</config>
</rule>
......@@ -202,7 +202,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">6291456000</subcondition>
<sub-condition type="MaxVal">6291456000</sub-condition>
</condition>
</config>
</rule>
......@@ -213,7 +213,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">393216000</subcondition>
<sub-condition type="MaxVal">393216000</sub-condition>
</condition>
</config>
</rule>
......@@ -223,7 +223,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">27525120000</subcondition>
<sub-condition type="MaxVal">27525120000</sub-condition>
</condition>
</config>
</rule>
......@@ -233,7 +233,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">27525120000</subcondition>
<sub-condition type="MaxVal">27525120000</sub-condition>
</condition>
</config>
</rule>
......@@ -243,7 +243,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">13369344000</subcondition>
<sub-condition type="MaxVal">13369344000</sub-condition>
</condition>
</config>
</rule>
......@@ -253,7 +253,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">13369344000</subcondition>
<sub-condition type="MaxVal">13369344000</sub-condition>
</condition>
</config>
</rule>
......@@ -263,7 +263,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">393216000</subcondition>
<sub-condition type="MaxVal">393216000</sub-condition>
</condition>
</config>
</rule>
......@@ -273,7 +273,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">6291456000</subcondition>
<sub-condition type="MaxVal">6291456000</sub-condition>
</condition>
</config>
</rule>
......@@ -283,7 +283,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">27525120000</subcondition>
<sub-condition type="MaxVal">27525120000</sub-condition>
</condition>
</config>
</rule>
......@@ -293,7 +293,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">27525120000</subcondition>
<sub-condition type="MaxVal">27525120000</sub-condition>
</condition>
</config>
</rule>
......@@ -303,7 +303,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">27525120000</subcondition>
<sub-condition type="MaxVal">27525120000</sub-condition>
</condition>
</config>
</rule>
......@@ -313,7 +313,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">27525120000</subcondition>
<sub-condition type="MaxVal">27525120000</sub-condition>
</condition>
</config>
</rule>
......@@ -326,7 +326,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">393216000</subcondition>
<sub-condition type="MaxVal">393216000</sub-condition>
</condition>
</config>
</rule>
......@@ -339,7 +339,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">393216000</subcondition>
<sub-condition type="MaxVal">393216000</sub-condition>
</condition>
</config>
</rule>
......@@ -352,7 +352,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">393216000</subcondition>
<sub-condition type="MaxVal">393216000</sub-condition>
</condition>
</config>
</rule>
......@@ -365,7 +365,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">393216000</subcondition>
<sub-condition type="MaxVal">393216000</sub-condition>
</condition>
</config>
</rule>
......@@ -375,7 +375,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">27525120000</subcondition>
<sub-condition type="MaxVal">27525120000</sub-condition>
</condition>
</config>
</rule>
......@@ -385,7 +385,7 @@
</metric-item>
<config starttime="00:00" endtime="24:00">
<condition minute="1">
<subcondition type="MaxVal">27525120000</subcondition>
<sub-condition type="MaxVal">27525120000</sub-condition>
</condition>
</config>
</rule>
......
cat-home/src/test/resources/config/test-minute-monitor.xml
浏览文件 @ 28f045a9
......@@ -2,10 +2,10 @@
<rule id="two-minute">
<config starttime="00:00" endtime="24:00">
<condition minute="2">
<subcondition type="DescPer">40</subcondition>
<sub-condition type="DescPer">40</sub-condition>
</condition>
<condition minute="2">
<subcondition type="DescVal">80</subcondition>
<sub-condition type="DescVal">80</sub-condition>
</condition>
</config>
</rule>
......
cat-home/src/test/resources/config/test-rule-monitor.xml
浏览文件 @ 28f045a9
......@@ -2,96 +2,96 @@
<rule id="decreasePercentage">
<config starttime="00:00" endtime="24:00">
<condition>
<subcondition type="DescPer">40</subcondition>
<sub-condition type="DescPer">40</sub-condition>
</condition>
<condition>
<subcondition type="DescVal">200</subcondition>
<sub-condition type="DescVal">200</sub-condition>
</condition>
</config>
</rule>
<rule id="decreaseValue">
<config starttime="00:00" endtime="24:00">
<condition>
<subcondition type="DescPer">40</subcondition>
<subcondition type="DescVal">200</subcondition>
<sub-condition type="DescPer">40</sub-condition>
<sub-condition type="DescVal">200</sub-condition>
</condition>
<condition>
<subcondition type="DescVal">95</subcondition>
<sub-condition type="DescVal">95</sub-condition>
</condition>
</config>
</rule>
<rule id="increasePercentage">
<config starttime="00:00" endtime="24:00">
<condition>
<subcondition type="DescPer">40</subcondition>
<subcondition type="DescVal">200</subcondition>
<sub-condition type="DescPer">40</sub-condition>
<sub-condition type="DescVal">200</sub-condition>
</condition>
<condition>
<subcondition type="AscPer">49</subcondition>
<sub-condition type="AscPer">49</sub-condition>
</condition>
</config>
</rule>
<rule id="increaseValue">
<config starttime="00:00" endtime="24:00">
<condition>
<subcondition type="DescPer">40</subcondition>
<subcondition type="DescVal">200</subcondition>
<sub-condition type="DescPer">40</sub-condition>
<sub-condition type="DescVal">200</sub-condition>
</condition>
<condition>
<subcondition type="AscVal">49</subcondition>
<sub-condition type="AscVal">49</sub-condition>
</condition>
</config>
</rule>
<rule id="absoluteMaxValue">
<config starttime="00:00" endtime="24:00">
<condition>
<subcondition type="DescPer">40</subcondition>
<subcondition type="DescVal">200</subcondition>
<sub-condition type="DescPer">40</sub-condition>
<sub-condition type="DescVal">200</sub-condition>
</condition>
<condition>
<subcondition type="MaxVal">450</subcondition>
<sub-condition type="MaxVal">450</sub-condition>
</condition>
</config>
</rule>
<rule id="absoluteMinValue">
<config starttime="00:00" endtime="24:00">
<condition>
<subcondition type="DescPer">40</subcondition>
<subcondition type="DescVal">200</subcondition>
<sub-condition type="DescPer">40</sub-condition>
<sub-condition type="DescVal">200</sub-condition>
</condition>
<condition>
<subcondition type="MinVal">51</subcondition>
<sub-condition type="MinVal">51</sub-condition>
</condition>
</config>
</rule>
<rule id="conditionCombination">
<config starttime="00:00" endtime="24:00">
<condition>
<subcondition type="DescPer">400</subcondition>
<sub-condition type="DescPer">400</sub-condition>
</condition>
<condition>
<subcondition type="DescPer">400</subcondition>
<subcondition type="DescVal">900</subcondition>
<sub-condition type="DescPer">400</sub-condition>
<sub-condition type="DescVal">900</sub-condition>
</condition>
<condition>
<subcondition type="DescPer">40</subcondition>
<subcondition type="DescVal">100</subcondition>
<sub-condition type="DescPer">40</sub-condition>
<sub-condition type="DescVal">100</sub-condition>
</condition>
</config>
</rule>
<rule id="subconditionCombination">
<config starttime="00:00" endtime="24:00">
<condition>
<subcondition type="DescPer">400</subcondition>
<sub-condition type="DescPer">400</sub-condition>
</condition>
<condition>
<subcondition type="DescPer">400</subcondition>
<subcondition type="DescVal">900</subcondition>
<sub-condition type="DescPer">400</sub-condition>
<sub-condition type="DescVal">900</sub-condition>
</condition>
<condition>
<subcondition type="DescPer">40</subcondition>
<subcondition type="DescVal">200</subcondition>
<subcondition type="MinVal">10</subcondition>
<sub-condition type="DescPer">40</sub-condition>
<sub-condition type="DescVal">200</sub-condition>
<sub-condition type="MinVal">10</sub-condition>
</condition>
</config>
</rule>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或