Commit Graph

3620 Commits

Author SHA1 Message Date
吴晟 Wu Sheng dfeeeab108
Merge branch 'master' into adjust-network-proto 2018-01-05 07:56:46 +08:00
wusheng c11f37ab9f Remove an unused import. 2018-01-05 07:54:32 +08:00
吴晟 Wu Sheng 60422f512b
Merge pull request #725 from apache/graph-ql/add-incoming-attr
Add incoming attr for application node.
2018-01-05 06:24:07 +08:00
吴晟 Wu Sheng bc615e9c5c
Merge branch 'master' into graph-ql/add-incoming-attr 2018-01-05 06:10:25 +08:00
Xin,Zhang f86426b35b
Merge branch 'master' into adjust-network-proto 2018-01-04 23:21:26 +08:00
wusheng d934ec53f2 Fix test cases 2018-01-04 23:19:17 +08:00
wusheng ef284dc6d5 Make the applicationCodeRegister only for single code. 2018-01-04 23:07:49 +08:00
吴晟 Wu Sheng fcb809a864
Merge pull request #726 from ascrutae/fix/httpclient-issue
[Agent] fix import incorrector class in httpclient plugin
2018-01-04 23:04:25 +08:00
ascrutae a108e8feeb [Agent] fix import incorrector class in httpclient plugin 2018-01-04 22:47:09 +08:00
wusheng fd08a731a4 Fix compile 2018-01-04 22:29:52 +08:00
wusheng e7b72eb2f9 catch up the TODO list. 2018-01-04 21:50:43 +08:00
peng-yongsheng b61ab344ef Merge remote-tracking branch 'upstream/master' 2018-01-04 18:18:17 +08:00
wu-sheng 79ed3bff48 Add incoming attr for application node. 2018-01-04 14:25:26 +08:00
吴晟 Wu Sheng 1fbb28d26b
Merge pull request #724 from peng-yongsheng/feature/alarm
A big change in collector.
2018-01-04 12:38:18 +08:00
YunaiV dde58ef004 Fix DataTTLKeeperTimer's startTimestamp and endTimestamp 2018-01-04 12:24:17 +08:00
peng-yongsheng 6f986cc770 Merge branch 'feature/alarm' of https://github.com/peng-yongsheng/incubator-skywalking into feature/alarm 2018-01-04 12:18:05 +08:00
peng-yongsheng 43151551ab Use DecimalFormat to replace DecimalFormat because of DecimalFormat will add a comma in formatted result when value greater than 1000. 2018-01-04 12:17:57 +08:00
彭勇升 pengys 441090ef3e
Merge pull request #2 from YunaiV/master-5.0
Fix DataTTLKeeperTimer's startTimestamp and endTimestamp
2018-01-04 11:44:53 +08:00
吴晟 Wu Sheng 3e0da01cee
Merge branch 'master' into feature/alarm 2018-01-04 11:44:02 +08:00
彭勇升 pengys 8cf42e72cc
Merge pull request #723 from apache/feature/segment-limit-log
Add warning log outputs, if too many spans created in one segment.
2018-01-04 10:54:54 +08:00
wu-sheng 92b320ebc2 Add warning log outputs, if too many spans created in one segment. 2018-01-04 10:29:22 +08:00
peng-yongsheng 766971837b Add alarm config into application.yml. 2018-01-03 19:50:11 +08:00
peng-yongsheng f625cdd166 Alarm test ok. 2018-01-03 17:24:47 +08:00
peng-yongsheng ba0d00c7bc Application reference metric and application metric test ok. 2018-01-03 15:00:21 +08:00
peng-yongsheng ba06a68c7a Instance metric and instance reference metric test ok. 2018-01-03 14:55:35 +08:00
peng-yongsheng cee7c71516 Service metric test ok. 2018-01-03 14:50:58 +08:00
peng-yongsheng 6b20b3e30d Service reference metric test ok. 2018-01-03 14:40:59 +08:00
吴晟 Wu Sheng 22420a45e8
Merge pull request #722 from goldonship/patch-1
Update StringUtil.java
2018-01-03 14:34:39 +08:00
goldon f3847972e3
Update StringUtil.java
clean code
2018-01-03 14:14:40 +08:00
peng-yongsheng a9ae31df8d Create application, instance, network address when peer or network id register. 2018-01-03 13:26:25 +08:00
peng-yongsheng 7d73fba84d Network address register by http json and grpc. 2018-01-02 21:30:59 +08:00
peng-yongsheng 3b6c684310 Merge remote-tracking branch 'upstream/master' into feature/alarm 2018-01-02 19:46:06 +08:00
peng-yongsheng 279ccb2916 Network address register and cache. 2018-01-02 19:43:38 +08:00
吴晟 Wu Sheng e5ea6cf331
Merge pull request #719 from apache/service/network-address-register
Isolate NetworkAddressRegisterService from ApplicationRegisterService
2018-01-02 17:51:37 +08:00
wu-sheng 02755e2af2 Remove comment. 2018-01-02 17:36:38 +08:00
wu-sheng 498e8a52cc Isolate NetworkAddressRegisterService from ApplicationRegisterService 2018-01-02 16:51:42 +08:00
peng-yongsheng 58aaaf2d51 Add instance mapping analysis to collect the relationship between instance and it’s ip:port. 2018-01-02 15:47:35 +08:00
peng-yongsheng 7a4154709b Rename the method in InstanceCacheService class from get to getApplicationId. 2018-01-02 10:26:23 +08:00
peng-yongsheng c15bfc71b8 Alarm persistence DAO for h2, not implement. 2018-01-01 20:58:33 +08:00
peng-yongsheng a073551041 Alarm persistence DAO for elastic search. 2018-01-01 20:39:01 +08:00
peng-yongsheng d88f460e34 Alarm table define for elastic search. 2018-01-01 18:56:21 +08:00
peng-yongsheng e4e09e7607 Change the generic of persistence DAO. 2018-01-01 18:34:24 +08:00
peng-yongsheng 50714fccef Collector startup success. 2018-01-01 18:26:29 +08:00
peng-yongsheng d2b4edd8d9 Compile success. 2018-01-01 18:17:03 +08:00
peng-yongsheng 97abe99bfd Application reference metric alarm. 2018-01-01 15:48:41 +08:00
peng-yongsheng a55a5f046e Instance reference metric alarm. 2018-01-01 15:34:15 +08:00
peng-yongsheng 5cab1e2715 Service reference metric alarm. 2018-01-01 15:18:08 +08:00
peng-yongsheng a17de070c1 Application metric alarm. 2018-01-01 14:45:44 +08:00
peng-yongsheng 82771cc60b Instance metric alarm. 2018-01-01 14:28:06 +08:00
peng-yongsheng 2d44d8a419 Service metric alarm. 2018-01-01 14:10:08 +08:00