Merge pull request #2970 from influxdata/fixes/missing-colors-from-canned-single-stats

Always return colors for single stat graphs

CHANGELOG.md

@@ -10,6 +10,7 @@
 1.  [#2947](https://github.com/influxdata/chronograf/pull/2947): Fix Okta oauth2 provider support
 1.  [#2866](https://github.com/influxdata/chronograf/pull/2866): Change hover text on delete mappings confirmation button to 'Delete'
 1.  [#2919](https://github.com/influxdata/chronograf/pull/2919): Automatically add graph type 'line' to any graph missing a type
+1.  [#2970](https://github.com/influxdata/chronograf/pull/2970): Fix hanging browser on docker host dashboard
 
 ## v1.4.2.3 [2018-03-08]
 

canned/docker.json

@@ -56,6 +56,7 @@
           ]
         }
       ],
+      "colors": [],
       "type": "single-stat"
     },
     {
@@ -73,6 +74,7 @@
           ]
         }
       ],
+      "colors": [],
       "type": "single-stat"
     },
     {

canned/mesos.json

@@ -117,6 +117,7 @@
       "h": 4,
       "i": "0fa47984-825b-46f1-9ca5-0366e3220008",
       "name": "Mesos Master Uptime",
+      "colors": [],
       "type": "single-stat",
       "queries": [
         {

chronograf.go

@@ -591,15 +591,16 @@ type DashboardsStore interface {
 
 // Cell is a rectangle and multiple time series queries to visualize.
 type Cell struct {
-	X       int32           `json:"x"`
-	Y       int32           `json:"y"`
-	W       int32           `json:"w"`
-	H       int32           `json:"h"`
-	I       string          `json:"i"`
-	Name    string          `json:"name"`
-	Queries []Query         `json:"queries"`
-	Axes    map[string]Axis `json:"axes"`
-	Type    string          `json:"type"`
+	X          int32           `json:"x"`
+	Y          int32           `json:"y"`
+	W          int32           `json:"w"`
+	H          int32           `json:"h"`
+	I          string          `json:"i"`
+	Name       string          `json:"name"`
+	Queries    []Query         `json:"queries"`
+	Axes       map[string]Axis `json:"axes"`
+	Type       string          `json:"type"`
+	CellColors []CellColor     `json:"colors"`
 }
 
 // Layout is a collection of Cells for visualization

server/layout.go

@@ -30,6 +30,10 @@ func newLayoutResponse(layout chronograf.Layout) layoutResponse {
 			layout.Cells[idx].Axes = make(map[string]chronograf.Axis, len(axes))
 		}
 
+		if cell.CellColors == nil {
+			layout.Cells[idx].CellColors = []chronograf.CellColor{}
+		}
+
 		for _, axis := range axes {
 			if _, found := cell.Axes[axis]; !found {
 				layout.Cells[idx].Axes[axis] = chronograf.Axis{

server/layout_test.go

@@ -76,12 +76,13 @@ func Test_Layouts(t *testing.T) {
 				Measurement: "influxdb",
 				Cells: []chronograf.Cell{
 					{
-						X:    0,
-						Y:    0,
-						W:    4,
-						H:    4,
-						I:    "3b0e646b-2ca3-4df2-95a5-fd80915459dd",
-						Name: "A Graph",
+						X:          0,
+						Y:          0,
+						W:          4,
+						H:          4,
+						I:          "3b0e646b-2ca3-4df2-95a5-fd80915459dd",
+						Name:       "A Graph",
+						CellColors: []chronograf.CellColor{},
 						Axes: map[string]chronograf.Axis{
 							"x": chronograf.Axis{
 								Bounds: []string{},
@@ -103,12 +104,13 @@ func Test_Layouts(t *testing.T) {
 					Measurement: "influxdb",
 					Cells: []chronograf.Cell{
 						{
-							X:    0,
-							Y:    0,
-							W:    4,
-							H:    4,
-							I:    "3b0e646b-2ca3-4df2-95a5-fd80915459dd",
-							Name: "A Graph",
+							X:          0,
+							Y:          0,
+							W:          4,
+							H:          4,
+							I:          "3b0e646b-2ca3-4df2-95a5-fd80915459dd",
+							CellColors: []chronograf.CellColor{},
+							Name:       "A Graph",
 						},
 					},
 				},