AMBARI-22521. Log Search: Adding new dynamic field for service logs (oleewere)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9c549484 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9c549484 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9c549484 Branch: refs/heads/branch-feature-AMBARI-22457 Commit: 9c54948407de5281457f5fb69df445e80e07c26e Parents: cdc1ed6 Author: Oliver Szabo <[email protected]> Authored: Mon Nov 27 17:33:14 2017 +0100 Committer: Oliver Szabo <[email protected]> Committed: Mon Nov 27 18:09:08 2017 +0100 ---------------------------------------------------------------------- .../configsets/hadoop_logs/conf/managed-schema | 3 +++ .../logsearch/model/response/ServiceLogData.java | 2 ++ .../ambari/logsearch/solr/SolrConstants.java | 1 + .../logsearch/solr/model/SolrServiceLogData.java | 17 +++++++++++++++++ 4 files changed, 23 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9c549484/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/hadoop_logs/conf/managed-schema ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/hadoop_logs/conf/managed-schema b/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/hadoop_logs/conf/managed-schema index c6f498b..27ca78e 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/hadoop_logs/conf/managed-schema +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/configsets/hadoop_logs/conf/managed-schema @@ -115,6 +115,9 @@ <dynamicField name='std_*' type="text_std_token_lower_case" multiValued="false" stored="false"/> <dynamicField name='key_*' type="key_lower_case" multiValued="false" stored="false"/> <dynamicField name="ws_*" type="text_ws" multiValued="false" omitNorms="false" stored="false"/> + + <dynamicField name="sdi_*" type="text_ws" omitNorms="false" multiValued="false" stored="true"/> + <copyField source="log_message" dest="key_log_message"/> </schema> http://git-wip-us.apache.org/repos/asf/ambari/blob/9c549484/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/response/ServiceLogData.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/response/ServiceLogData.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/response/ServiceLogData.java index 16aed16..d4dbf61 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/response/ServiceLogData.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/response/ServiceLogData.java @@ -60,4 +60,6 @@ public interface ServiceLogData extends CommonLogData, ComponentTypeLogData, Hos String getHost(); void setHost(String host); + + } http://git-wip-us.apache.org/repos/asf/ambari/blob/9c549484/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/solr/SolrConstants.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/solr/SolrConstants.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/solr/SolrConstants.java index 39e134a..147cfc2 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/solr/SolrConstants.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/solr/SolrConstants.java @@ -66,6 +66,7 @@ public class SolrConstants { public static final String STORED_TOKEN_DYNAMIC_FIELDS = "std_*"; public static final String KEY_DYNAMIC_FIELDS = "key_*"; public static final String WS_DYNAMIC_FIELDS = "ws_*"; + public static final String SDI_DYNAMIC_FIELDS = "sdi_*"; } public class AuditLogConstants { http://git-wip-us.apache.org/repos/asf/ambari/blob/9c549484/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/solr/model/SolrServiceLogData.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/solr/model/SolrServiceLogData.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/solr/model/SolrServiceLogData.java index c6fdba3..224ed8c 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/solr/model/SolrServiceLogData.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/solr/model/SolrServiceLogData.java @@ -22,6 +22,7 @@ import org.apache.ambari.logsearch.model.response.ServiceLogData; import org.apache.solr.client.solrj.beans.Field; import java.util.Date; +import java.util.Map; import static org.apache.ambari.logsearch.solr.SolrConstants.ServiceLogConstants.*; @@ -48,6 +49,9 @@ public class SolrServiceLogData extends SolrCommonLogData implements ServiceLogD @Field(HOST) private String host; + @Field(SDI_DYNAMIC_FIELDS) + private Map<String, Object> sdiDynamicFields; + @Override public String getPath() { return path; @@ -117,4 +121,17 @@ public class SolrServiceLogData extends SolrCommonLogData implements ServiceLogD public void setLevel(String level) { this.level = level; } + + public void setSdiDynamicFields(Map<String, Object> sdiDynamicFields) { + this.sdiDynamicFields = sdiDynamicFields; + } + + @Override + public Map<String, Object> getAllDynamicFields() { + Map<String, Object> dynamicFieldsMap = super.getAllDynamicFields(); + if (sdiDynamicFields != null) { + dynamicFieldsMap.putAll(sdiDynamicFields); + } + return dynamicFieldsMap; + } }
