You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2018/10/28 15:02:03 UTC
[incubator-skywalking] branch submodule/ui updated (a2621d0 ->
78dcf35)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch submodule/ui
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from a2621d0 Update ui
add 8cd327d Revert #1790 reset feature and provide default alarm settings. (#1833)
add e7526ac Deploy docker (#1834)
add 78dcf35 Merge branch 'master' into submodule/ui
No new revisions were added by this update.
Summary of changes:
.../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 +-
.../resources => docker/config}/application.yml | 2 +-
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 | 6 +-
.../logback-spring.xml => docker/ui/logback.xml | 7 +-
kubernetes/oap/{01-service.yml => 00-rbac.yml} | 37 ++-
kubernetes/oap/01-config.yml | 338 +++++++++++++++++++++
kubernetes/oap/01-service.yml | 1 -
kubernetes/oap/02-deployment.yml | 14 +-
.../server/core/alarm/provider/RunningRule.java | 31 +-
.../service/ServiceInstanceInventoryRegister.java | 2 +-
.../register/provider/RegisterModuleProvider.java | 1 -
.../handler/v5/ServiceInstancePingPkgHandler.java | 60 ----
oap-server/server-starter/pom.xml | 2 +
.../src/main/assembly/alarm-settings.yml | 44 ++-
35 files changed, 514 insertions(+), 508 deletions(-)
delete mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/listener/ResetConfListener.java
delete mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/listener/ResetStatus.java
delete mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/listener/Reseter.java
copy {oap-server/server-starter/src/main/resources => docker/config}/application.yml (98%)
copy docker/{snapshot => config}/log4j2.xml (100%)
rename docker/{stack.yml => docker-compose.yml} (79%)
copy docker/{snapshot => oap}/Dockerfile (85%)
rename docker/{snapshot => oap}/docker-entrypoint.sh (84%)
rename docker/{snapshot => oap}/log4j2.xml (100%)
rename docker/{snapshot => ui}/Dockerfile (82%)
copy apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/src/main/resources/skywalking-plugin.def => docker/ui/docker-entrypoint.sh (88%)
mode change 100644 => 100755
copy apm-webapp/src/main/resources/logback-spring.xml => docker/ui/logback.xml (75%)
copy kubernetes/oap/{01-service.yml => 00-rbac.yml} (65%)
create mode 100644 kubernetes/oap/01-config.yml
delete mode 100644 oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v5/ServiceInstancePingPkgHandler.java