github-mirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2026-04-21 07:00:27 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity
15,796 Commits 355 Branches 525 Tags
v3.5.2
Commit Graph

2383 Commits

Author SHA1 Message Date
Julien Pivotto
55cba91ce1 Release 3.5.2 LTS 
Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
 2026-04-13 13:11:27 +02:00
Julien
dd63f3d24a Merge pull request #18508 from roidelapluie/roidelapluie/update-go-grpc-lts 
LTS: Bump go to 1.25; bump some dependencies
 2026-04-13 12:58:00 +02:00
Julien Pivotto
ec34996111 Bump go to 1.25; bump dependencies 
Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
 2026-04-13 10:48:12 +02:00
Julius Volz
a7b86697d6 UI: Fix stored XSS via unescaped metric names and labels 
Metric names, label names, and label values containing HTML/JavaScript were
inserted into `innerHTML` without escaping in several UI code paths, enabling
stored XSS attacks via crafted metrics. This mostly becomes exploitable in
Prometheus 3.x, since it defaults to allowing any UTF-8 characters in metric
and label names.

Apply `escapeHTML()` to all user-controlled values before innerHTML
insertion in:

* Mantine UI chart tooltip
* Old React UI chart tooltip
* Old React UI metrics explorer fuzzy search
* Old React UI heatmap tooltip

See https://github.com/prometheus/prometheus/security/advisories/GHSA-vffh-x6r8-xx99

Signed-off-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
 2026-04-10 11:57:17 +02:00
