diff --git a/cloud-auth/src/main/resources/logback.xml b/cloud-auth/src/main/resources/logback.xml index 880c02d..fc76e2a 100644 --- a/cloud-auth/src/main/resources/logback.xml +++ b/cloud-auth/src/main/resources/logback.xml @@ -4,6 +4,7 @@ + @@ -57,6 +58,19 @@ + + + + + ${log.sky.pattern} + + + + + + + + diff --git a/cloud-common/cloud-common-core/pom.xml b/cloud-common/cloud-common-core/pom.xml index 1106e4e..8e132a4 100644 --- a/cloud-common/cloud-common-core/pom.xml +++ b/cloud-common/cloud-common-core/pom.xml @@ -136,6 +136,18 @@ lombok + + + org.apache.skywalking + apm-toolkit-trace + + + + + org.apache.skywalking + apm-toolkit-logback-1.x + + diff --git a/cloud-gateway/src/main/resources/logback.xml b/cloud-gateway/src/main/resources/logback.xml index 5ac21d0..971e45e 100644 --- a/cloud-gateway/src/main/resources/logback.xml +++ b/cloud-gateway/src/main/resources/logback.xml @@ -4,6 +4,7 @@ + @@ -57,6 +58,19 @@ + + + + + ${log.sky.pattern} + + + + + + + + diff --git a/cloud-modules/cloud-modules-file/src/main/resources/logback.xml b/cloud-modules/cloud-modules-file/src/main/resources/logback.xml index 30606f7..151a3cb 100644 --- a/cloud-modules/cloud-modules-file/src/main/resources/logback.xml +++ b/cloud-modules/cloud-modules-file/src/main/resources/logback.xml @@ -4,6 +4,7 @@ + @@ -57,6 +58,19 @@ + + + + + ${log.sky.pattern} + + + + + + + + diff --git a/cloud-modules/cloud-modules-gen/src/main/resources/logback.xml b/cloud-modules/cloud-modules-gen/src/main/resources/logback.xml index 0b3964c..4a9d602 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/logback.xml +++ b/cloud-modules/cloud-modules-gen/src/main/resources/logback.xml @@ -4,6 +4,7 @@ + @@ -57,6 +58,19 @@ + + + + + ${log.sky.pattern} + + + + + + + + diff --git a/cloud-modules/cloud-modules-job/src/main/resources/logback.xml b/cloud-modules/cloud-modules-job/src/main/resources/logback.xml index 1e014d6..b7a2ac4 100644 --- a/cloud-modules/cloud-modules-job/src/main/resources/logback.xml +++ b/cloud-modules/cloud-modules-job/src/main/resources/logback.xml @@ -4,6 +4,7 @@ + @@ -57,6 +58,19 @@ + + + + + ${log.sky.pattern} + + + + + + + + diff --git a/cloud-modules/cloud-modules-system/src/main/resources/logback.xml b/cloud-modules/cloud-modules-system/src/main/resources/logback.xml index d1b5629..d863800 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/logback.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/logback.xml @@ -4,6 +4,7 @@ + @@ -57,6 +58,19 @@ + + + + + ${log.sky.pattern} + + + + + + + + diff --git a/pom.xml b/pom.xml index 80e72d3..73d04fd 100644 --- a/pom.xml +++ b/pom.xml @@ -35,6 +35,8 @@ 8.2.2 4.1.2 2.14.3 + 9.2.0 + 9.2.0 @@ -68,6 +70,20 @@ import + + + org.apache.skywalking + apm-toolkit-trace + ${skywalking-toolkit.version} + + + + + org.apache.skywalking + apm-toolkit-logback-1.x + ${apm-logback.version} + + com.github.tobato diff --git a/skywalking/install/elasticsearch/elasticsearch.sh b/skywalking/install/elasticsearch/elasticsearch.sh new file mode 100644 index 0000000..1c86a51 --- /dev/null +++ b/skywalking/install/elasticsearch/elasticsearch.sh @@ -0,0 +1,9 @@ +docker run -d \ + --name elasticsearch \ + -e ES_JAVA_OPTS="-Xms512m -Xmx512m" \ + --network skywalking \ + -e "discovery.type=single-node" \ + -p 9200:9200 \ + -p 9300:9300 \ + -v ./data:/usr/share/elasticsearch/data \ + docker.elastic.co/elasticsearch/elasticsearch:7.17.21 diff --git a/skywalking/install/skywalking-net.sh b/skywalking/install/skywalking-net.sh new file mode 100644 index 0000000..8b4e769 --- /dev/null +++ b/skywalking/install/skywalking-net.sh @@ -0,0 +1,2 @@ +docker netwrok create skywalking + diff --git a/skywalking/install/skywalking/skywalking-oap.sh b/skywalking/install/skywalking/skywalking-oap.sh new file mode 100644 index 0000000..4c48982 --- /dev/null +++ b/skywalking/install/skywalking/skywalking-oap.sh @@ -0,0 +1,10 @@ +docker run -d \ + --name skywalking-oap \ + --restart always \ + --network skywalking \ + -p 12800:12800 \ + -p 11800:11800 \ + -e SW_STORAGE=elasticsearch \ + -e SW_STORAGE_ES_CLUSTER_NODES=elasticsearch:9200 \ + apache/skywalking-oap-server:9.7.0-java17 + diff --git a/skywalking/install/skywalking/skywalking-ui.sh b/skywalking/install/skywalking/skywalking-ui.sh new file mode 100644 index 0000000..9e73197 --- /dev/null +++ b/skywalking/install/skywalking/skywalking-ui.sh @@ -0,0 +1,7 @@ +docker run -d \ + --name skywalking-ui \ + --restart always \ + --network skywalking \ + -p 8080:8080 \ + -e SW_OAP_ADDRESS=http://skywalking-oap:12800 \ + apache/skywalking-ui:9.7.0-java17