delete short_message

[Counterflowwind]

What type of this PR

Add one of the following kinds:
/kind bugfix

Language	Changelog
🇺🇸 English	delete short_message
🇨🇳 中文	删除多余的short_message

[codecov]

Codecov Report

Merging #3195 (80bf7d0) into master (94449aa) will decrease coverage by 0.04%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##           master    #3195      +/-   ##
==========================================
- Coverage   17.63%   17.58%   -0.05%     
==========================================
  Files        1370     1370              
  Lines      141878   141799      -79     
==========================================
- Hits        25022    24942      -80     
- Misses     114140   114264     +124     
+ Partials     2716     2593     -123     

Impacted Files	Coverage Δ
.../core/monitor/alert/alert-apis/adapt/expression.go	29.22% <0.00%> (-5.18%)	⬇️
modules/orchestrator/services/addon/addon_mysql.go	47.27% <0.00%> (-7.28%)	⬇️
modules/msp/tenant/project/project.service.go	26.47% <0.00%> (-5.76%)	⬇️
modules/cmp/metrics/metrics.go	24.09% <0.00%> (-3.84%)	⬇️
...components/cmp-dashboard-pods/podsCharts/render.go	30.90% <0.00%> (-3.64%)	⬇️
modules/cmp/provider.go	14.81% <0.00%> (-3.05%)	⬇️
...s/cmp-dashboard-podDetail/yamlFileEditor/render.go	22.42% <0.00%> (-2.80%)	⬇️
...dashboard-workload-detail/yamlFileEditor/render.go	9.15% <0.00%> (-2.35%)	⬇️
...rotocol/components/cmp-cluster-list/list/render.go	30.27% <0.00%> (-1.97%)	⬇️
... and 17 more

[snakorse]

/approve

[snakorse]

/cherry-pick release/1.5-alpha1

[erda-bot]

Automated cherry pick failed, please resolve the confilcts and create PR manually.
Details:

Auto-merging modules/core/monitor/alert/alert-apis/adapt/expression.go
CONFLICT (content): Merge conflict in modules/core/monitor/alert/alert-apis/adapt/expression.go
diff --cc modules/core/monitor/alert/alert-apis/adapt/expression.go
index 1afe65a2,8f07df7e..00000000
--- a/modules/core/monitor/alert/alert-apis/adapt/expression.go
+++ b/modules/core/monitor/alert/alert-apis/adapt/expression.go
@@@ -194,18 -201,12 +194,25 @@@ func (a *Adapt) AggregatorKeysSet() map
  }
  
  // NotifyTargetsKeys .
 -func (a *Adapt) NotifyTargetsKeys(code i18n.LanguageCodes, config map[string]bool) []*pb.DisplayKey {
 +func (a *Adapt) NotifyTargetsKeys(code i18n.LanguageCodes, orgId string) []*pb.DisplayKey {
  	var keys []*pb.DisplayKey
++<<<<<<< HEAD
 +	for _, item := range notifyTargets {
 +
 +		if item == "vms" || item == "sms" {
 +			config, err := a.bdl.GetNotifyConfig(orgId, "")
 +			if err != nil {
 +				continue
 +			}
 +			if !config.Config.EnableMS {
 +				continue
 +			}
++=======
+ 	for item := range config {
+ 		if item == shortMessage {
+ 			keys = append(keys, &pb.DisplayKey{Key: SMS, Display: a.t.Text(code, SMS)})
+ 			continue
++>>>>>>> ab897e08 (delete short_message (#3195))
  		}
  		keys = append(keys, &pb.DisplayKey{Key: item, Display: a.t.Text(code, item)})
  	}

[snakorse]

/cherry-pick release/1.5-alpha2