From 4cb6ecfd889fd433bef0531f15de8341ce5ff3fc Mon Sep 17 00:00:00 2001
From: eduponte <eduponte@users.noreply.github.com>
Date: Wed, 8 Nov 2017 17:17:13 +0100
Subject: [PATCH 1/4] update configs to Prometheus v2

---
 docker-compose.yml         |  9 ++++-----
 prometheus/alert.rules     |  9 ---------
 prometheus/alert.rules.yml | 22 ++++++++++++++++++++++
 prometheus/prometheus.yml  |  2 +-
 4 files changed, 27 insertions(+), 15 deletions(-)
 delete mode 100644 prometheus/alert.rules
 create mode 100644 prometheus/alert.rules.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index f4be2cf..a9027c0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,11 +16,10 @@ services:
       - ./prometheus/:/etc/prometheus/
       - prometheus_data:/prometheus
     command:
-      - '-config.file=/etc/prometheus/prometheus.yml'
-      - '-storage.local.path=/prometheus'
-      - '-alertmanager.url=http://alertmanager:9093'
-      - '-web.console.libraries=/usr/share/prometheus/console_libraries'
-      - '-web.console.templates=/usr/share/prometheus/consoles'
+      - '--config.file=/etc/prometheus/prometheus.yml'
+      - '--storage.tsdb.path=/prometheus'
+      - '--web.console.libraries=/usr/share/prometheus/console_libraries'
+      - '--web.console.templates=/usr/share/prometheus/consoles'
     ports:
       - 9090:9090
     links:
diff --git a/prometheus/alert.rules b/prometheus/alert.rules
deleted file mode 100644
index 697931b..0000000
--- a/prometheus/alert.rules
+++ /dev/null
@@ -1,9 +0,0 @@
-ALERT service_down
-  IF up == 0
-  
-ALERT high_load
-  IF node_load1 > 0.5
-  ANNOTATIONS {
-      summary = "Instance {{ $labels.instance }} under high load",
-      description = "{{ $labels.instance }} of job {{ $labels.job }} is under high load.",
-  }
\ No newline at end of file
diff --git a/prometheus/alert.rules.yml b/prometheus/alert.rules.yml
new file mode 100644
index 0000000..0cc6836
--- /dev/null
+++ b/prometheus/alert.rules.yml
@@ -0,0 +1,22 @@
+groups:
+- name: example
+  rules:
+
+  # Alert for any instance that is unreachable for >5 minutes.
+  - alert: service_down
+    expr: up == 0
+    for: 2m
+    labels:
+      severity: page
+    annotations:
+      summary: "Instance {{ $labels.instance }} down"
+      description: "{{ $labels.instance }} of job {{ $labels.job }} has been down for more than 5 minutes."
+
+  - alert: high_load
+    expr: node_load1 > 0.5
+    for: 2m
+    labels:
+      severity: page
+    annotations:
+      summary: "Instance {{ $labels.instance }} under high load"
+      description: "{{ $labels.instance }} of job {{ $labels.job }} is under high load."
diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml
index 2cf6b58..d6cec37 100644
--- a/prometheus/prometheus.yml
+++ b/prometheus/prometheus.yml
@@ -11,7 +11,7 @@ global:
 
 # Load and evaluate rules in this file every 'evaluation_interval' seconds.
 rule_files:
-  - "alert.rules"
+  - 'alert.rules.yml'
   # - "first.rules"
   # - "second.rules"
 

From 9a4536cec6627abcc49aca6af6a6fd9d8ecc50a7 Mon Sep 17 00:00:00 2001
From: eduponte <eduponte@users.noreply.github.com>
Date: Fri, 10 Nov 2017 11:56:16 +0100
Subject: [PATCH 2/4] Remove .yml on rules

---
 prometheus/prometheus.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml
index d6cec37..dd4783c 100644
--- a/prometheus/prometheus.yml
+++ b/prometheus/prometheus.yml
@@ -11,7 +11,7 @@ global:
 
 # Load and evaluate rules in this file every 'evaluation_interval' seconds.
 rule_files:
-  - 'alert.rules.yml'
+  - 'alert.rules'
   # - "first.rules"
   # - "second.rules"
 

From 91389ccbf2fc4ad33bf9fba7380bea34df98fcd5 Mon Sep 17 00:00:00 2001
From: eduponte <eduponte@users.noreply.github.com>
Date: Fri, 10 Nov 2017 12:00:28 +0100
Subject: [PATCH 3/4] Rename alert.rules no .yml

---
 prometheus/{alert.rules.yml => alert.rules} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename prometheus/{alert.rules.yml => alert.rules} (100%)

diff --git a/prometheus/alert.rules.yml b/prometheus/alert.rules
similarity index 100%
rename from prometheus/alert.rules.yml
rename to prometheus/alert.rules

From 76159c8b386d9ab03e2b9c903232eff4d30b75f4 Mon Sep 17 00:00:00 2001
From: eduponte <eduponte@users.noreply.github.com>
Date: Fri, 10 Nov 2017 14:21:53 +0100
Subject: [PATCH 4/4] Configure alertmanager, the 2.0 way

---
 prometheus/prometheus.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml
index dd4783c..ffecd9f 100644
--- a/prometheus/prometheus.yml
+++ b/prometheus/prometheus.yml
@@ -15,6 +15,12 @@ rule_files:
   # - "first.rules"
   # - "second.rules"
 
+alerting:
+  alertmanagers:
+  - static_configs:
+    - targets:
+      - alertmanager:9093
+
 # A scrape configuration containing exactly one endpoint to scrape:
 # Here it's Prometheus itself.
 scrape_configs: