From d91ae4d87dee316803f624823e778806efd48f5b Mon Sep 17 00:00:00 2001
From: Nemo <me@captnemo.in>
Date: Mon, 04 Jun 2018 15:30:17 +0530
Subject: [PATCH] Sets up ACT exporter
---
docker/traefik.tf | 4 +++-
monitoring/cadvisor.tf | 6 ------
monitoring/grafana.tf | 9 +++++++--
monitoring/images.tf | 5 +++++
monitoring/prometheus.tf | 2 ++
docker/conf/traefik.toml | 2 +-
monitoring/config/prometheus.yml | 5 +++++
7 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/docker/traefik.tf b/docker/traefik.tf
index add985a..7f868e4 100644
--- a/docker/traefik.tf
+++ a/docker/traefik.tf
@@ -95,7 +95,9 @@
// `bridge` is auto-connected for now
// https://github.com/terraform-providers/terraform-provider-docker/issues/10
- networks = ["${docker_network.traefik.id}"]
+ //
+ // The extra IDs are till https://github.com/containous/traefik/issues/3429 is resolved
+ networks = ["${docker_network.traefik.id}", "31efc1966139", "f0d3bbcf75dd", "aad198ad4ba8"]
env = [
"CLOUDFLARE_EMAIL=${var.cloudflare_email}",
diff --git a/monitoring/cadvisor.tf b/monitoring/cadvisor.tf
index d18c872..e80fe5d 100644
--- a/monitoring/cadvisor.tf
+++ a/monitoring/cadvisor.tf
@@ -8,12 +8,6 @@
must_run = true
volumes {
- host_path = "/"
- container_path = "/rootfs"
- read_only = true
- }
-
- volumes {
host_path = "/sys"
container_path = "/sys"
read_only = true
diff --git a/monitoring/grafana.tf b/monitoring/grafana.tf
index 5b1b631..cdfb144 100644
--- a/monitoring/grafana.tf
+++ a/monitoring/grafana.tf
@@ -1,7 +1,10 @@
resource "docker_container" "grafana" {
name = "grafana"
image = "${docker_image.grafana.latest}"
+ // grafana:grafana
+ user = "984:982"
+
labels = "${merge(
var.traefik-labels, map(
"traefik.port", 3000,
@@ -17,13 +20,13 @@
networks = ["${var.traefik-network-id}"]
env = [
- # Keep this disabled unless bringing up a new grafana instance
- # "GF_SECURITY_ADMIN_PASSWORD=${var.gf-security-admin-password}",
"GF_SERVER_ROOT_URL=https://grafana.${var.domain}",
-
"GF_AUTH_ANONYMOUS_ENABLED=true",
"GF_AUTH_ANONYMOUS_ORG_NAME=Tatooine",
]
+
+ # Keep this disabled unless bringing up a new grafana instance
+ # "GF_SECURITY_ADMIN_PASSWORD=${var.gf-security-admin-password}",
restart = "unless-stopped"
destroy_grace_seconds = 10
diff --git a/monitoring/images.tf b/monitoring/images.tf
index 8a0418e..e448ddc 100644
--- a/monitoring/images.tf
+++ a/monitoring/images.tf
@@ -22,3 +22,8 @@
name = "${data.docker_registry_image.speedtest.name}"
pull_triggers = ["${data.docker_registry_image.speedtest.sha256_digest}"]
}
+
+resource "docker_image" "act-exporter" {
+ name = "${data.docker_registry_image.act-exporter.name}"
+ pull_triggers = ["${data.docker_registry_image.act-exporter.sha256_digest}"]
+}
diff --git a/monitoring/prometheus.tf b/monitoring/prometheus.tf
index 164ac8c..d023dd7 100644
--- a/monitoring/prometheus.tf
+++ a/monitoring/prometheus.tf
@@ -29,10 +29,12 @@
file = "/etc/prometheus/prometheus.yml"
}
+ // TODO: Use network instead
links = [
"${docker_container.nodeexporter.name}",
"${docker_container.cadvisor.name}",
"${docker_container.speedtest.name}",
+ "${docker_container.act-exporter.name}",
"${var.links-traefik}",
]
diff --git a/docker/conf/traefik.toml b/docker/conf/traefik.toml
index e5d6ef2..dd32aa0 100644
--- a/docker/conf/traefik.toml
+++ a/docker/conf/traefik.toml
@@ -1,5 +1,5 @@
defaultEntryPoints = ["http", "https"]
-
+# logLevel = "DEBUG"
# Have to enable this because of heimdall
InsecureSkipVerify = true
sendAnonymousUsage = true
diff --git a/monitoring/config/prometheus.yml b/monitoring/config/prometheus.yml
index 763a24f..691f46d 100644
--- a/monitoring/config/prometheus.yml
+++ a/monitoring/config/prometheus.yml
@@ -34,5 +34,10 @@
static_configs:
- targets: ['traefik:1111']
+ - job_name: 'act'
+ scrape_interval: 5m
+ static_configs:
+ - targets: ['act-exporter:3000']
+
rule_files:
- "alert.rules"
--
rgit 0.1.5