Merge branch 'master' into vip

INSTALL.md

@@ -186,10 +186,14 @@ docker ps
 docker exec -it kafka sh
 ```
 
-创建一个topic(这里我的**topicName**就叫austinBusiness，你们可以改成自己的)
+创建两个topic(这里我的**topicName**就叫austinBusiness和austinLog，你们可以改成自己的)
 
 ```
-$KAFKA_HOME/bin/kafka-topics.sh --create --topic austinBusiness --partitions 1 --zookeeper zookeeper:2181 --replication-factor 1 
+
+$KAFKA_HOME/bin/kafka-topics.sh --create --topic austinBusiness --partitions 1 --zookeeper zookeeper:2181 --replication-factor 1
+
+
+$KAFKA_HOME/bin/kafka-topics.sh --create --topic austinLog --partitions 1 --zookeeper zookeeper:2181 --replication-factor 1 
 ```
 
 查看刚创建的topic信息：
@@ -277,9 +281,10 @@ auth austin
 
 PS：我的namespace是`boss.austin`
 
-
 ![](https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/4c4636a5620a454b931aea8b248e2890~tplv-k3u1fbpfcp-watermark.image?)
 
+`dynamic-tp-apollo-dtp`它是一个apollo的namespace，存放着动态线程池的配置
+
 ## 06、安装PROMETHEUS和GRAFANA(可选)
 
 存放`docker-compose.yml`的信息：
@@ -299,7 +304,6 @@ services:
         restart: always
         volumes:
             - ./prometheus.yml:/etc/prometheus/prometheus.yml
-#            - ./node_down.yml:/usr/local/etc/node_down.yml:rw
         ports:
             - "9090:9090"
         networks:
@@ -310,8 +314,6 @@ services:
         container_name: alertmanager
         hostname: alertmanager
         restart: always
-#        volumes:
-#            - ./alertmanager.yml:/usr/local/etc/alertmanager.yml
         ports:
             - "9093:9093"
         networks:
@@ -439,6 +441,7 @@ services:
         - transport.host=localhost
         - network.host=0.0.0.0
         - "ES_JAVA_OPTS=-Dlog4j2.formatMsgNoLookups=true -Xms512m -Xmx512m"
+        - GRAYLOG_ROOT_TIMEZONE=Asia/Shanghai
       ulimits:
         memlock:
           soft: -1
@@ -455,6 +458,7 @@ services:
         - GRAYLOG_PASSWORD_SECRET=somepasswordpepper
         - GRAYLOG_ROOT_PASSWORD_SHA2=8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918
         - GRAYLOG_HTTP_EXTERNAL_URI=http://ip:9009/ # 这里注意要改ip
+        - GRAYLOG_ROOT_TIMEZONE=Asia/Shanghai
       entrypoint: /usr/bin/tini -- wait-for-it elasticsearch:9200 --  /docker-entrypoint.sh
       networks:
         - graylog

docker/graylog/docker-compose.yml

@@ -0,0 +1,47 @@
+version: '3'
+services:
+  mongo:
+    image: mongo:4.2
+    networks:
+      - graylog
+  elasticsearch:
+    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
+    environment:
+      - http.host=0.0.0.0
+      - transport.host=localhost
+      - network.host=0.0.0.0
+      - "ES_JAVA_OPTS=-Dlog4j2.formatMsgNoLookups=true -Xms512m -Xmx512m"
+      - GRAYLOG_ROOT_TIMEZONE=Asia/Shanghai
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+    deploy:
+      resources:
+        limits:
+          memory: 1g
+    networks:
+      - graylog
+  graylog:
+    image: graylog/graylog:4.2
+    environment:
+      - GRAYLOG_PASSWORD_SECRET=somepasswordpepper
+      - GRAYLOG_ROOT_PASSWORD_SHA2=8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918
+      - GRAYLOG_HTTP_EXTERNAL_URI=http://ip:9009/ # 这里注意要改ip
+      - GRAYLOG_ROOT_TIMEZONE=Asia/Shanghai  # 设置时区
+    entrypoint: /usr/bin/tini -- wait-for-it elasticsearch:9200 --  /docker-entrypoint.sh
+    networks:
+      - graylog
+    restart: always
+    depends_on:
+      - mongo
+      - elasticsearch
+    ports:
+      - 9009:9000
+      - 1514:1514
+      - 1514:1514/udp
+      - 12201:12201
+      - 12201:12201/udp
+networks:
+  graylog:
+    driver: bridge

docker/prometheus/docker-compose.yaml

@@ -12,7 +12,6 @@ services:
     restart: always
     volumes:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml
-    #            - ./node_down.yml:/usr/local/etc/node_down.yml:rw
     ports:
       - "9090:9090"
     networks:
@@ -23,8 +22,6 @@ services:
     container_name: alertmanager
     hostname: alertmanager
     restart: always
-    #        volumes:
-    #            - ./alertmanager.yml:/usr/local/etc/alertmanager.yml
     ports:
       - "9093:9093"
     networks: