[#49] swarm test重启测试通过

deployment_new/templates/server/compose/docker-compose.yml

@@ -5,18 +5,9 @@ networks:
     external: true
 
 services:
-  bind:
-    image: ${BIND_IMAGE_TAG:-argus-bind9:${PKG_VERSION}}
-    container_name: argus-bind-sys
-    networks: [argus-sys-net]
-    volumes:
-      - ../private:/private
-    restart: unless-stopped
-
   master:
     image: ${MASTER_IMAGE_TAG:-argus-master:${PKG_VERSION}}
     container_name: argus-master-sys
-    depends_on: [bind]
     environment:
       - OFFLINE_THRESHOLD_SECONDS=6
       - ONLINE_THRESHOLD_SECONDS=2
@@ -29,7 +20,10 @@ services:
       - ../private/argus/master:/private/argus/master
       - ../private/argus/metric/prometheus:/private/argus/metric/prometheus
       - ../private/argus/etc:/private/argus/etc
-    networks: [argus-sys-net]
+    networks:
+      argus-sys-net:
+        aliases:
+          - master.argus.com
     restart: unless-stopped
 
   es:
@@ -47,7 +41,10 @@ services:
     ports:
       - "${ES_HTTP_PORT:-9200}:9200"
     restart: unless-stopped
-    networks: [argus-sys-net]
+    networks:
+      argus-sys-net:
+        aliases:
+          - es.log.argus.com
 
   kibana:
     image: ${KIBANA_IMAGE_TAG:-argus-kibana:${PKG_VERSION}}
@@ -63,27 +60,10 @@ services:
     ports:
       - "${KIBANA_PORT:-5601}:5601"
     restart: unless-stopped
-    networks: [argus-sys-net]
-
-  ftp:
-    image: ${FTP_IMAGE_TAG:-argus-metric-ftp:${PKG_VERSION}}
-    container_name: argus-ftp
-    restart: unless-stopped
-    environment:
-      - TZ=Asia/Shanghai
-      - FTP_BASE_PATH=/private/argus/ftp
-      - FTP_PASSWORD=${FTP_PASSWORD:-NASPlab1234!}
-      - DOMAIN=${FTP_DOMAIN:-ftp.metric.argus.com}
-      - ARGUS_BUILD_UID=${ARGUS_BUILD_UID:-2133}
-      - ARGUS_BUILD_GID=${ARGUS_BUILD_GID:-2015}
-    ports:
-      - "${FTP_PORT:-21}:21"
-      - "${FTP_DATA_PORT:-20}:20"
-      - "${FTP_PASSIVE_HOST_RANGE:-21100-21110}:21100-21110"
-    volumes:
-      - ../private/argus/metric/ftp:/private/argus/ftp
-      - ../private/argus/etc:/private/argus/etc
-    networks: [argus-sys-net]
+    networks:
+      argus-sys-net:
+        aliases:
+          - kibana.log.argus.com
 
   prometheus:
     image: ${PROM_IMAGE_TAG:-argus-metric-prometheus:${PKG_VERSION}}
@@ -99,7 +79,10 @@ services:
     volumes:
       - ../private/argus/metric/prometheus:/private/argus/metric/prometheus
       - ../private/argus/etc:/private/argus/etc
-    networks: [argus-sys-net]
+    networks:
+      argus-sys-net:
+        aliases:
+          - prom.metric.argus.com
 
   grafana:
     image: ${GRAFANA_IMAGE_TAG:-argus-metric-grafana:${PKG_VERSION}}
@@ -122,7 +105,10 @@ services:
       - ../private/argus/metric/grafana:/private/argus/metric/grafana
       - ../private/argus/etc:/private/argus/etc
     depends_on: [prometheus]
-    networks: [argus-sys-net]
+    networks:
+      argus-sys-net:
+        aliases:
+          - grafana.metric.argus.com
 
   alertmanager:
     image: ${ALERT_IMAGE_TAG:-argus-alertmanager:${PKG_VERSION}}
@@ -133,7 +119,10 @@ services:
     volumes:
       - ../private/argus/etc:/private/argus/etc
       - ../private/argus/alert/alertmanager:/private/argus/alert/alertmanager
-    networks: [argus-sys-net]
+    networks:
+      argus-sys-net:
+        aliases:
+          - alertmanager.alert.argus.com
     ports:
       - "${ALERTMANAGER_PORT:-9093}:9093"
     restart: unless-stopped
@@ -151,19 +140,25 @@ services:
       - EXTERNAL_KIBANA_PORT=${WEB_PROXY_PORT_8083:-8083}
     volumes:
       - ../private/argus/etc:/private/argus/etc
-    networks: [argus-sys-net]
+    networks:
+      argus-sys-net:
+        aliases:
+          - web.argus.com
     restart: unless-stopped
 
   web-proxy:
     image: ${WEB_PROXY_IMAGE_TAG:-argus-web-proxy:${PKG_VERSION}}
     container_name: argus-web-proxy
-    depends_on: [bind, master, grafana, prometheus, kibana, alertmanager]
+    depends_on: [master, grafana, prometheus, kibana, alertmanager]
     environment:
       - ARGUS_BUILD_UID=${ARGUS_BUILD_UID:-2133}
       - ARGUS_BUILD_GID=${ARGUS_BUILD_GID:-2015}
     volumes:
       - ../private/argus/etc:/private/argus/etc
-    networks: [argus-sys-net]
+    networks:
+      argus-sys-net:
+        aliases:
+          - proxy.argus.com
     ports:
       - "${WEB_PROXY_PORT_8080:-8080}:8080"
       - "${WEB_PROXY_PORT_8081:-8081}:8081"
@@ -172,4 +167,3 @@ services:
       - "${WEB_PROXY_PORT_8084:-8084}:8084"
       - "${WEB_PROXY_PORT_8085:-8085}:8085"
     restart: unless-stopped
-