Commit Graph

84 Commits

Author SHA1 Message Date
吴晟 Wu Sheng d8d28a0b33
Support TLS of gRPC between agent and server. (#968)
* Finish the prototype of TLS of gRPC between agent and server.

* Fix for rat check.

* Update GRPCChannelManager.java

* Update AgentModuleGRPCProvider.java

* Upgrade netty version (#971)

* Make sure end user can't start gRPC server with and without SSL in the same port.
2018-03-22 06:59:17 +08:00
吴晟 Wu Sheng 08267611a2 Prepare beta iteratoration (#944)
* [maven-release-plugin] prepare release apm-5.0.0-alpha

* [maven-release-plugin] prepare for next development iteration
2018-03-13 23:47:38 -05: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 08d26eca09 Change the traceId type to be collection in trace graphql protocol. 2018-03-01 17:57:01 +08:00
peng-yongsheng c1fedb02b5 1. Changed the attribute name from TPS to callsPerSec.
2. Calculate the callsPerSec.
2018-02-28 20:24:24 +08:00
peng-yongsheng 62d5148295 1. Changed the attribute name from TPS to callsPerSec.
2. Calculate the callsPerSec.
2018-02-28 11:44:58 +08:00
peng-yongsheng 2caa29a0dc 1. Changed the attribute name from TPS to callsPerSec.
2. Calculate the callsPerSec.
2018-02-28 10:20:06 +08:00
peng-yongsheng 2e9f07c0a8 Merge remote-tracking branch 'upstream/master' into feature/getClusterTopology 2018-02-27 21:11:08 +08:00
peng-yongsheng 1cca13df32 Change the attribute name from responseTimePerSec to avgResponseTime. 2018-02-27 15:56:35 +08:00
吴晟 Wu Sheng acae617047
Merge branch 'master' into feature/support-hystrix-plugin 2018-02-27 06:21:27 +08:00
wusheng f7fdd9f854 Fix assmbly for mvn clean install -Papache-release and update version to SNAPSHOT for SNAPSHOT release. 2018-02-26 23:22:10 +08:00
ascrutae fa99652d5b [Agent] Support hystrix plugin 2018-02-25 21:02:38 +08:00
wu-sheng 8a1f4434d7 Update submodule. 2018-02-23 16:51:14 +08:00
Wu Sheng 3b3a20e251 Add submodule links for protocol 2018-02-23 11:46:30 +08:00
peng-yongsheng 4836883d75 Change the data type of sla and apdex attributes from Float to Int. 2018-02-13 23:52:00 +08:00
李运涛 liyuntao e233b7becc
Merge branch 'master' into servicecomb 2018-02-10 20:49:43 -06:00
peng-yongsheng da0a8b8546 Provide the getServerThroughput query. 2018-02-10 10:46:15 +08:00
李运涛 liyuntao cbb2eca248
Merge branch 'master' into servicecomb 2018-02-09 03:20:24 -06:00
wu-sheng a736c01a81 Fix protocol mistakes. 2018-02-09 17:09:48 +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
李运涛 liyuntao 6793deb0e1
Merge branch 'master' into servicecomb 2018-02-08 20:13:24 -06: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
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 ca11058f8e Add a new field for operation register. 2018-02-07 15:58:05 +08:00
吴晟 Wu Sheng 505f6a0ec3
Merge branch 'master' into feature/graphql-ui 2018-02-06 21:28:19 +08:00
李运涛 liyuntao 49a99a5353
Merge branch 'master' into servicecomb 2018-02-05 20:12:43 -06:00
peng-yongsheng b513024a85 Provide the searchService query. 2018-02-05 10:26:54 +08:00
peng-yongsheng 77f615a8ae Provide the queryBasicTraces query. 2018-02-04 22:16:52 +08:00
Gao Hongtao 0851b5612e
Update protocol 2018-02-02 17:18:45 +08:00
李运涛 liyuntao a3985d7b63
Merge branch 'master' into servicecomb 2018-01-30 10:04:27 +08:00
peng-yongsheng f177ebd909 Provide the search server query, but only completed es storage and non tps. 2018-01-27 09:13:48 +08:00
peng-yongsheng 1510f7059d Change the data type from int to long which attributes named responseTimePerSec and callsPerSec. 2018-01-26 08:55:55 +08:00
peng-yongsheng a25e353e2d Implement the method named getAllApplication in application layer graphql protocol. 2018-01-24 00:12:27 +08:00
ascrutae 22ead46dcc [Agent] Support kafka framework 2018-01-22 19:56:22 +08:00
lytscu 1b499f0dc0 Add [Agent] ServiceComb Plugin #437 2018-01-22 15:56:25 +08:00
peng-yongsheng 06f675ac9b Changed dependency graphql-java from 6.0 to 7.0. 2018-01-20 22:21:56 +08:00
吴晟 Wu Sheng 5175e9d54b
Merge branch 'master' into alter-graphql-log-time 2018-01-18 11:20:31 +08:00
wu-sheng cef1ca8410 Time should be Long 2018-01-18 11:14:10 +08:00
wu-sheng ed30481696 Add a missing field. 2018-01-17 08:20:50 +08:00
wu-sheng b482463f42 Add parentSpanId for Span 2018-01-16 15:53:09 +08:00
李运涛 liyuntao bcac37b534
Merge branch 'master' into develop 2018-01-16 11:02:20 +08:00
吴晟 Wu Sheng 4f2c781270
Merge branch 'master' into feature/graphql 2018-01-16 09:26:04 +08:00
peng-yongsheng b525e1e0e2 Lowercase the IPv4 and IPv6 attributes, because of there have a java style check that regulate the first letter must be lowercase. 2018-01-16 09:18:56 +08:00
lytscu 4a0a210348 Modify ComponentsDefine.java 2018-01-15 19:19:49 +08:00