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 7cbed1bb62ea4875877b7957782b7ca8b67b21c3
Merge: cb2ea6b 47e1db5
Author: 吴晟 Wu Sheng <wu.sh...@foxmail.com>
AuthorDate: Mon Feb 12 16:43:17 2018 +0800

    Merge pull request #810 from peng-yongsheng/feature/loadAlarmList
    
    Provide the loadAlarmList query.

 .../apm/collector/core/util/TimeBucketUtils.java   |  13 +-
 .../apm/collector/storage/StorageModule.java       |   7 ++
 .../ui/IApplicationAlarmUIDAO.java}                |  16 +--
 .../ui/IInstanceAlarmUIDAO.java}                   |  16 +--
 .../ui/IServiceAlarmUIDAO.java}                    |  16 +--
 .../apm/collector/storage/ui/alarm/Alarm.java      |   5 +
 .../apm/collector/storage/ui/alarm/AlarmItem.java  |  48 ++++++++
 .../storage/es/StorageModuleEsProvider.java        |  10 ++
 .../storage/es/dao/ui/ApplicationAlarmEsUIDAO.java |  90 ++++++++++++++
 .../storage/es/dao/ui/InstanceAlarmEsUIDAO.java    |  90 ++++++++++++++
 .../storage/es/dao/ui/ServiceAlarmEsUIDAO.java     |  90 ++++++++++++++
 .../storage/h2/StorageModuleH2Provider.java        |  10 ++
 .../h2/dao/ui/ApplicationAlarmH2UIDAO.java}        |  26 ++--
 .../storage/h2/dao/ui/InstanceAlarmH2UIDAO.java}   |  24 ++--
 .../storage/h2/dao/ui/ServiceAlarmH2UIDAO.java}    |  24 ++--
 .../collector/ui/jetty/handler/GraphQLHandler.java |   2 +-
 .../apm/collector/ui/query/AlarmQuery.java         |  46 ++++++--
 .../apm/collector/ui/service/AlarmService.java     |  33 ++++++
 .../ui/service/InstanceHealthService.java          | 110 -----------------
 .../collector/ui/service/InstanceJVMService.java   | 131 ---------------------
 20 files changed, 490 insertions(+), 317 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
wush...@apache.org.

Reply via email to