Upgrade grafana and improve the default configuration, details:

  - Upgrade to Grafana 1.6.1.
  - Make sure we are using StatsD v0.7.1 and not whatever is in master.
  - Ensure that the flushInterval in StatsD matches the retention period expected by Graphite.
  - Add aggregation policies to ensure that max, mins and counts are properly aggregated.
  - Track 50, 75, 90, 95, 98, 99, 99.9, 99.99 and 99.999 percentiles in StatsD.

Author: ivantopo

Dockerfile

@@ -1,5 +1,5 @@
-from ubuntu
-run     echo 'deb http://us.archive.ubuntu.com/ubuntu/ precise universe' >> /etc/apt/sources.list
+from    ubuntu:14.04
+run     echo 'deb http://us.archive.ubuntu.com/ubuntu/ trusty universe' >> /etc/apt/sources.list
 run     apt-get -y update
 run     apt-get -y upgrade
 
@@ -8,7 +8,7 @@ run     apt-get -y upgrade
 #   Installation   #
 # ---------------- #
 
-# Install all prerequisites 
+# Install all prerequisites
 run apt-get -y install software-properties-common
 run     add-apt-repository -y ppa:chris-lea/node.js
 run     apt-get -y update
@@ -21,7 +21,7 @@ run     cd ~ && wget https://download.elasticsearch.org/elasticsearch/elasticsea
 run     cd ~ && dpkg -i elasticsearch-1.1.1.deb && rm elasticsearch-1.1.1.deb
 
 # Install StatsD
-run     mkdir /src && git clone https://github.com/etsy/statsd.git /src/statsd
+run     mkdir /src && git clone https://github.com/etsy/statsd.git /src/statsd && cd /src/statsd && git checkout v0.7.1
 
 # Install Whisper, Carbon and Graphite-Web
 run     pip install Twisted==11.1.0
@@ -32,8 +32,8 @@ run     pip install --install-option="--prefix=/var/lib/graphite" --install-opti
 
 # Install Grafana
 run     mkdir /src/grafana && cd /src/grafana &&\
-        wget http://grafanarel.s3.amazonaws.com/grafana-1.5.3.tar.gz &&\
-        tar xzvf grafana-1.5.3.tar.gz --strip-components=1 && rm grafana-1.5.3.tar.gz
+        wget http://grafanarel.s3.amazonaws.com/grafana-1.6.1.tar.gz &&\
+        tar xzvf grafana-1.6.1.tar.gz --strip-components=1 && rm grafana-1.6.1.tar.gz
 
 
 # ----------------- #
@@ -53,6 +53,7 @@ add     ./graphite/initial_data.json /var/lib/graphite/webapp/graphite/initial_d
 add     ./graphite/local_settings.py /var/lib/graphite/webapp/graphite/local_settings.py
 add     ./graphite/carbon.conf /var/lib/graphite/conf/carbon.conf
 add     ./graphite/storage-schemas.conf /var/lib/graphite/conf/storage-schemas.conf
+add     ./graphite/storage-aggregation.conf /var/lib/graphite/conf/storage-aggregation.conf
 run     mkdir -p /var/lib/graphite/storage/whisper
 run     touch /var/lib/graphite/storage/graphite.db /var/lib/graphite/storage/index
 run     chown -R www-data /var/lib/graphite/storage
@@ -62,7 +63,7 @@ run     cd /var/lib/graphite/webapp/graphite && python manage.py syncdb --noinpu
 
 # Configure Grafana
 add     ./grafana/config.js /src/grafana/config.js
-add     ./grafana/scripted.json /src/grafana/app/dashboards/default.json
+#add     ./grafana/scripted.json /src/grafana/app/dashboards/default.json
 
 # Configure nginx and supervisord
 add     ./nginx/nginx.conf /etc/nginx/nginx.conf
@@ -89,4 +90,4 @@ expose  8126
 #   Run!   #
 # -------- #
 
-cmd     ["/usr/bin/supervisord"]
+cmd     ["/usr/bin/supervisord"]

grafana/config.js

