Merge pull request coroot#754 from coroot/fix_753

incidents: truncate long incident time ranges to 1 day when rendering SLI charts

Author: def

api/api.go

@@ -32,6 +32,10 @@ import (
 	"k8s.io/klog"
 )
 
+const (
+	MaxIncidentWindow = timeseries.Day
+)
+
 type LoadWorldF func(ctx context.Context, project *db.Project, from, to timeseries.Time) (*model.World, error)
 
 type Api struct {
@@ -580,7 +584,7 @@ func (api *Api) PanelData(w http.ResponseWriter, r *http.Request, u *db.User) {
 		}
 	}
 
-	from, to, _ := api.getTimeContext(r)
+	from, to, _, _ := api.getTimeContext(r)
 	step := increaseStepForBigDurations(from, to, maxRefreshInterval)
 	data, err := views.Dashboards.PanelData(r.Context(), promClients, config, from, to, step)
 	if err != nil {
@@ -1772,16 +1776,17 @@ func (api *Api) LoadWorldByRequest(r *http.Request) (*model.World, *db.Project,
 		return nil, nil, nil, err
 	}
 
-	from, to, _ := api.getTimeContext(r)
+	from, to, _, truncated := api.getTimeContext(r)
 	world, cacheStatus, err := api.LoadWorld(r.Context(), project, from, to)
 	if world == nil {
 		step := increaseStepForBigDurations(from, to, 15*timeseries.Second)
 		world = model.NewWorld(from, to.Add(-step), step, step)
 	}
+	world.Ctx.Truncated = truncated
 	return world, project, cacheStatus, err
 }
 
-func (api *Api) getTimeContext(r *http.Request) (from timeseries.Time, to timeseries.Time, incident *model.ApplicationIncident) {
+func (api *Api) getTimeContext(r *http.Request) (from timeseries.Time, to timeseries.Time, incident *model.ApplicationIncident, truncated bool) {
 	now := timeseries.Now()
 	q := r.URL.Query()
 	from = utils.ParseTime(now, q.Get("from"), now.Add(-timeseries.Hour))
@@ -1802,6 +1807,10 @@ func (api *Api) getTimeContext(r *http.Request) (from timeseries.Time, to timese
 			} else {
 				to = now
 			}
+			if to.Sub(from) > MaxIncidentWindow {
+				from = to.Add(-MaxIncidentWindow)
+				truncated = true
+			}
 		}
 	}
 	return

api/rca.go

@@ -18,7 +18,7 @@ import (
 func (api *Api) RCA(w http.ResponseWriter, r *http.Request, u *db.User) {
 	rca := &model.RCA{}
 	projectId := db.ProjectId(mux.Vars(r)["project"])
-	from, to, incident := api.getTimeContext(r)
+	from, to, incident, _ := api.getTimeContext(r)
 
 	defer func() {
 		if incident != nil {

model/chart.go

@@ -114,6 +114,9 @@ type Chart struct {
 }
 
 func NewChart(ctx timeseries.Context, title string) *Chart {
+	if ctx.Truncated {
+		title += " (truncated range)"
+	}
 	return &Chart{Ctx: ctx, Title: title}
 }
 
@@ -245,6 +248,10 @@ type ChartGroup struct {
 }
 
 func NewChartGroup(ctx timeseries.Context, title string) *ChartGroup {
+	if ctx.Truncated {
+		title += " (truncated range)"
+		ctx.Truncated = false
+	}
 	return &ChartGroup{ctx: ctx, Title: title}
 }
 

timeseries/time.go

@@ -20,10 +20,11 @@ const (
 )
 
 type Context struct {
-	From    Time     `json:"from"`
-	To      Time     `json:"to"`
-	Step    Duration `json:"step"`
-	RawStep Duration `json:"raw_step"`
+	From      Time     `json:"from"`
+	To        Time     `json:"to"`
+	Step      Duration `json:"step"`
+	RawStep   Duration `json:"raw_step"`
+	Truncated bool     `json:"truncated"`
 }
 
 func NewContext(from, to Time, step Duration) Context {