吴晟 Wu Sheng
0c47dac853
Merge pull request #823 from apache/proto-update
...
Update submodule.
2018-02-23 17:06:54 +08:00
wu-sheng
8a1f4434d7
Update submodule.
2018-02-23 16:51:14 +08:00
吴晟 Wu Sheng
8435871081
Merge pull request #822 from apache/submodule
...
Using submodule to link protocol and UI
2018-02-23 14:29:58 +08:00
Wu Sheng
3b3a20e251
Add submodule links for protocol
2018-02-23 11:46:30 +08:00
Wu Sheng
c8b2110d5e
add UI as a submodule
2018-02-23 10:22:00 +08:00
吴晟 Wu Sheng
3298c383d5
Merge pull request #820 from sdanzo/master
...
Update assembly.xml
2018-02-19 08:20:24 +08:00
Danzo
c96077ebbc
Update assembly.xml
...
fixed maven 3.3.9 build issue caused by empty assembly ID on Ubuntu 16.04.2 using OpenJDK 1.8.0_151.
[INFO] Building apm-collector-boot 5.0.0-alpha
[INFO] ------------------------------------------------------------------------
[INFO]
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ apm-collector-boot ---
[INFO] Deleting /home/steve/skywalking/incubator-skywalking/apm-collector/apm-collector-boot/target
[INFO]
[INFO] --- maven-checkstyle-plugin:2.17:check (validate) @ apm-collector-boot ---
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 1.492 s
[INFO] Finished at: 2018-02-18T12:05:49-06:00
[INFO] Final Memory: 19M/235M
[INFO] ------------------------------------------------------------------------
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-checkstyle-plugin:2.17:check (validate) on project apm-collector-boot: Failed during checkstyle configuration: cannot initialize module Header - Unable to find: CHECKSTYLE_HEAD -> [Help 1]
[ERROR]
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR]
[ERROR] For more information about the errors and possible solutions, please read the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException
2018-02-18 12:22:56 -06:00
Gao Hongtao
787f26244b
Merge pull request #819 from peng-yongsheng/feature/graphql_protocol
...
Change the data type of sla and apdex attributes from Float to Int.
2018-02-14 09:29:07 +08:00
吴晟 Wu Sheng
47e29900f6
Merge branch 'master' into feature/graphql_protocol
2018-02-14 06:17:16 +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
吴晟 Wu Sheng
d42458ffd8
Merge pull request #815 from apache/update/logbck-version
...
Update logback version in application logback toolkit
2018-02-13 23:24:52 +08:00
吴晟 Wu Sheng
efcc8e856c
Merge branch 'master' into update/logbck-version
2018-02-13 23:09:09 +08:00
吴晟 Wu Sheng
ab3615e237
Merge pull request #818 from peng-yongsheng/feature/metric_check
...
Agent data aggregate test.
2018-02-13 23:08:25 +08:00
peng-yongsheng
37a5287360
JVM metric aggregate tested.
2018-02-13 22:52:12 +08:00
peng-yongsheng
1435cbb1fe
Trace segment metric aggregate and alarm metric aggregate tested.
2018-02-13 18:00:19 +08:00
彭勇升 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
4544d99673
Update logback version in application logback toolkit, based on #813 , where I explained that the logback library is not really used, just for compiling the bridge. But anyway, no harm to fix the risk
2018-02-13 14:25:36 +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