ci: 使用内置的监控

metersphere/docker-compose-task-runner.yml

@@ -6,11 +6,17 @@ services:
     deploy:
       resources:
         limits:
-          memory: ${MS_TASK_MEM_LIMIT:-1g}
+          memory: ${MS_NC_MEM_LIMIT:-1g}
     environment:
       FORMAT_MESSAGES_PATTERN_DISABLE_LOOKUPS: 'true'
       RUN_AS_NON_ROOT_USER: 'true'
-    command: sh -c 'sed -i "s/:101:/:${MS_DOCKER_GID:-101}:/g" /etc/group; /deployments/run-java.sh'
+    command:
+      - sh
+      - -c
+      - |
+        node_exporter --path.procfs=/host/proc --path.sysfs=/host/sys &
+        sed -i "s/:101:/:${MS_DOCKER_GID:-101}:/g" /etc/group
+        /deployments/run-java.sh
     ports:
       - ${MS_TASK_RUNNER_PORT}:6000
       - ${MS_NODE_EXPORTER_PORT}:9100
@@ -23,30 +29,9 @@ services:
       - ${MS_BASE}/metersphere/data/app:/opt/metersphere/data/app
       - ${MS_BASE}/metersphere/logs/task-runner:/opt/metersphere/logs/task-runner
       - /var/run/docker.sock:/var/run/docker.sock
-    restart: always
-    networks:
-      - ms-network
-  node-exporter:
-    image: ${MS_IMAGE_PREFIX}/node-exporter:v1.5.0
-    container_name: node-exporter
-    user: root
-    privileged: true
-    deploy:
-      resources:
-        limits:
-          memory: 128m
-    volumes:
       - /proc:/host/proc:ro
       - /sys:/host/sys:ro
       - /:/rootfs:ro
-    command:
-      - '--path.procfs=/host/proc'
-      - '--path.sysfs=/host/sys'
-      - '--collector.filesystem.ignored-mount-points=^/(sys|proc|dev|host|etc)($$|/)'
     restart: always
-    healthcheck:
-      test: [ "CMD", "nc", "-zv", "localhost", "9100" ]
-      interval: 6s
-      timeout: 5s
-      retries: 50
-    network_mode: service:task-runner
+    networks:
+      - ms-network