Merge pull request #1649 from grafana/mix_meta_tags_and_normal_tags_i…

…n_autocomplete

auto complete should not ignore meta tags if they are also metric tags

idx/memory/memory.go

@@ -1451,20 +1451,11 @@ func (m *UnpartitionedMemoryIdx) FindTagValuesWithQuery(orgId uint32, tag, prefi
 	m.RLock()
 	defer m.RUnlock()
 
-	tags, ok := m.tags[orgId]
-	if !ok {
-		return nil
-	}
-
-	// check whether the tag of which we're looking up values is a metric tag
-	// if so we can skip the meta tag enrichment
-	_, isMetricTag := tags[tag]
-
 	resMap := make(map[string]struct{})
 
 	var enricher *metaTagEnricher
 	var mtr *metaTagRecords
-	if MetaTagSupport && !isMetricTag {
+	if MetaTagSupport {
 		mtr, _, enricher = m.getMetaTagDataStructures(orgId, false)
 		if enricher != nil && enricher.countMetricsWithMetaTags() == 0 {
 			// if the enricher is empty we set it back to nil so it doesn't even get called

idx/memory/memory_find_test.go

@@ -1119,7 +1119,7 @@ func testAutoCompleteTagValuesWithQueryWithMetaTagSupport(t *testing.T) {
 			prefix: "",
 			expr:   []string{"host=~.+"},
 			limit:  100,
-			expRes: []string{"read", "write"},
+			expRes: []string{"none", "read", "write"},
 		}, {
 			tag:    "direction",
 			prefix: "wr",
@@ -1131,13 +1131,13 @@ func testAutoCompleteTagValuesWithQueryWithMetaTagSupport(t *testing.T) {
 			prefix: "no",
 			expr:   []string{"host=~.+"},
 			limit:  100,
-			expRes: []string{},
+			expRes: []string{"none"},
 		}, {
 			tag:    "direction",
 			prefix: "",
 			expr:   []string{"host=~.+"},
-			limit:  1,
-			expRes: []string{"read"},
+			limit:  2,
+			expRes: []string{"none", "read"},
 		}, {
 			tag:    "all",
 			prefix: "",