From facb431d9937c102533517c4f94f5d6541885a07 Mon Sep 17 00:00:00 2001
From: Andrew Seigner <andrew@sig.gy>
Date: Wed, 19 Jul 2017 12:52:35 -0700
Subject: [PATCH] 30s default scrape_interval, fix config setting

fixes #34
---
 CHANGES.md                                   | 5 +++++
 consul/prometheus-consul.yml                 | 4 ++--
 dcos/linkerd-viz.json                        | 2 +-
 dcos/prometheus-dcos.yml                     | 4 ++--
 k8s/linkerd-viz.yml                          | 2 +-
 k8s/prometheus-k8s.yml                       | 4 ++--
 linkerd-viz                                  | 6 +++---
 mesos-marathon/linkerd-viz.json              | 2 +-
 mesos-marathon/prometheus-mesos-marathon.yml | 4 ++--
 9 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 8e11b6e..9839d18 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,10 @@
 ## In the next release
 
+## 0.1.2 2017-07-19
+
+* Set default Prometheus `scrape_interval` and `evaluation_interval` to `30s`, to ensure Grafana `irate` graphs render properly.
+* Fixed `scrape_interval` configuration not being honored.
+
 ## 0.1.1 2017-07-12
 
 * Set default Prometheus `scrape_interval` and `evaluation_interval` to `1m`, make configurable.
diff --git a/consul/prometheus-consul.yml b/consul/prometheus-consul.yml
index 86c91a9..a1259da 100644
--- a/consul/prometheus-consul.yml
+++ b/consul/prometheus-consul.yml
@@ -1,6 +1,6 @@
 global:
-  scrape_interval:     1m
-  evaluation_interval: 1m
+  scrape_interval:     30s
+  evaluation_interval: 30s
 
 scrape_configs:
 - job_name: 'linkerd'
diff --git a/dcos/linkerd-viz.json b/dcos/linkerd-viz.json
index a50633d..a0631f7 100644
--- a/dcos/linkerd-viz.json
+++ b/dcos/linkerd-viz.json
@@ -38,6 +38,6 @@
   "env": {
     "PUBLIC_PORT": "3000",
     "STATS_PORT": "9191",
-    "SCRAPE_INTERVAL": "1m"
+    "SCRAPE_INTERVAL": "30s"
   }
 }
diff --git a/dcos/prometheus-dcos.yml b/dcos/prometheus-dcos.yml
index 1a1eb56..1816f89 100644
--- a/dcos/prometheus-dcos.yml
+++ b/dcos/prometheus-dcos.yml
@@ -1,6 +1,6 @@
 global:
-  scrape_interval:     1m
-  evaluation_interval: 1m
+  scrape_interval:     30s
+  evaluation_interval: 30s
 
 scrape_configs:
 - job_name: 'linkerd'
diff --git a/k8s/linkerd-viz.yml b/k8s/linkerd-viz.yml
index dccb60d..f9b17bf 100644
--- a/k8s/linkerd-viz.yml
+++ b/k8s/linkerd-viz.yml
@@ -25,7 +25,7 @@ spec:
         - name: STATS_PORT
           value: "9191"
         - name: SCRAPE_INTERVAL
-          value: "1m"
+          value: "30s"
         ports:
         - name: grafana
           containerPort: 3000
diff --git a/k8s/prometheus-k8s.yml b/k8s/prometheus-k8s.yml
index bee4eb6..2d9eb9d 100644
--- a/k8s/prometheus-k8s.yml
+++ b/k8s/prometheus-k8s.yml
@@ -1,6 +1,6 @@
 global:
-  scrape_interval:     1m
-  evaluation_interval: 1m
+  scrape_interval:     30s
+  evaluation_interval: 30s
 
 scrape_configs:
 - job_name: 'linkerd'
diff --git a/linkerd-viz b/linkerd-viz
index 8237724..e5c891d 100755
--- a/linkerd-viz
+++ b/linkerd-viz
@@ -10,7 +10,7 @@
 PLATFORM="${1:-dcos}"
 PUBLIC_PORT="${PUBLIC_PORT:-3000}"
 STATS_PORT="${STATS_PORT:-9191}"
-SCRAPE_INTERVAL="${SCRAPE_INTERVAL:-1m}"
+SCRAPE_INTERVAL="${SCRAPE_INTERVAL:-30s}"
 
 #
 # init grafana
@@ -60,8 +60,8 @@ curl -vX PUT -d"{\"theme\": \"dark\"}" -H "Content-Type: application/json" http:
 # set scrape and evaluation intervals
 PROMETHEUS_CONF=/etc/prometheus/prometheus-$PLATFORM.yml
 
-sed -i "" "s@scrape_interval:.*@scrape_interval: $SCRAPE_INTERVAL@" $PROMETHEUS_CONF
-sed -i "" "s@ evaluation_interval:.*@ evaluation_interval: $SCRAPE_INTERVAL@" $PROMETHEUS_CONF
+sed -i"" "s@scrape_interval:.*@scrape_interval: $SCRAPE_INTERVAL@" $PROMETHEUS_CONF
+sed -i"" "s@evaluation_interval:.*@evaluation_interval: $SCRAPE_INTERVAL@" $PROMETHEUS_CONF
 
 exec /bin/prometheus \
   -config.file=$PROMETHEUS_CONF \
diff --git a/mesos-marathon/linkerd-viz.json b/mesos-marathon/linkerd-viz.json
index 9de87ce..b0ef2e9 100644
--- a/mesos-marathon/linkerd-viz.json
+++ b/mesos-marathon/linkerd-viz.json
@@ -38,6 +38,6 @@
   "env": {
     "PUBLIC_PORT": "3000",
     "STATS_PORT": "9191",
-    "SCRAPE_INTERVAL": "1m"
+    "SCRAPE_INTERVAL": "30s"
   }
 }
diff --git a/mesos-marathon/prometheus-mesos-marathon.yml b/mesos-marathon/prometheus-mesos-marathon.yml
index b9e1c06..96bb0e0 100644
--- a/mesos-marathon/prometheus-mesos-marathon.yml
+++ b/mesos-marathon/prometheus-mesos-marathon.yml
@@ -1,6 +1,6 @@
 global:
-  scrape_interval:     1m
-  evaluation_interval: 1m
+  scrape_interval:     30s
+  evaluation_interval: 30s
 
 scrape_configs:
 - job_name: 'linkerd'