From 627d9f648ae4a606ff5f9b9a326c564dc506ffcc Mon Sep 17 00:00:00 2001
From: Max Rydahl Andersen <manderse@redhat.com>
Date: Mon, 1 Oct 2018 12:48:41 +0200
Subject: [PATCH] add speedtest and blackbox probes

---
 docker-compose.yml        | 20 ++++++++++++++------
 prometheus/prometheus.yml | 30 ++++++++++++++++++++++++------
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index d1084d7..9613173 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -45,12 +45,20 @@ services:
     tty: true
     stdin_open: true
     expose:
-      - 9171
+      - 9115
     ports:
-      - 9171:9171
-    image: infinityworks/github-exporter:latest 
-    environment:
-      - REPOS=freeCodeCamp/freeCodeCamp, docker/docker
-      - GITHUB_TOKEN=<GitHub API Token see README>
+      - 9115:9115
+    image: prom/blackbox-exporter
+    networks:
+      - back-tier
+
+  speedtest:
+    tty: true
+    stdin_open: true
+    expose:
+      - 9696
+    ports:
+      - 9696:9696
+    image: stefanwalther/speedtest-exporter
     networks:
       - back-tier
diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml
index ae6ffd7..1208706 100644
--- a/prometheus/prometheus.yml
+++ b/prometheus/prometheus.yml
@@ -28,10 +28,28 @@ scrape_configs:
          - targets: ['localhost:9090']
 
 
-  - job_name: 'metrics'
-
-    # Override the global default and scrape targets from this job every 5 seconds.
-    scrape_interval: 5s
-
+  - job_name: 'speedtest'
+    metrics_path: /metrics
+    scrape_interval: 5m
+    scrape_timeout: 60s # running speedtest needs time to complete
+    
     static_configs:
-         - targets: ['metrics:9171']
+      - targets: ['speedtest:9696']
+
+  - job_name: 'blackbox'
+    metrics_path: /probe
+    scrape_interval: 5s
+    params:
+      module: [http_2xx]  # Look for a HTTP 200 response.
+    static_configs:
+      - targets:
+        - http://google.com    # Target to probe with http.
+        - https://blackdata.xam.dk:5001   # Target to probe with https.
+        - http://doesnotexistreally.com # Target to probe with http on port 8080.
+    relabel_configs:
+      - source_labels: [__address__]
+        target_label: __param_target
+      - source_labels: [__param_target]
+        target_label: instance
+      - target_label: __address__
+        replacement: metrics:9115  # The blackbox exporter's real hostname:port.