diff --git a/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java b/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java index a97e9f6258..96ee62c317 100644 --- a/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java +++ b/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java @@ -10,7 +10,6 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.alibaba.druid.stat.DruidStatManagerFacade; import com.alibaba.druid.support.JSONDruidStatService; import com.alibaba.druid.util.IOUtils; @@ -29,7 +28,6 @@ public class StatViewServlet extends HttpServlet { private final static String RESOURCE_PATH = "support/http/resources"; private final static String TEMPLATE_PAGE_RESOURCE_PATH = RESOURCE_PATH + "/template.html"; - private static DruidStatManagerFacade druidStatManager = DruidStatManagerFacade.getInstance(); private static JSONDruidStatService jsonDruidStatService = JSONDruidStatService.getInstance(); public String templatePage; diff --git a/src/main/resources/support/http/resources/activeConnectionStackTrace.html b/src/main/resources/support/http/resources/activeConnectionStackTrace.html index 85ac4e1e47..80a9ccedb4 100644 --- a/src/main/resources/support/http/resources/activeConnectionStackTrace.html +++ b/src/main/resources/support/http/resources/activeConnectionStackTrace.html @@ -1,31 +1,29 @@ - - Druid ActiveConnection StackTrace + + Druid ActiveConnection StackTrace - + function init(){ + ajaxRequestForActiveConnectionStackTrace(); + var time2=setInterval("ajaxRequestForActiveConnectionStackTrace();",2000); + buildMenu(); + buildFooter(); + } + + -
- -
-

ActiveConnection StackTrace for Datasource {datasourceId} [View JSON API]

-
+

ActiveConnection StackTrace for Datasource + [View JSON API] +

+
-
+
-
- +
- \ No newline at end of file + diff --git a/src/main/resources/support/http/resources/api.html b/src/main/resources/support/http/resources/api.html index 7aeef92d98..21d3c62742 100644 --- a/src/main/resources/support/http/resources/api.html +++ b/src/main/resources/support/http/resources/api.html @@ -1,90 +1,73 @@ - - Druid Stat JSON API + + Druid Stat JSON API - - -
- + + +
-

JSON API

- +

JSON API

+
- - - + + + - - - + + + - - - + + + - - + - + - - + - + - - - + - - + - + - - - -
NameDescription
NameDescription
- basic.json - - basic info. -
basic.json basic info.
- datasource.json - - DatsSourceStat List -
datasource.json DatsSourceStat List
- datasource-{id}.json - + datasource-{id}.json DatasourceStat for id={id},id is DatsSourceStat.ID
Example: druid/datasource-1.json
- activeConnectionStackTrace-{datasourceId}.json - + activeConnectionStackTrace-{datasourceId}.json StrackTrace for activeConnection in datasource which datasource.id={datasourceId},id is DatsSourceStat.ID
Required: set removeAbandoned=true
Example: druid/activeConnectionStackTrace-1.json
+ sql.json + SqlStat info List.
orderBy=[ID|ExecuteCount|...|](every property without histogram in sqlstat object)
orderType=[asc|desc] default is desc
page=page count start with 1
perPageCount=item count in one page,default is INTEGER.MAX_VALUE
- sql-{id}.json - + sql-{id}.json SqlStat for id={id} ,id is SqlStat.ID
Example: druid/sql-1.json
- reset-all.json - - Reset all stat -
-
- + reset-all.json + Reset all stat + + + - \ No newline at end of file + diff --git a/src/main/resources/support/http/resources/connectionInfo.html b/src/main/resources/support/http/resources/connectionInfo.html index 1be8995935..92602d8a61 100644 --- a/src/main/resources/support/http/resources/connectionInfo.html +++ b/src/main/resources/support/http/resources/connectionInfo.html @@ -1,27 +1,25 @@ - Druid SqlStat + Druid SqlStat + function init(){ + ajaxRequestForConnectionInfo(); + var time3=setInterval("ajaxRequestForConnectionInfo();",1000); + buildMenu(); + buildFooter(); + } + -
-
-

Pooling Connection Info List for Datasource {datasourceId}[View JSON API]

- +

Pooling Connection Info List for Datasource {datasourceId}[View JSON API]

+
@@ -36,17 +34,16 @@ Pscache
ID
- - - - + + + +
sqldefault Row Pretchrow Prefetchhit Countsqldefault Row Pretchrow Prefetchhit Count
- - - -
- + + + + diff --git a/src/main/resources/support/http/resources/datasource.html b/src/main/resources/support/http/resources/datasource.html index 4f1a93f655..5d2c918d94 100644 --- a/src/main/resources/support/http/resources/datasource.html +++ b/src/main/resources/support/http/resources/datasource.html @@ -1,31 +1,27 @@ - - Druid DataSourceStat + + Druid DataSourceStat - + function init(){ + ajaxRequestForDataSourceInfo(); + var time2=setInterval("ajaxRequestForDataSourceInfo();",5000); + buildMenu(); + buildFooter(); + } + + -
-

DataSourceStat List[View JSON API]

-
+
-

(*) property for user to setup

-
- +
- \ No newline at end of file + diff --git a/src/main/resources/support/http/resources/index.html b/src/main/resources/support/http/resources/index.html index 13a8b8e75a..5a54b93f85 100644 --- a/src/main/resources/support/http/resources/index.html +++ b/src/main/resources/support/http/resources/index.html @@ -1,44 +1,36 @@ - - Druid Stat Index + + Druid Stat Index - + function init(){ + ajaxRequestForBasicInfo(); + buildMenu(); + buildFooter(); + } + + -
-
-

Stat Index[View JSON API]

- +

Stat Index[View JSON API]

+
+ - + + - - - -
Version - - -
- drivers - - -
-
- + drivers + + + + - \ No newline at end of file + diff --git a/src/main/resources/support/http/resources/js/common.js b/src/main/resources/support/http/resources/js/common.js index 905698f85e..47707d2018 100644 --- a/src/main/resources/support/http/resources/js/common.js +++ b/src/main/resources/support/http/resources/js/common.js @@ -70,4 +70,28 @@ function getUrlVar(name) { return vars[name]; } +function $(id) { + return document.getElementById(id); +} +function buildMenu() { + var divEle = document.createElement("div"); + divEle.id = "menu"; + divEle.innerHTML = " Index | " + + "DataSource | " + + "Sql | " + + "WebURI | " + + "Web Session | " + + "Spring | " + + "Reset All | " + + "JSON API "; + document.body.insertBefore(divEle, document.body.firstChild); + document.body.insertBefore(document.createElement("br"), document.body.firstChild); +} + +function buildFooter() { + var divEle = document.createElement("div"); + divEle.id = "footer"; + divEle.innerHTML = " powered by sandzhang" ; + document.body.appendChild(divEle); +} diff --git a/src/main/resources/support/http/resources/spring.html b/src/main/resources/support/http/resources/spring.html index c039859251..bac667f128 100644 --- a/src/main/resources/support/http/resources/spring.html +++ b/src/main/resources/support/http/resources/spring.html @@ -1,45 +1,42 @@ - - Druid Web Session Stat + + Druid Web Session Stat - + var time3=setInterval("ajaxRequestForDataSourceSqlStatInfo();",5000); + buildMenu(); + buildFooter(); + } + + -
-
- +
- - - - - - - - - - - - - - -
N--ClassMethodExec CountExec TimeRunning CountConcurrent MaxJdbc Exec CountJdbc Exec TimeJdbc CommitJdbc RollbackJdbc FetchRowJdbc Update
-
- + Class + Method + Exec Count + Exec Time + Running Count + Concurrent Max + Jdbc Exec Count + Jdbc Exec Time + Jdbc Commit + Jdbc Rollback + Jdbc FetchRow + Jdbc Update + + + + - \ No newline at end of file + diff --git a/src/main/resources/support/http/resources/sql.html b/src/main/resources/support/http/resources/sql.html index 3836c41ff7..6d221845a1 100644 --- a/src/main/resources/support/http/resources/sql.html +++ b/src/main/resources/support/http/resources/sql.html @@ -1,84 +1,81 @@ - - Druid SqlStat + + Druid SqlStat - + var time3=setInterval("ajaxRequestForDataSourceSqlStatInfo();",5000); + buildMenu(); + buildFooter(); + } + + -
-
-

