prometheus

mirror of https://github.com/prometheus/prometheus.git synced 2025-09-21 13:51:00 +02: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

command-line

notifier: optionally drain queued notifications before shutting down (#14290 )

2024-06-26 11:32:04 +01:00

configuration

discovery: add support for gathering flavor name in Openstack discovery (#14312 )

2024-06-30 19:18:18 +02:00

images

Add 2.0 storage docs (#3423 )

2017-11-07 22:00:38 +01:00

querying

Merge branch 'main' into 3.0-main-sync