Commit Graph

3780 Commits

Author SHA1 Message Date
吴晟 Wu Sheng beda526140
Merge pull request #884 from peng-yongsheng/feature/http_json
The instance heart beat implementation of http JSON protocol.
2018-03-05 22:55:58 +08:00
彭勇升 pengys 845f553c92
Merge branch 'master' into feature/http_json 2018-03-05 22:24:45 +08:00
吴晟 Wu Sheng c9bb3411f4
Merge pull request #883 from peng-yongsheng/fixed/855
Fixed/855
2018-03-05 22:21:47 +08:00
peng-yongsheng 395ad44a4c The instance heart beat implementation of http JSON protocol. 2018-03-05 22:18:47 +08:00
吴晟 Wu Sheng 07151c5e94
Merge branch 'master' into fixed/855 2018-03-05 21:38:20 +08:00
吴晟 Wu Sheng a8459e6bd9
Merge pull request #882 from apache/contributing-doc
Create CONTRIBUTING.md
2018-03-05 21:33:51 +08:00
彭勇升 pengys 3d1acbc9ab
Merge branch 'master' into fixed/855 2018-03-05 21:06:04 +08:00
peng-yongsheng 24468b1eea Add the segmentId into BasicTrace which belongs to trace query graphql protocol. 2018-03-05 21:00:24 +08:00
peng-yongsheng 9906e68451 When entry span layer is MQ:
1. Use peer id in entry span to find the instance id and application id.
2. Make the instance id and application id to be the front instance id and front application id of the reference metric.
3. Do not create the application mapping metric.
2018-03-05 20:55:47 +08:00
peng-yongsheng 87c0f73e10 Make the page number to be 1 when the value equal to 0. 2018-03-05 20:27:59 +08:00
吴晟 Wu Sheng fd5ef76c79
Create CONTRIBUTING.md 2018-03-05 19:36:32 +08:00
吴晟 Wu Sheng 101fc11027
Merge pull request #880 from apache/5.0.0-alpha-doc
Update NOTICE.txt
2018-03-05 19:32:43 +08:00
吴晟 Wu Sheng 12a486fb42
Merge branch 'master' into 5.0.0-alpha-doc 2018-03-05 18:56:30 +08:00
吴晟 Wu Sheng de81e2115d
Merge pull request #881 from ascrutae/fix/entry-span-issue
[Agent] fix create entry span failure
2018-03-05 18:52:05 +08:00
ascrutae 26889046bc [Agent] fix create entry span failure 2018-03-05 18:06:17 +08:00
Gao Hongtao b74f59ed44
Merge branch 'master' into 5.0.0-alpha-doc 2018-03-05 17:33:48 +08:00
Gao Hongtao 77f7ce228d
Update NOTICE.txt
Add UI repo dependencies
2018-03-05 17:30:58 +08:00
吴晟 Wu Sheng 4a7f11c92c
Merge pull request #878 from peng-yongsheng/feature/notice
Add the third Party Components description into notice file.
2018-03-05 16:00:02 +08:00
吴晟 Wu Sheng ba3a506496
Merge branch 'master' into feature/notice 2018-03-05 15:21:07 +08:00
吴晟 Wu Sheng ae6a739d0d
Update NOTICE.txt
Remove Apache projects from NOTICE
2018-03-05 15:20:53 +08:00
吴晟 Wu Sheng 9e9c08df6a
Merge pull request #879 from peng-yongsheng/fixed/855
Fixed/855
2018-03-05 13:48:31 +08:00
peng-yongsheng a9850c136e Report @ 2018/03/04 23:00, Application, [COLLECTOR] The topology is incorrect.
Fixed the getApplicationTopology bug, remove the application node which not contains the source or target of calls.
2018-03-05 13:18:42 +08:00
peng-yongsheng c587b9f009 Report @ 2018/03/04 23:00, Dashboard [COLLECTOR] The /api/dashboard response is incorrect .
Fixed the number of application bug.
2018-03-05 13:01:52 +08:00
彭勇升 pengys 5776889870
Merge branch 'master' into feature/notice 2018-03-05 12:46:59 +08:00
peng-yongsheng 7a73e3b6da Add the third Party Components description into notice file. 2018-03-05 12:46:00 +08:00
吴晟 Wu Sheng a66d280944
Merge pull request #876 from hanahmily/submodule/update-ui
Update submodule/skywaling-ui
2018-03-05 12:34:24 +08:00
hanahmily cc3000977f Update submodule/skywaling-ui 2018-03-05 11:33:55 +08:00
吴晟 Wu Sheng 67a8771fdd
Merge pull request #872 from hanahmily/submodule/update-ui
Submodule/update-ui
2018-03-04 22:07:49 +08:00
gaohongtao 00229e4fdb Merge branch 'apache-master' into submodule/update-ui 2018-03-04 21:35:03 +08:00
gaohongtao b4f455cc97 Merge branch 'master' of https://github.com/apache/incubator-skywalking into apache-master 2018-03-04 21:34:33 +08:00
gaohongtao ad31bf24ba Update skywalking-ui submodule 2018-03-04 21:30:09 +08:00
Xin,Zhang 9b6f87237a
Merge pull request #870 from peng-yongsheng/fixed/855
Fixed/855
2018-03-04 15:17:53 +08:00
peng-yongsheng 610edfe426 Fixed compile error. 2018-03-04 14:32:01 +08:00
peng-yongsheng ca20d08837 Use application mapping to get the actual application id for the alarm title. 2018-03-04 14:29:26 +08:00
peng-yongsheng 0006cb4b10 Fixed the NullPointerException in getServerThroughput method. 2018-03-04 14:10:51 +08:00
peng-yongsheng da3d993e4d Add application node when the source of reference is not have application metric. 2018-03-04 13:56:59 +08:00
peng-yongsheng c7dae338f0 Make the alarm trend rate value is 0 when application size equal to 0. 2018-03-04 11:35:07 +08:00
peng-yongsheng 8e3e0a3c55 Clear the duration in query condition when trace id is not empty. 2018-03-04 11:30:08 +08:00
吴晟 Wu Sheng 10ccd4f163
Merge pull request #868 from apache/sync-ui
Sync UI updates.
2018-03-04 07:31:29 +08:00
吴晟 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