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

3554 Commits

Author SHA1 Message Date
彭勇升 pengys 2cef97a897
Merge pull request #817 from peng-yongsheng/feature/heartbeat_test 
Instance heart beat tested with elastic search.
 2018-02-13 16:27:23 +08:00
peng-yongsheng a14207e67a Instance heart beat tested with elastic search. OK. 2018-02-13 16:12:19 +08:00
peng-yongsheng ede4260f3f Merge branch 'master' into feature/heartbeat_test 2018-02-13 15:44:29 +08:00
peng-yongsheng add26b8e96 Sleeping when id not get. 2018-02-13 15:43:40 +08:00
吴晟 Wu Sheng abb3515963
Merge pull request #816 from peng-yongsheng/feature/register_test 
Application, Instance, Service register tested with elastic search.
 2018-02-13 15:24:36 +08:00
peng-yongsheng 5445058238 Merge branch 'master' into feature/register_test 2018-02-13 15:06:09 +08:00
peng-yongsheng 724b9c59b5 Application, Instance, Service register tested with elastic search. 2018-02-13 15:03:32 +08:00
吴晟 Wu Sheng 8276eac7ee
Merge pull request #814 from peng-yongsheng/feature/mock 
Mock trace segment data which sniffer from Dubbo framework.
 2018-02-13 11:53:52 +08:00
peng-yongsheng 56d9b2782c Mock trace segment data which sniffer from Dubbo framework. 2018-02-13 11:10:15 +08:00
彭勇升 pengys 4032e95dce
Merge pull request #812 from peng-yongsheng/feature/getAlarmTrend 
Provide the getAlarmTrend query.
 2018-02-12 21:34:25 +08:00
peng-yongsheng fb1c99df47 Merge branch 'feature/getAlarmTrend' of https://github.com/peng-yongsheng/incubator-skywalking into feature/getAlarmTrend 2018-02-12 21:14:40 +08:00
peng-yongsheng 58365eba73 Merge branch 'master' into feature/getAlarmTrend 2018-02-12 21:14:31 +08:00
彭勇升 pengys cc0f6f5ee9
Merge branch 'master' into feature/getAlarmTrend 2018-02-12 21:02:27 +08:00
peng-yongsheng 23975678a9 Provide the getAlarmTrend query. 2018-02-12 21:01:26 +08:00
吴晟 Wu Sheng 1bef96db1c
Merge pull request #811 from apache/update-supported-list 
Update Supported-list for a new supported framework
 2018-02-12 20:31:59 +08:00
吴晟 Wu Sheng cf04f034ac
Update Supported-list.md 
Update document based on #771
 2018-02-12 18:52:24 +08:00
吴晟 Wu Sheng e53b50e539
Merge pull request #771 from lytscu/servicecomb 
Add [Agent] ServiceComb Plugin #437
 2018-02-12 17:41:07 +08:00
李运涛 liyuntao e4e694021b
Merge branch 'master' into servicecomb 2018-02-12 03:08:48 -06:00
吴晟 Wu Sheng 7cbed1bb62
Merge pull request #810 from peng-yongsheng/feature/loadAlarmList 
Provide the loadAlarmList query.
 2018-02-12 16:43:17 +08:00
peng-yongsheng 47e1db5011 Provide the loadAlarmList query. 2018-02-12 16:28:00 +08:00
lytscu 6e56c7fdb4 Update /org/apache/skywalking/apm/collector/storage/table/register/ServerTypeDefine.java 2018-02-12 15:50:18 +08:00
lytscu 3eeacb1ae6 Update comments 2018-02-12 15:23:44 +08:00
吴晟 Wu Sheng 59380c4684
Merge branch 'master' into servicecomb 2018-02-12 14:26:53 +08:00
吴晟 Wu Sheng cb2ea6b026
Merge pull request #809 from peng-yongsheng/feature/applicationalarm 
Feature/applicationalarm
 2018-02-12 14:15:38 +08:00
