This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from 766a78d Merge pull request #861 from apache/re-organize-dist
add f9c241c Pagination calculate
add 36d0eb5 getAlarmTrend ok.
add 3863aa7 1. Generate alarm content. 2. loadAlarmList ok.
add fc5f67f Setting the alarm attributes in topology.
add 75a9283 1. Add application code into instance table. 2. Search server
by application code by searchServer method.
add d615a69 Merge branch 'master' into feature/appCodeInServer
new e7a6a24 Merge pull request #863 from
peng-yongsheng/feature/appCodeInServer
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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 ++++++-
.../{ApdexCalculator.java => PaginationUtils.java} | 29 +++++-
.../ui/utils/PaginationUtilsTestCase.java} | 36 +++----
41 files changed, 428 insertions(+), 98 deletions(-)
copy
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/utils/{ApdexCalculator.java
=> PaginationUtils.java} (59%)
copy
apm-collector/{apm-collector-analysis/analysis-register/register-provider/src/test/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/IdAutoIncrementTestCase.java
=>
apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/ui/utils/PaginationUtilsTestCase.java}
(54%)
--
To stop receiving notification emails like this one, please contact
wush...@apache.org.
