IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-04 12:41:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

mqe: fixes broken test for indexalias

Browse Source
This commit is contained in:
bergquist 2017-02-09 16:43:57 +01:00
parent aa7292fac6
commit c7febca447
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/tsdb/mqe/response_parser.go
View File

@ -154,7 +154,8 @@ func (parser *ResponseParser) wildcardAlias(body MQEResponseSerie, queryToSend Q
} }
func (parser *ResponseParser) indexAlias(body MQEResponseSerie, queryToSend QueryToSend) string { func (parser *ResponseParser) indexAlias(body MQEResponseSerie, queryToSend QueryToSend) string {
queryNameParts := strings.Split(body.Name, `.`) queryNameParts := strings.Split(queryToSend.Metric.Metric, `.`)
name := indexAliasPattern.ReplaceAllStringFunc(queryToSend.Metric.Alias, func(in string) string { name := indexAliasPattern.ReplaceAllStringFunc(queryToSend.Metric.Alias, func(in string) string {
positionName := strings.TrimSpace(strings.Replace(in, "$", "", 1)) positionName := strings.TrimSpace(strings.Replace(in, "$", "", 1))

2
pkg/tsdb/mqe/response_parser_test.go
View File

@ -75,7 +75,7 @@ func TestMQEResponseParser(t *testing.T) {
AddClusterToAlias: true, AddClusterToAlias: true,
AddHostToAlias: true, AddHostToAlias: true,
}, },
Metric: Metric{Alias: "$2 $3"}, Metric: Metric{Alias: "$2 $3", Metric: "os.disk.sda3.weighted_io_time"},
} }
legend := parser.formatLegend(serie, mqeSerie, queryRef) legend := parser.formatLegend(serie, mqeSerie, queryRef)
So(legend, ShouldEqual, "demoapp staples-lab-1 disk.sda3") So(legend, ShouldEqual, "demoapp staples-lab-1 disk.sda3")