You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2018/10/25 02:52:01 UTC
[incubator-skywalking] 01/02: Merge remote-tracking branch
'origin/master'
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch docs/kubernetes
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 987ec86abfa2516876a9b2b25ac9b9860a9f69e6
Merge: ed971a0 7bb577a
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Thu Oct 25 09:41:31 2018 +0800
Merge remote-tracking branch 'origin/master'
.../oap/server/core/CoreModuleConfig.java | 15 +++
.../oap/server/core/CoreModuleProvider.java | 4 +
.../type/StorageDataType.java => DataTTL.java} | 17 ++-
.../generated/all/AllHeatmapIndicator.java | 19 ++--
.../analysis/generated/all/AllP50Indicator.java | 19 ++--
.../analysis/generated/all/AllP75Indicator.java | 19 ++--
.../analysis/generated/all/AllP90Indicator.java | 19 ++--
.../analysis/generated/all/AllP95Indicator.java | 19 ++--
.../analysis/generated/all/AllP99Indicator.java | 19 ++--
.../generated/endpoint/EndpointAvgIndicator.java | 7 +-
.../generated/endpoint/EndpointCpmIndicator.java | 7 +-
.../generated/endpoint/EndpointP50Indicator.java | 19 ++--
.../generated/endpoint/EndpointP75Indicator.java | 19 ++--
.../generated/endpoint/EndpointP90Indicator.java | 19 ++--
.../generated/endpoint/EndpointP95Indicator.java | 19 ++--
.../generated/endpoint/EndpointP99Indicator.java | 19 ++--
.../generated/endpoint/EndpointSlaIndicator.java | 7 +-
.../EndpointRelationCpmIndicator.java | 7 +-
.../EndpointRelationRespTimeIndicator.java | 7 +-
.../generated/service/ServiceCpmIndicator.java | 7 +-
.../generated/service/ServiceP50Indicator.java | 19 ++--
.../generated/service/ServiceP75Indicator.java | 19 ++--
.../generated/service/ServiceP90Indicator.java | 19 ++--
.../generated/service/ServiceP95Indicator.java | 19 ++--
.../generated/service/ServiceP99Indicator.java | 19 ++--
.../service/ServiceRespTimeIndicator.java | 7 +-
.../generated/service/ServiceSlaIndicator.java | 7 +-
.../ServiceInstanceCpmIndicator.java | 7 +-
.../ServiceInstanceRespTimeIndicator.java | 7 +-
.../InstanceJvmCpuIndicator.java | 7 +-
.../InstanceJvmOldGcCountIndicator.java | 7 +-
.../InstanceJvmOldGcTimeIndicator.java | 7 +-
.../InstanceJvmYoungGcCountIndicator.java | 7 +-
.../InstanceJvmYoungGcTimeIndicator.java | 7 +-
.../InstanceJvmMemoryHeapIndicator.java | 7 +-
.../InstanceJvmMemoryHeapMaxIndicator.java | 7 +-
.../InstanceJvmMemoryNoheapIndicator.java | 7 +-
.../InstanceJvmMemoryNoheapMaxIndicator.java | 7 +-
.../ServiceRelationClientCallSlaIndicator.java | 7 +-
.../ServiceRelationClientCpmIndicator.java | 7 +-
.../ServiceRelationClientRespTimeIndicator.java | 7 +-
.../ServiceRelationServerCallSlaIndicator.java | 7 +-
.../ServiceRelationServerCpmIndicator.java | 7 +-
.../ServiceRelationServerRespTimeIndicator.java | 7 +-
.../server/core/analysis/indicator/Indicator.java | 7 +-
.../core/analysis/indicator/IntKeyLongValue.java | 6 +
.../analysis/indicator/IntKeyLongValueArray.java | 13 +++
.../analysis/manual/segment/SegmentRecord.java | 2 +-
.../analysis/worker/IndicatorPersistentWorker.java | 46 +++++++-
.../core/analysis/worker/PersistenceWorker.java | 2 +-
.../analysis/worker/RecordPersistentWorker.java | 35 ++++++
.../server/core/register/EndpointInventory.java | 2 +-
.../core/register/NetworkAddressInventory.java | 2 +-
.../core/register/ServiceInstanceInventory.java | 2 +-
.../oap/server/core/register/ServiceInventory.java | 2 +-
.../server/core/remote/RemoteSenderService.java | 5 +-
.../{IRecordDAO.java => IHistoryDeleteDAO.java} | 7 +-
.../oap/server/core/storage/IIndicatorDAO.java | 2 -
.../oap/server/core/storage/IRecordDAO.java | 2 -
.../oap/server/core/storage/StorageModule.java | 1 +
.../annotation/StorageAnnotationListener.java | 3 +-
.../core/storage/annotation/StorageEntity.java | 2 +
.../annotation/StorageEntityAnnotationUtils.java | 9 ++
.../oap/server/core/storage/model/Model.java | 6 +-
.../server/core/storage/model/ModelInstaller.java | 4 +-
.../core/storage/ttl/DataTTLKeeperTimer.java | 122 +++++++++++++++++++++
.../server/core/storage/type/StorageDataType.java | 2 +
.../client/elasticsearch/ElasticSearchClient.java | 11 +-
.../src/main/resources/application.yml | 18 +--
.../StorageModuleElasticsearchProvider.java | 1 +
.../elasticsearch/base/HistoryDeleteEsDAO.java} | 23 ++--
.../plugin/elasticsearch/base/IndicatorEsDAO.java | 6 +-
.../plugin/elasticsearch/base/RecordEsDAO.java | 3 -
73 files changed, 589 insertions(+), 272 deletions(-)