diff --git a/apm-collector/apm-collector-boot/docker/Dockerfile b/apm-collector/apm-collector-boot/docker/Dockerfile deleted file mode 100644 index bfc1dcad98ee8329ea329b95c6635b1b7656407d..0000000000000000000000000000000000000000 --- a/apm-collector/apm-collector-boot/docker/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM openjdk:8u111-jdk - -ENV ZK_ADDRESSES=127.0.0.1:2181 \ - ES_CLUSTER_NAME=CollectorDBCluster \ - ES_ADDRESSES=localhost:9300 \ - BIND_HOST=localhost \ - NAMING_BIND_HOST=localhost \ - NAMING_BIND_PORT=10800 \ - REMOTE_BIND_PORT=11800 \ - AGENT_GRPC_BIND_PORT=11800 \ - AGENT_JETTY_BIND_HOST=localhost \ - AGENT_JETTY_BIND_PORT=12800 \ - UI_JETTY_BIND_PORT=12800 \ - UI_JETTY_BIND_HOST=localhost - -ADD skywalking-collector.tar.gz /usr/local -COPY collectorService.sh /usr/local/skywalking-collector/bin -COPY log4j2.xml /usr/local/skywalking-collector/config -COPY application.yml /usr/local/skywalking-collector/config -COPY docker-entrypoint.sh / - -RUN chmod +x /usr/local/skywalking-collector/bin/collectorService.sh && chmod +x /docker-entrypoint.sh - -EXPOSE 10800 -EXPOSE 11800 -EXPOSE 12800 - -ENTRYPOINT ["/docker-entrypoint.sh"] -CMD ["/usr/local/skywalking-collector/bin/collectorService.sh"] diff --git a/apm-collector/apm-collector-boot/docker/application.yml b/apm-collector/apm-collector-boot/docker/application.yml deleted file mode 100644 index d3b4f3c74a18fd95743ee84dc6e4d3b81e474942..0000000000000000000000000000000000000000 --- a/apm-collector/apm-collector-boot/docker/application.yml +++ /dev/null @@ -1,40 +0,0 @@ -cluster: - zookeeper: - hostPort: {ZK_ADDRESSES} - sessionTimeout: 100000 -naming: - jetty: - host: {NAMING_BIND_HOST} - port: {NAMING_BIND_PORT} - context_path: / -remote: - gRPC: - host: {BIND_HOST} - port: {REMOTE_BIND_PORT} -agent_gRPC: - gRPC: - host: {BIND_HOST} - port: {AGENT_GRPC_BIND_PORT} -agent_jetty: - jetty: - host: {AGENT_JETTY_BIND_HOST} - port: {AGENT_JETTY_BIND_PORT} - context_path: / -agent_stream: - default: - buffer_file_path: ../buffer/ - buffer_offset_max_file_size: 10M - buffer_segment_max_file_size: 500M -ui: - jetty: - host: {UI_JETTY_BIND_HOST} - port: {UI_JETTY_BIND_PORT} - context_path: / -storage: - elasticsearch: - cluster_name: {ES_CLUSTER_NAME} - cluster_transport_sniffer: true - cluster_nodes: {ES_ADDRESSES} - index_shards_number: 2 - index_replicas_number: 0 - ttl: 7 diff --git a/apm-collector/apm-collector-boot/docker/collectorService.sh b/apm-collector/apm-collector-boot/docker/collectorService.sh deleted file mode 100644 index f69cfdae63cb3c0b5965c0d4306debc521fdab87..0000000000000000000000000000000000000000 --- a/apm-collector/apm-collector-boot/docker/collectorService.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env sh - -PRG="$0" -PRGDIR=`dirname "$PRG"` -[ -z "$COLLECTOR_HOME" ] && COLLECTOR_HOME=`cd "$PRGDIR/.." >/dev/null; pwd` - -COLLECT_LOG_DIR="${COLLECTOR_HOME}/logs" -JAVA_OPTS=" -Xms256M -Xmx512M" - -if [ ! -d "${COLLECTOR_HOME}/logs" ]; then - mkdir -p "${COLLECT_LOG_DIR}" -fi - -_RUNJAVA=${JAVA_HOME}/bin/java -[ -z "$JAVA_HOME" ] && _RUNJAVA=java - -CLASSPATH="$COLLECTOR_HOME/config:$CLASSPATH" -for i in "$COLLECTOR_HOME"/libs/*.jar -do - CLASSPATH="$i:$CLASSPATH" -done - -${_RUNJAVA} ${JAVA_OPTS} -classpath $CLASSPATH org.apache.skywalking.apm.collector.boot.CollectorBootStartUp diff --git a/apm-collector/apm-collector-boot/docker/docker-entrypoint.sh b/apm-collector/apm-collector-boot/docker/docker-entrypoint.sh deleted file mode 100644 index ab9fe8e7e09bc26f0626355487489c7231f1558c..0000000000000000000000000000000000000000 --- a/apm-collector/apm-collector-boot/docker/docker-entrypoint.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -echo "replace {ZK_ADDRESSES} to ${ZK_ADDRESSES}" -eval sed -i -e 's/\{ZK_ADDRESSES\}/${ZK_ADDRESSES}/' /usr/local/skywalking-collector/config/application.yml - -echo "replace {ES_CLUSTER_NAME} to ${ES_CLUSTER_NAME}" -eval sed -i -e 's/\{ES_CLUSTER_NAME\}/${ES_CLUSTER_NAME}/' /usr/local/skywalking-collector/config/application.yml - -echo "replace {ES_ADDRESSES} to ${ES_ADDRESSES}" -eval sed -i -e 's/\{ES_ADDRESSES\}/${ES_ADDRESSES}/' /usr/local/skywalking-collector/config/application.yml - -echo "replace {BIND_HOST} to ${BIND_HOST}" -eval sed -i -e 's/\{BIND_HOST\}/${BIND_HOST}/' /usr/local/skywalking-collector/config/application.yml - -echo "replace {NAMING_BIND_HOST} to ${NAMING_BIND_HOST}" -eval sed -i -e 's/\{NAMING_BIND_HOST\}/${NAMING_BIND_HOST}/' /usr/local/skywalking-collector/config/application.yml - -echo "replace {NAMING_BIND_PORT} to ${NAMING_BIND_PORT}" -eval sed -i -e 's/\{NAMING_BIND_PORT\}/${NAMING_BIND_PORT}/' /usr/local/skywalking-collector/config/application.yml - -echo "replace {REMOTE_BIND_PORT} to ${REMOTE_BIND_PORT}" -eval sed -i -e 's/\{REMOTE_BIND_PORT\}/${REMOTE_BIND_PORT}/' /usr/local/skywalking-collector/config/application.yml - -echo "replace {AGENT_GRPC_BIND_PORT} to ${AGENT_GRPC_BIND_PORT}" -eval sed -i -e 's/\{AGENT_GRPC_BIND_PORT\}/${AGENT_GRPC_BIND_PORT}/' /usr/local/skywalking-collector/config/application.yml - -echo "replace {AGENT_JETTY_BIND_HOST} to ${AGENT_JETTY_BIND_HOST}" -eval sed -i -e 's/\{AGENT_JETTY_BIND_HOST\}/${AGENT_JETTY_BIND_HOST}/' /usr/local/skywalking-collector/config/application.yml - -echo "replace {AGENT_JETTY_BIND_PORT} to ${AGENT_JETTY_BIND_PORT}" -eval sed -i -e 's/\{AGENT_JETTY_BIND_PORT\}/${AGENT_JETTY_BIND_PORT}/' /usr/local/skywalking-collector/config/application.yml - -echo "replace {UI_JETTY_BIND_PORT} to ${UI_JETTY_BIND_PORT}" -eval sed -i -e 's/\{UI_JETTY_BIND_PORT\}/${UI_JETTY_BIND_PORT}/' /usr/local/skywalking-collector/config/application.yml - -echo "replace {UI_JETTY_BIND_HOST} to ${UI_JETTY_BIND_HOST}" -eval sed -i -e 's/\{UI_JETTY_BIND_HOST\}/${UI_JETTY_BIND_HOST}/' /usr/local/skywalking-collector/config/application.yml - - -exec "$@" diff --git a/apm-collector/apm-collector-boot/docker/log4j2.xml b/apm-collector/apm-collector-boot/docker/log4j2.xml deleted file mode 100644 index 16213cb93edf4ba6ef9a8da034a2db0cce7cfbe1..0000000000000000000000000000000000000000 --- a/apm-collector/apm-collector-boot/docker/log4j2.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/apm-collector/apm-collector-boot/pom.xml b/apm-collector/apm-collector-boot/pom.xml index 1acface4b8ca01583518f97a56b6de11424e1e35..781868110d60ac6ae69fd1f8467ed6d68e6cd4ab 100644 --- a/apm-collector/apm-collector-boot/pom.xml +++ b/apm-collector/apm-collector-boot/pom.xml @@ -227,27 +227,6 @@ - - - com.spotify - docker-maven-plugin - ${docker.plugin.version} - - false - ${docker.image.name} - - ${docker.image.version} - - ${project.basedir}/docker - - - / - ${project.basedir}/../../packages - ${build.finalName}.tar.gz - - - - diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index aeb1328f7baa4fe28e55fdf0787fbb726b67dd6b..0000000000000000000000000000000000000000 --- a/docker-compose.yml +++ /dev/null @@ -1,76 +0,0 @@ -version: '2.1' -services: - skywalking-webui: - image: skywalking/skywalking-ui:5.0.0-alpha - expose: - - "8080" - ports: - - "8080:8080" - links: - - skywalking-collector - depends_on: - skywalking-collector: - condition: service_healthy - environment: - - COLLECTOR_SERVERS=skywalking-collector:10800 - - skywalking-collector: - image: skywalking/skywalking-collector:5.0.0-alpha - expose: - - "10800" - - "11800" - - "12800" - ports: - - "12800:12800" - - "11800:11800" - - "10800:10800" - depends_on: - es-server: - condition: service_healthy - zookeeper-server: - condition: service_healthy - links: - - es-server - - zookeeper-server - environment: - - ZK_ADDRESSES=zookeeper-server:2181 - - ES_ADDRESSES=es-server:9300 - - BIND_HOST=0.0.0.0 - - AGENT_JETTY_BIND_HOST=skywalking-collector - - NAMING_BIND_HOST=skywalking-collector - - UI_JETTY_BIND_HOST=skywalking-collector - healthcheck: - test: ["CMD", "curl", "-f", "http://skywalking-collector:10800/agent/gRPC"] - interval: 10s - timeout: 10s - retries: 5 - - zookeeper-server: - image: zookeeper:3.4.9 - expose: - - "2181" - ports: - - "2181:2181" - healthcheck: - test: ["CMD", "/zookeeper-3.4.9/bin/zkServer.sh", "status"] - interval: 10s - timeout: 10s - retries: 5 - - es-server: - image: elasticsearch:5.3 - command: "-Enode.name=TestNode -Enetwork.host=0.0.0.0 -Ehttp.cors.enabled=true -Ehttp.cors.allow-origin=* -Ethread_pool.bulk.queue_size=1000 -Ecluster.name=CollectorDBCluster" - environment: - - bootstrap.memory_lock=true - - "ES_JAVA_OPTS=-Xms512m -Xmx512m" - expose: - - "9200" - - "9300" - ports: - - "9200:9200" - - "9300:9300" - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:9200"] - interval: 10s - timeout: 10s - retries: 5 diff --git a/docs/README.md b/docs/README.md index ab0683ffa15f76e943a8dda10a0a855634d1b2ef..a7b05ab42b127ace2c691cf88afa1e5834218280 100644 --- a/docs/README.md +++ b/docs/README.md @@ -3,7 +3,6 @@ * Getting Started * [Quick start](en/Quick-start.md) - * [Deploy docker image](en/Deploy-docker-image.md) * [Supported middlewares, frameworks and libraries](Supported-list.md) * [How to disable plugins?](en/How-to-disable-plugin.md) * Application Toolkit diff --git a/docs/README_ZH.md b/docs/README_ZH.md index ea7fed22890b399cd0e72d78fb6074040fd85cee..79176a6a004125479190d055b2a3dc895fcbb64d 100644 --- a/docs/README_ZH.md +++ b/docs/README_ZH.md @@ -3,7 +3,6 @@ * [项目简介](/README_ZH.md) * [快速入门](cn/Quick-start-CN.md) - * [部署Collector镜像](cn/Deploy-docker-image-CN.md) * [中间件,框架与类库支持列表](Supported-list.md) * [如何关闭特定插件](cn/How-to-disable-plugin-CN.md) * APM相关介绍资料 diff --git a/docs/cn/Deploy-docker-image-CN.md b/docs/cn/Deploy-docker-image-CN.md deleted file mode 100644 index 4969a073d2778d99b5e58e6fba21b647c454cc51..0000000000000000000000000000000000000000 --- a/docs/cn/Deploy-docker-image-CN.md +++ /dev/null @@ -1,13 +0,0 @@ -- [下载Source code](https://github.com/apache/incubator-skywalking/releases)并解压,进入解压目录,执行以下命令: - -```shell -> docker-compose pull -> docker-compose up -``` -- 探针配置的端口是10800。 -- 通过http://localhost:8080 访问WebUI - -注意:Docker Compose主要用于在本地进行快速环境搭建和测试,请不要通过远程访问默认Docker Compose启动的Collector环境 - -___ -测试环境: docker 17.03.1-ce, docker compose 1.11.2 diff --git a/docs/en/Deploy-docker-image.md b/docs/en/Deploy-docker-image.md deleted file mode 100644 index 8d5470c6c5f1e170dcfdb85d2f8d6fff1925ac6e..0000000000000000000000000000000000000000 --- a/docs/en/Deploy-docker-image.md +++ /dev/null @@ -1,14 +0,0 @@ -- [Download source code](https://github.com/apache/incubator-skywalking/releases) and unzip source package. Execute following command under the unzipped directory. - -```shell -> docker-compose pull -> docker-compose up -``` -- The REST-service of collector listening on localhost:10800 -- Open http://localhost:8080 - -Attention: The Docker Compose is only designed for you to run collector in your local machine. If you are running by using our provided docker compose, you can't access the ip:10800. - ---- - -Test environment : docker 17.03.1-ce, docker compose 1.11.2 diff --git a/pom.xml b/pom.xml index ed623e0ed8538df27819a41e323fa962d6c6e9fc..7eacc5984e603bfe147af6c03c572033ae9ff5cd 100644 --- a/pom.xml +++ b/pom.xml @@ -252,14 +252,6 @@ - - com.spotify - docker-maven-plugin - ${docker.plugin.version} - - true - - maven-checkstyle-plugin 2.17