Merge remote-tracking branch 'upstream/main' into kubernetes-reuse-tls-certs

Author: YuryHrytsuk

services/logging/docker-compose.yml.j2

@@ -18,7 +18,7 @@ services:
           memory: 300M
           cpus: "0.1"
     networks:
-      logging:
+      graylog:
         aliases:
           - mongo # needed because of graylog configuration
 
@@ -46,7 +46,7 @@ services:
           memory: 1G
           cpus: "0.1"
     networks:
-      logging:
+      graylog:
   # Graylog: https://hub.docker.com/r/graylog/graylog/
   graylog:
     image: graylog/graylog:6.0.5
@@ -71,18 +71,12 @@ services:
     networks:
       public:
       monitoring:
-      logging:
+      graylog:
         aliases:
           - graylog
     ports:
-      - target: 12201
-        published: 12203
-        protocol: udp
-        mode: host
-      - target: 12202
-        published: 12202
-        protocol: udp
-        mode: host
+    - 12201:12201/udp
+    - 12202:12202/udp
     deploy:
       replicas: 1
       restart_policy:
@@ -106,23 +100,19 @@ services:
         - traefik.http.middlewares.graylog_replace_regex.replacepathregex.replacement=/$${1}
         - traefik.http.routers.graylog.middlewares=ops_whitelist_ips@swarm, ops_gzip@swarm, graylog_replace_regex
   vector:
-    image: timberio/vector:0.50.X-debian
+    image: timberio/vector:0.49.X-debian
     ports:
-      - target: 12201
-        published: 12201
-        protocol: udp
-        mode: host
+      - "12200:12201/udp"  # GELF input
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
     environment:
       - VECTOR_CONFIG=/etc/vector/vector.yaml
       - VECTOR_LOG=info
-      - VECTOR_LOG_DESTINATION=${VECTOR_LOG_DESTINATION}
     configs:
       - source: vector_config
         target: /etc/vector/vector.yaml
     deploy:
-      replicas: 1
+      replicas: 0
       resources:
         limits:
           cpus: "1.0"
@@ -131,15 +121,11 @@ services:
           memory: 256M
       labels: []
     networks:
-      logging:
+      - monitoring
+      - graylog
 
   loki:
-    image: grafana/loki:3.5.7
-    ports:
-      - target: 3100
-        published: 12204
-        protocol: tcp
-        mode: host
+    image: grafana/loki:3.5.4
     configs:
       - source: loki_config
         target: /etc/loki/loki.yaml
@@ -155,7 +141,7 @@ services:
     deploy:
       placement:
         constraints: []
-      replicas: 1
+      replicas: 0
       restart_policy:
         condition: any
         delay: 5s
@@ -186,7 +172,7 @@ volumes:
   graylog_journal:
 
 networks:
-  logging:
+  graylog:
   public:
     external: true
     name: ${PUBLIC_NETWORK}

services/logging/template.env

@@ -24,4 +24,3 @@ S3_FORCE_PATH_STYLE_LOKI=${S3_FORCE_PATH_STYLE_LOKI}
 S3_REGION_LOKI=${S3_REGION_LOKI}
 S3_SECRET_KEY_LOKI=${S3_SECRET_KEY_LOKI}
 STORAGE_DOMAIN=${STORAGE_DOMAIN}
-VECTOR_LOG_DESTINATION=${VECTOR_LOG_DESTINATION}

services/logging/vector.yaml

@@ -58,7 +58,7 @@ sinks:
   loki:
     type: loki
     inputs: ["process_logs"]
-    endpoint: "http://${VECTOR_LOG_DESTINATION:?err}:12204"
+    endpoint: "http://loki:3100"
     encoding:
       codec: json
     labels:
@@ -76,7 +76,7 @@ sinks:
   graylog:
     type: socket
     inputs: ["process_logs"]
-    address: "${VECTOR_LOG_DESTINATION:?err}:12203"
+    address: "logging_graylog:12201"
     mode: udp
     encoding:
       codec: gelf