SqlStat List[View JSON API]

- +

SqlStat List[View JSON API]

+
- - - - - - - - - - - - - - - - - -
N--SQLExecute CountExecute Millis TotalExecute Millis MaxInTxn CountError CountEffected Row CountFetch Row CountRunning CountConcurrent MaxExecHistogram
[ - - - - - - - - - - - - - - - - ] - 		ExecAndRsHold
[ - - - - - - - - - - - - - - - - ] - 		FetchRow
[ - - - - - - - - - - - - ] - 		UpdateCount
[ - - - - - - - - - - - - ] -
-
- + SQL + Execute Count + Execute Millis Total + Execute Millis Max + InTxn Count + Error Count + Effected Row Count + Fetch Row Count + Running Count + Concurrent Max + ExecHistogram
[ + - + - + - + - + - + - + - + - ] + + ExecAndRsHold
[ + - + - + - + - + - + - + - + - ] + + FetchRow
[ + - + - + - + - + - + - ] + + UpdateCount
[ + - + - + - + - + - + - ] + + + + + + + setOrderBy('SQL'); + - \ No newline at end of file + diff --git a/src/main/resources/support/http/resources/sqlDetail.html b/src/main/resources/support/http/resources/sqlDetail.html index 9f25c82176..7037b4aa5b 100644 --- a/src/main/resources/support/http/resources/sqlDetail.html +++ b/src/main/resources/support/http/resources/sqlDetail.html @@ -10,22 +10,13 @@ function init(){ ajaxRequestForSqlInfo(); var time3=setInterval("ajaxRequestForSqlInfo();",5000); + buildMenu(); + buildFooter(); } -
- - +

