Skip to content

Commit 31ef893

Browse files
xiaochaoren1xiaochaoren1
committed
feat: querier supports biz source
1 parent 14405da commit 31ef893

9 files changed

Lines changed: 49 additions & 5 deletions

File tree

‎server/querier/db_descriptions/clickhouse/tag/enum/biz_feature_type.ch‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Value , DisplayName , Description
2+
1 , 系统 ,
3+
2 , 场景 ,

‎server/querier/db_descriptions/clickhouse/tag/enum/biz_feature_type.en‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Value , DisplayName , Description
2+
1 , System ,
3+
2 , Scene ,

‎server/querier/db_descriptions/clickhouse/tag/enum/policy_app_type.ch‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
# Value , DisplayName , Description
2-
1 , 系统 ,
3-
3 , 自定义 ,
2+
1 , 系统-阈值告警 ,
3+
3 , 自定义-阈值告警 ,
4+
4 , 业务-阈值告警 ,
5+
5 , 业务-组合告警 ,

‎server/querier/db_descriptions/clickhouse/tag/enum/policy_app_type.en‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
# Value , DisplayName , Description
2-
1 , System ,
3-
3 , Custom ,
1+
# Value , DisplayName , Description
2+
1 , System - Threshold Alert ,
3+
3 , Custom - Threshold Alert ,
4+
4 , Business - Threshold Alert ,
5+
5 , Business - Combined Alert ,

‎server/querier/db_descriptions/clickhouse/tag/event/alert_event‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ biz_service.group , biz_service.group_0 , biz_service.group_1
6868
user , user , user , resource , , Universal Tag , 111 , 0 ,
6969
alert_policy , alert_policy , alert_policy , resource , , Universal Tag , 110 , 0 ,
7070
policy_type , policy_type , policy_type , int_enum , policy_app_type , Alarm Info , 111 , 0 ,
71+
biz_feature_type , biz_feature_type , biz_feature_type , int_enum , biz_feature_type , Alarm Info , 111 , 0 ,
7172
event_level , event_level , event_level , int_enum , event_level , Alarm Info , 111 , 0 ,
7273
target_tags , target_tags , target_tags , string , , Event Info , 111 , 0 ,
7374
_target_uid , _target_uid , _target_uid , string , , Event Info , 111 , 0 , 111

‎server/querier/db_descriptions/clickhouse/tag/event/alert_event.ch‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ biz_service.group , 服务组 ,
6868
user , 创建人 ,
6969
alert_policy , 告警策略 ,
7070
policy_type , 策略类型 ,
71+
biz_feature_type , 业务功能类型 ,
7172
event_level , 事件等级 ,
7273
target_tags , 告警对象 ,
7374
_target_uid , ,

‎server/querier/db_descriptions/clickhouse/tag/event/alert_event.en‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ biz_service.group , Biz Service Group ,
6868
user , Creator ,
6969
alert_policy , AlarmPolicy ,
7070
policy_type , PolicyType ,
71+
biz_feature_type , BusinessFeatureType ,
7172
event_level , EventLevel ,
7273
target_tags , TargetTags ,
7374
_target_uid , ,

