Repository: eagle Updated Branches: refs/heads/master 8b402e7cd -> b4d071139
MINOR: rename 'HbaseServiceInstance' as 'HBaseServiceInstance' Author: Zhao, Qingwen <[email protected]> Author: Qingwen Zhao <[email protected]> Closes #923 from qingwen220/minor. Project: http://git-wip-us.apache.org/repos/asf/eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/eagle/commit/b4d07113 Tree: http://git-wip-us.apache.org/repos/asf/eagle/tree/b4d07113 Diff: http://git-wip-us.apache.org/repos/asf/eagle/diff/b4d07113 Branch: refs/heads/master Commit: b4d07113933aa79e8575715370b08ef79c287444 Parents: 8b402e7 Author: Zhao, Qingwen <[email protected]> Authored: Wed Apr 19 14:57:47 2017 +0800 Committer: Zhao, Qingwen <[email protected]> Committed: Wed Apr 19 14:57:47 2017 +0800 ---------------------------------------------------------------------- .../org/apache/eagle/jpm/mr/history/storm/JobHistorySpout.java | 4 ++-- .../eagle-hbase-web/src/main/webapp/app/apps/hbase/index.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/eagle/blob/b4d07113/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/storm/JobHistorySpout.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/storm/JobHistorySpout.java b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/storm/JobHistorySpout.java index 11deefe..0e975fb 100644 --- a/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/storm/JobHistorySpout.java +++ b/eagle-jpm/eagle-jpm-mr-history/src/main/java/org/apache/eagle/jpm/mr/history/storm/JobHistorySpout.java @@ -240,7 +240,7 @@ public class JobHistorySpout extends BaseRichSpout { return; } - LOG.info("update process time stamp {}", minTimeStamp); + LOG.info("updating the latest updated process time {}", minTimeStamp); Map<String, String> baseTags = new HashMap<String, String>() { { put("site", jobHistoryEndpointConfig.site); @@ -266,7 +266,7 @@ public class JobHistorySpout extends BaseRichSpout { int tried = 0; while (tried <= MAX_RETRY_TIMES) { try { - LOG.info("start flushing JobProcessTimeStampEntity entities of total number " + entities.size()); + LOG.info("start flushing {} JobProcessTimeStampEntity entities", entities.size()); client.create(entities); LOG.info("finish flushing entities of total number " + entities.size()); break; http://git-wip-us.apache.org/repos/asf/eagle/blob/b4d07113/eagle-metric/eagle-hbase-web/src/main/webapp/app/apps/hbase/index.js ---------------------------------------------------------------------- diff --git a/eagle-metric/eagle-hbase-web/src/main/webapp/app/apps/hbase/index.js b/eagle-metric/eagle-hbase-web/src/main/webapp/app/apps/hbase/index.js index 157cded..3120d5c 100644 --- a/eagle-metric/eagle-hbase-web/src/main/webapp/app/apps/hbase/index.js +++ b/eagle-metric/eagle-hbase-web/src/main/webapp/app/apps/hbase/index.js @@ -65,8 +65,8 @@ METRIC.STATUS_DEAD = "dead"; METRIC.QUERY_HBASE_METRICS = '${baseURL}/rest/entities?query=GenericMetricService[${condition}]{*}&metricName=${metric}&pageSize=${limit}'; METRIC.QUERY_HBASE_METRICS_WITHTIME = '${baseURL}/rest/entities?query=GenericMetricService[${condition}]{*}&metricName=${metric}&pageSize=${limit}&startTime=${startTime}&endTime=${endTime}'; - METRIC.QUERY_HBASE_INSTANCE = '${baseURL}/rest/entities?query=HbaseServiceInstance[${condition}]{*}&pageSize=${limit}'; - METRIC.QUERY_HBASE_INSTANCE_AGG = "${baseURL}/rest/entities?query=HbaseServiceInstance[${condition}]<${groups}>{${field}}&pageSize=${limit}"; + METRIC.QUERY_HBASE_INSTANCE = '${baseURL}/rest/entities?query=HBaseServiceInstance[${condition}]{*}&pageSize=${limit}'; + METRIC.QUERY_HBASE_INSTANCE_AGG = "${baseURL}/rest/entities?query=HBaseServiceInstance[${condition}]<${groups}>{${field}}&pageSize=${limit}"; METRIC.QUERY_HBASE_METRICS_INTERVAL = '${baseURL}/rest/entities?query=GenericMetricService[${condition}]<${groups}>{${field}}${order}${top}&metricName=${metric}&pageSize=${limit}&startTime=${startTime}&endTime=${endTime}&intervalmin=${intervalMin}&timeSeries=true'; /** * Fetch query content with current site application configuration
