Merge pull request #634 from raintank/fix-timestamp-shifting

fix timestamp shifting. fix #633
grafana · May 10, 2017 · 55c4819 · 55c4819
2 parents 9dd3b0d + b3c03b0
commit 55c4819
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/api/models/series.go b/api/models/series.go
@@ -72,12 +72,17 @@ func (series SeriesByTarget) Pickle(buf []byte) ([]byte, error) {
 		}
 		data[i] = seriesForPickle{
 			Name:           s.Target,
-			Start:          s.QueryFrom,
-			End:            s.QueryTo,
 			Step:           s.Interval,
 			Values:         datapoints,
 			PathExpression: s.QueryPatt,
 		}
+		if len(datapoints) > 0 {
+			data[i].Start = s.Datapoints[0].Ts
+			data[i].End = s.Datapoints[len(s.Datapoints)-1].Ts
+		} else {
+			data[i].Start = s.QueryFrom
+			data[i].End = s.QueryTo
+		}
 	}
 	buffer := bytes.NewBuffer(buf)
 	encoder := pickle.NewEncoder(buffer)