pull/808/head
Jade McGough 2017-01-27 04:51:31 -08:00
parent 607aa033f4
commit fdb6de3503
3 changed files with 9 additions and 10 deletions

View File

@ -247,11 +247,12 @@ func UnmarshalDashboard(data []byte, d *chronograf.Dashboard) error {
GroupBys: q.GroupBys,
Wheres: q.Wheres,
Label: q.Label,
}
if q.Range.Upper != q.Range.Lower {
queries[j].Range = &chronograf.Range{
Upper: q.Range.Upper,
Lower: q.Range.Lower,
}
if q.Range.Upper != q.Range.Lower {
queries[j].Range = &chronograf.Range{
Upper: q.Range.Upper,
Lower: q.Range.Lower,
}
}
}

View File

@ -243,7 +243,7 @@ type DashboardCell struct {
W int32 `json:"w"`
H int32 `json:"h"`
Name string `json:"name"`
Queries []string `json:"queries"`
Queries []Query `json:"queries"`
Type string `json:"type"`
}

View File

@ -164,10 +164,8 @@ func ValidDashboardRequest(d chronograf.Dashboard) error {
}
for _, c := range d.Cells {
for _, q := range c.Queries {
if len(q) == 0 {
return fmt.Errorf("query required")
}
if (len(c.Queries) == 0) {
return fmt.Errorf("query required")
}
}