FULL SQL

@@ -74,8 +65,6 @@ - -
diff --git a/src/main/resources/support/http/resources/websession.html b/src/main/resources/support/http/resources/websession.html index ecf971d2a4..8a477c01cd 100644 --- a/src/main/resources/support/http/resources/websession.html +++ b/src/main/resources/support/http/resources/websession.html @@ -1,47 +1,44 @@ - - Druid Web Session Stat + + Druid Web Session Stat - + var time3=setInterval("ajaxRequestForDataSourceSqlStatInfo();",5000); + buildMenu(); + buildFooter(); + } + + -
-
- +
- - - - - - - - - - - - - - - - -
N--SESSIONIDPrincipalCreateTimeRemoteAddressRequest CountRequestTimeRunning CountConcurrent MaxJdbc Exec CountJdbc Exec TimeJdbc CommitJdbc RollbackJdbc FetchRowJdbc Update
-
- + SESSIONID + Principal + CreateTime + RemoteAddress + Request Count + RequestTime + Running Count + Concurrent Max + Jdbc Exec Count + Jdbc Exec Time + Jdbc Commit + Jdbc Rollback + Jdbc FetchRow + Jdbc Update + + + + - \ No newline at end of file + diff --git a/src/main/resources/support/http/resources/weburi.html b/src/main/resources/support/http/resources/weburi.html index 68512e646a..c10d53cf7d 100644 --- a/src/main/resources/support/http/resources/weburi.html +++ b/src/main/resources/support/http/resources/weburi.html @@ -1,48 +1,44 @@ - - Druid Web URI Stat + + Druid Web URI Stat - + var time3=setInterval("ajaxRequestForDataSourceSqlStatInfo();", 5000); + buildMenu(); + buildFooter(); + } + + -
-
- +
- - - - - - - - - - - - - -
N--URIRequest CountRequest TimeRunning CountConcurrent MaxJdbc Exec CountJdbc Exec TimeJdbc CommitJdbc RollbackJdbc FetchRowJdbc Update
-
- + URI + Request Count + Request Time + Running Count + Concurrent Max + Jdbc Exec Count + Jdbc Exec Time + Jdbc Commit + Jdbc Rollback + Jdbc FetchRow + Jdbc Update + + + + - - \ No newline at end of file +