Skip to content
Snippets Groups Projects
Commit b1baa98b authored by Hannes Feldt's avatar Hannes Feldt Committed by Corné Lukken
Browse files

L2SS-2171: Fix logging in dev environment

parent aa6b9aa6
Branches
Tags
1 merge request!1059L2SS-2171: Fix logging in dev environment
...@@ -96,3 +96,14 @@ advertise { ...@@ -96,3 +96,14 @@ advertise {
rpc = "{{ GetInterfaceIP \"eth0\" }}" rpc = "{{ GetInterfaceIP \"eth0\" }}"
serf = "{{ 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"]
}
}
...@@ -9,17 +9,17 @@ resource "nomad_job" "monitoring" { ...@@ -9,17 +9,17 @@ resource "nomad_job" "monitoring" {
} }
} }
# resource "nomad_job" "logging" { resource "nomad_job" "logging" {
# cluster = variable.nomad_cluster cluster = variable.nomad_cluster
#
# paths = ["../jobs/station/logging.nomad"] paths = ["../jobs/station/logging.nomad"]
# depends_on = ["resource.nomad_job.monitoring"] depends_on = ["resource.nomad_job.monitoring"]
#
# health_check { health_check {
# timeout = "300s" timeout = "300s"
# jobs = ["log-scraping"] jobs = ["log-scraping"]
# } }
# } }
resource "ingress" "grafana" { resource "ingress" "grafana" {
port = 3000 port = 3000
......
...@@ -84,17 +84,20 @@ healthchecks.require_healthy = true ...@@ -84,17 +84,20 @@ healthchecks.require_healthy = true
address = "0.0.0.0:8686" address = "0.0.0.0:8686"
playground = false playground = false
[[ if ne .station "dev" ]]
[sources.syslog-remote] [sources.syslog-remote]
type = "syslog" type = "syslog"
address = "0.0.0.0:514" address = "0.0.0.0:514"
mode = "tcp" mode = "tcp"
permit_origin = [ "10.99.0.0/16" ] permit_origin = [ "10.99.0.0/16" ]
[[ end ]]
[sources.docker-local] [sources.docker-local]
type = "docker_logs" type = "docker_logs"
docker_host = "/var/run/docker.sock" docker_host = "/var/run/docker.sock"
exclude_containers = ["vector-"] exclude_containers = ["vector-"]
[[ if ne .station "dev" ]]
[transforms.syslog-parse] [transforms.syslog-parse]
inputs = ["syslog-remote"] inputs = ["syslog-remote"]
type = "remap" type = "remap"
...@@ -123,6 +126,7 @@ healthchecks.require_healthy = true ...@@ -123,6 +126,7 @@ healthchecks.require_healthy = true
# delete labels that vary too much or are duplicates # delete labels that vary too much or are duplicates
del(.procid) del(.procid)
''' '''
[[ end ]]
[transforms.docker-parse] [transforms.docker-parse]
inputs = ["docker-local"] inputs = ["docker-local"]
...@@ -164,14 +168,19 @@ healthchecks.require_healthy = true ...@@ -164,14 +168,19 @@ healthchecks.require_healthy = true
''' '''
[transforms.postprocess] [transforms.postprocess]
[[ if ne .station "dev" ]]
inputs = ["docker-parse", "syslog-parse"] inputs = ["docker-parse", "syslog-parse"]
[[ else ]]
inputs = ["docker-parse"]
[[ end ]]
type = "remap" type = "remap"
source = ''' source = '''
# hard limit on message size to prevent explosion # hard limit on message size to prevent explosion
.message = truncate!(.message, limit: 8192, suffix: "...") .message = truncate!(.message, limit: 8192, suffix: "...")
# standard labels # standard labels
.labels.level = .level .labels.level = .level || "info"
.labels.source_type = .source_type .labels.source_type = .source_type
''' '''
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment