You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by ha...@apache.org on 2018/03/09 00:05:35 UTC
[incubator-skywalking] branch submodule/update-ui created (now
ae5104d)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch submodule/update-ui
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
at ae5104d Update UI submodule
This branch includes the following new commits:
new 503282d Merge branch 'master' into submodule/update-ui
new ae5104d Update UI submodule
The 2 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.
--
To stop receiving notification emails like this one, please contact
hanahmily@apache.org.
[incubator-skywalking] 02/02: Update UI submodule
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch submodule/update-ui
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit ae5104d75f6050a013049766c89bf0ea8fe7555d
Author: hanahmily <ha...@gmail.com>
AuthorDate: Fri Mar 9 08:04:32 2018 +0800
Update UI submodule
---
skywalking-ui | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/skywalking-ui b/skywalking-ui
index 1780590..839e398 160000
--- a/skywalking-ui
+++ b/skywalking-ui
@@ -1 +1 @@
-Subproject commit 178059096be011229975b546519c7326c844d34c
+Subproject commit 839e39861b12d0cd4ce11672ede459fe4dbb00c4
--
To stop receiving notification emails like this one, please contact
hanahmily@apache.org.
[incubator-skywalking] 01/02: Merge branch 'master' into
submodule/update-ui
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch submodule/update-ui
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 503282dd0033354b43e3f0cf6561df2f65367a61
Merge: b522068 fc2e518
Author: hanahmily <ha...@gmail.com>
AuthorDate: Fri Mar 9 08:03:31 2018 +0800
Merge branch 'master' into submodule/update-ui
README.md | 30 ++-
README_ZH.md | 33 +--
.../apm/toolkit/opentracing/SkywalkingContext.java | 3 +-
.../toolkit/opentracing/SkywalkingSpanBuilder.java | 3 +-
.../apm/toolkit/opentracing/SkywalkingTracer.java | 2 +-
.../grpc/provider/handler/mock/RegisterMock.java | 4 +-
.../provider/AnalysisAlarmModuleProvider.java | 20 ++
.../worker/cpu/CpuDayMetricPersistenceWorker.java | 2 +-
.../worker/cpu/CpuHourMetricPersistenceWorker.java | 2 +-
.../cpu/CpuMinuteMetricPersistenceWorker.java | 2 +-
.../cpu/CpuMonthMetricPersistenceWorker.java | 2 +-
.../cpu/CpuSecondMetricPersistenceWorker.java | 2 +-
.../worker/gc/GCDayMetricPersistenceWorker.java | 2 +-
.../worker/gc/GCHourMetricPersistenceWorker.java | 2 +-
.../worker/gc/GCMinuteMetricPersistenceWorker.java | 2 +-
.../worker/gc/GCMonthMetricPersistenceWorker.java | 2 +-
.../worker/gc/GCSecondMetricPersistenceWorker.java | 2 +-
.../memory/MemoryDayMetricPersistenceWorker.java | 2 +-
.../memory/MemoryHourMetricPersistenceWorker.java | 2 +-
.../MemoryMinuteMetricPersistenceWorker.java | 2 +-
.../memory/MemoryMonthMetricPersistenceWorker.java | 2 +-
.../MemorySecondMetricPersistenceWorker.java | 2 +-
.../MemoryPoolDayMetricPersistenceWorker.java | 2 +-
.../MemoryPoolHourMetricPersistenceWorker.java | 2 +-
.../MemoryPoolMinuteMetricPersistenceWorker.java | 2 +-
.../MemoryPoolMonthMetricPersistenceWorker.java | 2 +-
.../MemoryPoolSecondMetricPersistenceWorker.java | 2 +-
.../provider/AnalysisMetricModuleProvider.java | 26 +++
.../provider/AnalysisRegisterModuleProvider.java | 15 ++
.../worker/model/impl/AggregationWorker.java | 2 +-
.../worker/model/impl/PersistenceWorker.java | 4 +-
.../apm/collector/core/data/AbstractData.java | 47 ++++-
.../skywalking/apm/collector/core/data/Column.java | 23 +-
.../data/{Column.java => FormulaOperation.java} | 19 +-
.../data/{Operation.java => MergeOperation.java} | 5 +-
.../apm/collector/core/data/Operation.java | 12 --
.../{AddOperation.java => AddMergeOperation.java} | 8 +-
...overOperation.java => CoverMergeOperation.java} | 8 +-
.../{MaxOperation.java => MaxMergeOperation.java} | 8 +-
.../{MinOperation.java => MinMergeOperation.java} | 8 +-
.../{NonOperation.java => NonMergeOperation.java} | 8 +-
.../remote/service/RemoteDataRegisterService.java | 2 +-
.../grpc/handler/RemoteCommonServiceHandler.java | 3 +-
.../apm/collector/storage/StorageModule.java | 40 ++--
.../ICpuDayMetricPersistenceDAO.java | 2 +-
.../ICpuHourMetricPersistenceDAO.java | 2 +-
.../ICpuMinuteMetricPersistenceDAO.java | 2 +-
.../ICpuMonthMetricPersistenceDAO.java | 2 +-
.../ICpuSecondMetricPersistenceDAO.java | 2 +-
.../{gcmp => gc}/IGCDayMetricPersistenceDAO.java | 2 +-
.../{gcmp => gc}/IGCHourMetricPersistenceDAO.java | 2 +-
.../IGCMinuteMetricPersistenceDAO.java | 2 +-
.../{gcmp => gc}/IGCMonthMetricPersistenceDAO.java | 2 +-
.../IGCSecondMetricPersistenceDAO.java | 2 +-
.../IMemoryDayMetricPersistenceDAO.java | 2 +-
.../IMemoryHourMetricPersistenceDAO.java | 2 +-
.../IMemoryMinuteMetricPersistenceDAO.java | 2 +-
.../IMemoryMonthMetricPersistenceDAO.java | 2 +-
.../IMemorySecondMetricPersistenceDAO.java | 2 +-
.../IMemoryPoolDayMetricPersistenceDAO.java | 2 +-
.../IMemoryPoolHourMetricPersistenceDAO.java | 2 +-
.../IMemoryPoolMinuteMetricPersistenceDAO.java | 2 +-
.../IMemoryPoolMonthMetricPersistenceDAO.java | 2 +-
.../IMemoryPoolSecondMetricPersistenceDAO.java | 2 +-
.../collector/storage/table/CommonMetricTable.java | 3 +
.../apm/collector/storage/table/Metric.java | 12 ++
.../storage/table/alarm/ApplicationAlarm.java | 24 ++-
.../storage/table/alarm/ApplicationAlarmList.java | 26 ++-
.../table/alarm/ApplicationReferenceAlarm.java | 18 +-
.../table/alarm/ApplicationReferenceAlarmList.java | 18 +-
.../storage/table/alarm/InstanceAlarm.java | 26 ++-
.../storage/table/alarm/InstanceAlarmList.java | 26 ++-
.../table/alarm/InstanceReferenceAlarm.java | 22 +-
.../table/alarm/InstanceReferenceAlarmList.java | 22 +-
.../storage/table/alarm/ServiceAlarm.java | 28 ++-
.../storage/table/alarm/ServiceAlarmList.java | 28 ++-
.../storage/table/alarm/ServiceReferenceAlarm.java | 26 +--
.../table/alarm/ServiceReferenceAlarmList.java | 26 +--
.../table/application/ApplicationComponent.java | 22 +-
.../table/application/ApplicationMapping.java | 22 +-
.../table/application/ApplicationMetric.java | 148 +++++++++----
.../application/ApplicationReferenceMetric.java | 151 +++++++++-----
.../storage/table/global/GlobalTrace.java | 12 +-
.../storage/table/instance/InstanceMapping.java | 24 ++-
.../storage/table/instance/InstanceMetric.java | 133 ++++++++----
.../table/instance/InstanceReferenceMetric.java | 135 ++++++++----
.../apm/collector/storage/table/jvm/CpuMetric.java | 18 +-
.../apm/collector/storage/table/jvm/GCMetric.java | 20 +-
.../collector/storage/table/jvm/MemoryMetric.java | 30 +--
.../storage/table/jvm/MemoryPoolMetric.java | 30 +--
.../storage/table/register/Application.java | 24 ++-
.../collector/storage/table/register/Instance.java | 32 +--
.../storage/table/register/NetworkAddress.java | 22 +-
.../storage/table/register/ServiceName.java | 22 +-
.../collector/storage/table/segment/Segment.java | 10 +-
.../storage/table/segment/SegmentDuration.java | 24 +--
.../storage/table/service/ServiceMetric.java | 133 ++++++++----
.../table/service/ServiceReferenceMetric.java | 139 +++++++++----
.../storage/utils/TimePyramidTableNameBuilder.java | 2 +-
.../collector/storage/es/DataTTLKeeperTimer.java | 8 +-
.../storage/es/StorageModuleEsProvider.java | 80 +++----
.../AbstractApplicationMetricEsPersistenceDAO.java | 6 +
...ApplicationReferenceMetricEsPersistenceDAO.java | 6 +
.../AbstractCpuMetricEsPersistenceDAO.java | 2 +-
.../CpuDayMetricEsPersistenceDAO.java | 4 +-
.../CpuHourMetricEsPersistenceDAO.java | 4 +-
.../CpuMinuteMetricEsPersistenceDAO.java | 4 +-
.../CpuMonthMetricEsPersistenceDAO.java | 4 +-
.../CpuSecondMetricEsPersistenceDAO.java | 4 +-
.../AbstractGCMetricEsPersistenceDAO.java | 2 +-
.../{gcmp => gc}/GCDayMetricEsPersistenceDAO.java | 4 +-
.../{gcmp => gc}/GCHourMetricEsPersistenceDAO.java | 4 +-
.../GCMinuteMetricEsPersistenceDAO.java | 4 +-
.../GCMonthMetricEsPersistenceDAO.java | 4 +-
.../GCSecondMetricEsPersistenceDAO.java | 4 +-
.../AbstractInstanceMetricEsPersistenceDAO.java | 6 +
...actInstanceReferenceMetricEsPersistenceDAO.java | 6 +
.../AbstractMemoryMetricEsPersistenceDAO.java | 2 +-
.../MemoryDayMetricEsPersistenceDAO.java | 4 +-
.../MemoryHourMetricEsPersistenceDAO.java | 4 +-
.../MemoryMinuteMetricEsPersistenceDAO.java | 4 +-
.../MemoryMonthMetricEsPersistenceDAO.java | 4 +-
.../MemorySecondMetricEsPersistenceDAO.java | 4 +-
.../AbstractMemoryPoolMetricEsPersistenceDAO.java | 2 +-
.../MemoryPoolDayMetricEsPersistenceDAO.java | 4 +-
.../MemoryPoolHourMetricEsPersistenceDAO.java | 4 +-
.../MemoryPoolMinuteMetricEsPersistenceDAO.java | 4 +-
.../MemoryPoolMonthMetricEsPersistenceDAO.java | 4 +-
.../MemoryPoolSecondMetricEsPersistenceDAO.java | 4 +-
.../smp/AbstractServiceMetricEsPersistenceDAO.java | 6 +
...ractServiceReferenceMetricEsPersistenceDAO.java | 6 +
.../es/dao/ui/ApplicationMetricEsUIDAO.java | 42 ++--
.../storage/es/dao/ui/InstanceEsUIDAO.java | 3 +
.../storage/es/dao/ui/InstanceMetricEsUIDAO.java | 51 ++---
.../storage/es/dao/ui/SegmentDurationEsUIDAO.java | 1 +
.../storage/es/dao/ui/ServiceMetricEsUIDAO.java | 75 +++----
.../AbstractApplicationComponentEsTableDefine.java | 2 +-
.../ApplicationComponentDayEsTableDefine.java | 2 +-
.../ApplicationComponentHourEsTableDefine.java | 2 +-
.../ApplicationComponentMinuteEsTableDefine.java | 2 +-
.../ApplicationComponentMonthEsTableDefine.java | 2 +-
.../AbstractApplicationMetricEsTableDefine.java | 3 +
.../AbstractApplicationMappingEsTableDefine.java | 2 +-
.../ApplicationMappingDayEsTableDefine.java | 2 +-
.../ApplicationMappingHourEsTableDefine.java | 2 +-
.../ApplicationMappingMinuteEsTableDefine.java | 2 +-
.../ApplicationMappingMonthEsTableDefine.java | 2 +-
...actApplicationReferenceMetricEsTableDefine.java | 3 +
.../imp/AbstractInstanceMetricEsTableDefine.java | 3 +
.../AbstractInstanceMappingEsTableDefine.java | 2 +-
.../InstanceMappingDayEsTableDefine.java | 2 +-
.../InstanceMappingHourEsTableDefine.java | 2 +-
.../InstanceMappingMinuteEsTableDefine.java | 2 +-
.../InstanceMappingMonthEsTableDefine.java | 2 +-
...stractInstanceReferenceMetricEsTableDefine.java | 3 +
.../smp/AbstractServiceMetricEsTableDefine.java | 3 +
...bstractServiceReferenceMetricEsTableDefine.java | 3 +
.../main/resources/META-INF/defines/storage.define | 28 +--
.../storage/h2/StorageModuleH2Provider.java | 70 +++----
.../AbstractApplicationMetricH2PersistenceDAO.java | 3 +
...ApplicationReferenceMetricH2PersistenceDAO.java | 6 +
.../AbstractCpuMetricH2PersistenceDAO.java | 2 +-
.../CpuDayMetricH2PersistenceDAO.java | 4 +-
.../CpuHourMetricH2PersistenceDAO.java | 4 +-
.../CpuMinuteMetricH2PersistenceDAO.java | 4 +-
.../CpuMonthMetricH2PersistenceDAO.java | 4 +-
.../CpuSecondMetricH2PersistenceDAO.java | 4 +-
.../h2/dao/gcmp/GCDayMetricH2PersistenceDAO.java | 2 +-
.../h2/dao/gcmp/GCHourMetricH2PersistenceDAO.java | 2 +-
.../dao/gcmp/GCMinuteMetricH2PersistenceDAO.java | 2 +-
.../h2/dao/gcmp/GCMonthMetricH2PersistenceDAO.java | 2 +-
.../dao/gcmp/GCSecondMetricH2PersistenceDAO.java | 2 +-
.../AbstractInstanceMetricH2PersistenceDAO.java | 6 +
...actInstanceReferenceMetricH2PersistenceDAO.java | 6 +
.../AbstractMemoryMetricH2PersistenceDAO.java | 2 +-
.../MemoryDayMetricH2PersistenceDAO.java | 4 +-
.../MemoryHourMetricH2PersistenceDAO.java | 4 +-
.../MemoryMinuteMetricH2PersistenceDAO.java | 4 +-
.../MemoryMonthMetricH2PersistenceDAO.java | 4 +-
.../MemorySecondMetricH2PersistenceDAO.java | 4 +-
.../AbstractMemoryPoolMetricH2PersistenceDAO.java | 2 +-
.../MemoryPoolDayMetricH2PersistenceDAO.java | 4 +-
.../MemoryPoolHourMetricH2PersistenceDAO.java | 4 +-
.../MemoryPoolMinuteMetricH2PersistenceDAO.java | 4 +-
.../MemoryPoolMonthMetricH2PersistenceDAO.java | 4 +-
.../MemoryPoolSecondMetricH2PersistenceDAO.java | 4 +-
.../smp/AbstractServiceMetricH2PersistenceDAO.java | 3 +
...ractServiceReferenceMetricH2PersistenceDAO.java | 3 +
.../AbstractApplicationComponentH2TableDefine.java | 2 +-
.../ApplicationComponentDayH2TableDefine.java | 2 +-
.../ApplicationComponentHourH2TableDefine.java | 2 +-
.../ApplicationComponentMinuteH2TableDefine.java | 2 +-
.../ApplicationComponentMonthH2TableDefine.java | 2 +-
.../AbstractApplicationMetricH2TableDefine.java | 3 +
.../AbstractApplicationMappingH2TableDefine.java | 2 +-
.../ApplicationMappingDayH2TableDefine.java | 2 +-
.../ApplicationMappingHourH2TableDefine.java | 2 +-
.../ApplicationMappingMinuteH2TableDefine.java | 2 +-
.../ApplicationMappingMonthH2TableDefine.java | 2 +-
...actApplicationReferenceMetricH2TableDefine.java | 3 +
.../imp/AbstractInstanceMetricH2TableDefine.java | 3 +
.../AbstractInstanceMappingH2TableDefine.java | 2 +-
.../InstanceMappingDayH2TableDefine.java | 2 +-
.../InstanceMappingHourH2TableDefine.java | 2 +-
.../InstanceMappingMinuteH2TableDefine.java | 2 +-
.../InstanceMappingMonthH2TableDefine.java | 2 +-
...stractInstanceReferenceMetricH2TableDefine.java | 3 +
.../smp/AbstractServiceMetricH2TableDefine.java | 3 +
...bstractServiceReferenceMetricH2TableDefine.java | 3 +
.../main/resources/META-INF/defines/storage.define | 28 +--
.../apm/collector/ui/query/AlarmQuery.java | 4 +-
.../apm/collector/ui/query/ApplicationQuery.java | 16 +-
.../apm/collector/ui/query/OverViewLayerQuery.java | 20 +-
.../apm/collector/ui/query/ServerQuery.java | 8 +-
.../apm/collector/ui/query/ServiceQuery.java | 9 +-
.../apm/collector/ui/query/TraceQuery.java | 4 +-
.../collector/ui/service/ServiceNameService.java | 13 +-
.../ui/service/ServiceTopologyService.java | 4 +-
.../apm/collector/ui/utils/DurationUtils.java | 27 ++-
.../ui/query/ApplicationQueryTestCase.java | 8 +-
.../collector/ui/utils/DurationUtilsTestCase.java | 36 ++++
.../v11/define/NetflixFeignInstrumentation.java | 2 +-
.../tracer/SkywalkingTracerExtractInterceptor.java | 25 +--
.../opentracing/SkywalkingSpanActivationTest.java | 55 +++--
docs/README.md | 1 +
docs/cn/Deploy-backend-in-cluster-mode-CN.md | 2 +-
docs/cn/How-to-build-CN.md | 4 +-
docs/cn/Trace-Data-Protocol-CN.md | 7 +-
docs/en/Deploy-backend-in-cluster-mode.md | 2 +-
docs/en/How-to-build.md | 2 +-
docs/en/Trace-Data-Protocol.md | 231 +++++++++++++++++++++
skywalking-ui | 2 +-
232 files changed, 1985 insertions(+), 1077 deletions(-)
--
To stop receiving notification emails like this one, please contact
hanahmily@apache.org.