mirror of
https://github.com/grafana/grafana.git
synced 2025-02-15 10:03:33 -06:00
* Add select component for choosing step option * Add onStepChange * Add functionality for max step * Rename minInterval to stepInterval to describe min, max and exact step interval * Change select option from standard to exact * Add new type StepType for better type safety * Add tests for adjustInterval * Add functionality and tests for exact step option * Prometheus: Spell out min and max in select component * Prometheus: Change width of step select component and add placeholder * Prometheus: Adjust for the factor in exact step * Prometheus: Update tooltip of step lable to include max and exact options and add padding to select component to give it some breathing room from other components * Update snapshot for step tooltip * Prometheus: make tooltip more informative * Prometheus: add tooltip to interval input element * Prometheus: extract default step option * Prometheus: update snapshot for PromQueryEditor * Prometheus: change step labels to uppercase * Prometheus: define a default step option * Prometheus: use default step option in both ui component and logic * Prometheus: update snapshot for PromQueryEditor * Prometheus: refactor datasource.ts for better readability * Prometheus: change tool tip for step * Prometheus: update snapshots * Prometheus: add correct styling * Prometheus: update snapshots * Prometheus change variable name to something less superfluous * Prometheus: refactor * Prometheus: add new test for adjustInterval * Docs: Update docummentation on the step parameter for prometheus * Prometheus: make step input field smaller and change placeholder text to 15s * Prometheus: update snapshots * Prometheus: Make stepMode uniform in all places in the code * Adjust step based on stepMode * Adjust comment * Check if we have queryInterval * Refactor, add safe interval * Fix merge resolutions * Fix tests and add tests * Update snapshot * Update docs/sources/datasources/prometheus.md Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> * Update docs/sources/datasources/prometheus.md Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> * Update docs/sources/datasources/prometheus.md Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> * Update docs/sources/datasources/prometheus.md Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> * Update docs/sources/datasources/prometheus.md Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> * Update docs/sources/datasources/prometheus.md Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> * Update docs/sources/datasources/prometheus.md Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> * Implement calculation with intervalMode in calculator.go * Update tests, add calculate safe interval method * Replace panic with error * Update pkg/tsdb/interval/interval_test.go Co-authored-by: idafurjes <36131195+idafurjes@users.noreply.github.com> * Update pkg/tsdb/calculator_test.go Co-authored-by: idafurjes <36131195+idafurjes@users.noreply.github.com> * Impotrt require * Remove lint errors Co-authored-by: Olof Bourghardt <ob655088@gmail.com> Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> Co-authored-by: idafurjes <36131195+idafurjes@users.noreply.github.com>
137 lines
4.5 KiB
Go
137 lines
4.5 KiB
Go
package interval
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/grafana/grafana/pkg/components/simplejson"
|
|
"github.com/grafana/grafana/pkg/models"
|
|
"github.com/grafana/grafana/pkg/plugins"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestIntervalCalculator_Calculate(t *testing.T) {
|
|
calculator := NewCalculator(CalculatorOptions{})
|
|
|
|
testCases := []struct {
|
|
name string
|
|
timeRange plugins.DataTimeRange
|
|
intervalMode string
|
|
expected string
|
|
}{
|
|
{"from 5m to now", plugins.NewDataTimeRange("5m", "now"), "min", "200ms"},
|
|
{"from 5m to now", plugins.NewDataTimeRange("5m", "now"), "exact", "1ms"},
|
|
{"from 5m to now", plugins.NewDataTimeRange("5m", "now"), "max", "1ms"},
|
|
{"from 15m to now", plugins.NewDataTimeRange("15m", "now"), "min", "500ms"},
|
|
{"from 15m to now", plugins.NewDataTimeRange("15m", "now"), "max", "1ms"},
|
|
{"from 15m to now", plugins.NewDataTimeRange("15m", "now"), "exact", "1ms"},
|
|
{"from 30m to now", plugins.NewDataTimeRange("30m", "now"), "min", "1s"},
|
|
{"from 30m to now", plugins.NewDataTimeRange("30m", "now"), "max", "1ms"},
|
|
{"from 30m to now", plugins.NewDataTimeRange("30m", "now"), "exact", "1ms"},
|
|
{"from 24h to now", plugins.NewDataTimeRange("24h", "now"), "min", "1m"},
|
|
{"from 24h to now", plugins.NewDataTimeRange("24h", "now"), "max", "1ms"},
|
|
{"from 24h to now", plugins.NewDataTimeRange("24h", "now"), "exact", "1ms"},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
interval, err := calculator.Calculate(tc.timeRange, time.Millisecond*1, tc.intervalMode)
|
|
require.Nil(t, err)
|
|
assert.Equal(t, tc.expected, interval.Text)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestIntervalCalculator_CalculateSafeInterval(t *testing.T) {
|
|
calculator := NewCalculator(CalculatorOptions{})
|
|
|
|
testCases := []struct {
|
|
name string
|
|
timeRange plugins.DataTimeRange
|
|
safeResolution int64
|
|
expected string
|
|
}{
|
|
{"from 5m to now", plugins.NewDataTimeRange("5m", "now"), 11000, "20ms"},
|
|
{"from 15m to now", plugins.NewDataTimeRange("15m", "now"), 11000, "100ms"},
|
|
{"from 30m to now", plugins.NewDataTimeRange("30m", "now"), 11000, "200ms"},
|
|
{"from 24h to now", plugins.NewDataTimeRange("24h", "now"), 11000, "10s"},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
interval := calculator.CalculateSafeInterval(tc.timeRange, tc.safeResolution)
|
|
assert.Equal(t, tc.expected, interval.Text)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestRoundInterval(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
interval time.Duration
|
|
expected time.Duration
|
|
}{
|
|
{"30ms", time.Millisecond * 30, time.Millisecond * 20},
|
|
{"45ms", time.Millisecond * 45, time.Millisecond * 50},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
assert.Equal(t, tc.expected, roundInterval(tc.interval))
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestFormatDuration(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
duration time.Duration
|
|
expected string
|
|
}{
|
|
{"61s", time.Second * 61, "1m"},
|
|
{"30ms", time.Millisecond * 30, "30ms"},
|
|
{"23h", time.Hour * 23, "23h"},
|
|
{"24h", time.Hour * 24, "1d"},
|
|
{"367d", time.Hour * 24 * 367, "1y"},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
assert.Equal(t, tc.expected, FormatDuration(tc.duration))
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestGetIntervalFrom(t *testing.T) {
|
|
dsJSON, err := simplejson.NewJson([]byte(`{"timeInterval": "60s"}`))
|
|
require.NoError(t, err)
|
|
testCases := []struct {
|
|
name string
|
|
dsInfo *models.DataSource
|
|
queryModel string
|
|
defaultInterval time.Duration
|
|
expected time.Duration
|
|
}{
|
|
{"45s", nil, `{"interval": "45s"}`, time.Second * 15, time.Second * 45},
|
|
{"45", nil, `{"interval": "45"}`, time.Second * 15, time.Second * 45},
|
|
{"2m", nil, `{"interval": "2m"}`, time.Second * 15, time.Minute * 2},
|
|
{"intervalMs", nil, `{"intervalMs": 45000}`, time.Second * 15, time.Second * 45},
|
|
{"intervalMs sub-seconds", nil, `{"intervalMs": 45200}`, time.Second * 15, time.Millisecond * 45200},
|
|
{"dsInfo timeInterval", &models.DataSource{
|
|
JsonData: dsJSON,
|
|
}, `{}`, time.Second * 15, time.Second * 60},
|
|
{"defaultInterval when interval empty", nil, `{"interval": ""}`, time.Second * 15, time.Second * 15},
|
|
{"defaultInterval when intervalMs 0", nil, `{"intervalMs": 0}`, time.Second * 15, time.Second * 15},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
js, _ := simplejson.NewJson([]byte(tc.queryModel))
|
|
actual, err := GetIntervalFrom(tc.dsInfo, js, tc.defaultInterval)
|
|
assert.Nil(t, err)
|
|
assert.Equal(t, tc.expected, actual)
|
|
})
|
|
}
|
|
}
|