kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,741 Commits 1 Branch 0 Tags 166 MiB
Commit Graph

3741 Commits

Author SHA1 Message Date
吴晟 Wu Sheng c6dce72be4
Merge branch 'master' into sync-ui 2018-03-04 06:58:35 +08:00
吴晟 Wu Sheng e7b3014869
Merge pull request #865 from peng-yongsheng/fixed/855 
Fixed/855
 2018-03-04 06:58:17 +08:00
彭勇升 pengys 0e61c97213
Merge branch 'master' into fixed/855 2018-03-04 00:23:33 +08:00
peng-yongsheng 8b366e1035 Merge branch 'fixed/855' of https://github.com/peng-yongsheng/incubator-skywalking into fixed/855 2018-03-04 00:23:00 +08:00
peng-yongsheng 40eeb8739a 1. Get the service id only when agent register service name. 
2. Setting the src span type when agent register service name.
3. Revert the topology build logic.
 2018-03-04 00:22:45 +08:00
彭勇升 pengys fd3d5ad93c
Merge branch 'master' into sync-ui 2018-03-04 00:18:46 +08:00
彭勇升 pengys 0ef48add57
Merge pull request #867 from apache/5.0.0-alpha-doc 
[WIP ]Update some documents for 5.0.0-alpha release.
 2018-03-04 00:18:32 +08:00
wusheng a7bbe2f4bc Sync UI updates. 2018-03-03 23:51:10 +08:00
wusheng 9ae8318c1d Rename collector to backend 2018-03-03 23:02:29 +08:00
wusheng 5765b1e4ff Remove all bintray related. 2018-03-03 22:59:52 +08:00
wusheng 293fd9a1cd Sync Chinese doc 2018-03-03 22:55:35 +08:00
wusheng 00a9cde282 Add UI startup.sh description. 2018-03-03 22:47:25 +08:00
wusheng 21c58f07d5 Update some documents for 5.0.0-alpha release. 2018-03-03 22:36:15 +08:00
吴晟 Wu Sheng 5d0ea12683
Merge branch 'master' into fixed/855 2018-03-03 20:59:18 +08:00
吴晟 Wu Sheng baa5765c51
Merge pull request #866 from apache/fix/dist 
Fix dist deploy
 2018-03-03 20:58:11 +08:00
wusheng 73f108a7de Fix dist deploy 2018-03-03 20:29:53 +08:00
peng-yongsheng 09f9c1200e Fixed the pagination bug. 2018-03-03 20:15:49 +08:00
peng-yongsheng bdc0601c6d Fixed the call type in calls of topology. 2018-03-03 20:03:45 +08:00
peng-yongsheng 41840ce851 Fixed the bug which the memory max non heap metric value is -1 when using JDK 1.8. 2018-03-03 16:05:21 +08:00
peng-yongsheng 6ba5453086 Use JVM metric to update instance heart beat time when using java agent. 2018-03-03 15:22:35 +08:00
peng-yongsheng 58259141f9 Fixed the Dashboard and Topology bug. 2018-03-03 15:16:52 +08:00
吴晟 Wu Sheng eee27e0459
Merge pull request #864 from hanahmily/submodule/update-ui 
Submodule/update-ui
 2018-03-03 09:15:42 +08:00
吴晟 Wu Sheng 25ac1ca610
Merge branch 'master' into submodule/update-ui 2018-03-03 08:42:38 +08:00
吴晟 Wu Sheng 560d9bf535
Merge pull request #860 from peng-yongsheng/feature/Alarm 
"getClusterTopology","getApplicationTopology","loadAlarmList","getAlarmTrend"
 2018-03-03 08:42:17 +08:00
gaohongtao f293abc4c7 Update skywalking-ui submodule 2018-03-03 08:20:08 +08:00
Gao Hongtao 43f3e8e25e
Merge pull request #5 from apache/master 
Merge from origin
 2018-03-03 08:14:13 +08:00
吴晟 Wu Sheng 718d88c75f
Merge branch 'master' into feature/Alarm 2018-03-03 08:00:34 +08:00
吴晟 Wu Sheng e7a6a246de
Merge pull request #863 from peng-yongsheng/feature/appCodeInServer 
Feature/app code in server
 2018-03-03 08:00:08 +08:00
彭勇升 pengys d615a6957f
Merge branch 'master' into feature/appCodeInServer 2018-03-03 00:16:19 +08:00
peng-yongsheng 75a9283d24 1. Add application code into instance table. 
2. Search server by application code by searchServer method.
 2018-03-03 00:15:10 +08:00
吴晟 Wu Sheng 1b7ac0f46d
Merge branch 'master' into feature/Alarm 2018-03-02 23:56:09 +08:00
吴晟 Wu Sheng 766a78dd12
Merge pull request #861 from apache/re-organize-dist 
Reorganize dist
 2018-03-02 23:54:45 +08:00
peng-yongsheng fc5f67f084 Setting the alarm attributes in topology. 2018-03-02 22:55:02 +08:00
peng-yongsheng 3863aa71ee 1. Generate alarm content. 
2. loadAlarmList ok.
 2018-03-02 22:32:48 +08:00
wusheng 6b04ad6583 Fix source package of agent. 2018-03-02 19:06:37 +08:00
wusheng 56fd10949e Rename dist. 2018-03-02 17:08:26 +08:00
wusheng 710cce162b Include the agent into `dist` 2018-03-02 17:00:43 +08:00
peng-yongsheng 36d0eb5f69 getAlarmTrend ok. 2018-03-02 13:52:42 +08:00
peng-yongsheng f9c241c5a9 Pagination calculate 2018-03-02 13:31:40 +08:00
吴晟 Wu Sheng 6ba42f364a
Merge pull request #857 from apache/sync-ui 
UI up to date.
 2018-03-01 23:15:38 +08:00
wusheng c2ddbe9861 UI up to date. 2018-03-01 22:42:22 +08:00
吴晟 Wu Sheng accaf60afa
Merge pull request #856 from peng-yongsheng/feature/queryBasicTraces 
Change the traceId type to be collection in trace graphql protocol.
 2018-03-01 18:33:06 +08:00
peng-yongsheng 08d26eca09 Change the traceId type to be collection in trace graphql protocol. 2018-03-01 17:57:01 +08:00
吴晟 Wu Sheng a498a91fce
Merge pull request #854 from peng-yongsheng/feature/TraceQuery 
"queryBasicTraces","queryTrace"
 2018-03-01 15:23:37 +08:00
peng-yongsheng b7f1f4c521 queryBasicTraces: 
1. Query segment id from global trace table by trace id.
2. Query BasicTrace from segment duration table by segment id.
 2018-03-01 14:49:36 +08:00
吴晟 Wu Sheng ce3bff899a
Merge pull request #853 from peng-yongsheng/feature/ServiceQuery 
"searchService","getServiceResponseTimeTrend","getServiceTPSTrend","getServiceSLATrend","getServiceTopology"
 2018-03-01 06:08:32 +08:00
彭勇升 pengys 7e5ad62fbc
Merge branch 'master' into feature/ServiceQuery 2018-03-01 00:34:57 +08:00
peng-yongsheng 573291ef54 Refactor service topology build logic. 2018-03-01 00:30:13 +08:00
彭勇升 pengys fc5eadae39
Merge pull request #852 from hanahmily/module/apm-backend-dist 
Module/apm backend dist
 2018-02-28 23:43:03 +08:00
吴晟 Wu Sheng 28d2911749
Merge branch 'master' into module/apm-backend-dist 2018-02-28 23:13:57 +08:00