support collector image

2017-09-16 17:15:39 +08:00 · 2017-09-16 17:15:39 +08:00 · d50a9f2c29
parent dae5c6921a
commit d50a9f2c29
10 changed files with 207 additions and 24 deletions
--- a/apm-collector/apm-collector-boot/docker/Dockerfile
+++ b/apm-collector/apm-collector-boot/docker/Dockerfile
@ -0,0 +1,28 @@
+FROM openjdk:8u111-jdk
+
+ENV ZK_ADDRESSES=127.0.0.1:2181 \
+    ES_CLUSTER_NAME=CollectorDBCluster \
+    ES_ADDRESSES=localhost:9300 \
+    BIND_HOST=localhost  \
+    CLUSTER_BIND_HOST=localhost \
+    CLUSTER_BIND_PORT=11800 \
+    UI_BIND_HOST=localhost \
+    UI_BIND_PORT=12800 \
+    GRPC_BIND_PORT=11800 \
+    AGENT_SERVER_BIND_PORT=10800 \
+    AGENT_STREAM_JETTY_BIND_PORT=12800
+
+ADD skywalking-collector.tar.gz /usr/local
+COPY collector-service.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/collector-service.sh && chmod +x /docker-entrypoint.sh
+
+EXPOSE 10800
+EXPOSE 11800
+EXPOSE 12800
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["/usr/local/skywalking-collector/bin/collector-service.sh"]
--- a/apm-collector/apm-collector-boot/docker/application.yml
+++ b/apm-collector/apm-collector-boot/docker/application.yml
@ -0,0 +1,33 @@
+cluster:
+  zookeeper:
+    hostPort: {ZK_ADDRESSES}
+    sessionTimeout: 100000
+agent_server:
+  jetty:
+    host: {BIND_HOST}
+    port: {AGENT_SERVER_BIND_PORT}
+    context_path: /
+agent_stream:
+  grpc:
+    host: {BIND_HOST}
+    port: {GRPC_BIND_PORT}
+  jetty:
+    host: {UI_BIND_HOST}
+    port: {UI_BIND_PORT}
+    context_path: /
+ui:
+  jetty:
+    host: {UI_BIND_HOST}
+    port: {UI_BIND_PORT}
+    context_path: /
+collector_inside:
+  grpc:
+    host: {CLUSTER_BIND_HOST}
+    port: {CLUSTER_BIND_PORT}
+storage:
+  elasticsearch:
+    cluster_name: {ES_CLUSTER_NAME}
+    cluster_transport_sniffer: true
+    cluster_nodes: {ES_ADDRESSES}
+    index_shards_number: 2
+    index_replicas_number: 0
--- a/apm-collector/apm-collector-boot/docker/collector-service.sh
+++ b/apm-collector/apm-collector-boot/docker/collector-service.sh
@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+PRG="$0"
+PRGDIR=`dirname "$PRG"`
+[ -z "$COLLECTOR_HOME" ] && COLLECTOR_HOME=`cd "$PRGDIR/.." >/dev/null; pwd`
+
+CLASSPATH="$COLLECTOR_HOME/config:$CLASSPATH"
+for i in "$COLLECTOR_HOME"/libs/*.jar
+do
+    CLASSPATH="$i:$CLASSPATH"
+done
+
+java ${JAVA_OPTS} ${COLLECTOR_OPTIONS} -classpath $CLASSPATH org.skywalking.apm.collector.boot.CollectorBootStartUp
--- a/apm-collector/apm-collector-boot/docker/docker-entrypoint.sh
+++ b/apm-collector/apm-collector-boot/docker/docker-entrypoint.sh
@ -0,0 +1,37 @@
+#!/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 {GRPC_BIND_PORT} to ${GRPC_BIND_PORT}"
+eval sed -i -e 's/\{GRPC_BIND_PORT\}/${GRPC_BIND_PORT}/' /usr/local/skywalking-collector/config/application.yml
+
+echo "replace {AGENT_SERVER_BIND_PORT} to ${AGENT_SERVER_BIND_PORT}"
+eval sed -i -e 's/\{AGENT_SERVER_BIND_PORT\}/${AGENT_SERVER_BIND_PORT}/' /usr/local/skywalking-collector/config/application.yml
+
+echo "replace {AGENT_STREAM_JETTY_BIND_PORT} to ${AGENT_STREAM_JETTY_BIND_PORT}"
+eval sed -i -e 's/\{AGENT_STREAM_JETTY_BIND_PORT\}/${AGENT_STREAM_JETTY_BIND_PORT}/' /usr/local/skywalking-collector/config/application.yml
+
+echo "replace {UI_BIND_HOST} to ${UI_BIND_HOST}"
+eval sed -i -e 's/\{UI_BIND_HOST\}/${UI_BIND_HOST}/' /usr/local/skywalking-collector/config/application.yml
+
+echo "replace {UI_BIND_PORT} to ${UI_BIND_PORT}"
+eval sed -i -e 's/\{UI_BIND_PORT\}/${UI_BIND_PORT}/' /usr/local/skywalking-collector/config/application.yml
+
+echo "replace {CLUSTER_BIND_HOST} to ${CLUSTER_BIND_HOST}"
+eval sed -i -e 's/\{CLUSTER_BIND_HOST\}/${CLUSTER_BIND_HOST}/' /usr/local/skywalking-collector/config/application.yml
+
+echo "replace {CLUSTER_BIND_PORT} to ${CLUSTER_BIND_PORT}"
+eval sed -i -e 's/\{CLUSTER_BIND_PORT\}/${CLUSTER_BIND_PORT}/' /usr/local/skywalking-collector/config/application.yml
+
+
+exec "$@"
--- a/apm-collector/apm-collector-boot/docker/log4j2.xml
+++ b/apm-collector/apm-collector-boot/docker/log4j2.xml
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="debug">
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout charset="UTF-8" pattern="[%d{yyyy-MM-dd HH:mm:ss:SSS}] [%p] - %l - %m%n" />
+        </Console>
+    </Appenders>
+    <Loggers>
+        <logger name="org.eclipse.jetty" level="INFO"/>
+        <logger name="org.apache.zookeeper" level="INFO"/>
+        <logger name="org.skywalking.apm.collector.agentstream.worker.storage.PersistenceTimer" level="INFO"/>
+        <Root level="INFO">
+            <AppenderRef ref="Console" />
+        </Root>
+    </Loggers>
+</Configuration>
--- a/apm-collector/apm-collector-boot/pom.xml
+++ b/apm-collector/apm-collector-boot/pom.xml
@ -15,7 +15,7 @@
    <properties>
        <main.class>org.skywalking.apm.collector.boot.CollectorBootStartUp</main.class>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <docker.image.name>skywalking/${artifactId}</docker.image.name>
+        <docker.image.name>skywalking/skywalking-collector</docker.image.name>
        <docker.image.version>${version}</docker.image.version>
    </properties>

@ -115,7 +115,7 @@
                    <resources>
                        <resource>
                            <targetPath>/</targetPath>
-                            <directory>${project.build.directory}</directory>
+                            <directory>${project.basedir}/../../packages</directory>
                            <include>${build.finalName}.tar.gz</include>
                        </resource>
                    </resources>
@ -131,4 +131,4 @@
            </plugin>
        </plugins>
    </build>
-</project>
+</project>
--- a/apm-collector/apm-collector-boot/src/main/assembly/assembly.xml
+++ b/apm-collector/apm-collector-boot/src/main/assembly/assembly.xml
@ -27,10 +27,18 @@
            <directory>src/main/resources</directory>
            <includes>
                <include>application.yml</include>
+
+            </includes>
+            <outputDirectory>/config</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/assembly</directory>
+            <includes>
                <include>log4j2.xml</include>
            </includes>
            <outputDirectory>/config</outputDirectory>
        </fileSet>
+
        <fileSet>
            <directory>${project.build.directory}</directory>
            <outputDirectory>/libs</outputDirectory>
--- a/apm-collector/apm-collector-boot/src/main/assembly/log4j2.xml
+++ b/apm-collector/apm-collector-boot/src/main/assembly/log4j2.xml
@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="error">
+    <Properties>
+        <Property name="log-path">${sys:collector.logDir}</Property>
+    </Properties>
+    <Appenders>
+        <RollingFile name="RollingFile" fileName="${log-path}/skywalking-collector.log"
+                     filePattern="${log-path}/skywalking-web-server-%d{yyyy-MM-dd}-%i.log">
+            <PatternLayout>
+                <pattern>%d - %c -%-4r [%t] %-5p %x - %m%n</pattern>
+            </PatternLayout>
+            <Policies>
+                <SizeBasedTriggeringPolicy size="102400KB"/>
+            </Policies>
+            <DefaultRolloverStrategy max="30"/>
+        </RollingFile>
+    </Appenders>
+    <Loggers>
+        <logger name="org.eclipse.jetty" level="INFO"/>
+        <logger name="org.apache.zookeeper" level="INFO"/>
+        <logger name="org.skywalking.apm.collector.agentstream.worker.storage.PersistenceTimer" level="INFO"/>
+        <Root level="info">
+            <AppenderRef ref="RollingFile"/>
+        </Root>
+    </Loggers>
+</Configuration>
--- a/apm-collector/apm-collector-boot/src/main/resources/log4j2.xml
+++ b/apm-collector/apm-collector-boot/src/main/resources/log4j2.xml
@ -1,26 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Configuration status="error">
-    <Properties>
-        <Property name="log-path">${sys:collector.logDir}</Property>
-    </Properties>
    <Appenders>
-        <RollingFile name="RollingFile" fileName="${log-path}/skywalking-collector.log"
-                     filePattern="${log-path}/skywalking-web-server-%d{yyyy-MM-dd}-%i.log">
-            <PatternLayout>
-                <pattern>%d - %c -%-4r [%t] %-5p %x - %m%n</pattern>
-            </PatternLayout>
-            <Policies>
-                <SizeBasedTriggeringPolicy size="102400KB"/>
-            </Policies>
-            <DefaultRolloverStrategy max="30"/>
-        </RollingFile>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout charset="UTF-8" pattern="%d - %c -%-4r [%t] %-5p %x - %m%n" />
+        </Console>
    </Appenders>
    <Loggers>
        <logger name="org.eclipse.jetty" level="INFO"/>
        <logger name="org.apache.zookeeper" level="INFO"/>
        <logger name="org.skywalking.apm.collector.agentstream.worker.storage.PersistenceTimer" level="INFO"/>
        <Root level="info">
-            <AppenderRef ref="RollingFile"/>
+            <AppenderRef ref="Console"/>
        </Root>
    </Loggers>
 </Configuration>
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,31 +1,60 @@
 version: '2.1'
 services:
  skywalking-webui:
-    image: skywalking/sky-walking-ui:3.1-2017
+    image: skywalking/skywalking-ui:3.2-2017
    expose:
      - "8080"
    ports:
      - "8080:8080"
    links:
      - skywalking-collector
+    depends_on:
+      skywalking-collector:
+        condition: service_healthy
    environment:
-      - COLLECTOR_SERVERS=skywalking-collector:12800
+      - COLLECTOR_SERVERS=skywalking-collector:10800

  skywalking-collector:
-    image: skywalking/skywalking-collector:3.1-2017
+    image: skywalking/skywalking-collector:3.2-2017
    expose:
+      - "10800"
+      - "11800"
      - "12800"
-      - "1000"
    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:
-      - ES_CLUSTER_NODES=es-server:9300
-      - HTTP_HOST_NAME=0.0.0.0
+      - ZK_ADDRESSES=zookeeper-server:2181
+      - ES_ADDRESSES=es-server:9300
+      - BIND_HOST=0.0.0.0
+      - UI_BIND_HOST=skywalking-collector
+      - CLUSTER_BIND_HOST=0.0.0.0
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:10800/agentstream/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
@ -36,8 +65,11 @@ services:
    expose:
      - "9200"
      - "9300"
+    ports:
+      - "9200:9200"
+      - "9300:9300"
    healthcheck:
      test: ["CMD", "curl", "-f", "http://localhost:9200"]
-      interval: 30s
+      interval: 10s
      timeout: 10s
      retries: 5