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/30 03:08:34 UTC
[incubator-skywalking] 01/02: Merge branch 'master' into
submodule/ui
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch submodule/ui
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 36f0cdadb3bbb13d375d36127c8d8fc38a5dbc79
Merge: a2621d0 041ed43
Author: gaohongtao <ha...@gmail.com>
AuthorDate: Tue Oct 30 11:07:15 2018 +0800
Merge branch 'master' into submodule/ui
.../apm/commons/datacarrier/DataCarrier.java | 6 -
.../apm/commons/datacarrier/buffer/Buffer.java | 6 -
.../skywalking/apm/agent/core/conf/Config.java | 18 +-
.../agent/core/conf/SnifferConfigInitializer.java | 23 +-
.../core/dictionary/NetworkAddressDictionary.java | 7 +-
.../core/dictionary/OperationNameDictionary.java | 11 -
.../apm/agent/core/listener/ResetConfListener.java | 84 -------
.../apm/agent/core/listener/ResetStatus.java | 35 ---
.../apm/agent/core/listener/Reseter.java | 159 ------------
.../core/remote/AppAndServiceRegisterClient.java | 49 ++--
.../core/remote/TraceSegmentServiceClient.java | 9 +-
...ache.skywalking.apm.agent.core.boot.BootService | 1 -
.../apm/agent/core/boot/ServiceManagerTest.java | 2 +-
apm-sniffer/config/agent.config | 9 -
docker/Makefile | 13 +-
docker/README.md | 8 +-
.../assembly => docker/config}/alarm-settings.yml | 13 +-
docker/config/application.yml | 82 +++++++
docker/config/component-libraries.yml | 270 +++++++++++++++++++++
docker/{snapshot => config}/log4j2.xml | 0
docker/{stack.yml => docker-compose.yml} | 16 +-
docker/{snapshot => oap}/Dockerfile | 5 +-
docker/{snapshot => oap}/docker-entrypoint.sh | 7 +-
docker/{snapshot => oap}/log4j2.xml | 0
docker/{snapshot => ui}/Dockerfile | 9 +-
.../ui/docker-entrypoint.sh | 11 +-
docker/{snapshot/log4j2.xml => ui/logback.xml} | 21 +-
docs/en/setup/backend/backend-k8s.md | 6 +-
docs/en/setup/istio/README.md | 18 ++
docs/powered-by.md | 2 +
kubernetes/elasticsearch/01-storageclass.yml | 25 --
kubernetes/elasticsearch/02-service.yml | 32 ---
kubernetes/elasticsearch/03-statefulset.yml | 117 ---------
kubernetes/istio/01-metrictemplete.yml | 24 --
kubernetes/istio/02-skywalingadapter.yml | 26 --
kubernetes/istio/03-operator_cfg.yml | 63 -----
kubernetes/oap/01-service.yml | 32 ---
kubernetes/oap/02-deployment.yml | 49 ----
.../server/core/alarm/provider/RunningRule.java | 31 ++-
.../plugin/kubernetes/KubernetesCoordinator.java | 1 +
.../dependencies/NamespacedPodListWatch.java | 26 +-
...alking.oap.server.library.module.ModuleProvider | 0
.../plugin/zookeeper/ZookeeperCoordinator.java | 40 ++-
.../oap/server/core/CoreModuleConfig.java | 2 +
.../oap/server/core/CoreModuleProvider.java | 60 ++++-
.../oap/server/core/alarm/AlarmMeta.java | 3 +-
.../core/analysis/generated/all/AllDispatcher.java | 2 +-
.../generated/all/AllHeatmapIndicator.java | 13 +-
.../analysis/generated/all/AllP50Indicator.java | 13 +-
.../analysis/generated/all/AllP75Indicator.java | 13 +-
.../analysis/generated/all/AllP90Indicator.java | 13 +-
.../analysis/generated/all/AllP95Indicator.java | 13 +-
.../analysis/generated/all/AllP99Indicator.java | 13 +-
.../generated/endpoint/EndpointAvgIndicator.java | 23 +-
.../generated/endpoint/EndpointCpmIndicator.java | 21 +-
.../generated/endpoint/EndpointDispatcher.java | 2 +-
.../generated/endpoint/EndpointP50Indicator.java | 21 +-
.../generated/endpoint/EndpointP75Indicator.java | 21 +-
.../generated/endpoint/EndpointP90Indicator.java | 21 +-
.../generated/endpoint/EndpointP95Indicator.java | 21 +-
.../generated/endpoint/EndpointP99Indicator.java | 21 +-
.../generated/endpoint/EndpointSlaIndicator.java | 23 +-
.../EndpointRelationCpmIndicator.java | 25 +-
.../EndpointRelationDispatcher.java | 2 +-
.../EndpointRelationRespTimeIndicator.java | 27 +--
.../generated/service/ServiceCpmIndicator.java | 17 +-
.../generated/service/ServiceDispatcher.java | 2 +-
.../generated/service/ServiceP50Indicator.java | 17 +-
.../generated/service/ServiceP75Indicator.java | 17 +-
.../generated/service/ServiceP90Indicator.java | 17 +-
.../generated/service/ServiceP95Indicator.java | 17 +-
.../generated/service/ServiceP99Indicator.java | 17 +-
.../service/ServiceRespTimeIndicator.java | 19 +-
.../generated/service/ServiceSlaIndicator.java | 19 +-
.../ServiceInstanceCpmIndicator.java | 19 +-
.../serviceinstance/ServiceInstanceDispatcher.java | 2 +-
.../ServiceInstanceRespTimeIndicator.java | 21 +-
.../InstanceJvmCpuIndicator.java | 21 +-
.../ServiceInstanceJVMCPUDispatcher.java | 2 +-
.../InstanceJvmOldGcCountIndicator.java | 17 +-
.../InstanceJvmOldGcTimeIndicator.java | 21 +-
.../InstanceJvmYoungGcCountIndicator.java | 17 +-
.../InstanceJvmYoungGcTimeIndicator.java | 21 +-
.../ServiceInstanceJVMGCDispatcher.java | 2 +-
.../InstanceJvmMemoryHeapIndicator.java | 21 +-
.../InstanceJvmMemoryHeapMaxIndicator.java | 21 +-
.../InstanceJvmMemoryNoheapIndicator.java | 21 +-
.../InstanceJvmMemoryNoheapMaxIndicator.java | 21 +-
.../ServiceInstanceJVMMemoryDispatcher.java | 4 +-
.../ServiceInstanceJVMMemoryPoolDispatcher.java | 2 +-
.../ServiceInstanceRelationDispatcher.java | 2 +-
.../ServiceRelationClientCallSlaIndicator.java | 19 +-
.../ServiceRelationClientCpmIndicator.java | 17 +-
.../ServiceRelationClientRespTimeIndicator.java | 19 +-
.../servicerelation/ServiceRelationDispatcher.java | 2 +-
.../ServiceRelationServerCallSlaIndicator.java | 19 +-
.../ServiceRelationServerCpmIndicator.java | 17 +-
.../ServiceRelationServerRespTimeIndicator.java | 19 +-
.../core/analysis/indicator/PercentIndicator.java | 2 +-
.../EndpointRelationServerSideIndicator.java | 13 +-
.../ServiceRelationClientSideIndicator.java | 13 +-
.../ServiceRelationServerSideIndicator.java | 13 +-
.../core/cache/ServiceInstanceInventoryCache.java | 8 +-
.../oap/server/core/cluster/RemoteInstance.java | 2 +-
.../server/core/register/EndpointInventory.java | 12 +-
.../core/register/NetworkAddressInventory.java | 10 +-
.../core/register/ServiceInstanceInventory.java | 47 ++--
.../oap/server/core/register/ServiceInventory.java | 16 +-
.../service/IServiceInstanceInventoryRegister.java | 2 +-
.../service/ServiceInstanceInventoryRegister.java | 9 +-
.../core/remote/client/GRPCRemoteClient.java | 1 +
.../core/remote/client/RemoteClientManager.java | 25 +-
.../cache/IServiceInstanceInventoryCacheDAO.java | 2 +-
.../analysis/indicator/PercentIndicatorTest.java | 6 +-
.../oap/server/library/server/grpc/GRPCServer.java | 13 +
.../mesh/ServiceMeshMetricDataDecorator.java | 12 +-
.../receiver/mesh/TelemetryDataDispatcher.java | 2 +-
.../register/provider/RegisterModuleProvider.java | 1 -
.../handler/v5/ServiceInstancePingPkgHandler.java | 60 -----
.../v5/grpc/InstanceDiscoveryServiceHandler.java | 17 +-
.../v5/rest/InstanceDiscoveryServletHandler.java | 17 +-
oap-server/server-starter/pom.xml | 2 +
.../src/main/assembly/alarm-settings.yml | 44 ++--
.../cache/ServiceInstanceInventoryCacheDAO.java | 4 +-
.../elasticsearch/query/MetadataQueryEsDAO.java | 2 +
.../h2/dao/H2ServiceInstanceInventoryCacheDAO.java | 4 +-
126 files changed, 1159 insertions(+), 1428 deletions(-)