peng-yongsheng 52c11398ae Application metric alarm list graph. 2018-02-12 13:58:26 +08:00
李运涛 liyuntao 4fa19f859e
Merge branch 'master' into servicecomb 2018-02-11 23:00:03 -06:00
lytscu 098251c2e6 Update consumer register 2018-02-12 12:57:50 +08:00
peng-yongsheng 7ab59cb252 Split application alarm list entity to minute, hour, day, month. 2018-02-12 11:21:28 +08:00
吴晟 Wu Sheng 778731f17a
Merge pull request #808 from peng-yongsheng/feature/searchService 
Change the elasticsearch analyzer type to stop that can tokenizer the…
 2018-02-12 08:36:32 +08:00
吴晟 Wu Sheng d2eb0b8241
Merge branch 'master' into feature/searchService 2018-02-12 06:05:35 +08:00
peng-yongsheng c9aadf289c Change the elasticsearch analyzer type to stop that can tokenizer the sentence such as “ org.apache.skywalking” to “org” “apache” “skywalking” 2018-02-12 01:05:22 +08:00
吴晟 Wu Sheng f84961d011
Merge pull request #807 from peng-yongsheng/feature/getConjecturalApps 
Provide the getConjecturalApps query.
 2018-02-11 18:19:13 +08:00
彭勇升 pengys 2e3666c879
Merge branch 'master' into feature/getConjecturalApps 2018-02-11 18:02:13 +08:00
peng-yongsheng 508b11dd46 Provide the getConjecturalApps query. 2018-02-11 18:00:48 +08:00
吴晟 Wu Sheng ed82e49f49
Merge pull request #806 from peng-yongsheng/feature/servertype 
Update span layer and server type by address id.
 2018-02-11 17:49:09 +08:00
peng-yongsheng eda2d8141b Update span layer and server type by address id when those not equals to the values in cache. 2018-02-11 17:23:21 +08:00
lytscu 61f8d3ee50 Update afterMethod exception status 2018-02-11 15:32:48 +08:00
lytscu 2e95e7fff2 Update exception status 2018-02-11 14:57:42 +08:00
李运涛 liyuntao e233b7becc
Merge branch 'master' into servicecomb 2018-02-10 20:49:43 -06:00
吴晟 Wu Sheng 6fc4579251
Merge pull request #805 from peng-yongsheng/feature/getServiceTPSTrend 
Provide the getServiceTPSTrend query.
 2018-02-10 15:11:48 +08:00
peng-yongsheng 0c9686e437 Provide the getServiceTPSTrend query. 2018-02-10 14:52:42 +08:00
吴晟 Wu Sheng 4419bca46f
Merge pull request #804 from peng-yongsheng/feature/getServerThroughput 
Provide the getServerThroughput query.
 2018-02-10 12:04:16 +08:00
吴晟 Wu Sheng 186438041b
Merge branch 'master' into feature/getServerThroughput 2018-02-10 10:53:49 +08:00
peng-yongsheng da0a8b8546 Provide the getServerThroughput query. 2018-02-10 10:46:15 +08:00
吴晟 Wu Sheng e09c2435a4
Merge pull request #803 from peng-yongsheng/feature/getTopNApplicationThroughput 
Provide the getTopNApplicationThroughput query.
 2018-02-10 10:40:53 +08:00
peng-yongsheng 71275468c5 Provide the getTopNApplicationThroughput query. 2018-02-10 10:17:32 +08:00
彭勇升 pengys 59ae085b1c
Merge pull request #802 from apache/fix/query 
Fix protocol mistakes.
 2018-02-09 21:18:34 +08:00
李运涛 liyuntao cbb2eca248
Merge branch 'master' into servicecomb 2018-02-09 03:20:24 -06:00
lytscu b5ec187e9c Update servicecomb-java-chassis-0.x-plugin/pom.xml 2018-02-09 17:19:15 +08:00
wu-sheng a736c01a81 Fix protocol mistakes. 2018-02-09 17:09:48 +08:00