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/09/12 21:42:44 UTC
[ambari] branch branch-2.7 updated: AMBARI-24626. Log Search: some
solr fields are missing from service log / audit log response (#2302)
This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new c03bbb7 AMBARI-24626. Log Search: some solr fields are missing from service log / audit log response (#2302)
c03bbb7 is described below
commit c03bbb7dde41748694dc483b951b4fd9023277e5
Author: Olivér Szabó <ol...@gmail.com>
AuthorDate: Wed Sep 12 23:42:42 2018 +0200
AMBARI-24626. Log Search: some solr fields are missing from service log / audit log response (#2302)
* AMBARI-24626. Log Search: some solr fields are missing from service log / audit log response
* Add missing field names
---
.../logsearch/model/response/ServiceLogData.java | 10 +++++
.../ambari/logsearch/solr/SolrConstants.java | 5 +++
.../logsearch/solr/model/SolrCommonLogData.java | 49 ++++++++++++++++++++++
.../logsearch/solr/model/SolrServiceLogData.java | 26 ++++++++++++
4 files changed, 90 insertions(+)
diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/response/ServiceLogData.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/response/ServiceLogData.java
index e17b87d..2d2589e 100644
--- a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/response/ServiceLogData.java
+++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/response/ServiceLogData.java
@@ -65,4 +65,14 @@ public interface ServiceLogData extends CommonLogData, ComponentTypeLogData, Hos
String getGroup();
void setGroup(String group);
+
+ @JsonProperty("logger_name")
+ String getLoggerName();
+
+ void setLoggerName(String loggerName);
+
+ @JsonProperty("method")
+ String getMethod();
+
+ void setMethod(String method);
}
diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/solr/SolrConstants.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/solr/SolrConstants.java
index 6b2669b..a999f93 100644
--- a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/solr/SolrConstants.java
+++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/solr/SolrConstants.java
@@ -60,6 +60,7 @@ public class SolrConstants {
public static final String GROUP = "group";
public static final String LEVEL = "level";
public static final String THREAD_NAME = "thread_name";
+ public static final String METHOD = "method";
public static final String LOGGER_NAME = "logger_name";
public static final String LINE_NUMBER = "line_number";
public static final String PATH = "path";
@@ -68,6 +69,10 @@ public class SolrConstants {
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 static final String INT_DYNAMIC_FIELDS = "*_i";
+ public static final String LONG_DYNAMIC_FIELDS = "*_l";
+ public static final String BOOLEAN_DYNAMIC_FIELDS = "*_b";
+ public static final String STRING_DYNAMIC_FIELDS = "*_s";
}
public class AuditLogConstants {
diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/solr/model/SolrCommonLogData.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/solr/model/SolrCommonLogData.java
index b5ce7ad..1cdc572 100644
--- a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/solr/model/SolrCommonLogData.java
+++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/solr/model/SolrCommonLogData.java
@@ -26,6 +26,10 @@ import java.util.HashMap;
import java.util.Map;
import static org.apache.ambari.logsearch.solr.SolrConstants.CommonLogConstants.*;
+import static org.apache.ambari.logsearch.solr.SolrConstants.ServiceLogConstants.INT_DYNAMIC_FIELDS;
+import static org.apache.ambari.logsearch.solr.SolrConstants.ServiceLogConstants.LONG_DYNAMIC_FIELDS;
+import static org.apache.ambari.logsearch.solr.SolrConstants.ServiceLogConstants.BOOLEAN_DYNAMIC_FIELDS;
+import static org.apache.ambari.logsearch.solr.SolrConstants.ServiceLogConstants.STRING_DYNAMIC_FIELDS;
import static org.apache.ambari.logsearch.solr.SolrConstants.ServiceLogConstants.KEY_DYNAMIC_FIELDS;
import static org.apache.ambari.logsearch.solr.SolrConstants.ServiceLogConstants.STORED_TOKEN_DYNAMIC_FIELDS;
import static org.apache.ambari.logsearch.solr.SolrConstants.ServiceLogConstants.WS_DYNAMIC_FIELDS;
@@ -92,6 +96,18 @@ public class SolrCommonLogData implements CommonLogData {
@Field(WS_DYNAMIC_FIELDS)
private Map<String, Object> wsDynamicFields;
+ @Field(INT_DYNAMIC_FIELDS)
+ private Map<String, Object> intDynamicFields;
+
+ @Field(LONG_DYNAMIC_FIELDS)
+ private Map<String, Object> longDynamicFields;
+
+ @Field(STRING_DYNAMIC_FIELDS)
+ private Map<String, Object> stringDynamicFields;
+
+ @Field(BOOLEAN_DYNAMIC_FIELDS)
+ private Map<String, Object> booleanDynamicFields;
+
@Override
public String getId() {
return this.id;
@@ -265,6 +281,7 @@ public class SolrCommonLogData implements CommonLogData {
@Override
public Map<String, Object> getAllDynamicFields() {
Map<String, Object> allDynamicFields = new HashMap<>();
+
if (stdDynamicFields != null) {
allDynamicFields.putAll(stdDynamicFields);
}
@@ -274,6 +291,22 @@ public class SolrCommonLogData implements CommonLogData {
if (wsDynamicFields != null) {
allDynamicFields.putAll(wsDynamicFields);
}
+
+ if (intDynamicFields != null) {
+ allDynamicFields.putAll(intDynamicFields);
+ }
+
+ if (longDynamicFields != null) {
+ allDynamicFields.putAll(longDynamicFields);
+ }
+
+ if (stringDynamicFields != null) {
+ allDynamicFields.putAll(stringDynamicFields);
+ }
+
+ if (booleanDynamicFields != null) {
+ allDynamicFields.putAll(booleanDynamicFields);
+ }
return allDynamicFields;
}
@@ -289,4 +322,20 @@ public class SolrCommonLogData implements CommonLogData {
public void setWsDynamicFields(Map<String, Object> wsDynamicFields) {
this.wsDynamicFields = wsDynamicFields;
}
+
+ public void setIntDynamicFields(Map<String, Object> intDynamicFields) {
+ this.intDynamicFields = intDynamicFields;
+ }
+
+ public void setLongDynamicFields(Map<String, Object> longDynamicFields) {
+ this.longDynamicFields = longDynamicFields;
+ }
+
+ public void setStringDynamicFields(Map<String, Object> stringDynamicFields) {
+ this.stringDynamicFields = stringDynamicFields;
+ }
+
+ public void setBooleanDynamicFields(Map<String, Object> booleanDynamicFields) {
+ this.booleanDynamicFields = booleanDynamicFields;
+ }
}
diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/solr/model/SolrServiceLogData.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/solr/model/SolrServiceLogData.java
index 5db04ee..59e6849 100644
--- a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/solr/model/SolrServiceLogData.java
+++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/solr/model/SolrServiceLogData.java
@@ -52,6 +52,12 @@ public class SolrServiceLogData extends SolrCommonLogData implements ServiceLogD
@Field(GROUP)
private String group;
+ @Field(LOGGER_NAME)
+ private String loggerName;
+
+ @Field(METHOD)
+ private String method;
+
@Field(SDI_DYNAMIC_FIELDS)
private Map<String, Object> sdiDynamicFields;
@@ -135,6 +141,26 @@ public class SolrServiceLogData extends SolrCommonLogData implements ServiceLogD
this.level = level;
}
+ @Override
+ public String getLoggerName() {
+ return loggerName;
+ }
+
+ @Override
+ public void setLoggerName(String loggerName) {
+ this.loggerName = loggerName;
+ }
+
+ @Override
+ public String getMethod() {
+ return method;
+ }
+
+ @Override
+ public void setMethod(String method) {
+ this.method = method;
+ }
+
public void setSdiDynamicFields(Map<String, Object> sdiDynamicFields) {
this.sdiDynamicFields = sdiDynamicFields;
}