This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch feature/tls in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit ae159e345f658eb22777345b5625895122d18964 Merge: 6ba29a2 0e60d40 Author: 吴晟 Wu Sheng <[email protected]> AuthorDate: Thu Mar 22 06:04:59 2018 +0800 Merge branch 'master' into feature/tls .../client/elasticsearch/ElasticSearchClient.java | 96 +++++++++--- .../collector-storage-es-provider/pom.xml | 5 + .../storage/es/StorageModuleEsProvider.java | 162 +++++---------------- .../es/base/dao/AbstractPersistenceEsDAO.java | 23 +-- .../es/dao/GlobalTraceEsPersistenceDAO.java | 21 ++- .../es/dao/SegmentDurationEsPersistenceDAO.java | 21 ++- .../storage/es/dao/SegmentEsPersistenceDAO.java | 21 ++- .../alarm/ApplicationAlarmEsPersistenceDAO.java | 35 +++-- .../ApplicationReferenceAlarmEsPersistenceDAO.java | 33 +++-- ...licationReferenceAlarmListEsPersistenceDAO.java | 33 +++-- .../dao/alarm/InstanceAlarmEsPersistenceDAO.java | 33 +++-- .../alarm/InstanceAlarmListEsPersistenceDAO.java | 33 +++-- .../InstanceReferenceAlarmEsPersistenceDAO.java | 37 +++-- ...InstanceReferenceAlarmListEsPersistenceDAO.java | 37 +++-- .../es/dao/alarm/ServiceAlarmEsPersistenceDAO.java | 35 +++-- .../alarm/ServiceAlarmListEsPersistenceDAO.java | 35 +++-- .../ServiceReferenceAlarmEsPersistenceDAO.java | 45 +++--- .../ServiceReferenceAlarmListEsPersistenceDAO.java | 45 +++--- .../AbstractMemoryPoolMetricEsPersistenceDAO.java | 32 ++-- .../es/dao/register/InstanceRegisterEsDAO.java | 32 ++-- .../storage/es/dao/ui/CpuMetricEsUIDAO.java | 25 ++-- .../storage/es/dao/ui/GCMetricEsUIDAO.java | 23 +-- .../storage/es/dao/ui/InstanceMetricEsUIDAO.java | 46 +++--- .../storage/es/dao/ui/MemoryMetricEsUIDAO.java | 33 +++-- .../storage/es/dao/ui/MemoryPoolMetricEsUIDAO.java | 44 ++---- .../storage/es/dao/ui/ServiceMetricEsUIDAO.java | 80 +++++----- 26 files changed, 554 insertions(+), 511 deletions(-) -- To stop receiving notification emails like this one, please contact [email protected].