@@ -1,51 +1,57 @@
-/** @scratch /configuration/config.js/1
- * == Configuration
- * config.js is where you will find the core Grafana configuration. This file contains parameter that
- * must be set before kibana is run for the first time.
- */
+///// @scratch /configuration/config.js/1
+ // == Configuration
+ // config.js is where you will find the core Grafana configuration. This file contains parameter that
+ // must be set before Grafana is run for the first time.
+ ///
 define(['settings'],
 function (Settings) {
 
-  return new Settings({
 
-    /**
-     * elasticsearch url:
-     * For Basic authentication use: http://username:[email protected]:9200
-     */
-    elasticsearch: "/elasticsearch",
-
-    /**
-     * graphite-web url:
-     * For Basic authentication use: http://username:[email protected]
-     * Basic authentication requires special HTTP headers to be configured
-     * in nginx or apache for cross origin domain sharing to work (CORS).
-     * Check install documentation on github
-     */
-    graphiteUrl: "/graphite",
-
-    /**
-     * Multiple graphite servers? Comment out graphiteUrl and replace with
-     *
-     *  datasources: {
-     *    data_center_us: { type: 'graphite',  url: 'http://<graphite_url>',  default: true },
-     *    data_center_eu: { type: 'graphite',  url: 'http://<graphite_url>' }
-     *  }
-     */
+  return new Settings({
 
+    // datasources, you can add multiple
+    datasources: {
+      graphite: {
+        type: 'graphite',
+        url: "/graphite",
+        default: true
+      }
+    },
+
+    // elasticsearch url
+    // used for storing and loading dashboards, optional
+    // For Basic authentication use: http://username:password@domain.com:9200
+    elasticsearch: '/elasticsearch', //"http://"+window.location.hostname+":9200",
+
+    // default start dashboard
     default_route: '/dashboard/file/default.json',
 
-    /**
-     * If your graphite server has another timezone than you & users browsers specify the offset here
-     * Example: "-0500" (for UTC - 5 hours)
-     */
-    timezoneOffset: null,
-
+    // Elasticsearch index for storing dashboards
     grafana_index: "grafana-dash",
 
-    panel_names: [
-      'text',
-      'graphite'
-    ]
+    // timezoneOFfset:
+    // If you experiance problems with zoom, it is probably caused by timezone diff between
+    // your browser and the graphite-web application. timezoneOffset setting can be used to have Grafana
+    // translate absolute time ranges to the graphite-web timezone.
+    // Example:
+    //   If TIME_ZONE in graphite-web config file local_settings.py is set to America/New_York, then set
+    //   timezoneOffset to "-0500" (for UTC - 5 hours)
+    // Example:
+    //   If TIME_ZONE is set to UTC, set this to "0000"
+    //
+    timezoneOffset: 0000,
+
+    // set to false to disable unsaved changes warning
+    unsaved_changes_warning: true,
+
+    // set the default timespan for the playlist feature
+    // Example: "1m", "1h"
+    playlist_timespan: "1m",
+
+    // Add your own custom pannels
+    plugins: {
+      panels: []
+    }
+
   });
 });
-

graphite/storage-aggregation.conf

@@ -0,0 +1,29 @@
+[min]
+pattern = \.lower$
+xFilesFactor = 0.1
+aggregationMethod = min
+
+[max]
+pattern = \.upper(_\d+)?$
+xFilesFactor = 0.1
+aggregationMethod = max
+
+[sum]
+pattern = \.sum$
+xFilesFactor = 0
+aggregationMethod = sum
+
+[count]
+pattern = \.count$
+xFilesFactor = 0
+aggregationMethod = sum
+
+[count_legacy]
+pattern = ^stats_counts.*
+xFilesFactor = 0
+aggregationMethod = sum
+
+[default_average]
+pattern = .*
+xFilesFactor = 0.3
+aggregationMethod = average

graphite/storage-schemas.conf

@@ -1,4 +1,3 @@
 [default]
 pattern = .*
 retentions = 10s:1d,1m:7d
-

start

@@ -3,5 +3,4 @@
 docker kill kamon-grafana-dashboard
 docker rm kamon-grafana-dashboard
 
-docker run -d -v /etc/localtime:/etc/localtime:ro -p 80:80 -p 8125:8125/udp -p 8126:8126 --name kamon-grafana-dashboard kamon/grafana_graphite 
-
+docker run -d -v /etc/localtime:/etc/localtime:ro -p 80:80 -p 8125:8125/udp -p 8126:8126 --name kamon-grafana-dashboard kamon/grafana_graphite

statsd/config.js

@@ -1,9 +1,15 @@
 {
-  flushInterval: 2000,
-  graphitePort: 2003,
-  graphiteHost: "127.0.0.1",
   port: 8125,
   mgmt_port: 8126,
+
+  percentThreshold: [ 50, 75, 90, 95, 98, 99, 99.9, 99.99, 99.999],
+
+  graphitePort: 2003,
+  graphiteHost: "127.0.0.1",
+  flushInterval: 10000,
+
   backends: ['./backends/graphite'],
-  debug: true
+  graphite: {
+    legacyNamespace: false
+  }
 }