diff --git a/monitoring/cadvisor.tf b/monitoring/cadvisor.tf index ee326c0..9f781bf 100644 --- a/monitoring/cadvisor.tf +++ b/monitoring/cadvisor.tf @@ -1,7 +1,7 @@ module "cadvisor" { source = "../modules/container" name = "cadvisor" - image = "google/cadvisor:latest" + image = "gcr.io/cadvisor/cadvisor" resource = { memory = 512 @@ -11,6 +11,7 @@ module "cadvisor" { restart = "unless-stopped" destroy_grace_seconds = 10 must_run = true + privileged = true volumes = [ { @@ -36,6 +37,7 @@ module "cadvisor" { { host_path = "/var/run" container_path = "/var/run" + read_only = true }, ] diff --git a/monitoring/grafana.tf b/monitoring/grafana.tf index 03f6f10..004fbf5 100644 --- a/monitoring/grafana.tf +++ b/monitoring/grafana.tf @@ -2,10 +2,15 @@ module "grafana" { name = "grafana" source = "../modules/container" - image = "grafana/grafana:latest" + image = "grafana/grafana-oss:latest" - // grafana:grafana - user = "984:982" + // grafana + user = "472" + + resource = { + memory = 512 + memory_swap = 512 + } web = { port = 3000