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 2019/09/12 01:43:34 UTC
[skywalking] branch docker/entrypoint created (now f3b84d2)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch docker/entrypoint
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
at f3b84d2 Merge branch 'master' of https://github.com/apache/skywalking
This branch includes the following new commits:
new 1102787 Update docker-entrypoint.sh
new f3b84d2 Merge branch 'master' of https://github.com/apache/skywalking
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.
[skywalking] 02/02: Merge branch 'master' of
https://github.com/apache/skywalking
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch docker/entrypoint
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit f3b84d219fc04f11bbd38abe2855f64a414d6621
Merge: 1102787 b5b088a
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Thu Sep 12 09:42:47 2019 +0800
Merge branch 'master' of https://github.com/apache/skywalking
.gitmodules | 3 +
Jenkinsfile-E2E | 11 +-
.../AbstractServerResponseMethodInterceptor.java | 6 +-
.../DispatcherHandlerHandleMethodInterceptor.java | 20 +-
.../v21x/NettyRoutingFilterInterceptor.java | 19 +-
docker/oap/docker-entrypoint.sh | 1 +
docs/en/FAQ/MQ-involved-architecture.png | Bin 0 -> 35911 bytes
docs/en/FAQ/README.md | 3 +
docs/en/FAQ/why_mq_not_involved.md | 26 ++
docs/en/concepts-and-designs/overview.md | 1 +
docs/en/setup/backend/ttl.md | 1 +
.../oap/server/core/CoreModuleConfig.java | 1 +
.../oap/server/core/CoreModuleProvider.java | 2 +-
.../core/storage/ttl/DataTTLKeeperTimer.java | 28 +-
.../src/main/assembly/application.yml | 1 +
.../src/main/resources/application.yml | 1 +
.../org/apache/skywalking/e2e/AbstractQuery.java | 52 +++-
.../e2e/metrics/AllOfMetricsMatcher.java | 60 +++++
.../e2e/verification/AbstractMatcher.java | 10 +
test/e2e/e2e-ttl/e2e-ttl-es/pom.xml | 193 ++++++++++++++
.../e2e-ttl/e2e-ttl-es/src/docker/es_storage.awk | 64 +++++
.../e2e-ttl-es/src/docker/rc.d/rc0-prepare.sh | 28 ++
.../e2e-ttl-es/src/docker/rc.d/rc1-startup.sh | 37 +++
test/e2e/e2e-ttl/e2e-ttl-es/src/main/proto | 1 +
.../apache/skywalking/e2e/StorageTTLITCase.java | 284 +++++++++++++++++++++
test/e2e/e2e-ttl/pom.xml | 36 +++
test/e2e/pom.xml | 5 +-
27 files changed, 864 insertions(+), 30 deletions(-)
[skywalking] 01/02: Update docker-entrypoint.sh
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch docker/entrypoint
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 1102787d05f8c130ad2af21a5b8ac4894aa3b988
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Thu Sep 12 09:42:35 2019 +0800
Update docker-entrypoint.sh
---
docker/oap/docker-entrypoint.sh | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/docker/oap/docker-entrypoint.sh b/docker/oap/docker-entrypoint.sh
index 7c2756b..a1428b1 100755
--- a/docker/oap/docker-entrypoint.sh
+++ b/docker/oap/docker-entrypoint.sh
@@ -82,9 +82,23 @@ EOT
}
generateStorageElastisearch() {
+if [[ "$SW_RECEIVER_ZIPKIN_ENABLED" = "true" ]]; then
+ cat <<EOT >> ${var_application_file}
+storage:
+ zipkin-elasticsearch:
+EOT
+elif [[ "$SW_RECEIVER_JAEGER_ENABLED" = "true" ]]; then
+ cat <<EOT >> ${var_application_file}
+storage:
+ jaeger-elasticsearch:
+EOT
+else
cat <<EOT >> ${var_application_file}
storage:
elasticsearch:
+EOT
+fi
+cat <<EOT >> ${var_application_file}
nameSpace: \${SW_NAMESPACE:""}
clusterNodes: \${SW_STORAGE_ES_CLUSTER_NODES:localhost:9200}
protocol: \${SW_STORAGE_ES_HTTP_PROTOCOL:"http"}
@@ -279,6 +293,15 @@ EOT
cat <<EOT >> ${var_application_file}
receiver-sharing-server:
default:
+ restHost: \${SW_RECEIVER_SHARING_REST_HOST:0.0.0.O}
+ restPort: \${SW_RECEIVER_SHARING_REST_PORT:0}
+ restContextPath: \${SW_RECEIVER_SHARING_REST_CONTEXT_PATH:/}
+ gRPCHost: \${SW_RECEIVER_SHARING_GRPC_HOST:0.0.0.O}
+ gRPCPort: \${SW_RECEIVER_SHARING_GRPC_PORT:0}
+ maxConcurrentCallsPerConnection: \${SW_RECEIVER_SHARING_MAX_CONCURRENT_CALL:0}
+ maxMessageSize: \${SW_RECEIVER_SHARING_MAX_MESSAGE_SIZE:0}
+ gRPCThreadPoolSize: \${SW_RECEIVER_SHARING_GRPC_THREAD_POOL_SIZE:0}
+ gRPCThreadPoolQueueSize: \${SW_RECEIVER_SHARING_GRPC_THREAD_POOL_QUEUE_SIZE:0}
receiver-register:
default:
receiver-trace: