mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge 7b699d279b into 61aa82865d

Browse source
This commit is contained in:
Sujal Shah 2025-03-06 01:26:17 +05:30 committed by GitHub
parent 61aa82865d 7b699d279b
commit d51482d691
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
promql/parser/printer.go
View file

@ -100,7 +100,7 @@ func joinLabels(ss []string) string {
if i > 0 { if i > 0 {
b.WriteString(", ") b.WriteString(", ")
} }
if !model.IsValidLegacyMetricName(string(model.LabelValue(s))) { if !model.LabelName(s).IsValidLegacy() {
b.Write(strconv.AppendQuote(b.AvailableBuffer(), s)) b.Write(strconv.AppendQuote(b.AvailableBuffer(), s))
} else { } else {
b.WriteString(s) b.WriteString(s)
@ -128,19 +128,24 @@ func (node *BinaryExpr) ShortString() string {
func (node *BinaryExpr) getMatchingStr() string { func (node *BinaryExpr) getMatchingStr() string {
matching := "" matching := ""
vm := node.VectorMatching vm := node.VectorMatching
if vm != nil && (len(vm.MatchingLabels) > 0 || vm.On) { if vm != nil {
vmTag := "ignoring" if len(vm.MatchingLabels) > 0 || vm.On {
if vm.On { vmTag := "ignoring"
vmTag = "on" if vm.On {
} vmTag = "on"
matching = fmt.Sprintf(" %s (%s)", vmTag, strings.Join(vm.MatchingLabels, ", ")) }
// Quote only necessary labels.
if vm.Card == CardManyToOne || vm.Card == CardOneToMany { matching = fmt.Sprintf(" %s (%s)", vmTag, joinLabels(vm.MatchingLabels))
vmCard := "right"
if vm.Card == CardManyToOne { if vm.Card == CardManyToOne || vm.Card == CardOneToMany {
vmCard = "left" vmCard := "right"
if vm.Card == CardManyToOne {
vmCard = "left"
}
// Quote only necessary Include labels.
matching += fmt.Sprintf(" group_%s (%s)", vmCard, joinLabels(vm.Include))
fmt.Printf("\n")
} }
matching += fmt.Sprintf(" group_%s (%s)", vmCard, strings.Join(vm.Include, ", "))
} }
} }
return matching return matching