remove system amount

WTIFS · Aug 31, 2023 · 64d2e8b · 64d2e8b
1 parent 801965a
commit 64d2e8b
Show file tree

Hide file tree

Showing 2 changed files with 131 additions and 215 deletions.
diff --git a/api/v1/traffic_manage/ratelimit.proto b/api/v1/traffic_manage/ratelimit.proto
@@ -37,7 +37,7 @@ message Rule {
     // 针对并发数进行限流
     CONCURRENCY = 1;
     // 针对CPU使用率进行限流
-    CPU_BBR = 2;
+    CPU = 2;
   }
   Resource resource = 6;
   // 限流类型
@@ -96,8 +96,6 @@ message Rule {
   google.protobuf.StringValue etime = 25;
   // 最大排队时长，单位秒
   google.protobuf.UInt32Value max_queue_delay = 26 [json_name = "max_queue_delay"];
-  // 系统资源限流配额
-  SystemResourceAmount systemResourceAmount = 27;
 }
 
 message MatchArgument {
@@ -215,14 +213,4 @@ message ClimbConfig {
   }
 
   ClimbThrottling throttling = 4;  // 限流调整相关参数
-}
-
-// 自适应限流阈值
-message SystemResourceAmount {
-  // 采样窗口大小
-  google.protobuf.Duration window = 1;
-  // 数据统计精度，决定滑动窗口的最小周期，滑窗的步长=window/precision
-  google.protobuf.UInt32Value precision = 2;
-  // 触发阈值
-  google.protobuf.FloatValue threshold = 3;
 }