浏览代码

mqe: fixes broken test for indexalias

bergquist 8 年之前
父节点
当前提交
c7febca447
共有 2 个文件被更改,包括 3 次插入2 次删除
  1. 2 1
      pkg/tsdb/mqe/response_parser.go
  2. 1 1
      pkg/tsdb/mqe/response_parser_test.go

+ 2 - 1
pkg/tsdb/mqe/response_parser.go

@@ -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))
 
 

+ 1 - 1
pkg/tsdb/mqe/response_parser_test.go

@@ -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")