mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
a9faab6b09
* Add global week start option to shared preferences * Add default_week_start to configuration docs * Add week start option to dashboards * Add week start argument to tsdb time range parser * Fix strict check issues * Add tests for week start * Change wording on default_week_start documentation Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> * Update week_start column to be a nullable field Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Update configuration to include browser option * Update WeekStartPicker container selector Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> * Add menuShouldPortal to WeekStartPicker to remove deprecation warning Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> * Add inputId to WeekStartPicker * Use e2e selector on WeekStartPicker aria-label * Simplify WeekStartPicker onChange condition * Specify value type on WeekStartPicker weekStarts * Remove setWeekStart side effect from reducer * Fix updateLocale failing to reset week start * Store week start as string to handle empty values Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
131 lines
2.9 KiB
Go
131 lines
2.9 KiB
Go
package tsdb
|
|
|
|
import (
|
|
"strconv"
|
|
"time"
|
|
|
|
"github.com/timberio/go-datemath"
|
|
)
|
|
|
|
func NewTimeRange(from, to string) *TimeRange {
|
|
return &TimeRange{
|
|
From: from,
|
|
To: to,
|
|
now: time.Now(),
|
|
}
|
|
}
|
|
|
|
func NewFakeTimeRange(from, to string, now time.Time) *TimeRange {
|
|
return &TimeRange{
|
|
From: from,
|
|
To: to,
|
|
now: now,
|
|
}
|
|
}
|
|
|
|
type TimeRange struct {
|
|
From string
|
|
To string
|
|
now time.Time
|
|
}
|
|
|
|
func (tr *TimeRange) GetFromAsMsEpoch() int64 {
|
|
return tr.MustGetFrom().UnixNano() / int64(time.Millisecond)
|
|
}
|
|
|
|
func (tr *TimeRange) GetFromAsSecondsEpoch() int64 {
|
|
return tr.GetFromAsMsEpoch() / 1000
|
|
}
|
|
|
|
func (tr *TimeRange) GetFromAsTimeUTC() time.Time {
|
|
return tr.MustGetFrom().UTC()
|
|
}
|
|
|
|
func (tr *TimeRange) GetToAsMsEpoch() int64 {
|
|
return tr.MustGetTo().UnixNano() / int64(time.Millisecond)
|
|
}
|
|
|
|
func (tr *TimeRange) GetToAsSecondsEpoch() int64 {
|
|
return tr.GetToAsMsEpoch() / 1000
|
|
}
|
|
|
|
func (tr *TimeRange) GetToAsTimeUTC() time.Time {
|
|
return tr.MustGetTo().UTC()
|
|
}
|
|
|
|
func (tr *TimeRange) MustGetFrom() time.Time {
|
|
res, err := tr.ParseFrom()
|
|
if err != nil {
|
|
return time.Unix(0, 0)
|
|
}
|
|
return res
|
|
}
|
|
|
|
func (tr *TimeRange) MustGetTo() time.Time {
|
|
res, err := tr.ParseTo()
|
|
if err != nil {
|
|
return time.Unix(0, 0)
|
|
}
|
|
return res
|
|
}
|
|
|
|
func tryParseUnixMsEpoch(val string) (time.Time, bool) {
|
|
if val, err := strconv.ParseInt(val, 10, 64); err == nil {
|
|
seconds := val / 1000
|
|
nano := (val - seconds*1000) * 1000000
|
|
return time.Unix(seconds, nano), true
|
|
}
|
|
return time.Time{}, false
|
|
}
|
|
|
|
func (tr *TimeRange) ParseFrom() (time.Time, error) {
|
|
return parse(tr.From, tr.now, false, nil, -1)
|
|
}
|
|
|
|
func (tr *TimeRange) ParseTo() (time.Time, error) {
|
|
return parse(tr.To, tr.now, true, nil, -1)
|
|
}
|
|
|
|
func (tr *TimeRange) ParseFromWithLocation(location *time.Location) (time.Time, error) {
|
|
return parse(tr.From, tr.now, false, location, -1)
|
|
}
|
|
|
|
func (tr *TimeRange) ParseToWithLocation(location *time.Location) (time.Time, error) {
|
|
return parse(tr.To, tr.now, true, location, -1)
|
|
}
|
|
|
|
func (tr *TimeRange) ParseFromWithWeekStart(location *time.Location, weekstart time.Weekday) (time.Time, error) {
|
|
return parse(tr.From, tr.now, false, location, weekstart)
|
|
}
|
|
|
|
func (tr *TimeRange) ParseToWithWeekStart(location *time.Location, weekstart time.Weekday) (time.Time, error) {
|
|
return parse(tr.To, tr.now, true, location, weekstart)
|
|
}
|
|
|
|
func parse(s string, now time.Time, withRoundUp bool, location *time.Location, weekstart time.Weekday) (time.Time, error) {
|
|
if res, ok := tryParseUnixMsEpoch(s); ok {
|
|
return res, nil
|
|
}
|
|
|
|
diff, err := time.ParseDuration("-" + s)
|
|
if err != nil {
|
|
options := []func(*datemath.Options){
|
|
datemath.WithNow(now),
|
|
datemath.WithRoundUp(withRoundUp),
|
|
}
|
|
if location != nil {
|
|
options = append(options, datemath.WithLocation(location))
|
|
}
|
|
if weekstart != -1 {
|
|
if weekstart > now.Weekday() {
|
|
weekstart = weekstart - 7
|
|
}
|
|
options = append(options, datemath.WithStartOfWeek(weekstart))
|
|
}
|
|
|
|
return datemath.ParseAndEvaluate(s, options...)
|
|
}
|
|
|
|
return now.Add(diff), nil
|
|
}
|