‎server/querier/engine/clickhouse/filter.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1564,6 +1564,8 @@ func (f *WhereFunction) Trans(expr sqlparser.Expr, w *Where, e *CHEngine) (view.
15641564
if strings.Contains(tagName, "pod_group_type") {
15651565
podGroupTag := strings.Replace(tagName, "pod_group_type", "pod_group_id", -1)
15661566
whereFilter = "(" + fmt.Sprintf(tagItem.WhereTranslator, nameColumn, "=", f.Value, enumFileName) + ") OR " + "dictGet('flow_tag.pod_group_map', 'pod_group_type', (toUInt64(" + podGroupTag + ")))" + " = " + "toUInt64(" + strconv.Itoa(intValue) + ")"
1567+
} else if strings.Contains(tagName, "biz_feature_type") {
1568+
whereFilter = fmt.Sprintf(tagItem.WhereTranslator, nameColumn, "=", f.Value, enumFileName) + " OR " + "tag_int_values[indexOf(tag_int_names,'biz_feature_type')] = " + "toUInt64(" + strconv.Itoa(intValue) + ")"
15671569
} else {
15681570
whereFilter = fmt.Sprintf(tagItem.WhereTranslator, nameColumn, "=", f.Value, enumFileName) + " OR " + tagName + " = " + "toUInt64(" + strconv.Itoa(intValue) + ")"
15691571
}
@@ -1582,6 +1584,8 @@ func (f *WhereFunction) Trans(expr sqlparser.Expr, w *Where, e *CHEngine) (view.
15821584
if strings.Contains(tagName, "pod_group_type") {
15831585
podGroupTag := strings.Replace(tagName, "pod_group_type", "pod_group_id", -1)
15841586
whereFilter = "not(" + fmt.Sprintf(tagItem.WhereTranslator, nameColumn, "=", f.Value, enumFileName) + ") AND " + "dictGet('flow_tag.pod_group_map', 'pod_group_type', (toUInt64(" + podGroupTag + ")))" + " != " + "toUInt64(" + strconv.Itoa(intValue) + ")"
1587+
} else if strings.Contains(tagName, "biz_feature_type") {
1588+
whereFilter = fmt.Sprintf(tagItem.WhereTranslator, nameColumn, opName, f.Value, enumFileName) + " AND " + "tag_int_values[indexOf(tag_int_names,'biz_feature_type')] != " + "toUInt64(" + strconv.Itoa(intValue) + ")"
15851589
} else {
15861590
whereFilter = fmt.Sprintf(tagItem.WhereTranslator, nameColumn, opName, f.Value, enumFileName) + " AND " + tagName + " != " + "toUInt64(" + strconv.Itoa(intValue) + ")"
15871591
}

‎server/querier/engine/clickhouse/tag/translation.go‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2207,6 +2207,33 @@ func GenerateAlarmEventTagResoureMap() map[string]map[string]*Tag {
22072207
),
22082208
}
22092209

2210+
tagResourceMap["biz_name"] = map[string]*Tag{
2211+
"default": NewTag(
2212+
"tag_string_values[indexOf(tag_string_names,'biz_name')]",
2213+
"",
2214+
"if(indexOf(tag_string_names,'biz_name')=0,NULL,tag_string_values[indexOf(tag_string_names,'biz_name')]) %s %s",
2215+
"%s(if(indexOf(tag_string_names,'biz_name')=0,NULL,tag_string_values[indexOf(tag_string_names,'biz_name')]), %s)",
2216+
"",
2217+
),
2218+
}
2219+
2220+
tagResourceMap["biz_feature_type"] = map[string]*Tag{
2221+
"default": NewTag(
2222+
"tag_int_values[indexOf(tag_int_names,'biz_feature_type')]",
2223+
"",
2224+
"if(indexOf(tag_int_names,'biz_feature_type')=0,NULL,tag_int_values[indexOf(tag_int_names,'biz_feature_type')]) %s %s",
2225+
"",
2226+
"",
2227+
),
2228+
"enum": NewTag(
2229+
"dictGetOrDefault('flow_tag.int_enum_map', '%s', ('%s',toUInt64(tag_int_values[indexOf(tag_int_names,'biz_feature_type')])), tag_int_values[indexOf(tag_int_names,'biz_feature_type')])",
2230+
"",
2231+
"toUInt64(tag_int_values[indexOf(tag_int_names,'biz_feature_type')]) GLOBAL IN (SELECT value FROM flow_tag.int_enum_map WHERE %s %s %s and tag_name='%s')",
2232+
"toUInt64(tag_int_values[indexOf(tag_int_names,'biz_feature_type')]) GLOBAL IN (SELECT value FROM flow_tag.int_enum_map WHERE %s(%s,%s) and tag_name='%s')",
2233+
"tag_int_values[indexOf(tag_int_names,'biz_feature_type')]",
2234+
),
2235+
}
2236+
22102237
// int_tags
22112238
tagResourceMap["int_tags"] = map[string]*Tag{
22122239
"default": NewTag(

0 commit comments

Comments
 (0)