🏡 index : github.com/captn3m0/nebula.git

16a5a26123a0612198b8379df7b00a9e4ed6df95 [patch]

7db52e491aaaba817cd0e09df9e80c7a9c467cc3

2b53a6a51274648c447dcf2b8dc740fdead0ddf2

16a5a26123a0612198b8379df7b00a9e4ed6df95.tar.gz

Switch to aliases for container<>networking

Diff

 monitoring/act.tf                | 13 +++++++++++--
 monitoring/prometheus.tf         |  8 ++++++++
 monitoring/speedtest.tf          | 12 +++++++++---
 monitoring/config/prometheus.yml | 16 ++++++++++------
 4 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/monitoring/act.tf b/monitoring/act.tf
index a47e042..b5c2e52 100644
--- a/monitoring/act.tf
+++ a/monitoring/act.tf
@@ -8,10 +8,15 @@

  entrypoint = ["/usr/local/bin/node", "server.js"]

  networks = [

    "${data.docker_network.bridge.id}",
    "${docker_network.monitoring.id}",
  ]
  networks_advanced {

    name    = "monitoring"
    aliases = ["act-exporter", "act-exporter.docker"]
  }

  // So it can talk to ACT
  networks_advanced {

    name = "bridge"
  }

  restart               = "unless-stopped"
  destroy_grace_seconds = 10
diff --git a/monitoring/prometheus.tf b/monitoring/prometheus.tf
index 80d83ba..7875f63 100644
--- a/monitoring/prometheus.tf
+++ a/monitoring/prometheus.tf
@@ -29,6 +29,14 @@
    file    = "/etc/prometheus/prometheus.yml"
  }

  networks_advanced {

    name = "monitoring"
  }

  networks_advanced {

    name = "bridge"
  }

  networks = [

    "${data.docker_network.bridge.id}",
    "${docker_network.monitoring.id}",
diff --git a/monitoring/speedtest.tf b/monitoring/speedtest.tf
index 454a6b9..bcbc9de 100644
--- a/monitoring/speedtest.tf
+++ a/monitoring/speedtest.tf
@@ -5,10 +5,14 @@
  name  = "speedtest"
  image = "${docker_image.speedtest.latest}"

  networks = [

    "${data.docker_network.bridge.id}",
    "${docker_network.monitoring.id}",
  ]
  networks_advanced {

    name    = "monitoring"
    aliases = ["speedtest", "speedtest.docker"]
  }

  networks_advanced {

    name = "bridge"
  }

  restart               = "unless-stopped"
  destroy_grace_seconds = 10
diff --git a/monitoring/config/prometheus.yml b/monitoring/config/prometheus.yml
index a543210..7e3f6db 100644
--- a/monitoring/config/prometheus.yml
+++ a/monitoring/config/prometheus.yml
@@ -1,17 +1,17 @@
global:
  scrape_interval: 15s
  external_labels:
    monitor: "docker-monitor"
    monitor: 'docker-monitor'

scrape_configs:
  - job_name: "prometheus"
  - job_name: 'prometheus'
    static_configs:
      - targets: ["localhost:9090"]
      - targets: ['localhost:9090']

  - job_name: "node"
  - job_name: 'node'
    scrape_interval: 5s
    static_configs:
      - targets: ["nodeexporter:9100"]
      - targets: ['nodeexporter:9100']

  - job_name: 'cadvisor'
    scrape_interval: 5s
@@ -22,7 +22,7 @@
    scrape_interval: 15m
    scrape_timeout: 2m
    static_configs:
      - targets: ['speedtest:9696']
      - targets: ['speedtest.docker:9696']

  - job_name: 'docker'
    scrape_interval: 5s
@@ -38,7 +38,7 @@
    scrape_interval: 15m
    scrape_timeout: 1m
    static_configs:
      - targets: ['act-exporter:3000']
      - targets: ['act-exporter.docker:3000']

rule_files:
- "alert.rules"
  - 'alert.rules'