Jan Fajerski
|
adf5d6bce1
|
Merge branch 'main' into 3.0-main-sync-24-07-18
Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
Conflicts:
VERSION
pick 3.0.0
promql/promqltest/testdata/histograms.test
pick changes from c39776c5b5,
but adjust 5m range selectors to 10m to account for
https://github.com/prometheus/prometheus/pull/13904.
Fixes:
promql/promqltest/testdata/functions.test
promql/promqltest/testdata/staleness.test
Tests added in https://github.com/prometheus/prometheus/pull/9138
need to be adjusted to account for
https://github.com/prometheus/prometheus/pull/13904.
|
2024-07-18 15:56:40 +02:00 |
|
darshanime
|
cfad8ff3b2
|
Deprecate duration token
Signed-off-by: darshanime <deathbullet@gmail.com>
|
2024-07-10 15:49:58 +02:00 |
|
|
darshanime
|
8c8860d2d6
|
Allow number literals as duration
Signed-off-by: darshanime <deathbullet@gmail.com>
|
2024-07-10 15:49:30 +02:00 |
|
|
Jan Fajerski
|
b4152309a4
|
Merge branch 'main' into 3.0-main-sync
Conflicts:
promql/engine_test.go
Resolved by picking main changes but adjusting total_samples for
query "max_over_time(metricWith1HistogramEvery10Seconds[60s])[20s:5s]"
to 312. Via https://github.com/prometheus/prometheus/pull/13662 this
histogram now stores 13 values per timestamp, but via
https://github.com/prometheus/prometheus/pull/13904 the range query
is now left-open.
promql/promqltest/testdata/functions.test
Resolved by picking changes in main. See also
https://github.com/prometheus/prometheus/pull/13662, but adjust some
range selectors (`s/1m/2m/`) to account for
https://github.com/prometheus/prometheus/pull/13904.
promql/promqltest/testdata/histograms.test
Resolved by picking changes in main. See also
https://github.com/prometheus/prometheus/pull/13662, but adjust some
range selectors (`s/5m/10m/`) to account for
https://github.com/prometheus/prometheus/pull/13904.
Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
|
2024-07-03 09:45:25 +02:00 |
|
Jeanette Tan
|
dda5f48c9e
|
Merge branch 'main' into nhcb-review-2
|
2024-06-20 22:50:00 +08:00 |
|
Zhang Zhanpeng
|
debbdb8608
|
make matrix selection and lookback left-open and right-closed
Signed-off-by: Zhang Zhanpeng <zhangzhanpeng.zzp@alibaba-inc.com>
Signed-off-by: beorn7 <beorn@grafana.com>
Co-authored-by: beorn7 <beorn@grafana.com>
|
2024-06-20 22:05:40 +08:00 |
|
Charles Korn
|
aeec30f082
|
Convert TestTimestampFunction_StepsMoreOftenThanSamples
Signed-off-by: Charles Korn <charles.korn@grafana.com>
|
2024-06-17 16:56:56 +10:00 |
|
|
Jeanette Tan
|
f028496133
|
Merge branch 'main' into nhcb
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
|
2024-05-14 16:20:15 +08:00 |
|
Bryan Boreham
|
11b27d5d22
|
test: move test files into new promqltest package
So that promql package does not bring in test-only dependencies.
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
|
2024-05-08 13:42:55 +01:00 |
|