Merge pull request #35 from linkerd/siggy/fix-scrape-interval

30s default scrape_interval, fix config setting
linkerd · Jul 19, 2017 · 1ce2be9 · 1ce2be9
2 parents 7da069c + facb431
commit 1ce2be9
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,6 +1,6 @@
 global:
-  scrape_interval:     1m
-  evaluation_interval: 1m
+  scrape_interval:     30s
+  evaluation_interval: 30s
 
 scrape_configs:
 - job_name: 'linkerd'