chore(pkger): backfill missing fillColumns field for histograms

closes: #18431
influxdata · Jun 10, 2020 · 0d9f4f2 · 0d9f4f2
1 parent 1d75e3e
commit 0d9f4f2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 2 deletions.
diff --git a/pkger/clone_resource.go b/pkger/clone_resource.go
@@ -568,6 +568,7 @@ func convertCellView(cell influxdb.Cell) chart {
 		ch.Kind = chartKindHistogram
 		ch.Queries = convertQueries(p.Queries)
 		ch.Colors = convertColors(p.ViewColors)
+		ch.FillColumns = p.FillColumns
 		ch.XCol = p.XColumn
 		ch.Axes = []axis{{Label: p.XAxisLabel, Name: "x", Domain: p.XDomain}}
 		ch.Note = p.Note
@@ -659,6 +660,10 @@ func convertChartToResource(ch chart) Resource {
 		r[fieldChartLegend] = ch.Legend
 	}
 
+	if len(ch.FillColumns) > 0 {
+		r[fieldChartFillColumns] = ch.FillColumns
+	}
+
 	if zero := new(tableOptions); ch.TableOptions != *zero {
 		tRes := make(Resource)
 		assignNonZeroBools(tRes, map[string]bool{

diff --git a/pkger/parser.go b/pkger/parser.go
@@ -1340,6 +1340,7 @@ func parseChart(r Resource) (chart, []validationErr) {
 		YCol:        r.stringShort(fieldChartYCol),
 		XPos:        r.intShort(fieldChartXPos),
 		YPos:        r.intShort(fieldChartYPos),
+		FillColumns: r.slcStr(fieldChartFillColumns),
 	}
 
 	if presLeg, ok := r[fieldChartLegend].(legend); ok {

diff --git a/pkger/parser_models.go b/pkger/parser_models.go
@@ -483,6 +483,7 @@ const (
 	fieldChartColors        = "colors"
 	fieldChartDecimalPlaces = "decimalPlaces"
 	fieldChartDomain        = "domain"
+	fieldChartFillColumns   = "fillColumns"
 	fieldChartGeom          = "geom"
 	fieldChartHeight        = "height"
 	fieldChartLegend        = "legend"
@@ -527,6 +528,7 @@ type chart struct {
 	BinCount        int
 	Position        string
 	FieldOptions    []fieldOption
+	FillColumns     []string
 	TableOptions    tableOptions
 	TimeFormat      string
 }
@@ -574,7 +576,7 @@ func (c chart) properties() influxdb.ViewProperties {
 			Type:              influxdb.ViewPropertyTypeHistogram,
 			Queries:           c.Queries.influxDashQueries(),
 			ViewColors:        c.Colors.influxViewColors(),
-			FillColumns:       []string{},
+			FillColumns:       c.FillColumns,
 			XColumn:           c.XCol,
 			XDomain:           c.Axes.get("x").Domain,
 			XAxisLabel:        c.Axes.get("x").Label,

diff --git a/pkger/parser_test.go b/pkger/parser_test.go
@@ -1118,7 +1118,7 @@ spec:
 					assert.Equal(t, 30, props.BinCount)
 					assert.True(t, props.ShowNoteWhenEmpty)
 					assert.Equal(t, []float64{0, 10}, props.XDomain)
-					assert.Equal(t, []string{}, props.FillColumns)
+					assert.Equal(t, []string{"a", "b"}, props.FillColumns)
 					require.Len(t, props.Queries, 1)
 					q := props.Queries[0]
 					queryText := `from(bucket: v.bucket) |> range(start: v.timeRangeStart, stop: v.timeRangeStop) |> filter(fn: (r) => r._measurement == "boltdb_reads_total") |> filter(fn: (r) => r._field == "counter")`

diff --git a/pkger/testdata/dashboard_histogram.json b/pkger/testdata/dashboard_histogram.json
@@ -18,6 +18,7 @@
           "xCol": "_value",
           "position": "stacked",
           "binCount": 30,
+          "fillColumns": ["a", "b"],
           "queries": [
             {
               "query": "from(bucket: v.bucket) |> range(start: v.timeRangeStart, stop: v.timeRangeStop) |> filter(fn: (r) => r._measurement == \"boltdb_reads_total\") |> filter(fn: (r) => r._field == \"counter\")"

diff --git a/pkger/testdata/dashboard_histogram.yml b/pkger/testdata/dashboard_histogram.yml
@@ -13,6 +13,7 @@ spec:
       width:  6
       height: 3
       binCount: 30
+      fillColumns: ["a", "b"]
       queries:
         - query: >
             from(bucket: v.bucket) |> range(start: v.timeRangeStart, stop: v.timeRangeStop) |> filter(fn: (r) => r._measurement == "boltdb_reads_total") |> filter(fn: (r) => r._field == "counter")