From 0be679f80637d395658718ca6d93c309d29d18af Mon Sep 17 00:00:00 2001
From: bidaya0 <xianzelin@huoxian.cn>
Date: Fri, 16 Dec 2022 14:35:44 +0800
Subject: [PATCH] feat: remove-config-application-and-jvm-metric-p2

---
 dongtai_common/models/agent_config.py   | 4 ++--
 dongtai_conf/settings.py                | 6 +-----
 dongtai_web/threshold/config_setting.py | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/dongtai_common/models/agent_config.py b/dongtai_common/models/agent_config.py
index c9107777d..9be4a7509 100644
--- a/dongtai_common/models/agent_config.py
+++ b/dongtai_common/models/agent_config.py
@@ -42,7 +42,7 @@ class MetricGroup(IntegerChoices):
 
 
 class DealType(IntegerChoices):
-    UNLOAD = 1, _("完全卸载")
+#    UNLOAD = 1, _("完全卸载")
     RELIVE = 2, _("恢复后启动")
 
 
@@ -122,7 +122,7 @@ class IastCircuitConfig(models.Model):
     is_enable = models.IntegerField(blank=True, null=True)
     is_deleted = models.IntegerField(default=0, blank=True, null=True)
     deal = models.IntegerField(blank=True, null=True)
-    interval = models.IntegerField(blank=True, null=True)
+    interval = models.IntegerField(blank=True, null=True, default=30)
     metric_group = models.IntegerField(blank=True, null=True)
     priority = models.IntegerField(blank=True, null=True)
     create_time = models.IntegerField(blank=True,
diff --git a/dongtai_conf/settings.py b/dongtai_conf/settings.py
index f0a13bbf0..d9b3595c7 100644
--- a/dongtai_conf/settings.py
+++ b/dongtai_conf/settings.py
@@ -573,7 +573,7 @@ def safe_execute(default, exception, function, *args):
         "interval":
         1,
         "deal":
-        1,
+        2,
         "is_enable":
         1,
         "is_deleted":
@@ -587,10 +587,6 @@ def safe_execute(default, exception, function, *args):
             "metric_type": 2,
             "opt": 5,
             "value": 100
-        }, {
-            "metric_type": 3,
-            "opt": 5,
-            "value": 1000000000
         }]
     },
     'JVM': {
diff --git a/dongtai_web/threshold/config_setting.py b/dongtai_web/threshold/config_setting.py
index d97b3bf55..5a031000a 100644
--- a/dongtai_web/threshold/config_setting.py
+++ b/dongtai_web/threshold/config_setting.py
@@ -135,7 +135,7 @@ class AgentConfigSettingV2Serializer(serializers.Serializer):
     metric_group = serializers.ChoiceField(MetricGroup.choices)
     metrics = serializers.ListField(
         child=AgentConfigSettingV2MetricSerializer())
-    interval = serializers.IntegerField()
+    interval = serializers.IntegerField(default=30)
     deal = serializers.ChoiceField(DealType.choices)
     is_enable = serializers.IntegerField()