Deprecate links in monitoring module
This commit is contained in:
parent
d91ae4d87d
commit
c7e2cc043f
|
@ -0,0 +1,16 @@
|
||||||
|
data "docker_registry_image" "act-exporter" {
|
||||||
|
name = "captn3m0/prometheus-act-exporter:latest"
|
||||||
|
}
|
||||||
|
|
||||||
|
resource "docker_container" "act-exporter" {
|
||||||
|
name = "act-exporter"
|
||||||
|
image = "${docker_image.act-exporter.latest}"
|
||||||
|
|
||||||
|
entrypoint = ["/usr/local/bin/node", "server.js"]
|
||||||
|
|
||||||
|
networks = ["${docker_network.monitoring.id}"]
|
||||||
|
|
||||||
|
restart = "unless-stopped"
|
||||||
|
destroy_grace_seconds = 10
|
||||||
|
must_run = true
|
||||||
|
}
|
|
@ -30,7 +30,7 @@ resource "docker_container" "cadvisor" {
|
||||||
container_path = "/var/run"
|
container_path = "/var/run"
|
||||||
}
|
}
|
||||||
|
|
||||||
networks = ["${var.traefik-network-id}"]
|
networks = ["${var.traefik-network-id}", "${docker_network.monitoring.id}"]
|
||||||
|
|
||||||
labels = "${merge(
|
labels = "${merge(
|
||||||
var.traefik-labels, map(
|
var.traefik-labels, map(
|
||||||
|
|
|
@ -36,6 +36,7 @@ scrape_configs:
|
||||||
|
|
||||||
- job_name: 'act'
|
- job_name: 'act'
|
||||||
scrape_interval: 5m
|
scrape_interval: 5m
|
||||||
|
scrape_timeout: 1m
|
||||||
static_configs:
|
static_configs:
|
||||||
- targets: ['act-exporter:3000']
|
- targets: ['act-exporter:3000']
|
||||||
|
|
||||||
|
|
|
@ -16,17 +16,16 @@ resource "docker_container" "grafana" {
|
||||||
container_path = "/var/lib/grafana"
|
container_path = "/var/lib/grafana"
|
||||||
}
|
}
|
||||||
|
|
||||||
links = ["${docker_container.prometheus.name}"]
|
networks = ["${var.traefik-network-id}", "${docker_network.monitoring.id}"]
|
||||||
networks = ["${var.traefik-network-id}"]
|
|
||||||
|
|
||||||
env = [
|
env = [
|
||||||
"GF_SERVER_ROOT_URL=https://grafana.${var.domain}",
|
"GF_SERVER_ROOT_URL=https://grafana.${var.domain}",
|
||||||
"GF_AUTH_ANONYMOUS_ENABLED=true",
|
"GF_AUTH_ANONYMOUS_ENABLED=true",
|
||||||
"GF_AUTH_ANONYMOUS_ORG_NAME=Tatooine",
|
"GF_AUTH_ANONYMOUS_ORG_NAME=Tatooine",
|
||||||
]
|
|
||||||
|
|
||||||
# Keep this disabled unless bringing up a new grafana instance
|
# Keep this disabled unless bringing up a new grafana instance
|
||||||
# "GF_SECURITY_ADMIN_PASSWORD=${var.gf-security-admin-password}",
|
"GF_SECURITY_ADMIN_PASSWORD=${var.gf-security-admin-password}",
|
||||||
|
]
|
||||||
|
|
||||||
restart = "unless-stopped"
|
restart = "unless-stopped"
|
||||||
destroy_grace_seconds = 10
|
destroy_grace_seconds = 10
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
resource "docker_network" "monitoring" {
|
||||||
|
name = "monitoring"
|
||||||
|
driver = "bridge"
|
||||||
|
internal = true
|
||||||
|
}
|
|
@ -24,6 +24,8 @@ resource "docker_container" "nodeexporter" {
|
||||||
"--collector.filesystem.ignored-mount-points=\"^/(sys|proc|dev|host|etc)($$|/)\"",
|
"--collector.filesystem.ignored-mount-points=\"^/(sys|proc|dev|host|etc)($$|/)\"",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
networks = ["${docker_network.monitoring.id}"]
|
||||||
|
|
||||||
restart = "unless-stopped"
|
restart = "unless-stopped"
|
||||||
destroy_grace_seconds = 10
|
destroy_grace_seconds = 10
|
||||||
must_run = true
|
must_run = true
|
||||||
|
|
|
@ -29,13 +29,8 @@ resource "docker_container" "prometheus" {
|
||||||
file = "/etc/prometheus/prometheus.yml"
|
file = "/etc/prometheus/prometheus.yml"
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Use network instead
|
networks = [
|
||||||
links = [
|
"${docker_network.monitoring.id}",
|
||||||
"${docker_container.nodeexporter.name}",
|
|
||||||
"${docker_container.cadvisor.name}",
|
|
||||||
"${docker_container.speedtest.name}",
|
|
||||||
"${docker_container.act-exporter.name}",
|
|
||||||
"${var.links-traefik}",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
restart = "unless-stopped"
|
restart = "unless-stopped"
|
||||||
|
|
|
@ -5,6 +5,8 @@ resource "docker_container" "speedtest" {
|
||||||
name = "speedtest"
|
name = "speedtest"
|
||||||
image = "${docker_image.speedtest.latest}"
|
image = "${docker_image.speedtest.latest}"
|
||||||
|
|
||||||
|
networks = ["${docker_network.monitoring.id}"]
|
||||||
|
|
||||||
restart = "unless-stopped"
|
restart = "unless-stopped"
|
||||||
destroy_grace_seconds = 10
|
destroy_grace_seconds = 10
|
||||||
must_run = true
|
must_run = true
|
||||||
|
|
Loading…
Reference in New Issue