Deploy docker (#1834)

* Update submodule skywalking-ui

* Refactor kubernetes config

* Add ui image

docker/Makefile

@@ -14,9 +14,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-snapshot:
-	cd snapshot; \
+oap:
+	cd oap; \
 	cp ../../dist/apache-skywalking-apm-incubating.tar.gz ./ ; \
 	docker build -t skywalking/oap:latest .
 
-.PHONY: snapshot
\ No newline at end of file
+ui:
+	cd ui; \
+	cp ../../dist/apache-skywalking-apm-incubating.tar.gz ./ ; \
+	docker build -t skywalking/ui:latest .
+	
+build: oap ui
+
+.PHONY: oap ui
\ No newline at end of file

docker/README.md

 
-# Build snapshot image
+# Build all images
 
 ```shell
-make snapshot
+make build
 ```
 
-# Run oap by docker-compose
+# Run skywalking by docker-compose
 
 ```shell
-docker-compose -f stack.yml up
+docker-compose up
 ```
\ No newline at end of file

docker/config/application.yml

+# 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:
+#  zookeeper:
+#    hostPort: localhost:2181
+#    # Retry Policy
+#    baseSleepTimeMs: 1000 # initial amount of time to wait between retries
+#    maxRetries: 3 # max number of times to retry
+#  kubernetes:
+#    watchTimeoutSeconds: 60
+#    namespace: default
+#    labelSelector: app=collector,release=skywalking
+#    uidEnvName: SKYWALKING_COLLECTOR_UID
+core:
+  default:
+    restHost: 0.0.0.0
+    restPort: 12800
+    restContextPath: /
+    gRPCHost: 0.0.0.0
+    gRPCPort: 11800
+    downsampling:
+    - Hour
+    - Day
+    - Month
+    # Set a timeout on metric data. After the timeout has expired, the metric data will automatically be deleted.
+    recordDataTTL: 90 # Unit is minute
+    minuteMetricsDataTTL: 90 # Unit is minute
+    hourMetricsDataTTL: 36 # Unit is hour
+    dayMetricsDataTTL: 45 # Unit is day
+    monthMetricsDataTTL: 18 # Unit is month
+storage:
+  elasticsearch:
+    clusterNodes: elasticsearch:9200
+    indexShardsNumber: 2
+    indexReplicasNumber: 0
+    # Batch process setting, refer to https://www.elastic.co/guide/en/elasticsearch/client/java-api/5.5/java-docs-bulk-processor.html
+    bulkActions: 2000 # Execute the bulk every 2000 requests
+    bulkSize: 20 # flush the bulk every 20mb
+    flushInterval: 10 # flush the bulk every 10 seconds whatever the number of requests
+    concurrentRequests: 2 # the number of concurrent requests
+#  h2:
+#    driver: org.h2.jdbcx.JdbcDataSource
+#    url: jdbc:h2:mem:skywalking-oap-db
+#    user: sa
+receiver-register:
+  default:
+receiver-trace:
+  default:
+    bufferPath: ../trace-buffer/  # Path to trace buffer files, suggest to use absolute path
+    bufferOffsetMaxFileSize: 100 # Unit is MB
+    bufferDataMaxFileSize: 500 # Unit is MB
+    bufferFileCleanWhenRestart: false
+receiver-jvm:
+  default:
+service-mesh:
+  default:
+    bufferPath: ../mesh-buffer/  # Path to trace buffer files, suggest to use absolute path
+    bufferOffsetMaxFileSize: 100 # Unit is MB
+    bufferDataMaxFileSize: 500 # Unit is MB
+    bufferFileCleanWhenRestart: false
+istio-telemetry:
+  default:
+query:
+  graphql:
+    path: /graphql
+alarm:
+  default:

docker/stack.yml → docker/docker-compose.yml

@@ -36,3 +36,17 @@ services:
     ports:
       - 11800:11800
       - 12800:12800
+    volumes:
+      - ./config:/apache-skywalking-apm-incubating/config:ro
+  ui:
+    image: skywalking/ui
+    container_name: ui
+    depends_on:
+      - oap
+    links:
+      - oap
+    restart: always
+    ports:
+      - 8080:8080
+    environment:
+      collector.ribbon.listOfServers: oap:12800
\ No newline at end of file

docker/snapshot/Dockerfile → docker/oap/Dockerfile

@@ -27,7 +27,8 @@ COPY "$DIST_NAME.tar.gz" /
 
 RUN set -ex; \
     tar -xzf "$DIST_NAME.tar.gz"; \
-    rm -rf "$DIST_NAME.tar.gz"; rm -rf config/log4j2.xml;
+    rm -rf "$DIST_NAME.tar.gz"; rm -rf "$DIST_NAME/config/log4j2.xml"; \
+    rm -rf "$DIST_NAME/bin"; rm -rf "$DIST_NAME/webapp"; rm -rf "$DIST_NAME/agent";
 
 WORKDIR $DIST_NAME
 
@@ -36,4 +37,4 @@ COPY docker-entrypoint.sh .
 
 EXPOSE 12800 11800
 
-ENTRYPOINT ["./docker-entrypoint.sh"]
\ No newline at end of file
+ENTRYPOINT ["sh", "docker-entrypoint.sh"]
\ No newline at end of file

docker/snapshot/docker-entrypoint.sh → docker/oap/docker-entrypoint.sh

@@ -16,7 +16,7 @@
 
 #!/bin/bash
 
-set -e
+set -ex
 
 CLASSPATH="config:$CLASSPATH"
 for i in oap-libs/*.jar
@@ -24,6 +24,5 @@ do
     CLASSPATH="$i:$CLASSPATH"
 done
 
-java ${JAVA_OPTS} -classpath $CLASSPATH \
- -Dstorage.elasticsearch.clusterNodes=elasticsearch:9200 \
- org.apache.skywalking.oap.server.starter.OAPServerStartUp
+exec java ${JAVA_OPTS} -classpath $CLASSPATH \
+ org.apache.skywalking.oap.server.starter.OAPServerStartUp "$@"

docker/oap/log4j2.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  ~
+  -->
+
+<Configuration status="INFO">
+    <Appenders>
+        <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.elasticsearch.common.network.IfConfig" level="INFO"/>
+        <logger name="io.grpc.netty" level="INFO"/>
+        <logger name="org.apache.skywalking.oap.server.receiver.istio.telemetry" level="DEBUG"/>
+        <Root level="INFO">
+            <AppenderRef ref="Console"/>
+        </Root>
+    </Loggers>
+</Configuration>

docker/ui/Dockerfile

+# 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.
+
+FROM openjdk:8-jre-alpine
+
+ENV DIST_NAME=apache-skywalking-apm-incubating \
+    JAVA_OPTS=" -Xms256M -Xmx512M"
+
+# Install required packages
+RUN apk add --no-cache \
+    bash
+
+COPY "$DIST_NAME.tar.gz" /
+
+RUN set -ex; \
+    tar -xzf "$DIST_NAME.tar.gz"; \
+    rm -rf "$DIST_NAME.tar.gz"; rm -rf "$DIST_NAME/config"; \
+    rm -rf "$DIST_NAME/bin"; rm -rf "$DIST_NAME/oap-libs"; rm -rf "$DIST_NAME/agent";
+
+WORKDIR $DIST_NAME
+
+COPY docker-entrypoint.sh .
+COPY logback.xml webapp/
+
+EXPOSE 8080
+
+ENTRYPOINT ["sh", "docker-entrypoint.sh"]
\ No newline at end of file

docker/ui/docker-entrypoint.sh

+# 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.
+
+#!/bin/bash
+
+set -ex
+
+exec java -jar webapp/skywalking-webapp.jar --logging.config=webapp/logback.xml "$@"

docker/ui/logback.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  ~
+  -->
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/base.xml" />
+</configuration>
\ No newline at end of file

kubernetes/oap/00-rbac.yml

+# 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.
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: skywalking-oap
+  namespace: skywalking
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: skywalking-oap
+subjects:
+- kind: ServiceAccount
+  name: skywalking-oap
+  namespace: skywalking
+
+---
+
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  namespace: skywalking
+  name: skywalking-oap
+rules:
+- apiGroups: [""]
+  resources: ["pods"]
+  verbs: ["watch", "list"]
\ No newline at end of file

kubernetes/oap/01-config.yml

+# 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.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: oap-config
+  namespace: skywalking
+data:
+  application.yml: |-
+    cluster:
+      kubernetes:
+        watchTimeoutSeconds: 60
+        namespace: default
+        labelSelector: app=oap
+        uidEnvName: SKYWALKING_COLLECTOR_UID
+    core:
+      default:
+        restHost: 0.0.0.0
+        restPort: 12800
+        restContextPath: /
+        gRPCHost: 0.0.0.0
+        gRPCPort: 11800
+        downsampling:
+        - Hour
+        - Day
+        - Month
+        recordDataTTL: 90 # Unit is minute
+        minuteMetricsDataTTL: 90 # Unit is minute
+        hourMetricsDataTTL: 36 # Unit is hour
+        dayMetricsDataTTL: 45 # Unit is day
+        monthMetricsDataTTL: 18 # Unit is month
+    storage:
+      elasticsearch:
+        clusterNodes: localhost:9200
+        indexShardsNumber: 2
+        indexReplicasNumber: 0
+        bulkActions: 2000 # Execute the bulk every 2000 requests
+        bulkSize: 20 # flush the bulk every 20mb
+        flushInterval: 10 # flush the bulk every 10 seconds whatever the number of requests
+        concurrentRequests: 2 # the number of concurrent requests
+    receiver-register:
+      default:
+    receiver-trace:
+      default:
+        bufferPath: /trace-buffer/  # Path to trace buffer files, suggest to use absolute path
+        bufferOffsetMaxFileSize: 100 # Unit is MB
+        bufferDataMaxFileSize: 500 # Unit is MB
+        bufferFileCleanWhenRestart: false
+    receiver-jvm:
+      default:
+    service-mesh:
+      default:
+        bufferPath: /mesh-buffer/  # Path to trace buffer files, suggest to use absolute path
+        bufferOffsetMaxFileSize: 100 # Unit is MB
+        bufferDataMaxFileSize: 500 # Unit is MB
+        bufferFileCleanWhenRestart: false
+    istio-telemetry:
+      default:
+    query:
+      graphql:
+        path: /graphql
+    alarm:
+      default:
+
+  log4j2.xml: |--
+    <Configuration status="INFO">
+        <Appenders>
+            <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.elasticsearch.common.network.IfConfig" level="INFO"/>
+            <logger name="io.grpc.netty" level="INFO"/>
+            <logger name="org.apache.skywalking.oap.server.receiver.istio.telemetry" level="DEBUG"/>
+            <Root level="INFO">
+                <AppenderRef ref="Console"/>
+            </Root>
+        </Loggers>
+    </Configuration>
+
+  alarm-settings.yml: |-
+    rules:
+      service_resp_time_rule:
+        indicator-name: service_resp_time
+        include-names:
+          - dubbox-provider
+          - dubbox-consumer
+        threshold: 1000
+        op: ">"
+        period: 10
+        count: 1
+    webhooks:
+
+  component-libraries.yml: |-
+    Tomcat:
+      id: 1
+      languages: Java
+    HttpClient:
+      id: 2
+      languages: Java,C#,Node.js
+    Dubbo:
+      id: 3
+      languages: Java
+    H2:
+      id: 4
+      languages: Java
+    Mysql:
+      id: 5
+      languages: Java,C#,Node.js
+    ORACLE:
+      id: 6
+      languages: Java
+    Redis:
+      id: 7
+      languages: Java,C#,Node.js
+    Motan:
+      id: 8
+      languages: Java
+    MongoDB:
+      id: 9
+      languages: Java,C#,Node.js
+    Resin:
+      id: 10
+      languages: Java
+    Feign:
+      id: 11
+      languages: Java
+    OKHttp:
+      id: 12
+      languages: Java
+    SpringRestTemplate:
+      id: 13
+      languages: Java
+    SpringMVC:
+      id: 14
+      languages: Java
+    Struts2:
+      id: 15
+      languages: Java
+    NutzMVC:
+      id: 16
+      languages: Java
+    NutzHttp:
+      id: 17
+      languages: Java
+    JettyClient:
+      id: 18
+      languages: Java
+    JettyServer:
+      id: 19
+      languages: Java
+    Memcached:
+      id: 20
+      languages: Java
+    ShardingJDBC:
+      id: 21
+      languages: Java
+    PostgreSQL:
+      id: 22
+      languages: Java,C#,Node.js
+    GRPC:
+      id: 23
+      languages: Java
+    ElasticJob:
+      id: 24
+      languages: Java
+    RocketMQ:
+      id: 25
+      languages: Java
+    httpasyncclient:
+      id: 26
+      languages: Java
+    Kafka:
+      id: 27
+      languages: Java
+    ServiceComb:
+      id: 28
+      languages: Java
+    Hystrix:
+      id: 29
+      languages: Java
+    Jedis:
+      id: 30
+      languages: Java
+    SQLite:
+      id: 31
+      languages: Java,C#
+    h2-jdbc-driver:
+      id: 32
+      languages: Java
+    mysql-connector-java:
+      id: 33
+      languages: Java
+    Spymemcached:
+      id: 35
+      languages: Java
+    Xmemcached:
+      id: 36
+      languages: Java
+    postgresql-jdbc-driver:
+      id: 37
+      languages: Java
+    rocketMQ-producer:
+      id: 38
+      languages: Java
+    rocketMQ-consumer:
+      id: 39
+      languages: Java
+    kafka-producer:
+      id: 40
+      languages: Java
+    kafka-consumer:
+      id: 41
+      languages: Java
+    mongodb-driver:
+      id: 42
+      languages: Java
+    SOFARPC:
+      id: 43
+      languages: Java
+    ActiveMQ:
+      id: 44
+      languages: Java
+    activemq-producer:
+      id: 45
+      languages: Java
+    activemq-consumer:
+      id: 46
+      languages: Java
+    Elasticsearch:
+      id: 47
+      languages: Java
+    transport-client:
+      id: 48
+      languages: Java
+    AspNetCore:
+      id: 3001
+      languages: C#
+    EntityFrameworkCore:
+      id: 3002
+      languages: C#
+    SqlClient:
+      id: 3003
+      languages: C#
+    CAP:
+      id: 3004
+      languages: C#
+    StackExchange.Redis:
+      id: 3005
+      languages: C#
+    SqlServer:
+      id: 3006
+      languages: C#
+    Npgsql:
+      id: 3007
+      languages: C#
+    MySqlConnector:
+      id: 3008
+      languages: C#
+    EntityFrameworkCore.InMemory:
+      id: 3009
+      languages: C#
+    EntityFrameworkCore.SqlServer:
+      id: 3010
+      languages: C#
+    EntityFrameworkCore.Sqlite:
+      id: 3011
+      languages: C#
+    Pomelo.EntityFrameworkCore.MySql:
+      id: 3012
+      languages: C#
+    Npgsql.EntityFrameworkCore.PostgreSQL:
+      id: 3013
+      languages: C#
+    InMemoryDatabase:
+      id: 3014
+      languages: C#
+    AspNet:
+      id: 3015
+      languages: C#
+
+    # NoeJS components
+    # [4000, 5000) for Node.js agent
+    HttpServer:
+      id: 4001
+      languages: Node.js
+    express:
+      id: 4002
+      languages: Node.js
+    Egg:
+      id: 4003
+      languages: Node.js
+    Koa:
+      id: 4004
+      languages: Node.js
+    Component-Server-Mappings:
+      mongodb-driver: MongoDB
+      rocketMQ-producer: RocketMQ
+      rocketMQ-consumer: RocketMQ
+      kafka-producer: Kafka
+      kafka-consumer: Kafka
+      activemq-producer: ActiveMQ
+      activemq-consumer: ActiveMQ
+      postgresql-jdbc-driver: PostgreSQL
+      Xmemcached: Memcached
+      Spymemcached: Memcached
+      h2-jdbc-driver: H2
+      mysql-connector-java: Mysql
+      Jedis: Redis
+      StackExchange.Redis: Redis
+      SqlClient: SqlServer
+      Npgsql: PostgreSQL
+      MySqlConnector: Mysql
+      EntityFrameworkCore.InMemory: InMemoryDatabase
+      EntityFrameworkCore.SqlServer: SqlServer
+      EntityFrameworkCore.Sqlite: SQLite
+      Pomelo.EntityFrameworkCore.MySql: Mysql
+      Npgsql.EntityFrameworkCore.PostgreSQL: PostgreSQL
+      transport-client: Elasticsearch
+
+

kubernetes/oap/01-service.yml

@@ -22,7 +22,6 @@ metadata:
   labels:
     service: oap
 spec:
-  clusterIP: None
   ports:
   - port: 12800
     name: rest

kubernetes/oap/02-deployment.yml

@@ -22,7 +22,7 @@ metadata:
   labels:
     app: oap
 spec:
-  replicas: 1
+  replicas: 3
   selector:
     matchLabels:
       app: oap
@@ -30,6 +30,9 @@ spec:
     metadata:
       labels:
         app: oap
+    spec:
+      serviceAccountName: skywalking-oap
+      automountServiceAccountToken: false
     spec:
       containers:
       - name: oap
@@ -47,3 +50,10 @@ spec:
         env:
         - name: JAVA_OPTS
           value: -Xms256M -Xmx512M
+        volumeMounts:
+        - name: config
+          mountPath: /apache-skywalking-apm-incubating/config
+      volumes:
+      - name: config
+        configMap:
+          name: oap-config
\ No newline at end of file