mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
12359 commits 313 branches 456 tags 672 MiB
Commit graph

716 commits

Author SHA1 Message Date
György Krajcsovits d42e296516 Merge remote-tracking branch 'upstream/main' into krajo/merge-upstream 2023-11-02 20:45:05 +01:00
beorn7 5dca994f64 Merge branch 'release-2.48' into beorn7/release 2023-11-02 19:58:33 +01:00
Levi Harrison 8b87f3bbf1 Release 2.48.0-rc.2 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2023-11-01 21:19:24 -04:00
Dimitar Dimitrov dba5006d7a
Merge branch 'upstream/main' into dimitar/sync-with-upstream-main 2023-11-01 14:06:11 +01:00
Julien Pivotto f568221610
Merge pull request #13057 from prometheus/release-2.48 
Merge release-2.48 back into main
 2023-10-31 15:24:39 -04:00
Levi Harrison 8db8ad1bae
bump version (#13032) 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2023-10-27 23:25:56 +02:00
Jeanette Tan 6341ba7374 Merge remote-tracking branch 'upstream/main' into sync-upstream-20231026 2023-10-26 22:18:24 +08:00
Gilles De Mey 4912c82ed0
ui: Pass unexpected boot errors to StartingContent component (#13016) 
Signed-off-by: Gilles De Mey <gilles.de.mey@gmail.com>
 2023-10-23 14:17:53 +02:00
Levi Harrison 827804c79d Release 2.48.0-rc0 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2023-10-15 22:32:41 -04:00
Arve Knudsen b5f0920506 Merge remote-tracking branch 'prometheus/main' into arve/sync-prometheus 2023-10-10 10:27:09 +02:00
Danny Kopping d3554d8421
Show group interval in Rules display (#12943) 
* Show group interval in Rules display

Signed-off-by: Danny Kopping <danny.kopping@grafana.com>

* Humanise interval

Signed-off-by: Danny Kopping <danny.kopping@grafana.com>

---------

Signed-off-by: Danny Kopping <danny.kopping@grafana.com>
 2023-10-08 14:51:24 +02:00
Arve Knudsen 35ab75918a Merge remote-tracking branch 'prometheus/main' into arve/upgrade-exp 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2023-10-06 16:11:40 +02:00
Julien Pivotto 76ebd621d6 UI: Update word-wrap (GHSA-j8xg-fqg3-53r7) 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-09-29 13:54:45 +02:00
Julien Pivotto 3d80cb1325 UI: Update json5 (GHSA-9c47-m6qq-7p4h) 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-09-29 13:53:45 +02:00
Julien Pivotto d50c7d3bfc UI: Update loader-utils (GHSA-hhq3-ff78-jv3g GHSA-3rfm-jhwj-7488) 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-09-29 13:53:42 +02:00
Julien Pivotto f24dc17fcc UI: Update semver (GHSA-c2qf-rxjj-qqgw) 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-09-29 13:51:00 +02:00
Julien Pivotto ca12cb8909 UI: Update tough-cookie (GHSA-72xf-g2v4-qvf3 GHSA-76p3-8jx3-jpfq) 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-09-29 13:50:53 +02:00
Julien Pivotto b6fbda0c8a UI: Update Webpack (GHSA-hc6q-2mpp-qw7j) 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-09-29 13:47:54 +02:00
Arve Knudsen e48d4e5835 Merge remote-tracking branch 'prometheus/main' into chore/sync-prometheus 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2023-09-18 09:29:42 +02:00
Julius Volz aa7bf083e9
Move /targets page discovered labels to expandable section (#12824) 
* Move /targets page discovered labels to expandable section

The current tooltip for showing the pre-relabeling discovered labels for a
target is notoriously unreliable and can get cut off when there are many
labels. This PR introduces a (hopefully unobtuse enough) expander/collapser
button for the discovered labels of each target, and then the discovered labels
are shown in a more persistent way underneath the final target labels, instead
of using a tooltip.

Fixes https://github.com/prometheus/prometheus/issues/9175#issuecomment-1713074341

Signed-off-by: Julius Volz <julius.volz@gmail.com>

* Remove obsolete test snapshot

Signed-off-by: Julius Volz <julius.volz@gmail.com>

---------

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2023-09-11 11:36:44 +02:00
Bryan Boreham cfa78609f7 Merge branch 'release-2.47' into merge-2-47-0 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2023-09-06 11:49:15 +00:00
Bryan Boreham 966dc0bf67 Release 2.47.0 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2023-09-06 08:16:07 +00:00
Dimitar Dimitrov 77ac7ad40a
Merge remote-tracking branch 'upstream/main' into dimitar/pull-upstream 2023-09-05 16:19:00 +02:00
Daniel Mellado 6ee3db15e4
Add version in web/ui/package-lock.json (#12771) 
This commit adds the option --include-workspace-root in ui_release.sh
npm scripts in order to also include the version in web/ui/pagkage jsons
files when bumping the version. This also avoids issues when building
directly with npm install on some systems.

Signed-off-by: Daniel Mellado <dmellado@redhat.com>
 2023-09-01 10:38:15 +02:00
arukiidou 1df0fb5569
build(deps): bump lru-cache from 6.0.0 to 7.18.3 in /web/ui (#12768) 
Signed-off-by: junya koyama <arukiidou@yahoo.co.jp>
 2023-09-01 10:35:29 +02:00
SuperQ 23988a9373
Update nodejs version 
Update to the latest nodejs LTS release. The old v16 ends security
support 2023.09.11.

* https://nodejs.org/en/blog/announcements/v20-release-announce
* https://nodejs.org/en/blog/announcements/nodejs16-eol

Signed-off-by: SuperQ <superq@gmail.com>
 2023-08-27 16:57:41 +02:00
Bryan Boreham cebdc90f23 Release 2.47.0-rc.0 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2023-08-26 14:19:50 +00:00
zenador 54aaa2bd7e
Add histogram_stdvar and histogram_stddev functions (#12614) 
* Add new function: histogram_stdvar and histogram_stddev

Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
 2023-08-24 21:02:14 +02:00
Bryan Boreham 1e3fef6ab0
scraping: limit detail on dropped targets, to save memory (#12647) 
It's possible (quite common on Kubernetes) to have a service discovery
return thousands of targets then drop most of them in relabel rules.
The main place this data is used is to display in the web UI, where
you don't want thousands of lines of display.

The new limit is `keep_dropped_targets`, which defaults to 0
for backwards-compatibility.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2023-08-14 15:39:25 +01:00
Oleg Zaytsev a54cb4744d Merge branch 'main' into prometheus-2023-07-31-76dd9b547 2023-08-04 09:46:03 +02:00
Julien Pivotto 16c645a6dd Release 2.46.0 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-07-25 13:38:08 +02:00
Julien Pivotto c37af1eda5 Release 2.46.0-rc.0 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-07-20 16:52:56 +02:00
cui fliter 5fc639dabc fix some typos (#12498) 
Signed-off-by: cui fliter <imcusg@gmail.com>
 2023-07-04 15:01:02 +00:00
Jesus Vazquez 0e2d08f4a8 Release 2.45.0 (#12486) 
Signed-off-by: Jesus Vazquez <jesusvzpg@gmail.com>
 2023-07-04 15:01:01 +00:00
Jesus Vazquez e7f9683097 Create 2.45.0-rc.1 (#12478) 
Signed-off-by: Jesus Vazquez <jesusvzpg@gmail.com>
 2023-07-04 15:01:01 +00:00
Jesus Vazquez 18f3c26ce0 Bump UI version (#12440) 
Signed-off-by: Jesus Vazquez <jesusvzpg@gmail.com>
 2023-07-04 15:01:01 +00:00
Jesus Vazquez 3961006613 Create release candidate 2.45.0-rc.0 (#12435) 
Signed-off-by: Jesus Vazquez <jesusvzpg@gmail.com>
 2023-07-04 15:01:01 +00:00
cui fliter a6454ccbca fix problematic link (#12405) 
Signed-off-by: cui fliter <imcusg@gmail.com>
 2023-07-04 13:38:31 +00:00
cui fliter 484a9e4071
fix some typos (#12498) 
Signed-off-by: cui fliter <imcusg@gmail.com>
 2023-06-29 12:28:13 +02:00
Jesus Vazquez 8ef767e396
Release 2.45.0 (#12486) 
Signed-off-by: Jesus Vazquez <jesusvzpg@gmail.com>
 2023-06-23 17:01:52 +02:00
Jesus Vazquez c858049744
Create 2.45.0-rc.1 (#12478) 
Signed-off-by: Jesus Vazquez <jesusvzpg@gmail.com>
 2023-06-20 15:13:02 +00:00
Jesus Vazquez edfc97a77e
Bump UI version (#12440) 
Signed-off-by: Jesus Vazquez <jesusvzpg@gmail.com>
 2023-06-07 16:00:15 +02:00
Jesus Vazquez bfa466d00f
Create release candidate 2.45.0-rc.0 (#12435) 
Signed-off-by: Jesus Vazquez <jesusvzpg@gmail.com>
 2023-06-07 12:29:04 +02:00
cui fliter 6e7ac76981
fix problematic link (#12405) 
Signed-off-by: cui fliter <imcusg@gmail.com>
 2023-05-29 10:26:11 +02:00
Jeanette Tan 1be0816b46 Merge remote-tracking branch 'upstream/main' 2023-05-23 00:20:36 +08:00
Bryan Boreham 1ac5131f69
Release 2.44.0 (#12364) 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2023-05-14 07:13:03 +01:00
Bryan Boreham 94d9367bbf
Create 2.44.0-rc.2 (#12341) 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2023-05-08 11:30:29 +01:00
Bryan Boreham 3d26faade4
Create 2.44.0-rc.1 (#12323) 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2023-05-03 16:18:28 +01:00
Bryan Boreham aeccf9e770 Bump version to 2.44.0-rc0 
Including CHANGELOG.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2023-04-24 15:38:43 +00:00
Oleg Zaytsev 4086a5f042 Merge branch 'main' into prometheus-2023-04-03-3923e83 2023-04-13 09:15:24 +02:00