docker swarm

docker-swarm/log/README

@@ -9,4 +9,7 @@
 # }
 
 
-env $(cat ./env_crm1 | xargs) envsubst < ./docker-compose.yml | docker stack deploy --compose-file - crm1_log   --with-registry-auth
+env $(cat ./env_crm1 | xargs) envsubst < ./docker-compose.yml | docker stack deploy --compose-file - crm1_log   --with-registry-auth
+
+
+env $(cat ./env_prod | xargs) envsubst < ./docker-compose.yml | docker stack deploy --compose-file - prod_log   --with-registry-auth

docker-swarm/log/docker-compose.yml

@@ -5,7 +5,8 @@ networks:
     external: true
 services:
   logstash:
-    image: docker.elastic.co/logstash/logstash:7.17.3
+    image: docker.elastic.co/logstash/logstash:8.13.4
+    hostname: ${NAMESPACE}-log-logstash
     ports:
       - '${NODE_PORT}:5044'
     environment:
@@ -18,13 +19,13 @@ services:
         constraints:
           - node.labels.${NAMESPACE}_es==1
   filebeat:
-    image: docker.elastic.co/beats/filebeat:7.17.3
+    image: docker.elastic.co/beats/filebeat:8.13.4
     volumes:
       - "kibana_data:/bitnami/kibana"
     environment:
       - TZ=Asia/Shanghai
-      - LOGSTASH_URL=${NAMESPACE}_log_logstash:5044
-      - KIBANA_HOSTS=${NAMESPACE}_es_kibana
+      - LOGSTASH_URL=${NAMESPACE}-log-logstash:5044
+      - KIBANA_HOSTS=${NAMESPACE}-es-kibana
     configs:
       - source: filebeat_conf
         target: /usr/share/filebeat/filebeat.yml

docker-swarm/log/env_prod

@@ -0,0 +1,2 @@
+NAMESPACE=prod
+NODE_PORT=5044

docker-swarm/log/logstash.conf

@@ -18,14 +18,14 @@ filter {
 output {
   if [servicename] {  
     elasticsearch {
-        hosts => [ "crm1-es-elasticsearch:9200" ]
+        hosts => [ "prod-es-elasticsearch:9200" ]
         index => "sslog-%{[service]}"
         action => "create"
         ilm_enabled => false
     }
   }else{
     elasticsearch {
-        hosts => [ "crm1-es-elasticsearch:9200" ]
+        hosts => [ "prod-es-elasticsearch:9200" ]
         index => "sslog-default"
         action => "create"
         ilm_enabled => false