From ea198fea6e4d86ecd9c0a937cf55be0e7ce398bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Fri, 17 Jul 2015 15:20:12 +0200
Subject: [PATCH] fix(graph): fixed legend color when having many many series,
 fixes #2359

---
 .../app/features/templating/templateValuesSrv.js | 16 ++++++++--------
 public/app/panels/graph/module.js                |  3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js
index 6f7e5398618..c1d787804d7 100644
--- a/public/app/features/templating/templateValuesSrv.js
+++ b/public/app/features/templating/templateValuesSrv.js
@@ -230,17 +230,17 @@ function (angular, _, kbn) {
     this.addAllOption = function(variable) {
       var allValue = '';
       switch(variable.allFormat) {
-        case 'wildcard':
-          allValue = '*';
+      case 'wildcard':
+        allValue = '*';
         break;
-        case 'regex wildcard':
-          allValue = '.*';
+      case 'regex wildcard':
+        allValue = '.*';
         break;
-        case 'regex values':
-          allValue = '(' + _.pluck(variable.options, 'text').join('|') + ')';
+      case 'regex values':
+        allValue = '(' + _.pluck(variable.options, 'text').join('|') + ')';
         break;
-        default:
-          allValue = '{';
+      default:
+        allValue = '{';
         allValue += _.pluck(variable.options, 'text').join(',');
         allValue += '}';
       }
diff --git a/public/app/panels/graph/module.js b/public/app/panels/graph/module.js
index 867f864123c..ea0a1e958ad 100644
--- a/public/app/panels/graph/module.js
+++ b/public/app/panels/graph/module.js
@@ -175,7 +175,8 @@ function (angular, app, $, _, kbn, moment, TimeSeries, PanelMeta) {
     $scope.seriesHandler = function(seriesData, index) {
       var datapoints = seriesData.datapoints;
       var alias = seriesData.target;
-      var color = $scope.panel.aliasColors[alias] || $rootScope.colors[index];
+      var colorIndex = index % $rootScope.colors.length;
+      var color = $scope.panel.aliasColors[alias] || $rootScope.colors[colorIndex];
 
       var series = new TimeSeries({
         datapoints: datapoints,