You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ta...@apache.org on 2021/08/24 03:32:11 UTC
[skywalking] 01/02: fix node type(browser) not queried in API.
This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a commit to branch fix_browser_nodetype
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 3754d0fe61c7fff299806bc5ce0ff5f379c8ca19
Author: JaredTan95 <ji...@daocloud.io>
AuthorDate: Tue Aug 24 10:58:40 2021 +0800
fix node type(browser) not queried in API.
---
.../server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java
index 8464d3b..f1c8811 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetadataQueryEsDAO.java
@@ -63,7 +63,8 @@ public class MetadataQueryEsDAO extends EsDAO implements IMetadataQueryDAO {
SearchSourceBuilder sourceBuilder = SearchSourceBuilder.searchSource();
BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
- boolQueryBuilder.must().add(QueryBuilders.termQuery(ServiceTraffic.NODE_TYPE, NodeType.Normal.value()));
+ boolQueryBuilder.should().add(QueryBuilders.termQuery(ServiceTraffic.NODE_TYPE, NodeType.Normal.value()));
+ boolQueryBuilder.should().add(QueryBuilders.termQuery(ServiceTraffic.NODE_TYPE, NodeType.Browser.value()));
if (StringUtil.isNotEmpty(group)) {
boolQueryBuilder.must().add(QueryBuilders.termQuery(ServiceTraffic.GROUP, group));
}