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

3533 Commits

Author SHA1 Message Date
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
吴晟 Wu Sheng 1afe6c7977
Merge pull request #775 from peng-yongsheng/feature/graphql-ui 
Feature/graphql ui
 2018-02-09 16:35:05 +08:00
peng-yongsheng e6f0c3ee75 Fixed CI fail. 2018-02-09 16:09:43 +08:00
peng-yongsheng cbe5227e1d Merge branch 'master' into feature/graphql-ui 
# Conflicts:
#	apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/util/TimeBucketUtils.java
 2018-02-09 14:46:10 +08:00
hanahmily 87ee4f2f77 Merge remote-tracking branch 'origin/feature/graphql-ui' into feature/graphql-ui 2018-02-09 14:19:01 +08:00
hanahmily af6d91dfba Refactor alarm schema 2018-02-09 14:18:26 +08:00
peng-yongsheng 1bc0d84532 Provide the getTopNServerThroughput query. 2018-02-09 14:12:04 +08:00
hanahmily f0c2be4346 Merge branch 'feature/graphql-ui' of https://github.com/peng-yongsheng/incubator-skywalking into feature/graphql-ui 2018-02-09 14:10:56 +08:00
peng-yongsheng 87d246d756 Fixed the bug: service/searchService #104 2018-02-09 10:40:06 +08:00
peng-yongsheng 59c512fb2b CI fail fixed. 2018-02-09 10:20:31 +08:00
李运涛 liyuntao 6793deb0e1
Merge branch 'master' into servicecomb 2018-02-08 20:13:24 -06:00
彭勇升 pengys a3609de7f1
Merge pull request #801 from apache/fix/dateformat-concurrency 
Avoid SImpleDateFormat concurrency risk
 2018-02-09 10:01:43 +08:00
wu-sheng bb0552a4fc Create SImpleDateFormat everytime. 2018-02-09 09:47:19 +08:00
吴晟 Wu Sheng 43fa3c0f6a
Merge pull request #800 from ascrutae/fix/docker-compose-version 
Fix the docker version is out of date
 2018-02-08 22:24:01 +08:00
ascrutae 93c4ef9502 Fix the docker version is out of date 2018-02-08 21:49:09 +08:00
peng-yongsheng 425324ee46 Provide the overview/getTopNSlowService query. 2018-02-08 19:02:53 +08:00
peng-yongsheng 7b2cb2e410 Merge branch 'feature/graphql-ui' of https://github.com/peng-yongsheng/incubator-skywalking into feature/graphql-ui 2018-02-08 18:17:07 +08:00
peng-yongsheng a81719786e Provide the getSlowService query. 2018-02-08 18:16:58 +08:00
hanahmily 8cd6b5b410 Merge branch 'feature/graphql-ui' of https://github.com/peng-yongsheng/incubator-skywalking into feature/graphql-ui 2018-02-08 15:19:56 +08:00
Gao Hongtao 87ebf6598c
Merge branch 'master' into feature/graphql-ui 2018-02-08 00:51:58 -06:00
peng-yongsheng 90c820d1d8 Merge branch 'feature/graphql-ui' of https://github.com/peng-yongsheng/incubator-skywalking into feature/graphql-ui 2018-02-07 18:11:12 +08:00
peng-yongsheng 62477a5318 Provide the getServiceTopology query. 2018-02-07 18:10:17 +08:00