Merge pull request #4598 from mikechengwei/feature/addtmplabel

pkg/prometheus/promcfg.go

@@ -1078,6 +1078,14 @@ func (cg *ConfigGenerator) generateProbeConfig(
 
 		// Relabelings for prober.
 		relabelings = append(relabelings, []yaml.MapSlice{
+			{
+				{Key: "source_labels", Value: []string{"__tmp_prometheus_address"}},
+				{Key: "separator", Value: ";"},
+				{Key: "regex", Value: "(.*)"},
+				{Key: "target_label", Value: "__tmp_prometheus_address"},
+				{Key: "replacement", Value: "$1"},
+				{Key: "action", Value: "replace"},
+			},
 			{
 				{Key: "source_labels", Value: []string{"__param_target"}},
 				{Key: "target_label", Value: "instance"},

pkg/prometheus/promcfg_test.go

@@ -1001,6 +1001,13 @@ scrape_configs:
   - source_labels:
     - __meta_kubernetes_ingress_name
     target_label: ingress
+  - source_labels:
+    - __tmp_prometheus_address
+    separator: ;
+    regex: (.*)
+    target_label: __tmp_prometheus_address
+    replacement: $1
+    action: replace
   - source_labels:
     - __param_target
     target_label: instance
@@ -1132,6 +1139,13 @@ scrape_configs:
   - source_labels:
     - __meta_kubernetes_ingress_name
     target_label: ingress
+  - source_labels:
+    - __tmp_prometheus_address
+    separator: ;
+    regex: (.*)
+    target_label: __tmp_prometheus_address
+    replacement: $1
+    action: replace
   - source_labels:
     - __param_target
     target_label: instance