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 cb2ea6b  Merge pull request #809 from 
peng-yongsheng/feature/applicationalarm
     add 47e1db5  Provide the loadAlarmList query.
     new 7cbed1b  Merge pull request #810 from 
peng-yongsheng/feature/loadAlarmList

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:
 .../apm/collector/core/util/TimeBucketUtils.java   |  13 +-
 .../apm/collector/storage/StorageModule.java       |   7 ++
 ...rviceUIDAO.java => IApplicationAlarmUIDAO.java} |   9 +-
 ...balTraceUIDAO.java => IInstanceAlarmUIDAO.java} |   8 +-
 ...obalTraceUIDAO.java => IServiceAlarmUIDAO.java} |   8 +-
 .../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 ++
 ...icH2UIDAO.java => ApplicationAlarmH2UIDAO.java} |  19 +--
 .../storage/h2/dao/ui/InstanceAlarmH2UIDAO.java}   |  18 +--
 .../storage/h2/dao/ui/ServiceAlarmH2UIDAO.java}    |  18 +--
 .../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, 467 insertions(+), 298 deletions(-)
 copy 
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/{IServiceNameServiceUIDAO.java
 => IApplicationAlarmUIDAO.java} (78%)
 copy 
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/{IGlobalTraceUIDAO.java
 => IInstanceAlarmUIDAO.java} (79%)
 copy 
apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/dao/ui/{IGlobalTraceUIDAO.java
 => IServiceAlarmUIDAO.java} (79%)
 create mode 100644 
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ApplicationAlarmEsUIDAO.java
 create mode 100644 
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/InstanceAlarmEsUIDAO.java
 create mode 100644 
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ServiceAlarmEsUIDAO.java
 copy 
apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/{ApplicationMetricH2UIDAO.java
 => ApplicationAlarmH2UIDAO.java} (62%)
 copy 
apm-collector/{apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/ConfigQuery.java
 => 
apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/InstanceAlarmH2UIDAO.java}
 (63%)
 copy 
apm-collector/{apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/query/ConfigQuery.java
 => 
apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/dao/ui/ServiceAlarmH2UIDAO.java}
 (63%)
 delete mode 100644 
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/InstanceHealthService.java
 delete mode 100644 
apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/InstanceJVMService.java

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

Reply via email to