prometheus

mirror of https://github.com/prometheus/prometheus.git synced 2025-11-13 14:51:01 +01:00

History

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

api.md

Document sorting behaviour

2024-05-17 13:54:08 +10:00

basics.md

make matrix selection and lookback left-open and right-closed

2024-06-20 22:05:40 +08:00

examples.md

Examples: link to rate for new users (#10535 )

2024-01-16 11:13:52 +00:00

functions.md

fix(docs/querying): explain ceil behaviour more explicitly with examples (#11987 )