diff --git a/server/metrics/storage-ext-es/src/main/java/com/alipay/sofa/lookout/server/storage/ext/es/QueryBuilder.java b/server/metrics/storage-ext-es/src/main/java/com/alipay/sofa/lookout/server/storage/ext/es/QueryBuilder.java index e3f488c..65239f1 100755 --- a/server/metrics/storage-ext-es/src/main/java/com/alipay/sofa/lookout/server/storage/ext/es/QueryBuilder.java +++ b/server/metrics/storage-ext-es/src/main/java/com/alipay/sofa/lookout/server/storage/ext/es/QueryBuilder.java @@ -111,7 +111,7 @@ public StringQuery addMetricName(String value) { } public StringQuery addTagCond(String tagKey, String tagValExpr) { - String expr = "tags:" + tagKey + "=" + tagValExpr; + String expr = "tags.keyword:" + tagKey + "=" + tagValExpr; valueExprs.add(expr); return this; } diff --git a/server/metrics/storage-ext-es/src/test/java/com/alipay/sofa/lookout/server/storage/ext/es/QueryBuilderTest.java b/server/metrics/storage-ext-es/src/test/java/com/alipay/sofa/lookout/server/storage/ext/es/QueryBuilderTest.java index 239f302..ae66160 100644 --- a/server/metrics/storage-ext-es/src/test/java/com/alipay/sofa/lookout/server/storage/ext/es/QueryBuilderTest.java +++ b/server/metrics/storage-ext-es/src/test/java/com/alipay/sofa/lookout/server/storage/ext/es/QueryBuilderTest.java @@ -38,7 +38,7 @@ public void testBuildQuery() { System.out.println(qry); Assert .assertEquals( - "{\"size\":10000,\"query\":{\"bool\":{\"must\":[{\"query_string\":{\"query\":\"tags:zone=G*\"}},{\"regexp\":{\"tags\":\"tags=.*ms\"}},{\"range\":{\"time\":{\"gte\":1556525226597,\"lte\":1556525226597,\"format\":\"epoch_millis\"}}}],\"must_not\":[{\"query_string\":{\"query\":\"tags:zone=G*\"}},{\"regexp\":{\"tags\":\"tags=.*ms\"}}]}}}", + "{\"size\":10000,\"query\":{\"bool\":{\"must\":[{\"query_string\":{\"query\":\"tags.keyword:zone=G*\"}},{\"regexp\":{\"tags\":\"tags=.*ms\"}},{\"range\":{\"time\":{\"gte\":1556525226597,\"lte\":1556525226597,\"format\":\"epoch_millis\"}}}],\"must_not\":[{\"query_string\":{\"query\":\"tags.keyword:zone=G*\"}},{\"regexp\":{\"tags\":\"tags=.*ms\"}}]}}}", qry); } @@ -52,7 +52,7 @@ public void testBuildQuery_no_mustnot() { System.out.println(qry); Assert .assertEquals( - "{\"size\":10000,\"query\":{\"bool\":{\"must\":[{\"query_string\":{\"query\":\"tags:zone=G*\"}},{\"regexp\":{\"tags\":\"tags=.*ms\"}},{\"range\":{\"time\":{\"gte\":1556525491882,\"lte\":1556525491882,\"format\":\"epoch_millis\"}}}],\"must_not\":[]}}}", + "{\"size\":10000,\"query\":{\"bool\":{\"must\":[{\"query_string\":{\"query\":\"tags.keyword:zone=G*\"}},{\"regexp\":{\"tags\":\"tags=.*ms\"}},{\"range\":{\"time\":{\"gte\":1556525491882,\"lte\":1556525491882,\"format\":\"epoch_millis\"}}}],\"must_not\":[]}}}", qry); } @@ -69,7 +69,7 @@ public void testBuildStringQuery() { QueryBuilder.StringQuery stringQuery = new QueryBuilder.StringQuery(); stringQuery.addTagCond("zone", "G*").addTagCond("app", "zk"); System.out.println(stringQuery); - Assert.assertEquals("{\"query_string\":{\"query\":\"tags:zone=G* AND tags:app=zk\"}}", + Assert.assertEquals("{\"query_string\":{\"query\":\"tags.keyword:zone=G* AND tags.keyword:app=zk\"}}", stringQuery.toString()); stringQuery = new QueryBuilder.StringQuery();