merge: 合并代码20240531

restagent/config/config.go

@@ -20,6 +20,11 @@ type YamlConfig struct {
 		Count    int    `yaml:"count"`
 	} `yaml:"logger"`
 
+	Pprof struct {
+		Enabled bool   `yaml:"enabled"`
+		Addr    string `yaml:"addr"`
+	} `yaml:"pprof"`
+
 	// Rest []struct {
 	// 	IPv4           string `yaml:"ipv4"`
 	// 	IPv6           string `yaml:"ipv6"`
@@ -76,30 +81,7 @@ type YamlConfig struct {
 		CmdTimeout       int    `yaml:"cmdTimeout"`
 	} `yaml:"omc"`
 
-	Alarm struct {
-		ForwardAlarm bool   `yaml:"forwardAlarm"`
-		SMProxy      string `yaml:"smProxy"`
-		Email        struct {
-			Smtp          string `yaml:"smtp"`
-			Port          uint16 `yaml:"port"`
-			User          string `yaml:"user"`
-			Password      string `yaml:"password"`
-			TlsSkipVerify bool   `yaml:"tlsSkipVerify"`
-		} `yaml:"email"`
-		SMS struct {
-			ApiURL          string `yaml:"apiURL"`
-			AccessKeyID     string `yaml:"AccessKeyID"`
-			AccessKeySecret string `yaml:"accessKeySecret"`
-			SignName        string `yaml:"signName"`
-			TemplateCode    string `yaml:"templateCode"`
-		} `yaml:"sms"`
-		SMSC struct {
-			Addr       string `yaml:"addr"`
-			SystemID   string `yaml:"systemID"`
-			Password   string `yaml:"password"`
-			SystemType string `yaml:"systemType"`
-		} `yaml:"smsc"`
-	} `yaml:"alarm"`
+	Alarm AlarmConfig `yaml:"alarm"`
 
 	MML MMLParam `yaml:"mml"`
 
@@ -164,6 +146,32 @@ type DbConfig struct {
 	Backup    string `yaml:"backup"`
 }
 
+type AlarmConfig struct {
+	SplitEventAlarm bool   `yaml:"splitEventAlarm"`
+	ForwardAlarm    bool   `yaml:"forwardAlarm"`
+	SMProxy         string `yaml:"smProxy"`
+	Email           struct {
+		Smtp          string `yaml:"smtp"`
+		Port          uint16 `yaml:"port"`
+		User          string `yaml:"user"`
+		Password      string `yaml:"password"`
+		TlsSkipVerify bool   `yaml:"tlsSkipVerify"`
+	} `yaml:"email"`
+	SMS struct {
+		ApiURL          string `yaml:"apiURL"`
+		AccessKeyID     string `yaml:"AccessKeyID"`
+		AccessKeySecret string `yaml:"accessKeySecret"`
+		SignName        string `yaml:"signName"`
+		TemplateCode    string `yaml:"templateCode"`
+	} `yaml:"sms"`
+	SMSC struct {
+		Addr       string `yaml:"addr"`
+		SystemID   string `yaml:"systemID"`
+		Password   string `yaml:"password"`
+		SystemType string `yaml:"systemType"`
+	} `yaml:"smsc"`
+}
+
 type MMLParam struct {
 	Port       int    `yaml:"port"`
 	Port2      int    `yaml:"port2"`
@@ -175,7 +183,6 @@ type MMLParam struct {
 	User       string `yaml:"user"`
 	Password   string `ymal:"password"`
 	MmlHome    string `yaml:"mmlHome"`
-	Upload     string `yaml:"upload"`
 }
 
 type TestDatas struct {
@@ -223,6 +230,9 @@ func NewYamlConfig() YamlConfig {
 			SizeCol:    128,
 			BufferSize: 65535,
 		},
+		Alarm: AlarmConfig{
+			SplitEventAlarm: true,
+		},
 	}
 }