#830 custom template add string_code_map

tangjiawei · tangjiawei · commit 5ab4ec9ea7dd · 2024-10-29T15:56:58.000+08:00
diff --git a/monitor-server/services/db/dashboard.go b/monitor-server/services/db/dashboard.go
@@ -218,7 +218,7 @@ func ReplacePromQlKeyword(promQl, metric string, host *m.EndpointNewTable, tagLi
 				if i == 0 {
 					promQl = getTagPromQl(tagObj, originPromQl)
 				} else {
-					promQl = promQl + " and " + getTagPromQl(tagObj, originPromQl)
+					promQl = "(" + promQl + ") and (" + getTagPromQl(tagObj, originPromQl) + ")"
 				}
 			}
 		} else {

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ func ReplacePromQlKeyword(promQl, metric string, host *m.EndpointNewTable, tagLi`
`218`	`218`	`if i == 0 {`
`219`	`219`	`promQl = getTagPromQl(tagObj, originPromQl)`
`220`	`220`	`} else {`
`221`		`- promQl = promQl + " and " + getTagPromQl(tagObj, originPromQl)`
	`221`	`+ promQl = "(" + promQl + ") and (" + getTagPromQl(tagObj, originPromQl) + ")"`
`222`	`222`	`}`
`223`	`223`	`}`
`224`	`224`	`} else {`