This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit e7a6a246de9d39efb203512a4771eb92b841f446
Merge: 766a78d d615a69
Author: 吴晟 Wu Sheng <wu.sh...@foxmail.com>
AuthorDate: Sat Mar 3 08:00:08 2018 +0800
Merge pull request #863 from peng-yongsheng/feature/appCodeInServer
Feature/app code in server
.../analysis-alarm/alarm-provider/pom.xml | 5 +
.../alarm/provider/worker/AlarmAssertWorker.java | 10 +-
.../ApplicationMetricAlarmAssertWorker.java | 22 +++++
...pplicationReferenceMetricAlarmAssertWorker.java | 22 +++++
.../instance/InstanceMetricAlarmAssertWorker.java | 30 ++++++
.../InstanceReferenceMetricAlarmAssertWorker.java | 30 ++++++
.../service/ServiceMetricAlarmAssertWorker.java | 22 +++++
.../ServiceReferenceMetricAlarmAssertWorker.java | 28 +++++-
.../register/InstanceRegisterSerialWorker.java | 3 +
.../provider/service/InstanceIDService.java | 12 +++
.../storage/dao/ui/IApplicationAlarmListUIDAO.java | 23 ++++-
.../storage/dao/ui/IApplicationAlarmUIDAO.java | 2 +-
.../storage/dao/ui/IInstanceAlarmUIDAO.java | 2 +-
.../storage/dao/ui/IServiceAlarmUIDAO.java | 2 +-
.../collector/storage/table/register/Instance.java | 9 ++
.../storage/table/register/InstanceTable.java | 1 +
.../apm/collector/storage/ui/alarm/AlarmItem.java | 6 +-
.../es/dao/register/InstanceRegisterEsDAO.java | 1 +
.../storage/es/dao/ui/ApplicationAlarmEsUIDAO.java | 8 +-
.../es/dao/ui/ApplicationAlarmListEsUIDAO.java | 15 +--
.../storage/es/dao/ui/InstanceAlarmEsUIDAO.java | 7 +-
.../storage/es/dao/ui/InstanceEsUIDAO.java | 1 +
.../storage/es/dao/ui/ServiceAlarmEsUIDAO.java | 7 +-
.../es/define/register/InstanceEsTableDefine.java | 3 +-
.../h2/dao/register/InstanceRegisterH2DAO.java | 1 +
.../storage/h2/dao/ui/ApplicationAlarmH2UIDAO.java | 2 +-
.../h2/dao/ui/ApplicationAlarmListH2UIDAO.java | 2 +-
.../storage/h2/dao/ui/InstanceAlarmH2UIDAO.java | 2 +-
.../storage/h2/dao/ui/ServiceAlarmH2UIDAO.java | 2 +-
.../h2/define/register/InstanceH2TableDefine.java | 1 +
.../apm/collector/ui/query/AlarmQuery.java | 14 +--
.../apm/collector/ui/query/OverViewLayerQuery.java | 12 +--
.../apm/collector/ui/service/AlarmService.java | 105 ++++++++++++++++++---
.../collector/ui/service/ApplicationService.java | 2 +-
.../ui/service/ApplicationTopologyService.java | 4 +-
.../ui/service/ClusterTopologyService.java | 2 +-
.../apm/collector/ui/service/ServerService.java | 7 +-
.../ui/service/ServiceTopologyService.java | 1 +
.../apm/collector/ui/service/TopologyBuilder.java | 33 ++++++-
.../apm/collector/ui/utils/PaginationUtils.java} | 36 ++++---
.../ui/utils/PaginationUtilsTestCase.java} | 32 ++++---
41 files changed, 429 insertions(+), 100 deletions(-)
--
To stop receiving notification emails like this one, please contact
wush...@apache.org.
