This is an automated email from the ASF dual-hosted git repository. hanahmily pushed a commit to branch docker/build in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit a317558cb43ea9dcdd3eaf67ac34481a08274649 Merge: 6103832 89d0333 Author: Gao Hongtao <[email protected]> AuthorDate: Wed May 15 17:32:59 2019 +0800 Merge branch 'master' into docker/build apm-dist/release-docs/LICENSE | 2 + apm-dist/release-docs/NOTICE | 38 ++++++ .../release-docs/licenses/LICENSE-fastjson.txt | 13 ++ docs/en/setup/backend/backend-cluster.md | 17 ++- oap-server/pom.xml | 36 ++++++ .../cluster-nacos-plugin/pom.xml | 71 +++++++++++ .../plugin/nacos/ClusterModuleNacosConfig.java | 31 +++++ .../plugin/nacos/ClusterModuleNacosProvider.java | 84 +++++++++++++ .../cluster/plugin/nacos/NacosCoordinator.java | 79 ++++++++++++ ...alking.oap.server.library.module.ModuleProvider | 19 +++ .../nacos/ClusterModuleNacosProviderTest.java | 106 ++++++++++++++++ .../cluster/plugin/nacos/NacosCoordinatorTest.java | 134 +++++++++++++++++++++ oap-server/server-cluster-plugin/pom.xml | 1 + .../server/core/cluster/ServiceQueryException.java | 29 +++++ oap-server/server-starter/pom.xml | 5 + .../src/main/assembly/application.yml | 3 + .../src/main/resources/application.yml | 55 +++++---- 17 files changed, 695 insertions(+), 28 deletions(-) diff --cc oap-server/server-starter/src/main/resources/application.yml index e39e0ae,9891b6c..ced2d43 --- a/oap-server/server-starter/src/main/resources/application.yml +++ b/oap-server/server-starter/src/main/resources/application.yml @@@ -120,7 -123,7 +123,7 @@@ telemetry prometheus: host: ${SW_TELEMETRY_PROMETHEUS_HOST:0.0.0.0} port: ${SW_TELEMETRY_PROMETHEUS_PORT:1234} --exporter: -- grpc: -- targetHost: ${SW_EXPORTER_GRPC_HOST:127.0.0.1} -- targetPort: ${SW_EXPORTER_GRPC_PORT:9870} ++#exporter: ++# grpc: ++# targetHost: ${SW_EXPORTER_GRPC_HOST:127.0.0.1} ++# targetPort: ${SW_EXPORTER_GRPC_PORT:9870}
