You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ol...@apache.org on 2018/05/24 17:33:07 UTC
[ambari] branch trunk updated: AMBARI-23944. [Logsearch] Components filter does not have effect on g… (#1372)
This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6880f7d AMBARI-23944. [Logsearch] Components filter does not have effect on g… (#1372)
6880f7d is described below
commit 6880f7d92296d69644a97b0f328904fa12c48eb7
Author: Olivér Szabó <ol...@gmail.com>
AuthorDate: Thu May 24 19:32:49 2018 +0200
AMBARI-23944. [Logsearch] Components filter does not have effect on g… (#1372)
* AMBARI-23944. [Logsearch] Components filter does not have effect on graph data in service logs screen.
* AMBARI-23944. Remove unused imports.
---
.../converter/ServiceLogLevelDateRangeRequestQueryConverter.java | 4 ++++
.../ServiceLogLevelDateRangeRequestQueryConverterTest.java | 6 +++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/converter/ServiceLogLevelDateRangeRequestQueryConverter.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/converter/ServiceLogLevelDateRangeRequestQueryConverter.java
index 46f8f85..f4c0206 100644
--- a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/converter/ServiceLogLevelDateRangeRequestQueryConverter.java
+++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/converter/ServiceLogLevelDateRangeRequestQueryConverter.java
@@ -29,6 +29,7 @@ import java.util.Arrays;
import java.util.List;
import static org.apache.ambari.logsearch.solr.SolrConstants.CommonLogConstants.CLUSTER;
+import static org.apache.ambari.logsearch.solr.SolrConstants.ServiceLogConstants.COMPONENT;
import static org.apache.ambari.logsearch.solr.SolrConstants.ServiceLogConstants.HOST;
import static org.apache.ambari.logsearch.solr.SolrConstants.ServiceLogConstants.LEVEL;
import static org.apache.ambari.logsearch.solr.SolrConstants.ServiceLogConstants.LOGTIME;
@@ -59,6 +60,7 @@ public class ServiceLogLevelDateRangeRequestQueryConverter extends AbstractDateR
}
}
addListFilterToSolrQuery(solrQuery, CLUSTER, request.getClusters());
+ addListFilterToSolrQuery(solrQuery, COMPONENT, request.getMustBe());
return solrQuery;
}
@@ -66,4 +68,6 @@ public class ServiceLogLevelDateRangeRequestQueryConverter extends AbstractDateR
public LogType getLogType() {
return LogType.SERVICE;
}
+
+
}
diff --git a/ambari-logsearch/ambari-logsearch-server/src/test/java/org/apache/ambari/logsearch/converter/ServiceLogLevelDateRangeRequestQueryConverterTest.java b/ambari-logsearch/ambari-logsearch-server/src/test/java/org/apache/ambari/logsearch/converter/ServiceLogLevelDateRangeRequestQueryConverterTest.java
index b83363c..f30a03d 100644
--- a/ambari-logsearch/ambari-logsearch-server/src/test/java/org/apache/ambari/logsearch/converter/ServiceLogLevelDateRangeRequestQueryConverterTest.java
+++ b/ambari-logsearch/ambari-logsearch-server/src/test/java/org/apache/ambari/logsearch/converter/ServiceLogLevelDateRangeRequestQueryConverterTest.java
@@ -45,10 +45,10 @@ public class ServiceLogLevelDateRangeRequestQueryConverterTest extends AbstractR
// WHEN
SolrQuery query = underTest.convert(request);
// THEN
- assertEquals("?q=*%3A*&facet=true&facet.pivot=%7B%21range%3Dr1%7Dlevel&facet.mincount=1&facet.limit=-1&facet.sort=index" +
- "&facet.range=%7B%21tag%3Dr1%7Dlogtime&f.logtime.facet.range.start=2016-09-13T22%3A00%3A01.000Z" +
+ assertEquals("?q=*%3A*&facet=true&facet.pivot=%7B%21range%3Dr1%7Dlevel&facet.mincount=1&facet.limit=-1" +
+ "&facet.sort=index&facet.range=%7B%21tag%3Dr1%7Dlogtime&f.logtime.facet.range.start=2016-09-13T22%3A00%3A01.000Z" +
"&f.logtime.facet.range.end=2016-09-14T22%3A00%3A01.000Z&f.logtime.facet.range.gap=%2B1HOUR&rows=0&start=0" +
- "&fq=level%3A%28WARN+OR+ERROR+OR+FATAL%29&fq=cluster%3Acl1", query.toQueryString());
+ "&fq=level%3A%28WARN+OR+ERROR+OR+FATAL%29&fq=cluster%3Acl1&fq=type%3A%28logsearch_app+OR+secure_log%29", query.toQueryString());
}
@Test
--
To stop receiving notification emails like this one, please contact
oleewere@apache.org.