Merge branch 'fix-logging-dev-env' into 'master'

L2SS-2171: Fix logging in dev environment

Closes L2SS-2171

See merge request !1059

infra/dev/nomad/config/nomad/client.hcl

@@ -96,3 +96,14 @@ advertise {
   rpc  = "{{ GetInterfaceIP \"eth0\" }}"
   serf = "{{ GetInterfaceIP \"eth0\" }}"
 }
+
+plugin "docker" {
+  config {
+    allow_privileged = true
+    volumes {
+      enabled = true
+    }
+    allow_caps = ["all"]
+    extra_labels = ["job_name", "job_id", "task_group_name", "task_name", "namespace", "node_name", "node_id"]
+  }
+}

infra/dev/services/services.hcl

@@ -9,17 +9,17 @@ resource "nomad_job" "monitoring" {
   }
 }
 
-# resource "nomad_job" "logging" {
-#   cluster = variable.nomad_cluster
-#
-#   paths = ["../jobs/station/logging.nomad"]
-#   depends_on = ["resource.nomad_job.monitoring"]
-#
-#   health_check {
-#     timeout = "300s"
-#     jobs    = ["log-scraping"]
-#   }
-# }
+resource "nomad_job" "logging" {
+  cluster = variable.nomad_cluster
+
+  paths = ["../jobs/station/logging.nomad"]
+  depends_on = ["resource.nomad_job.monitoring"]
+
+  health_check {
+    timeout = "300s"
+    jobs    = ["log-scraping"]
+  }
+}
 
 resource "ingress" "grafana" {
   port = 3000

infra/jobs/station/logging.levant.nomad

@@ -84,17 +84,20 @@ healthchecks.require_healthy = true
   address              = "0.0.0.0:8686"
   playground           = false
 
+[[ if ne .station "dev" ]]
 [sources.syslog-remote]
   type                 = "syslog"
   address              = "0.0.0.0:514"
   mode                 = "tcp"
   permit_origin        = [ "10.99.0.0/16" ]
+[[ end ]]
 
 [sources.docker-local]
   type                 = "docker_logs"
   docker_host          = "/var/run/docker.sock"
   exclude_containers   = ["vector-"]
 
+[[ if ne .station "dev" ]]
 [transforms.syslog-parse]
   inputs = ["syslog-remote"]
   type   = "remap"
@@ -123,6 +126,7 @@ healthchecks.require_healthy = true
     # delete labels that vary too much or are duplicates
     del(.procid)
   '''
+[[ end ]]
 
 [transforms.docker-parse]
   inputs = ["docker-local"]
@@ -164,14 +168,19 @@ healthchecks.require_healthy = true
   '''
 
 [transforms.postprocess]
+  [[ if ne .station "dev" ]]
     inputs = ["docker-parse", "syslog-parse"]
+  [[ else ]]
+    inputs = ["docker-parse"]
+  [[ end ]]
+
   type   = "remap"
   source = '''
     # hard limit on message size to prevent explosion
     .message         = truncate!(.message, limit: 8192, suffix: "...")
 
     # standard labels
-    .labels.level       = .level
+    .labels.level       = .level || "info"
     .labels.source_type = .source_type
   '''