Bryan Boreham
ce47e4c58a Bump to version 3.5.1
Some checks failed
CI / Go tests (push) Has been cancelled
Details
CI / More Go tests (push) Has been cancelled
Details
CI / Go tests with previous Go version (push) Has been cancelled
Details
CI / UI tests (push) Has been cancelled
Details
CI / Go tests on Windows (push) Has been cancelled
Details
CI / Mixins tests (push) Has been cancelled
Details
CI / Build Prometheus for common architectures (0) (push) Has been cancelled
Details
CI / Build Prometheus for common architectures (1) (push) Has been cancelled
Details
CI / Build Prometheus for common architectures (2) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (0) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (1) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (10) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (11) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (2) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (3) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (4) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (5) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (6) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (7) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (8) (push) Has been cancelled
Details
CI / Build Prometheus for all architectures (9) (push) Has been cancelled
Details
CI / Check generated parser (push) Has been cancelled
Details
CI / golangci-lint (push) Has been cancelled
Details
CI / fuzzing (push) Has been cancelled
Details
CI / codeql (push) Has been cancelled
Details
CI / Report status of build Prometheus for all architectures (push) Has been cancelled
Details
CI / Publish main branch artifacts (push) Has been cancelled
Details
CI / Publish release artefacts (push) Has been cancelled
Details
CI / Publish UI on npm Registry (push) Has been cancelled
Details 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2026-01-20 16:41:11 +00:00
Bryan Boreham
8be3a9560f Prepare release 3.5.0 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2025-07-14 12:38:42 +01:00
Bryan Boreham
eea203702c Prepare release 3.5.0-rc.1 (#16845) 
This RC reverts the feature "OTLP: Support promoting OTel scope attributes".

Add the line back into the CHANGELOG for 3.5.0-rc.0, since we are not changing that version.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2025-07-09 12:07:27 +01:00
Bryan Boreham
31f0c7007e Prepare release 3.5.0-rc.0 (#16778) 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Co-authored-by: Julius Volz <julius.volz@gmail.com>
 2025-06-30 14:19:45 +01:00
Jan-Otto Kröpke
5a1deb84cc Merge branch 'release-3.4' into release-3.4-main 
# Conflicts:
#	CHANGELOG.md
 2025-06-26 22:54:24 +02:00
Jan-Otto Kröpke
b392caf256 Prepare release 3.4.2 
Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
 2025-06-26 22:48:39 +02:00
Julien Pivotto
7f2946ccdd mantine-ui: add query info warnings display to graph view 
Followup of https://github.com/prometheus/prometheus/pull/16753

Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
 2025-06-20 13:47:15 +02:00
Julien Pivotto
8dcb0ba24a mantine-ui: add query warnings display to graph view 
Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
 2025-06-19 12:17:25 +02:00
Björn Rabenstein
32b471ed47 Merge pull request #16417 from amanycodes/histogram-helper-test 
ui-tests: Add Unit tests to Native histogram and its helpers.
 2025-06-18 20:11:23 +02:00
Björn Rabenstein
4aee718013 Merge pull request #16722 from MichaHoffmann/mhoffmann/add-tmin-tmax-tlast-over-time-functions 
promql: add ts_of_(min|max|last)_over_time
 2025-06-12 19:40:18 +02:00
Michael Hoffmann
a5fa9431d8 promql: add ts_of_(max,min,last)_over_time functions 
This commit adds the ts_of_(max,min,last)_over_time functions behind the experimental feature flag.

Signed-off-by: Michael Hoffmann <mhoffmann@cloudflare.com>
 2025-06-12 15:03:28 +00:00
Julius Volz
4eeeb6ee88 Fetch and display full query stats in hover tooltip in table query tab (#16723) 
Fixes https://github.com/prometheus/prometheus/issues/5857

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2025-06-12 14:16:41 +00:00
Aman
f8508ccafa mantine-ui: fix /alerts accordian theme colors (#16043) 
* fix-alerts-accordion-theme

Signed-off-by: amanycodes <amanycodes@gmail.com>

* fixes

Signed-off-by: amanycodes <amanycodes@gmail.com>

* added changes to /rules page

Signed-off-by: amanycodes <amanycodes@gmail.com>

* more fixes

Signed-off-by: amanycodes <amanycodes@gmail.com>

---------

Signed-off-by: amanycodes <amanycodes@gmail.com>
Signed-off-by: Aman <95525722+amanycodes@users.noreply.github.com>
 2025-06-12 08:23:04 +00:00
Björn Rabenstein
eb1272eda7 Merge pull request #16653 from jkroepke/release-3.4-main 
Merge release-3.4 into main
 2025-06-04 18:06:11 +02:00
Julius Volz
ef430074f3 Merge pull request #16567 from ryanwuer/optimize-target-pool-search-experience 
UI: optimize pool searching in /targets page
 2025-05-31 16:53:58 +02:00
Jan-Otto Kröpke
638dc8dbdc Merge branch 'release-3.4' into release-3.4-main 
# Conflicts:
#	.github/workflows/ci.yml
#	CHANGELOG.md
#	RELEASE.md
#	VERSION
#	cmd/prometheus/main_test.go
#	docs/configuration/configuration.md
#	web/ui/mantine-ui/package.json
#	web/ui/module/codemirror-promql/package.json
#	web/ui/module/lezer-promql/package.json
#	web/ui/package-lock.json
#	web/ui/package.json
 2025-05-31 12:48:16 +02:00
Jan-Otto Kröpke
aea6503d9b Release 3.4.1 (#16652) 2025-05-31 08:41:19 +02:00
tongjicoder
4fe20fa340 chore: fix some comments 
Signed-off-by: tongjicoder <tongjicoder@icloud.com>
 2025-05-27 23:14:41 +08:00
Julius Volz
6c930e8506 Merge pull request #16605 from prometheus/rules-page-filters 
Add health & text filtering on the /rules page
 2025-05-19 23:22:25 +02:00
Bartlomiej Plotka
8e6b008608 feature: type-and-unit-labels (PROM-39 implementation) (#16228) 
* feature: type-and-unit-labels (extended MetricIdentity)

Experimental implementation of https://github.com/prometheus/proposals/pull/39

Previous (unmerged) experiments:
* https://github.com/prometheus/prometheus/compare/main...dashpole:prometheus:type_and_unit_labels
* https://github.com/prometheus/prometheus/pull/16025

Signed-off-by: bwplotka <bwplotka@gmail.com>

feature: type-and-unit-labels (extended MetricIdentity)

Experimental implementation of https://github.com/prometheus/proposals/pull/39

Previous (unmerged) experiments:
* https://github.com/prometheus/prometheus/compare/main...dashpole:prometheus:type_and_unit_labels
* https://github.com/prometheus/prometheus/pull/16025

Signed-off-by: bwplotka <bwplotka@gmail.com>

* Fix compilation errors

Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com>

Lint

Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com>

Revert change made to protobuf 'Accept' header

Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com>

Fix compilation errors for 'dedupelabels' tag

Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com>

* Rectored into schema.Metadata

Signed-off-by: bwplotka <bwplotka@gmail.com>

* texparse: Added tests for PromParse

Signed-off-by: bwplotka <bwplotka@gmail.com>

* add OM tests.

Signed-off-by: bwplotka <bwplotka@gmail.com>

* add proto tests

Signed-off-by: bwplotka <bwplotka@gmail.com>

* Addressed comments.

Signed-off-by: bwplotka <bwplotka@gmail.com>

* add schema label tests.

Signed-off-by: bwplotka <bwplotka@gmail.com>

* addressed comments.

Signed-off-by: bwplotka <bwplotka@gmail.com>

* fix tests.

Signed-off-by: bwplotka <bwplotka@gmail.com>

* add promql tests.

Signed-off-by: bwplotka <bwplotka@gmail.com>

* lint

Signed-off-by: bwplotka <bwplotka@gmail.com>

* Addressed comments.

Signed-off-by: bwplotka <bwplotka@gmail.com>

---------

Signed-off-by: bwplotka <bwplotka@gmail.com>
Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com>
Co-authored-by: Arthur Silva Sens <arthursens2005@gmail.com>
 2025-05-17 09:37:25 +00:00
Jan-Otto Kröpke
84a3acaf1b Merge release-3.4 into main (#16609) 
Co-authored-by: Ayoub Mrini <ayoubmrini424@gmail.com>
 2025-05-17 10:04:22 +02:00
Jan-Otto Kröpke
93f7c78211 Release 3.4.0 (#16600) 2025-05-17 08:40:29 +02:00
Julius Volz
69ed0a5794 Add health & text filtering on the /rules page 
Addresses part of https://github.com/prometheus/prometheus/issues/16515

For now, I'm adding very similar filtering to the /rules page as we have on
the /alerts page, with the difference being:

* The state filter filters by rule health (ok/warn/unknown) instead of
  alert state (firing/pending/inactive)
* We don't collect & show detailed stats on the different state counts as
  we do on the /alerts page

There is a lot of copied / very similar code between those two pages (and
also some others) around filtering and pagination, so maybe there is an
opportunity for more code sharing in the future here.

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2025-05-16 17:50:46 +02:00
Julius Volz
5f1c6226e2 SD UI: Better total target count display when using keep_dropped_targets option 
Fixes https://github.com/prometheus/prometheus/issues/16586

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2025-05-16 11:07:55 +02:00
Julius Volz
dbf5d01a62 Fix full-page re-rendering when opening status nav menu (#16590) 
When opening the status pages menu while already viewing one of the
status pages, the whole page would be re-rendered because the menu target's
default action of following the current page's URL was not prevented. Also,
we don't need to use a NavLink component for the menu target when we are
not viewing a status page, because then the component won't need to be
highlighted anyways.

Discovered + fixed with the help of react-scan.

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2025-05-12 12:17:18 +02:00
Julius Volz
5c06804df8 Optimize memoization and search debouncing on /targets page (#16589) 
Moving the debouncing of the search field to the parent component and then
memoizing the ScrapePoolsList component prevents a lot of superfluous
re-renders of the entire scrape pools list that previously got triggered
immediately when you typed in the search box or even just collapsed a pool.
(While the computation of what data to show was already memoized in the
ScrapePoolList component, the component itself still had to re-render a lot
with the same data.)

Discovered this problem + verified fix using react-scan.

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2025-05-12 10:39:58 +02:00
Ryan Wu
a810e59990 UI: optimize pool searching in /target page 
Signed-off-by: Ryan Wu <rongjun0821@gmail.com>
 2025-05-07 21:32:34 +08:00
Arve Knudsen
e7e3ab2824 Fix linting issues found by golangci-lint v2.0.2 (#16368) 
* Fix linting issues found by golangci-lint v2.0.2

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2025-05-03 19:05:13 +02:00
Jan-Otto Kröpke
7a92230652 Prepare release 3.4.0-rc.0 (#16517) 
Co-authored-by: Ayoub Mrini <ayoubmrini424@gmail.com>
 2025-05-02 19:25:54 +02:00
Jan-Otto Kröpke
7789ef27c8 Upgraded npm dependencies pre 3.4.0-rc.0 (#16493) 2025-04-29 17:19:23 +02:00
amanycodes
ad8464249c removed comments 
Signed-off-by: amanycodes <amanycodes@gmail.com>
 2025-04-24 20:09:05 +05:30
amanycodes
25d2746e35 stable and unique key for /rules page and key fixes 
Signed-off-by: amanycodes <amanycodes@gmail.com>
 2025-04-24 20:09:03 +05:30
amanycodes
de5b5c56e2 fix-ci-errors 
Signed-off-by: amanycodes <amanycodes@gmail.com>
 2025-04-24 20:08:16 +05:30
amanycodes
3dc9cbc8c0 stable and definitely unique card UI key in /alerts 
Signed-off-by: amanycodes <amanycodes@gmail.com>
 2025-04-24 20:08:16 +05:30
Aman
26bddcf068 promql: histogram_stddev and histogram_stdvar should use arithmetic mean for custom buckets 
Signed-off-by: amanycodes <amanycodes@gmail.com>
 2025-04-24 14:48:58 +02:00
Fiona Liao
7ec63b1fa1 Add primitive support for ingesting OTLP delta metrics as-is (#16360) 
* Add simple delta support

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* Rename delta2cumulative part

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* Whoops bad refactor

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* Add example yml

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* Feature flag instead and histogram hint handling

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* Delete otel_delta.yml - outdated

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* Renaming to native delta support

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* Add more explanatory comments

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* Add more explanation to histograms

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* Correct comment on d2c consumer

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* Add tests for counters and fix bug

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* Add histogram tests

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* Add docs

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* Sort series to make test deterministic

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* More formatting

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* Change flag name to ingestion

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* Explain where rate calculation can go wrong

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* Add warning about duplicate timestamps

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* Update docs/feature_flags.md

Co-authored-by: Arthur Silva Sens <arthursens2005@gmail.com>
Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* Fix tests

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* Remove unnecessary if

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* Add warning to d2c section

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* Make unknown type error when getting temporality

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* Correct type comment - not planning to add delta metric metadata type

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* Remove unused param for empty type

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* Rewrite temporality logic to be clearer

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

* Change spurious to unnecessary - better description

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>

---------

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>
Co-authored-by: Arthur Silva Sens <arthursens2005@gmail.com>
 2025-04-23 09:58:02 -03:00
machine424
381720497e Merge branch 'release-3.3' into 33sync 
Signed-off-by: machine424 <ayoubmrini424@gmail.com>
 2025-04-23 09:08:46 +02:00
machine424
46883e05ae Prepare release 3.3.0 
Signed-off-by: machine424 <ayoubmrini424@gmail.com>
 2025-04-15 12:43:15 +02:00
amanycodes
70eb58219a added unit tests to HistogramHelpers.ts and HistogramChart.ts 
Signed-off-by: amanycodes <amanycodes@gmail.com>
 2025-04-09 20:18:46 +05:30
Julius Volz
683e6983db Merge pull request #16391 from prometheus/revamp-ui-readme 
Completely revamp web/ui/README.md
 2025-04-03 11:52:14 +02:00
Julius Volz
36e50db698 Update npm + nodejs versions in prerequisites section 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2025-04-03 10:02:53 +02:00
Ryan Wu
831f79261c Change IconCopy to IconCheck after clicking copy icon in metrics explore modal 
Signed-off-by: Ryan Wu <rongjun0821@gmail.com>
 2025-04-02 23:03:00 +08:00
Julius Volz
f92e37bb99 Completely revamp web/ui/README.md 
Updated/fixed/changed a lot of content, changed wordings and style, etc.

Things should now be in an order that most users / developers expect, with the
most relevant sections (how to build + run) at the top.

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2025-04-02 16:39:42 +02:00
Julius Volz
6bfaaa0fee Fix persisting alert groups per page setting to localStorage (#16388) 
Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2025-04-02 09:44:47 +01:00
github-actions[bot]
41744d6331 Merge pull request #16370 from prometheus/dependabot/npm_and_yarn/web/ui/react-app/babel/runtime-7.27.0 
chore(deps): bump @babel/runtime from 7.24.8 to 7.27.0 in /web/ui/react-app
 2025-04-01 14:38:21 +00:00
dependabot[bot]
bd874a50f2 chore(deps): bump @babel/runtime in /web/ui/react-app 
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.24.8 to 7.27.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.27.0/packages/babel-runtime)

---
updated-dependencies:
- dependency-name: "@babel/runtime"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-04-01 14:16:24 +00:00