Commit Graph

3506 Commits

Author SHA1 Message Date
李运涛 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 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
吴晟 Wu Sheng ddd1d80e78
Merge pull request #797 from apache/add-component-for-operation-name
Add a new field for operation register.
2018-02-07 16:23:56 +08:00
wu-sheng ca11058f8e Add a new field for operation register. 2018-02-07 15:58:05 +08:00
吴晟 Wu Sheng 75be8c879f
Merge pull request #794 from carlvine500/master
bugfix:no data collected after application started
2018-02-07 12:38:07 +08:00
吴晟 Wu Sheng efd27dddcd
Merge branch 'master' into master 2018-02-07 11:49:48 +08:00
carlvine 5c44dd96a2 bugfix:no data collected after application started 20+seconds 2018-02-07 09:53:19 +08:00
吴晟 Wu Sheng b00b588cbf
Merge pull request #793 from ascrutae/feature/update-docs
Modify GRPC support version
2018-02-07 07:16:44 +08:00
吴晟 Wu Sheng 57e809daf3
Merge branch 'master' into feature/update-docs 2018-02-07 06:55:26 +08:00
吴晟 Wu Sheng 32922de9c0
Merge pull request #792 from ascrutae/fix/kafka-plugin-issue
[Agent] fix kafka plugin don't works
2018-02-07 06:54:51 +08:00
ascrutae c7c190165f Modify GRPC support version 2018-02-06 23:09:01 +08:00
Xin,Zhang daf3c257d7
Merge branch 'master' into fix/kafka-plugin-issue 2018-02-06 22:55:02 +08:00
吴晟 Wu Sheng 505f6a0ec3
Merge branch 'master' into feature/graphql-ui 2018-02-06 21:28:19 +08:00
吴晟 Wu Sheng 63eec4bd21
Merge pull request #790 from ascrutae/fix/grpc-plugin-issue
[Agent] Fix grpc don't works in 1.8 version
2018-02-06 21:17:07 +08:00
ascrutae a3df0cf0ff [Agent] fix kafka plugin don't works 2018-02-06 20:30:51 +08:00
ascrutae 03071a4061 modify the comments 2018-02-06 17:28:28 +08:00
李运涛 liyuntao 49a99a5353
Merge branch 'master' into servicecomb 2018-02-05 20:12:43 -06:00
ascrutae 93da3fa5bf Modify operation name 2018-02-05 23:52:51 +08:00
ascrutae 60638f7ceb add comments 2018-02-05 22:30:21 +08:00
lytscu 5fce5dcd0e Update servicecomb-java-chassis-0.x-plugin 2018-02-05 20:54:07 +08:00
ascrutae 9c332e864a [Agent] Fix grpc don't works in 1.8 version 2018-02-05 19:41:54 +08:00
peng-yongsheng 2c6b03bfbb Provide the getServiceSLATrend query. 2018-02-05 19:21:39 +08:00
peng-yongsheng cccba2ec8f Provide the getServiceResponseTimeTrend query. 2018-02-05 16:04:56 +08:00
peng-yongsheng b513024a85 Provide the searchService query. 2018-02-05 10:26:54 +08:00
peng-yongsheng 1d625d2ad5 Provide the queryTrace query. 2018-02-04 23:57:40 +08:00
peng-yongsheng 77f615a8ae Provide the queryBasicTraces query. 2018-02-04 22:16:52 +08:00
peng-yongsheng 8cfadaa0c6 Merge branch 'feature/graphql-ui' of https://github.com/peng-yongsheng/incubator-skywalking into feature/graphql-ui 2018-02-03 14:18:31 +08:00
peng-yongsheng 7a175574d2 Move ui dao to ui package. 2018-02-03 14:18:10 +08:00
peng-yongsheng 7925c7b623 Provide the getClusterBrief query. 2018-02-03 14:17:32 +08:00