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
12058 commits 313 branches 456 tags 672 MiB
Commit graph

168 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Ganesh Vernekar 41649ceb1b
Merge remote-tracking branch 'upstream/main' into codesome/sync-prom 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2023-03-22 08:35:08 +05:30
Julien Pivotto 1070c9b06c Release 2.43.0 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-03-21 13:07:51 +01:00
Julien Pivotto 2c6168be5f Release 2.43.0-rc.1 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-03-16 20:21:40 +01:00
Ganesh Vernekar 7e74f73733
Merge remote-tracking branch 'upstream/main' into sync-prom 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2023-03-13 12:38:59 +05:30
Julien Pivotto b6d91e8bf8 Release 2.43.0-rc.0 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-03-09 14:30:02 +01:00
Yuri Nikolic 13c2945af0 Fixing conflicts with commit 86d3d5fec6 2023-03-08 16:48:58 +01:00
Shan Aminzadeh 3f6f5d3357
Scope GroupBy labels to metric (#11914) 
Signed-off-by: Shan Aminzadeh <shan.aminzadeh@chronosphere.io>
 2023-02-17 10:23:16 +01:00
Kemal Akkoyun 225c61122d
Cut v2.42.0 (#11912) 
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
 2023-01-31 18:04:46 +01:00
Kemal Akkoyun 7b9cc7eea3
Cut v2.42.0-rc.0 (#11902) 
* Cut v2.42.0-rc.0

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Add missing log items

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
 2023-01-27 13:43:47 +01:00
Marco Pracucci 2461dee551
Merge remote-tracking branch 'remotes/prometheus/main' into update-upstream 2023-01-26 18:41:17 +01:00
Kemal Akkoyun bab3b4e3c3 Upgrade dependencies 
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
 2023-01-26 09:19:50 +01:00
Kemal Akkoyun ae597cac62
Upgrade several UI dependencies (#11894) 
* build(deps): bump @codemirror/autocomplete in /web/ui

Bumps [@codemirror/autocomplete](https://github.com/codemirror/autocomplete) from 6.3.0 to 6.4.0.
- [Release notes](https://github.com/codemirror/autocomplete/releases)
- [Changelog](https://github.com/codemirror/autocomplete/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/autocomplete/compare/6.3.0...6.4.0)

---
updated-dependencies:
- dependency-name: "@codemirror/autocomplete"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* build(deps): bump @fortawesome/fontawesome-svg-core in /web/ui

Bumps [@fortawesome/fontawesome-svg-core](https://github.com/FortAwesome/Font-Awesome) from 6.2.0 to 6.2.1.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/6.2.0...6.2.1)

---
updated-dependencies:
- dependency-name: "@fortawesome/fontawesome-svg-core"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-01-25 19:49:14 +01:00
Julien Pivotto 44ef49805c
Merge pull request #11890 from prometheus/release-2.41 
Merge back Release 2.41
 2023-01-25 11:22:46 +01:00
Shan Aminzadeh cdfd18ce00
[lezer-promql] Fix package.json main to point to correct cjs module (#11888) 
Signed-off-by: Shan Aminzadeh <shan.aminzadeh@chronosphere.io>
 2023-01-25 11:00:59 +01:00
György Krajcsovits 103c4fd289 Merge remote-tracking branch 'upstream/main' into main 
# Conflicts:
#	.github/workflows/ci.yml
#	tsdb/block.go
#	tsdb/compact.go
#	tsdb/compact_test.go
#	tsdb/head_read.go
#	tsdb/index/index.go
#	tsdb/ooo_head_read.go
#	tsdb/querier_test.go
 2023-01-08 14:55:44 +01:00
Julien Pivotto d7937d4be2 Release 2.41.0 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2022-12-20 09:21:06 +01:00
Julien Pivotto 75af6531e4 Release v2.41.0-rc.0 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2022-12-15 13:48:51 +01:00
Julien Pivotto 475cfe8a6b Merge remote-tracking branch 'origin/release-2.40' 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2022-12-14 11:22:01 +01:00
Julien Pivotto 106d06a032 Release 2.40.7 
We have 2 bugfixes,  one which is important for Windows users and
another one on native histograms. I think it is worth cutting another
bugfix release before 2.41 comes out.

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2022-12-14 09:45:26 +01:00
Julien Pivotto 5198eac6f4 Release 2.40.6 with security fixes 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2022-12-09 11:04:13 +01:00
Julien Pivotto 0b302f8a39
Merge pull request #11662 from prometheus/release-2.40 
Merge back release-2.40 branch again
 2022-12-06 17:30:51 +01:00
Ganesh Vernekar 44af4716c8
Cut v2.40.5 (#11646) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2022-12-01 18:16:11 +05:30
Julien Pivotto 0372e259ba
Merge pull request #11634 from prometheus/release-2.40 
Merge release-2.40 branch into main
 2022-11-29 15:54:58 +01:00
Julien Pivotto 31a2db3ae9 Fix Basic Authentication Bypass (CVE-2022-46146) 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2022-11-29 10:44:09 +01:00
Ganesh Vernekar aa3f8d0975
Cut v2.40.3 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2022-11-23 18:16:54 +05:30