Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 399AF200B6A for ; Mon, 22 Aug 2016 15:37:04 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 386AC160ABC; Mon, 22 Aug 2016 13:37:04 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id ADE38160AD8 for ; Mon, 22 Aug 2016 15:37:01 +0200 (CEST) Received: (qmail 90409 invoked by uid 500); 22 Aug 2016 13:37:00 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 87447 invoked by uid 99); 22 Aug 2016 13:36:58 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Aug 2016 13:36:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 31412E08AC; Mon, 22 Aug 2016 13:36:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: oleewere@apache.org To: commits@ambari.apache.org Date: Mon, 22 Aug 2016 13:37:49 -0000 Message-Id: <82778df51c79453ead69c2dca3aa52ef@git.apache.org> In-Reply-To: <349079adae024981a7937339769ff969@git.apache.org> References: <349079adae024981a7937339769ff969@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [54/55] [abbrv] ambari git commit: AMBARI-18161. Support UNKNOWN log level for Log Search (Dharmesh Makwana via oleewere) archived-at: Mon, 22 Aug 2016 13:37:04 -0000 AMBARI-18161. Support UNKNOWN log level for Log Search (Dharmesh Makwana via oleewere) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d8bb21c2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d8bb21c2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d8bb21c2 Branch: refs/heads/branch-dev-logsearch Commit: d8bb21c2b069326fead81c2a509e4111987d1db0 Parents: a971c1e Author: oleewere Authored: Mon Aug 22 11:01:36 2016 +0200 Committer: oleewere Committed: Mon Aug 22 12:56:04 2016 +0200 ---------------------------------------------------------------------- .../org/apache/ambari/logfeeder/OutputMgr.java | 7 +- .../logfeeder/logconfig/LogFeederConstants.java | 1 + .../logsearch/common/LogSearchConstants.java | 3 + .../logsearch/graph/GraphDataGenerator.java | 18 +---- .../ambari/logsearch/manager/LogsMgr.java | 84 +++----------------- .../ambari/logsearch/util/ConfigUtil.java | 14 ---- .../main/webapp/scripts/views/common/Header.js | 2 +- .../scripts/views/dashboard/LogLevelBoxView.js | 3 +- .../scripts/views/dashboard/LogLevelView.js | 1 + .../views/filter/CreateLogfeederFilterView.js | 2 +- .../scripts/views/graphs/GraphLayoutView.js | 3 +- .../scripts/views/graphs/GridGraphLayoutView.js | 3 +- .../webapp/scripts/views/tabs/LogFileView.js | 2 +- .../troubleshoot/TroubleShootLayoutView.js | 3 +- .../src/main/webapp/styles/style.css | 46 +++++++++-- .../dashboard/LogLevelBoxView_tmpl.html | 17 ++-- .../filter/CreateLogfeederFilter_tmpl.html | 1 + 17 files changed, 87 insertions(+), 123 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d8bb21c2/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/OutputMgr.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/OutputMgr.java b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/OutputMgr.java index c65b352..41b005b 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/OutputMgr.java +++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/OutputMgr.java @@ -29,6 +29,7 @@ import java.util.UUID; import org.apache.ambari.logfeeder.input.Input; import org.apache.ambari.logfeeder.input.InputMarker; +import org.apache.ambari.logfeeder.logconfig.LogFeederConstants; import org.apache.ambari.logfeeder.logconfig.filter.FilterLogData; import org.apache.ambari.logfeeder.output.Output; import org.apache.log4j.Level; @@ -86,7 +87,11 @@ public class OutputMgr { if (jsonObj.get("ip") == null && LogFeederUtil.ipAddress != null) { jsonObj.put("ip", LogFeederUtil.ipAddress); } - + + //Add level + if (jsonObj.get("level") == null) { + jsonObj.put("level", LogFeederConstants.LOG_LEVEL_UNKNOWN); + } if (input.isUseEventMD5() || input.isGenEventMD5()) { String prefix = ""; Object logtimeObj = jsonObj.get("logtime"); http://git-wip-us.apache.org/repos/asf/ambari/blob/d8bb21c2/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/logconfig/LogFeederConstants.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/logconfig/LogFeederConstants.java b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/logconfig/LogFeederConstants.java index b069029..09673a0 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/logconfig/LogFeederConstants.java +++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/logconfig/LogFeederConstants.java @@ -22,6 +22,7 @@ public class LogFeederConstants { public static final String ALL = "all"; public static final String LOGFEEDER_FILTER_NAME = "log_feeder_config"; + public static final String LOG_LEVEL_UNKNOWN = "UNKNOWN"; // solr fields public static final String SOLR_LEVEL = "level"; public static final String SOLR_COMPONENT = "type"; http://git-wip-us.apache.org/repos/asf/ambari/blob/d8bb21c2/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/LogSearchConstants.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/LogSearchConstants.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/LogSearchConstants.java index 593be65..43a7eb7 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/LogSearchConstants.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/common/LogSearchConstants.java @@ -27,6 +27,9 @@ public class LogSearchConstants { public static final String ERROR = "ERROR"; public static final String TRACE = "TRACE"; public static final String FATAL = "FATAL"; + public static final String UNKNOWN = "UNKNOWN"; + + public static final String[] SUPPORTED_LOG_LEVEL ={FATAL,ERROR,WARN,INFO,DEBUG,TRACE,UNKNOWN}; // Application Constants public static final String HOST = "H"; http://git-wip-us.apache.org/repos/asf/ambari/blob/d8bb21c2/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/graph/GraphDataGenerator.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/graph/GraphDataGenerator.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/graph/GraphDataGenerator.java index 92baaff..361f8e3 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/graph/GraphDataGenerator.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/graph/GraphDataGenerator.java @@ -188,15 +188,8 @@ public class GraphDataGenerator extends GraphDataGeneratorBase { } } if (xAxisField.equalsIgnoreCase(LogSearchConstants.SOLR_LEVEL)) { - List logLevels = new ArrayList(); - logLevels.add(LogSearchConstants.FATAL); - logLevels.add(LogSearchConstants.ERROR); - logLevels.add(LogSearchConstants.WARN); - logLevels.add(LogSearchConstants.INFO); - logLevels.add(LogSearchConstants.DEBUG); - logLevels.add(LogSearchConstants.TRACE); Collection sortedVNameValues = new ArrayList(); - for (String level : logLevels) { + for (String level : LogSearchConstants.SUPPORTED_LOG_LEVEL) { VNameValue value = new VNameValue(); value.setName(level); String val = "0"; @@ -292,17 +285,10 @@ public class GraphDataGenerator extends GraphDataGeneratorBase { if (LogSearchConstants.SOLR_LEVEL.equalsIgnoreCase(stackField) && LogSearchConstants.SOLR_LEVEL.equalsIgnoreCase(xAxisField)) { Collection levelVGraphData = dataList.getGraphData(); - List logLevels = new ArrayList(); - logLevels.add(LogSearchConstants.FATAL); - logLevels.add(LogSearchConstants.ERROR); - logLevels.add(LogSearchConstants.WARN); - logLevels.add(LogSearchConstants.INFO); - logLevels.add(LogSearchConstants.DEBUG); - logLevels.add(LogSearchConstants.TRACE); for (VBarGraphData garphData : levelVGraphData) { Collection valueList = garphData.getDataCount(); Collection valueListSorted = new ArrayList(); - for (String level : logLevels) { + for (String level : LogSearchConstants.SUPPORTED_LOG_LEVEL) { String val = "0"; for (VNameValue value : valueList) { if (value.getName().equalsIgnoreCase(level)) { http://git-wip-us.apache.org/repos/asf/ambari/blob/d8bb21c2/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/manager/LogsMgr.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/manager/LogsMgr.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/manager/LogsMgr.java index a2c15f4..748d2f9 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/manager/LogsMgr.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/manager/LogsMgr.java @@ -540,84 +540,25 @@ public class LogsMgr extends MgrBase { HashMap map = new HashMap(); List logsCounts = new ArrayList(); try { - queryGenerator.setFacetField(query, LogSearchConstants.SOLR_LEVEL); - List logLevelCounts = getFacetCounts(query, - LogSearchConstants.SOLR_LEVEL); - if(logLevelCounts == null){ + LogSearchConstants.SOLR_LEVEL); + if (logLevelCounts == null) { return logsCounts; } for (Count count : logLevelCounts) { map.put(count.getName().toUpperCase(), "" + count.getCount()); } - String level = LogSearchConstants.FATAL; - VNameValue nameValue = null; - - String value = map.get(level); - if (stringUtil.isEmpty(value)){ - value = defalutValue; - } - nameValue = new VNameValue(); - nameValue.setName(level); - nameValue.setValue(value); - logsCounts.add(nameValue); - - level = LogSearchConstants.ERROR; - - value = map.get(level); - if (stringUtil.isEmpty(value)){ - value = defalutValue; - } - nameValue = new VNameValue(); - nameValue.setName(level); - nameValue.setValue(value); - logsCounts.add(nameValue); - - level = LogSearchConstants.WARN; - - value = map.get(level); - if (stringUtil.isEmpty(value)){ - value = defalutValue; - } - nameValue = new VNameValue(); - nameValue.setName(level); - nameValue.setValue(value); - logsCounts.add(nameValue); - - level = LogSearchConstants.INFO; - - value = map.get(level); - if (stringUtil.isEmpty(value)){ - value = defalutValue; - } - nameValue = new VNameValue(); - nameValue.setName(level); - nameValue.setValue(value); - logsCounts.add(nameValue); - - level = LogSearchConstants.DEBUG; - - value = map.get(level); - if (stringUtil.isEmpty(value)){ - value = defalutValue; - } - nameValue = new VNameValue(); - nameValue.setName(level); - nameValue.setValue(value); - logsCounts.add(nameValue); - - level = LogSearchConstants.TRACE; - - value = map.get(level); - if (stringUtil.isEmpty(value)){ - value = defalutValue; + for (String level : LogSearchConstants.SUPPORTED_LOG_LEVEL) { + VNameValue nameValue = new VNameValue(); + String value = map.get(level); + if (stringUtil.isEmpty(value)) { + value = defalutValue; + } + nameValue.setName(level); + nameValue.setValue(value); + logsCounts.add(nameValue); } - nameValue = new VNameValue(); - nameValue.setName(level); - nameValue.setValue(value); - logsCounts.add(nameValue); - } catch (SolrException | SolrServerException | IOException e) { logger.error("Error during solrQuery=" + query, e); } @@ -1260,7 +1201,6 @@ public class LogsMgr extends MgrBase { String unit = getUnit((String) searchCriteria.getParamValue("unit")); List histogramData = new ArrayList(); - List logLevels = ConfigUtil.logLevels; String jsonHistogramQuery = queryGenerator .buildJSONFacetTermTimeRangeQuery( @@ -1287,7 +1227,7 @@ public class LogsMgr extends MgrBase { Collection vNameValues = new ArrayList(); List graphDatas = new ArrayList(); - for (String level : logLevels) { + for (String level : LogSearchConstants.SUPPORTED_LOG_LEVEL) { boolean isLevelPresent = false; VBarGraphData vData1 = null; for (VBarGraphData vData2 : histogramData) { http://git-wip-us.apache.org/repos/asf/ambari/blob/d8bb21c2/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/util/ConfigUtil.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/util/ConfigUtil.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/util/ConfigUtil.java index 2bf3b51..bdd304f 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/util/ConfigUtil.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/util/ConfigUtil.java @@ -19,7 +19,6 @@ package org.apache.ambari.logsearch.util; -import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -35,8 +34,6 @@ import org.codehaus.jettison.json.JSONObject; public class ConfigUtil { static Logger logger = Logger.getLogger(MgrBase.class); - public static List logLevels = new ArrayList(); - public static HashMap serviceLogsColumnMapping = new HashMap(); public static HashMap auditLogsColumnMapping = new HashMap(); @@ -44,7 +41,6 @@ public class ConfigUtil { public static HashMap schemaFieldsName = new HashMap(); public static void initializeApplicationConfig() { - intializeLogLevels(); initializeColumnMapping(); } @@ -67,16 +63,6 @@ public class ConfigUtil { } } } - - private static void intializeLogLevels() { - logLevels.add(LogSearchConstants.TRACE); - logLevels.add(LogSearchConstants.DEBUG); - logLevels.add(LogSearchConstants.INFO); - logLevels.add(LogSearchConstants.WARN); - logLevels.add(LogSearchConstants.ERROR); - logLevels.add(LogSearchConstants.FATAL); - } - private static void initializeColumnMapping() { String serviceLogsColumnMappingArray[] = PropertiesUtil .getPropertyStringList("logsearch.solr.service.logs.column.mapping"); http://git-wip-us.apache.org/repos/asf/ambari/blob/d8bb21c2/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/common/Header.js ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/common/Header.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/common/Header.js index cb8ca4e..e88afea 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/common/Header.js +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/common/Header.js @@ -172,7 +172,7 @@ define(['require', content: view, viewType: 'Filter', resizable: false, - width: 950, + width: 1000, height: 550, autoFocus1stElement : false, buttons: [{ http://git-wip-us.apache.org/repos/asf/ambari/blob/d8bb21c2/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/LogLevelBoxView.js ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/LogLevelBoxView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/LogLevelBoxView.js index d2ee3d8..0e7f1b8 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/LogLevelBoxView.js +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/LogLevelBoxView.js @@ -44,6 +44,7 @@ define(['require', DEBUG : "[data-id='DEBUG']", FATAL : "[data-id='FATAL']", TRACE : "[data-id='TRACE']", + UNKNOWN : "[data-id='UNKNOWN']", loader:".server-info .fa-spin" }, @@ -80,7 +81,7 @@ define(['require', } }, fetchLogLevelCounts : function(params){ - $.extend(this.logLevelList.queryParams,params,{level: "FATAL,ERROR,WARN,INFO,DEBUG,TRACE"}); + $.extend(this.logLevelList.queryParams,params,{level: "FATAL,ERROR,WARN,INFO,DEBUG,TRACE,UNKNOWN"}); this.ui.loader.show(); this.logLevelList.fetch({reset:true}); }, http://git-wip-us.apache.org/repos/asf/ambari/blob/d8bb21c2/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/LogLevelView.js ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/LogLevelView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/LogLevelView.js index 17a67fb..79c8bcf 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/LogLevelView.js +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/dashboard/LogLevelView.js @@ -45,6 +45,7 @@ define(['require', DEBUG : "[data-id='DEBUG']", FATAL : "[data-id='FATAL']", TRACE : "[data-id='TRACE']", + UNKNOWN : "[data-id='UNKNOWN']", togglePieViewButton:'#logToggle', pieRegionId:'#r_logLevelPieChart', logTable:'#logTable' http://git-wip-us.apache.org/repos/asf/ambari/blob/d8bb21c2/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/filter/CreateLogfeederFilterView.js ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/filter/CreateLogfeederFilterView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/filter/CreateLogfeederFilterView.js index 95324d9..9bdf0fa 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/filter/CreateLogfeederFilterView.js +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/filter/CreateLogfeederFilterView.js @@ -81,7 +81,7 @@ define(['require', this.model = new VUserFilter(); this.levelCollection = new Backbone.Collection(); - var levelArr = ["FATAL", "ERROR", "WARN", "INFO", "DEBUG", "TRACE"]; + var levelArr = ["FATAL", "ERROR", "WARN", "INFO", "DEBUG", "TRACE", "UNKNOWN"]; for (var i in levelArr) { this.levelCollection.add(new Backbone.Model({ type: levelArr[i] })); http://git-wip-us.apache.org/repos/asf/ambari/blob/d8bb21c2/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/graphs/GraphLayoutView.js ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/graphs/GraphLayoutView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/graphs/GraphLayoutView.js index 76d0537..35d0c9a 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/graphs/GraphLayoutView.js +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/graphs/GraphLayoutView.js @@ -255,7 +255,8 @@ define(['require', (model.get('name') === 'WARN') ? ("#FF8916") : (model.get('name') === 'FATAL') ? ("#830A0A") : (model.get('name') === 'DEBUG') ? ("#65E8FF") : - (model.get('name') === 'TRACE') ? ("#888888") : ("white")); + (model.get('name') === 'TRACE') ? ("#888888") : + (model.get('name') === 'UNKNOWN') ? ("#bdbdbd") : ("white")); } else { Obj['color'] = color[i]; } http://git-wip-us.apache.org/repos/asf/ambari/blob/d8bb21c2/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/graphs/GridGraphLayoutView.js ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/graphs/GridGraphLayoutView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/graphs/GridGraphLayoutView.js index 47393bb..ae76ba8 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/graphs/GridGraphLayoutView.js +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/graphs/GridGraphLayoutView.js @@ -203,7 +203,8 @@ define(['require', ( (""+model.get('name')).toUpperCase() === 'WARN') ? ("#FF8916") : ( (""+model.get('name')).toUpperCase() === 'FATAL') ? ("#830A0A") : ( (""+model.get('name')).toUpperCase() === 'DEBUG') ? ("#65E8FF") : - ( (""+model.get('name')).toUpperCase() === 'TRACE') ? ("#888888") : color[i]); + ( (""+model.get('name')).toUpperCase() === 'TRACE') ? ("#888888") : + ( (""+model.get('name')).toUpperCase() === 'UNKNOWN') ? ("#bdbdbd") : color[i]); } else { Obj['color'] = color[i]; } http://git-wip-us.apache.org/repos/asf/ambari/blob/d8bb21c2/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/LogFileView.js ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/LogFileView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/LogFileView.js index 4b42eab..0b32237 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/LogFileView.js +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/tabs/LogFileView.js @@ -495,7 +495,7 @@ define(['require', direction: "descending", orderable: true, displayOrder: 1, - width: "10", + width: "17", className: "logTime", formatter: _.extend({}, Backgrid.CellFormatter.prototype, { fromRaw: function(rawValue, model) { http://git-wip-us.apache.org/repos/asf/ambari/blob/d8bb21c2/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/troubleshoot/TroubleShootLayoutView.js ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/troubleshoot/TroubleShootLayoutView.js b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/troubleshoot/TroubleShootLayoutView.js index 66f851c..a6445c6 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/troubleshoot/TroubleShootLayoutView.js +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/scripts/views/troubleshoot/TroubleShootLayoutView.js @@ -369,7 +369,8 @@ define(['backbone', ( (""+name).toUpperCase() === 'WARN') ? ("#FF8916") : ( (""+name).toUpperCase() === 'FATAL') ? ("#830A0A") : ( (""+name).toUpperCase() === 'DEBUG') ? ("#65E8FF") : - ( (""+name).toUpperCase() === 'TRACE') ? ("#888888") : "") + ( (""+name).toUpperCase() === 'TRACE') ? ("#888888") : + ( (""+name).toUpperCase() === 'UNKNOWN') ? ("#bdbdbd") : "") }); } http://git-wip-us.apache.org/repos/asf/ambari/blob/d8bb21c2/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style.css ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style.css b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style.css index 240cc4d..543533b 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style.css +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/styles/style.css @@ -261,7 +261,9 @@ p.log-line:before { .bubbleGraph .label,.node--root,.node--leaf { pointer-events: none; } - +.UNKNOWN { + fill: #bdbdbd; +} .TRACE { fill: #888888; } @@ -489,6 +491,9 @@ div.columnmanager-visibilitycontrol { height: 100%; float: left; } +.node.UNKNOWN { + background-color: #bdbdbd; +} .node.TRACE { background-color: #888888; @@ -514,6 +519,9 @@ div.columnmanager-visibilitycontrol { background-color: #830A0A; } +.label-UNKNOWN { + background-color: #bdbdbd; +} .label-TRACE { background-color: #888888; } @@ -589,6 +597,15 @@ div.columnmanager-visibilitycontrol { top: -3px; right: 0; } +.server-info a.node.UNKNOWN { + border-color: #bdbdbd; + color: #bdbdbd; +} + +.server-info a.node.UNKNOWN.active { + background-color: #bdbdbd; + color: #fff; +} .server-info a.node.TRACE { border-color: #888888; @@ -649,6 +666,9 @@ div.columnmanager-visibilitycontrol { background-color: #830A0A; color: #fff; } +.UNKNOWN { + color: #bdbdbd; +} .TRACE { color: #888888; @@ -2348,19 +2368,19 @@ input:-webkit-autofill,input:-webkit-autofill:hover,input:-webkit-autofill:focus } .logFeederTable { - width: 906px; + width: 965px; display: block; } .logFeederTable tbody { height: 365px; overflow-y: auto; - width: 906px; + width: 965px; display: block; } .logFeederTable th { - width: 90px; + width: 106px; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-top: 1px solid #CCC !important; @@ -2376,7 +2396,7 @@ input:-webkit-autofill,input:-webkit-autofill:hover,input:-webkit-autofill:focus } .logFeederTable th:nth-child(2) { - width: 190px; + width: 165px; border-top: 1px solid #CCC !important; border-bottom: 1px solid #CCC !important; } @@ -2391,12 +2411,12 @@ input:-webkit-autofill,input:-webkit-autofill:hover,input:-webkit-autofill:focus } .logFeederTable td:first-of-type { - width: 269px; + width: 240px; padding: 0 10px; } .logFeederTable td:nth-child(2) { - width: 178px; + width: 135px; padding: 0 10px; } @@ -2929,4 +2949,16 @@ button.defaultCancelBtn{ } .comparisonTab .daterangepicker .ranges{ float: right !important; +} + +/*------------New Log Levels Tab CSS--------------*/ +.levelBox{ + width: 13%; + margin: 0 .6%; + float: left; + position: relative; + min-height: 1px; +} +.levelBox:last-of-type{ + clear : right; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/d8bb21c2/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/dashboard/LogLevelBoxView_tmpl.html ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/dashboard/LogLevelBoxView_tmpl.html b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/dashboard/LogLevelBoxView_tmpl.html index 4c3cd8d..0424cc0 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/dashboard/LogLevelBoxView_tmpl.html +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/dashboard/LogLevelBoxView_tmpl.html @@ -16,29 +16,34 @@ -->
0Fatal 0Error 0Warn 0Info 0Debug 0Trace + 0Unknown +
\ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/d8bb21c2/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/filter/CreateLogfeederFilter_tmpl.html ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/filter/CreateLogfeederFilter_tmpl.html b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/filter/CreateLogfeederFilter_tmpl.html index fe2a5c1..a4d78fa 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/filter/CreateLogfeederFilter_tmpl.html +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/webapp/templates/filter/CreateLogfeederFilter_tmpl.html @@ -34,6 +34,7 @@ INFO DEBUG TRACE + UNKNOWN