From 314cdbed28dff240669d4ac48e800b76d7d1386e Mon Sep 17 00:00:00 2001 From: yinjiangyi Date: Wed, 1 Sep 2021 19:16:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0=E9=85=8D?= =?UTF-8?q?=E7=BD=AEbaseline=E4=BF=9D=E5=AD=98level?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/mesalab/config/ApplicationConfig.java | 1 + src/main/java/cn/mesalab/service/BaselineSingleThread.java | 4 +++- src/main/resources/application.properties | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/cn/mesalab/config/ApplicationConfig.java b/src/main/java/cn/mesalab/config/ApplicationConfig.java index ffbfafb..6c28e90 100644 --- a/src/main/java/cn/mesalab/config/ApplicationConfig.java +++ b/src/main/java/cn/mesalab/config/ApplicationConfig.java @@ -22,6 +22,7 @@ public class ApplicationConfig { public static final Integer HISTORICAL_GRAD = ConfigUtils.getIntProperty("historical.grad"); public static final String TIME_FORMAT = ConfigUtils.getStringProperty("time.format"); public static final String BASELINE_METRIC_TYPE = ConfigUtils.getStringProperty("baseline.metric.type"); + public static final Integer BASELINE_SAVE_LEVEL = ConfigUtils.getIntProperty("baseline.save.level"); public static final String HBASE_BASELINE_GENERATION_TYPE_SUFFIX = ConfigUtils.getStringProperty("hbase.baseline.generation.type.suffix"); public static final String HBASE_BASELINE_ZERO_REPLACE_VALUE_SUFFIX = ConfigUtils.getStringProperty("hbase.baseline.zero.replace.value.suffix"); diff --git a/src/main/java/cn/mesalab/service/BaselineSingleThread.java b/src/main/java/cn/mesalab/service/BaselineSingleThread.java index 2d8098d..e48b3a3 100644 --- a/src/main/java/cn/mesalab/service/BaselineSingleThread.java +++ b/src/main/java/cn/mesalab/service/BaselineSingleThread.java @@ -29,6 +29,8 @@ import java.util.stream.Collectors; public class BaselineSingleThread extends Thread { private static final Logger LOG = LoggerFactory.getLogger(BaselineSingleThread.class); + private final int BASELINE_SAVE_LEVEL = ApplicationConfig.BASELINE_SAVE_LEVEL; + private final HbaseUtils hbaseUtils; private final Table hbaseTable; private final List attackTypeList; @@ -100,7 +102,7 @@ public class BaselineSingleThread extends Thread { int[] ipBaseline = tuple._1; int generateType = tuple._2; int zeroReplaceValue = tuple._3; - if ((ipBaseline!= null ) && (ip.length()>0)){ + if ((BASELINE_SAVE_LEVEL >= generateType) && (ipBaseline!= null ) && (ip.length()>0)){ hbaseUtils.cachedInPut(putList, ip, ipBaseline, attackType, ApplicationConfig.BASELINE_METRIC_TYPE); hbaseUtils.cachedInPut(putList, ip, generateType, attackType, ApplicationConfig.BASELINE_METRIC_TYPE + "_" + ApplicationConfig.HBASE_BASELINE_GENERATION_TYPE_SUFFIX); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 31c9419..c0593d0 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -33,6 +33,8 @@ druid.columnname.attacktype=attack_type druid.columnname.recvtime=__time druid.columnname.partition.num=partition_num baseline.metric.type=session_rate +#baseline存储级别，1-type1;2-type1及type2;3-all +baseline.save.level=1 #Hbase字段映射 hbase.baseline.generation.type.suffix=baseline_type