diff --git a/src/main/webapp/common/js/hippo/chart-scatter2.js b/src/main/webapp/common/js/hippo/chart-scatter2.js index 89a01f36b..c500b5f31 100644 --- a/src/main/webapp/common/js/hippo/chart-scatter2.js +++ b/src/main/webapp/common/js/hippo/chart-scatter2.js @@ -27,7 +27,7 @@ function drawScatter(start, end, targetId) { target : document.getElementById("scatter"), data : [], chart : { - width : 400, + width : 550, height : 400, padding : [ 50, 50, 50, 50 ], margin : [ 0, 0, 0, 0 ], diff --git a/src/main/webapp/common/js/hippo/hippo.js b/src/main/webapp/common/js/hippo/hippo.js index 1aae31834..25499e5e9 100644 --- a/src/main/webapp/common/js/hippo/hippo.js +++ b/src/main/webapp/common/js/hippo/hippo.js @@ -14,37 +14,37 @@ function getLastServerMapData2(application, period, callback) { function getServerMapData(application, begin, end, callback) { var app = application.split("@"); - d3.json("/getServerMapData.hippo?application=" + app + "&from=" + begin + "&to=" + end, function(d) { callback(d); }); + d3.json("/getServerMapData.hippo?application=" + app[0] + "&from=" + begin + "&to=" + end, function(d) { callback(d); }); } function getLastServerMapData(application, period, callback) { var app = application.split("@"); - d3.json("/getLastServerMapData.hippo?application=" + app + "&period=" + period, function(d) { callback(d); }); + d3.json("/getLastServerMapData.hippo?application=" + app[0] + "&period=" + period, function(d) { callback(d); }); } function getScatterData(application, begin, end, callback) { var app = application.split("@"); - d3.json("/getScatterData.hippo?application=" + app + "&from=" + begin + "&to=" + end + "&limit=5000", function(d) { callback(d); }); + d3.json("/getScatterData.hippo?application=" + app[0] + "&from=" + begin + "&to=" + end + "&limit=5000", function(d) { callback(d); }); } function getLastScatterData(application, period, callback) { var app = application.split("@"); - d3.json("/getLastScatterData.hippo?application=" + app + "&period=" + period + "&limit=5000", function(d) { callback(d); }); + d3.json("/getLastScatterData.hippo?application=" + app[0] + "&period=" + period + "&limit=5000", function(d) { callback(d); }); } function getRealtimeScatterData(application, begin, callback) { var app = application.split("@"); - d3.json("/getRealtimeScatterData.hippo?application=" + app + "&from=" + begin + "&limit=5000", function(d) { callback(d); }); + d3.json("/getRealtimeScatterData.hippo?application=" + app[0] + "&from=" + begin + "&limit=5000", function(d) { callback(d); }); } function getBusinessTransactionsData(application, begin, end, callback) { var application = $("#application").val().split("@")[0]; - d3.json("/getBusinessTransactionsData.hippo?application=" + app + "&from=" + begin + "&to=" + end, function(d) { callback(d); }); + d3.json("/getBusinessTransactionsData.hippo?application=" + app[0] + "&from=" + begin + "&to=" + end, function(d) { callback(d); }); } function getLastBusinessTransactionsData(application, period, callback) { var app = application.split("@"); - d3.json("/getLastBusinessTransactionsData.hippo?application=" + app + "&period=" + period, function(d) { callback(d); }); + d3.json("/getLastBusinessTransactionsData.hippo?application=" + app[0] + "&period=" + period, function(d) { callback(d); }); } function getQueryPeriod() { diff --git a/src/main/webapp/index2.html b/src/main/webapp/index2.html index d5002098f..6359f7923 100644 --- a/src/main/webapp/index2.html +++ b/src/main/webapp/index2.html @@ -184,33 +184,34 @@ -->
-
+
-
-
+
- -
+

-
+
+ + +
+
- + @@ -328,10 +329,10 @@ $(document).ready(function () { $("#businessTransactions TBODY").empty(); $("#businessTransactionsDetail TBODY").empty(); - $('#chartTabs a:first').tab('show'); - $('#transactionTabs a:first').tab('show'); + // $('#chartTabs a:first').tab('show'); + // $('#transactionTabs a:first').tab('show'); - $("#springygraph").css("display", "none"); + // $("#springygraph").css("display", "none"); } // TODO 조회 버튼을 두 번 연속 눌렀을 때 앞서 수행되던 결과는 취소시켜야 함. @@ -355,24 +356,22 @@ $(document).ready(function () { $("#springygraph").css("display", ""); }; - var businessTransactionCallback = function(data) { - showTransactionList(data.businessTransactions); - }; - if (isQueryFromNow()) { getLastServerMapData2($("#application").val(), getQueryPeriod(), serverMapCallback); // getLastServerMapData($("#application").val(), getQueryPeriod(), serverMapCallback); - //getLastBusinessTransactionsData($("#application").val(), getQueryPeriod(), businessTransactionCallback); - - //drawScatter($("#application").val(), getQueryStartTime(), getQueryEndTime(), "#scatter"); - //getLastScatterData($("#application").val(), getQueryPeriod(), scatterCallback); + + // 개발 편의상 모두 표시. + getLastBusinessTransactionsData($("#application").val(), getQueryPeriod(), businessTransactionCallback); + drawScatter($("#application").val(), getQueryStartTime(), getQueryEndTime(), "#scatter"); + getLastScatterData($("#application").val(), getQueryPeriod(), scatterCallback); } else { getServerMapData2($("#application").val(), getQueryStartTime(), getQueryEndTime(), serverMapCallback); // getServerMapData($("#application").val(), getQueryStartTime(), getQueryEndTime(), serverMapCallback); - //getBusinessTransactionsData($("#application").val(), getQueryStartTime(), getQueryEndTime(), businessTransactionCallback); - //drawScatter($("#application").val(), getQueryStartTime(), getQueryEndTime(), "#scatter"); - //getScatterData($("#application").val(), getQueryStartTime(), getQueryEndTime(), scatterCallback); + // 개발 편의상 모두 표시. + getBusinessTransactionsData($("#application").val(), getQueryStartTime(), getQueryEndTime(), businessTransactionCallback); + drawScatter($("#application").val(), getQueryStartTime(), getQueryEndTime(), "#scatter"); + getScatterData($("#application").val(), getQueryStartTime(), getQueryEndTime(), scatterCallback); } } @@ -480,6 +479,10 @@ var scatterCallback = function(data) { var scatterFetchTimer = setInterval(fetch, 200); }; +var businessTransactionCallback = function(data) { + showTransactionList(data.businessTransactions); +}; + function showResponseScatter(applicationName) { if (isQueryFromNow()) { drawScatter(applicationName, getQueryStartTime(), getQueryEndTime(), "#scatter"); @@ -489,6 +492,14 @@ function showResponseScatter(applicationName) { getScatterData(applicationName, getQueryStartTime(), getQueryEndTime(), scatterCallback); } } + +function showRequests(applicationName) { + if (isQueryFromNow()) { + getLastBusinessTransactionsData(applicationName, getQueryPeriod(), businessTransactionCallback); + } else { + getBusinessTransactionsData(applicationName, getQueryStartTime(), getQueryEndTime(), businessTransactionCallback); + } +}
NameURL Calls Time(ms) Min Time(ms)