You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2019/10/29 08:18:44 UTC
[skywalking] branch master updated: Modify application.yml to set
MySQL as storage provider (#3733)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new f44b094 Modify application.yml to set MySQL as storage provider (#3733)
f44b094 is described below
commit f44b09483b1aee2aa8313a82dd432b5ebf6437b4
Author: panjuan <pa...@apache.org>
AuthorDate: Tue Oct 29 16:18:36 2019 +0800
Modify application.yml to set MySQL as storage provider (#3733)
* Modify application.yml to set MySQL as storage provider
* use volume
---
test/e2e/e2e-mysql/pom.xml | 1 +
test/e2e/e2e-mysql/src/docker/application.yml | 204 ++++++++++++++++++++++
test/e2e/e2e-mysql/src/docker/rc.d/rc0-prepare.sh | 5 +-
3 files changed, 206 insertions(+), 4 deletions(-)
diff --git a/test/e2e/e2e-mysql/pom.xml b/test/e2e/e2e-mysql/pom.xml
index 6406222..888c4b8 100755
--- a/test/e2e/e2e-mysql/pom.xml
+++ b/test/e2e/e2e-mysql/pom.xml
@@ -119,6 +119,7 @@
<volume>${sw.home}:/sw</volume>
<volume>${project.build.directory}:/home</volume>
<volume>${project.basedir}/src/docker/rc.d:/rc.d:ro</volume>
+ <volume>${project.basedir}/src/docker/application.yml:/application.yml</volume>
</bind>
</volumes>
<wait>
diff --git a/test/e2e/e2e-mysql/src/docker/application.yml b/test/e2e/e2e-mysql/src/docker/application.yml
new file mode 100644
index 0000000..bb7f189
--- /dev/null
+++ b/test/e2e/e2e-mysql/src/docker/application.yml
@@ -0,0 +1,204 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+cluster:
+ standalone:
+# Please check your ZooKeeper is 3.5+, However, it is also compatible with ZooKeeper 3.4.x. Replace the ZooKeeper 3.5+
+# library the oap-libs folder with your ZooKeeper 3.4.x library.
+# zookeeper:
+# nameSpace: ${SW_NAMESPACE:""}
+# hostPort: ${SW_CLUSTER_ZK_HOST_PORT:localhost:2181}
+# #Retry Policy
+# baseSleepTimeMs: ${SW_CLUSTER_ZK_SLEEP_TIME:1000} # initial amount of time to wait between retries
+# maxRetries: ${SW_CLUSTER_ZK_MAX_RETRIES:3} # max number of times to retry
+# # Enable ACL
+# enableACL: ${SW_ZK_ENABLE_ACL:false} # disable ACL in default
+# schema: ${SW_ZK_SCHEMA:digest} # only support digest schema
+# expression: ${SW_ZK_EXPRESSION:skywalking:skywalking}
+# kubernetes:
+# watchTimeoutSeconds: ${SW_CLUSTER_K8S_WATCH_TIMEOUT:60}
+# namespace: ${SW_CLUSTER_K8S_NAMESPACE:default}
+# labelSelector: ${SW_CLUSTER_K8S_LABEL:app=collector,release=skywalking}
+# uidEnvName: ${SW_CLUSTER_K8S_UID:SKYWALKING_COLLECTOR_UID}
+# consul:
+# serviceName: ${SW_SERVICE_NAME:"SkyWalking_OAP_Cluster"}
+# Consul cluster nodes, example: 10.0.0.1:8500,10.0.0.2:8500,10.0.0.3:8500
+# hostPort: ${SW_CLUSTER_CONSUL_HOST_PORT:localhost:8500}
+# nacos:
+# serviceName: ${SW_SERVICE_NAME:"SkyWalking_OAP_Cluster"}
+# # Nacos Configuration namespace
+# namespace: ${SW_CLUSTER_NACOS_NAMESPACE:"public"}
+# hostPort: ${SW_CLUSTER_NACOS_HOST_PORT:localhost:8848}
+# etcd:
+# serviceName: ${SW_SERVICE_NAME:"SkyWalking_OAP_Cluster"}
+# etcd cluster nodes, example: 10.0.0.1:2379,10.0.0.2:2379,10.0.0.3:2379
+# hostPort: ${SW_CLUSTER_ETCD_HOST_PORT:localhost:2379}
+core:
+ default:
+ # Mixed: Receive agent data, Level 1 aggregate, Level 2 aggregate
+ # Receiver: Receive agent data, Level 1 aggregate
+ # Aggregator: Level 2 aggregate
+ role: ${SW_CORE_ROLE:Mixed} # Mixed/Receiver/Aggregator
+ restHost: ${SW_CORE_REST_HOST:0.0.0.0}
+ restPort: ${SW_CORE_REST_PORT:12800}
+ restContextPath: ${SW_CORE_REST_CONTEXT_PATH:/}
+ gRPCHost: ${SW_CORE_GRPC_HOST:0.0.0.0}
+ gRPCPort: ${SW_CORE_GRPC_PORT:11800}
+ downsampling:
+ - Hour
+ - Day
+ - Month
+ # Set a timeout on metrics data. After the timeout has expired, the metrics data will automatically be deleted.
+ enableDataKeeperExecutor: ${SW_CORE_ENABLE_DATA_KEEPER_EXECUTOR:true} # Turn it off then automatically metrics data delete will be close.
+ dataKeeperExecutePeriod: ${SW_CORE_DATA_KEEPER_EXECUTE_PERIOD:5} # How often the data keeper executor runs periodically, unit is minute
+ recordDataTTL: ${SW_CORE_RECORD_DATA_TTL:90} # Unit is minute
+ minuteMetricsDataTTL: ${SW_CORE_MINUTE_METRIC_DATA_TTL:90} # Unit is minute
+ hourMetricsDataTTL: ${SW_CORE_HOUR_METRIC_DATA_TTL:36} # Unit is hour
+ dayMetricsDataTTL: ${SW_CORE_DAY_METRIC_DATA_TTL:45} # Unit is day
+ monthMetricsDataTTL: ${SW_CORE_MONTH_METRIC_DATA_TTL:18} # Unit is month
+ # Cache metric data for 1 minute to reduce database queries, and if the OAP cluster changes within that minute,
+ # the metrics may not be accurate within that minute.
+ enableDatabaseSession: ${SW_CORE_ENABLE_DATABASE_SESSION:true}
+storage:
+# elasticsearch:
+# nameSpace: ${SW_NAMESPACE:""}
+# clusterNodes: ${SW_STORAGE_ES_CLUSTER_NODES:localhost:9200}
+# protocol: ${SW_STORAGE_ES_HTTP_PROTOCOL:"http"}
+# #trustStorePath: ${SW_SW_STORAGE_ES_SSL_JKS_PATH:"../es_keystore.jks"}
+# #trustStorePass: ${SW_SW_STORAGE_ES_SSL_JKS_PASS:""}
+# user: ${SW_ES_USER:""}
+# password: ${SW_ES_PASSWORD:""}
+# indexShardsNumber: ${SW_STORAGE_ES_INDEX_SHARDS_NUMBER:2}
+# indexReplicasNumber: ${SW_STORAGE_ES_INDEX_REPLICAS_NUMBER:0}
+# # Those data TTL settings will override the same settings in core module.
+# recordDataTTL: ${SW_STORAGE_ES_RECORD_DATA_TTL:7} # Unit is day
+# otherMetricsDataTTL: ${SW_STORAGE_ES_OTHER_METRIC_DATA_TTL:45} # Unit is day
+# monthMetricsDataTTL: ${SW_STORAGE_ES_MONTH_METRIC_DATA_TTL:18} # Unit is month
+# # Batch process setting, refer to https://www.elastic.co/guide/en/elasticsearch/client/java-api/5.5/java-docs-bulk-processor.html
+# bulkActions: ${SW_STORAGE_ES_BULK_ACTIONS:1000} # Execute the bulk every 1000 requests
+# flushInterval: ${SW_STORAGE_ES_FLUSH_INTERVAL:10} # flush the bulk every 10 seconds whatever the number of requests
+# concurrentRequests: ${SW_STORAGE_ES_CONCURRENT_REQUESTS:2} # the number of concurrent requests
+# metadataQueryMaxSize: ${SW_STORAGE_ES_QUERY_MAX_SIZE:5000}
+# segmentQueryMaxSize: ${SW_STORAGE_ES_QUERY_SEGMENT_SIZE:200}
+# h2:
+# driver: ${SW_STORAGE_H2_DRIVER:org.h2.jdbcx.JdbcDataSource}
+# url: ${SW_STORAGE_H2_URL:jdbc:h2:mem:skywalking-oap-db}
+# user: ${SW_STORAGE_H2_USER:sa}
+# metadataQueryMaxSize: ${SW_STORAGE_H2_QUERY_MAX_SIZE:5000}
+ mysql:
+ properties:
+ jdbcUrl: ${SW_JDBC_URL:"jdbc:mysql://localhost:3306/swtest"}
+ dataSource.user: ${SW_DATA_SOURCE_USER:root}
+ dataSource.password: ${SW_DATA_SOURCE_PASSWORD:root@1234}
+ dataSource.cachePrepStmts: ${SW_DATA_SOURCE_CACHE_PREP_STMTS:true}
+ dataSource.prepStmtCacheSize: ${SW_DATA_SOURCE_PREP_STMT_CACHE_SQL_SIZE:250}
+ dataSource.prepStmtCacheSqlLimit: ${SW_DATA_SOURCE_PREP_STMT_CACHE_SQL_LIMIT:2048}
+ dataSource.useServerPrepStmts: ${SW_DATA_SOURCE_USE_SERVER_PREP_STMTS:true}
+ metadataQueryMaxSize: ${SW_STORAGE_MYSQL_QUERY_MAX_SIZE:5000}
+receiver-sharing-server:
+ default:
+receiver-register:
+ default:
+receiver-trace:
+ default:
+ bufferPath: ${SW_RECEIVER_BUFFER_PATH:../trace-buffer/} # Path to trace buffer files, suggest to use absolute path
+ bufferOffsetMaxFileSize: ${SW_RECEIVER_BUFFER_OFFSET_MAX_FILE_SIZE:100} # Unit is MB
+ bufferDataMaxFileSize: ${SW_RECEIVER_BUFFER_DATA_MAX_FILE_SIZE:500} # Unit is MB
+ bufferFileCleanWhenRestart: ${SW_RECEIVER_BUFFER_FILE_CLEAN_WHEN_RESTART:false}
+ sampleRate: ${SW_TRACE_SAMPLE_RATE:10000} # The sample rate precision is 1/10000. 10000 means 100% sample in default.
+ slowDBAccessThreshold: ${SW_SLOW_DB_THRESHOLD:default:200,mongodb:100} # The slow database access thresholds. Unit ms.
+receiver-jvm:
+ default:
+receiver-clr:
+ default:
+#receiver-so11y:
+# default:
+service-mesh:
+ default:
+ bufferPath: ${SW_SERVICE_MESH_BUFFER_PATH:../mesh-buffer/} # Path to trace buffer files, suggest to use absolute path
+ bufferOffsetMaxFileSize: ${SW_SERVICE_MESH_OFFSET_MAX_FILE_SIZE:100} # Unit is MB
+ bufferDataMaxFileSize: ${SW_SERVICE_MESH_BUFFER_DATA_MAX_FILE_SIZE:500} # Unit is MB
+ bufferFileCleanWhenRestart: ${SW_SERVICE_MESH_BUFFER_FILE_CLEAN_WHEN_RESTART:false}
+istio-telemetry:
+ default:
+envoy-metric:
+ default:
+# alsHTTPAnalysis: ${SW_ENVOY_METRIC_ALS_HTTP_ANALYSIS:k8s-mesh}
+#receiver_zipkin:
+# default:
+# host: ${SW_RECEIVER_ZIPKIN_HOST:0.0.0.0}
+# port: ${SW_RECEIVER_ZIPKIN_PORT:9411}
+# contextPath: ${SW_RECEIVER_ZIPKIN_CONTEXT_PATH:/}
+#receiver_jaeger:
+# default:
+# gRPCHost: ${SW_RECEIVER_JAEGER_HOST:0.0.0.0}
+# gRPCPort: ${SW_RECEIVER_JAEGER_PORT:14250}
+query:
+ graphql:
+ path: ${SW_QUERY_GRAPHQL_PATH:/graphql}
+alarm:
+ default:
+telemetry:
+ none:
+# prometheus:
+# host: ${SW_TELEMETRY_PROMETHEUS_HOST:0.0.0.0}
+# port: ${SW_TELEMETRY_PROMETHEUS_PORT:1234}
+# so11y:
+# prometheusExporterEnabled: ${SW_TELEMETRY_SO11Y_PROMETHEUS_ENABLED:true}
+# prometheusExporterHost: ${SW_TELEMETRY_PROMETHEUS_HOST:0.0.0.0}
+# prometheusExporterPort: ${SW_TELEMETRY_PROMETHEUS_PORT:1234}
+configuration:
+ none:
+# apollo:
+# apolloMeta: http://106.12.25.204:8080
+# apolloCluster: default
+# # apolloEnv: # defaults to null
+# appId: skywalking
+# period: 5
+# nacos:
+# # Nacos Server Host
+# serverAddr: 127.0.0.1
+# # Nacos Server Port
+# port: 8848
+# # Nacos Configuration Group
+# group: 'skywalking'
+# # Nacos Configuration namespace
+# namespace: ''
+# # Unit seconds, sync period. Default fetch every 60 seconds.
+# period : 5
+# # the name of current cluster, set the name if you want to upstream system known.
+# clusterName: "default"
+# zookeeper:
+# period : 60 # Unit seconds, sync period. Default fetch every 60 seconds.
+# nameSpace: /default
+# hostPort: localhost:2181
+# #Retry Policy
+# baseSleepTimeMs: 1000 # initial amount of time to wait between retries
+# maxRetries: 3 # max number of times to retry
+# etcd:
+# period : 60 # Unit seconds, sync period. Default fetch every 60 seconds.
+# group : 'skywalking'
+# serverAddr: localhost:2379
+# clusterName: "default"
+# consul:
+# # Consul host and ports, separated by comma, e.g. 1.2.3.4:8500,2.3.4.5:8500
+# hostAndPorts: ${consul.address}
+# # Sync period in seconds. Defaults to 60 seconds.
+# period: 1
+
+#exporter:
+# grpc:
+# targetHost: ${SW_EXPORTER_GRPC_HOST:127.0.0.1}
+# targetPort: ${SW_EXPORTER_GRPC_PORT:9870}
diff --git a/test/e2e/e2e-mysql/src/docker/rc.d/rc0-prepare.sh b/test/e2e/e2e-mysql/src/docker/rc.d/rc0-prepare.sh
index a3224a7..f6c1d0e 100755
--- a/test/e2e/e2e-mysql/src/docker/rc.d/rc0-prepare.sh
+++ b/test/e2e/e2e-mysql/src/docker/rc.d/rc0-prepare.sh
@@ -17,7 +17,6 @@
MYSQL_URL="http://central.maven.org/maven2/mysql/mysql-connector-java/8.0.13/mysql-connector-java-8.0.13.jar"
MYSQL_DRIVER="mysql-connector-java-8.0.13.jar"
-TMP_APP_YML="tmp_app.yml"
echo "MySQL database is storage provider..."
# Download MySQL connector.
@@ -25,6 +24,4 @@ curl ${MYSQL_URL} > "${SW_HOME}/oap-libs/${MYSQL_DRIVER}"
[[ $? -ne 0 ]] && echo "Fail to download ${MYSQL_DRIVER}." && exit 1
# Modify application.yml to set MySQL as storage provider.
-cat "${SW_HOME}/config/application.yml" | sed '/elasticsearch/,/mysql/d' | sed "/storage:/a \ mysql:" | sed "/storage:/,/receiver-sharing-server:/s/#//" > ${TMP_APP_YML}
-cat ${TMP_APP_YML} > "${SW_HOME}/config/application.yml"
-rm -f ${TMP_APP_YML}
+cat /application.yml > "${SW_HOME}/config/application.yml"