Merge branch 'L2SS-1751-syslog_port_for_pis_2' into 'master'

L2SS-1751: Open syslog port

Closes L2SS-1751

See merge request !970

.gitignore

@@ -13,6 +13,7 @@
 **/AUTHORS
 **/ChangeLog
 **/env
+!infra/env
 **/pending_log_messages.db
 **/vscode-server.tar
 **/*.orig

infra/env/common.yaml

@@ -36,6 +36,9 @@ object_storage:
     name: minioadmin
     pass: minioadmin
 
+vector:
+  version: 0.39.X-distroless-static
+
 pypcc:
   version: v1-0
 

infra/jobs/station/logging.levant.nomad

@@ -22,11 +22,7 @@ job "log-scraping" {
             mode     = "delay"
         }
         network {
-            mode = "bridge"
-            port "api" {
-                to = 8686
-                host_network = "station"
-            }
+            mode = "cni/station"
         }
 
 [[ if ne .station "dev" ]]
@@ -46,8 +42,7 @@ job "log-scraping" {
         task "vector" {
             driver = "docker"
             config {
-                image = "timberio/vector:0.37.0.custom.2ca601b-distroless-static"
-                ports = ["api"]
+                image = "timberio/vector:[[.vector.version]]"
 [[ if eq .station "dev" ]]
                 volumes = [
                   "/var/run/docker.sock:/var/run/docker.sock"
@@ -88,6 +83,12 @@ healthchecks.require_healthy = true
   address              = "0.0.0.0:8686"
   playground           = false
 
+[sources.syslog]
+  type                 = "syslog"
+  address              = "0.0.0.0:514"
+  mode                 = "tcp"
+  permit_origin        = [ "10.99.0.0/16" ]
+
 [sources.docker-local]
   type                 = "docker_logs"
   docker_host          = "/var/run/docker.sock"
@@ -138,12 +139,12 @@ healthchecks.require_healthy = true
 #  # since without them it is harder to see logs
 #  # of for example crashing containers
 #  type                 = "console"
-#  inputs               = [ "nomad-flags" ]
+#  inputs               = [ "nomad-flags", "syslog" ]
 #  encoding.codec       = "logfmt"
 #  buffer.when_full     = "drop_newest"
 [sinks.loki]
   type                 = "loki"
-  inputs               = [ "nomad-flags" ]
+  inputs               = [ "nomad-flags", "syslog" ]
   endpoint             = "http://loki.service.consul:3100"
   encoding.codec       = "json"
   healthcheck.enabled  = true
@@ -156,7 +157,7 @@ healthchecks.require_healthy = true
 [[ if ne .station "dev" ]]
 [sinks.loki_central]
   type                 = "loki"
-  inputs               = [ "nomad-flags" ]
+  inputs               = [ "nomad-flags", "syslog" ]
   tenant_id            = "lofar"
   endpoint             = "http://logs.service.lofar-central.consul:3100"
   encoding.codec       = "json"
@@ -186,16 +187,21 @@ healthchecks.require_healthy = true
   healthcheck.enabled  = false
 EOF
             }
+            kill_timeout = "30s"
+        }
+
         service {
+            name         = "syslog"
+            port         = "514"
+            address_mode = "alloc"
             check {
-                    port     = "api"
+                port     = "8686"
                 type     = "http"
                 path     = "/health"
                 interval = "30s"
                 timeout  = "5s"
             }
         }
-            kill_timeout = "30s"
-        }
+
     }
 }