From 1e4ff1e7748a33cf8b95d179df02fd62b380c62a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 29 May 2014 21:05:49 -0700
Subject: [PATCH] Added config setting for default playlist timespan

---
 CHANGELOG.md                        | 1 +
 src/app/components/settings.js      | 2 +-
 src/app/controllers/playlistCtrl.js | 2 +-
 src/config.sample.js                | 7 ++++++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f1b4b15c55..113ae78df1f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@ vNext
 - New Y-axis formater for metric values that represent seconds (Issue #427) - thx @jippi
 - Allow special characters in serie names (influxdb datasource), PR #390 - thx  @majst01
 - Refactoring of filterSrv (Issue #428), thx @Tetha
+- New config for playlist feature. Set playlist_timespan to set default playlist interval (Issue #445) - thx @rmca
 
 # Fixes
 - Filter option loading when having muliple nested filters now works better.
diff --git a/src/app/components/settings.js b/src/app/components/settings.js
index 7e1480e0e00..0d9ce23bed9 100644
--- a/src/app/components/settings.js
+++ b/src/app/components/settings.js
@@ -25,7 +25,7 @@ function (_, crypto) {
       grafana_index                 : 'grafana-dash',
       elasticsearch_all_disabled    : false,
       timezoneOffset                : null,
-      playlistTimespan              : "15s",
+      playlist_timespan             : "1m",
       unsaved_changes_warning       : true
     };
 
diff --git a/src/app/controllers/playlistCtrl.js b/src/app/controllers/playlistCtrl.js
index 5af85baa66c..249099e5103 100644
--- a/src/app/controllers/playlistCtrl.js
+++ b/src/app/controllers/playlistCtrl.js
@@ -11,7 +11,7 @@ function (angular, _, config) {
   module.controller('PlaylistCtrl', function($scope, playlistSrv) {
 
     $scope.init = function() {
-      $scope.timespan = config.playlistTimespan;
+      $scope.timespan = config.playlist_timespan;
       $scope.loadFavorites();
       $scope.$on('modal-opened', $scope.loadFavorites);
     };
diff --git a/src/config.sample.js b/src/config.sample.js
index e5d1a991efd..874cd999411 100644
--- a/src/config.sample.js
+++ b/src/config.sample.js
@@ -14,7 +14,6 @@ function (Settings) {
      * For Basic authentication use: http://username:password@domain.com:9200
      */
     elasticsearch: "http://"+window.location.hostname+":9200",
-    playlistTimespan: "15s",
 
     /**
      * graphite-web url:
@@ -69,6 +68,12 @@ function (Settings) {
      */
     unsaved_changes_warning: true,
 
+    /**
+     * set the default timespan for the playlist feature
+     * Example: "1m", "1h"
+     */
+    playlist_timespan: "1m",
+
     panel_names: [
       'text',
       'graphite'