[ingester] alarm_event add user_id

deepflowio · Sep 8, 2023 · 362e6b2 · 362e6b2
1 parent f7a92ef
commit 362e6b2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/server/ingester/ckissu/ckissu.go b/server/ingester/ckissu/ckissu.go
@@ -934,6 +934,12 @@ var ColumnAdd635 = []*ColumnAdds{
 		ColumnNames: []string{"l7_parse_failed"},
 		ColumnType:  ckdb.UInt32,
 	},
+	&ColumnAdds{
+		Dbs:         []string{"event"},
+		Tables:      []string{"alarm_event", "alarm_event_local"},
+		ColumnNames: []string{"user_id"},
+		ColumnType:  ckdb.UInt32,
+	},
 }
 
 var ColumnDrops635 = []*ColumnDrops{

diff --git a/server/ingester/common/const.go b/server/ingester/common/const.go
@@ -17,6 +17,6 @@
 package common
 
 const (
-	CK_VERSION             = "v6.3.8.1" // 用于表示clickhouse的表版本号
+	CK_VERSION             = "v6.3.8.2" // 用于表示clickhouse的表版本号
 	DEFAULT_PCAP_DATA_PATH = "/var/lib/pcap"
 )
diff --git a/server/ingester/event/dbwriter/alarm_event_writer.go b/server/ingester/event/dbwriter/alarm_event_writer.go
@@ -45,6 +45,7 @@ type AlarmEventStore struct {
 	Time   uint32
 	Lcuuid string
 	User   string
+	UserId uint32
 
 	PolicyId                uint32
 	PolicyName              string
@@ -76,6 +77,7 @@ func AlarmEventColumns() []*ckdb.Column {
 		ckdb.NewColumn("time", ckdb.DateTime),
 		ckdb.NewColumn("lccuid", ckdb.String),
 		ckdb.NewColumn("user", ckdb.LowCardinalityString),
+		ckdb.NewColumn("user_id", ckdb.UInt32),
 
 		ckdb.NewColumn("policy_id", ckdb.UInt32),
 		ckdb.NewColumn("policy_name", ckdb.LowCardinalityString),
@@ -108,6 +110,7 @@ func (e *AlarmEventStore) WriteBlock(block *ckdb.Block) {
 	block.Write(
 		e.Lcuuid,
 		e.User,
+		e.UserId,
 		e.PolicyId,
 		e.PolicyName,
 		e.PolicyLevel,

diff --git a/server/ingester/event/decoder/decoder.go b/server/ingester/event/decoder/decoder.go
@@ -391,6 +391,7 @@ func (d *Decoder) writeAlarmEvent(event *alarm_event.AlarmEvent) {
 	s.Time = event.GetTimestamp()
 	s.Lcuuid = event.GetLcuuid()
 	s.User = event.GetUser()
+	s.UserId = event.GetUserId()
 
 	s.PolicyId = event.GetPolicyId()
 	s.PolicyName = event.GetPolicyName()