mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-14 09:34:05 -08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity
14326 commits 248 branches 440 tags 656 MiB
Commit graph

464 commits

Author SHA1 Message Date
Bryan Boreham 14cfec3f60
Prepare release 2.53.1 (#14452) 
Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com>
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-07-10 11:14:07 +01:00
Simon Pasquier 145988d48f
discovery(k8s): remove support for API versions no longer served 
This commit removes support for the following API versions:
* `discovery.k8s.io/v1beta1` API version of EndpointSlice (no longer
  served as of v1.25).
* `networking.k8s.io/v1beta1` API version of Ingress (no longer served
  as of v1.22).

Closes #12884

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2024-07-04 14:54:27 +02:00
Arve Knudsen c3793f2b32 Merge remote-tracking branch 'prometheus/main' into arve/wlog-histograms 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2024-07-01 10:51:22 +02:00
beorn7 10935e81df Update CHANGELOG.md 
Signed-off-by: beorn7 <beorn@grafana.com>
 2024-06-20 16:52:24 +02:00
beorn7 0c76210e83 Set VERSION and CHANGELOG appropriately for v3 preparation 
Signed-off-by: beorn7 <beorn@grafana.com>
 2024-06-20 15:12:48 +02:00
George Krajcsovits 29d3e48267
Update CHANGELOG.md 
Co-authored-by: Julien <291750+roidelapluie@users.noreply.github.com>
Signed-off-by: George Krajcsovits <krajorama@users.noreply.github.com>
 2024-06-18 13:45:53 +02:00
György Krajcsovits e121d07388 Prepare release 2.53.0 
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
 2024-06-16 10:24:09 +02:00
György Krajcsovits dd8676218b Prepare 2.53.0-rc.1 release 
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
 2024-06-11 12:56:32 +02:00
György Krajcsovits 4cfec57606 Revert "Update changelog due to pr 14273" 
This reverts commit dd44001465.

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
 2024-06-11 12:55:02 +02:00
SuperQ 38bf349ff7
Update changelog for GOGC tuning 
Include #14285 in changelog.

Signed-off-by: SuperQ <superq@gmail.com>
 2024-06-11 11:37:32 +02:00
György Krajcsovits dd44001465 Update changelog due to pr 14273 
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
 2024-06-07 10:21:27 +02:00
György Krajcsovits 3feefd903b Update changelog from review comments 
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
 2024-06-06 17:54:04 +02:00
György Krajcsovits c8de725aba Fix typo in changelog 
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
 2024-06-06 12:31:03 +02:00
György Krajcsovits b59034ec31 Ammend changelog with missing user impact entries 
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
 2024-06-06 12:29:34 +02:00
György Krajcsovits 8397c7bc48 Version bump to v2.53.0-rc.0 
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
 2024-06-06 09:56:36 +02:00
SuperQ 68ba6c1ae5
Add configuration option for GOGC 
Add the ability to adjust the `GOGC` variable from the Prometheus
configuration file.
* Create a new top-level `runtime` section in the config.
* Adjust from the Go default of 100 to 50 to reduce wasted memory.
* Use the `GOGC` env value if no configuraiton is used.

Signed-off-by: SuperQ <superq@gmail.com>
 2024-06-05 15:23:16 +02:00
Arthur Silva Sens d73537ccc0
Merge branch 'main' into resolveconflicts-2.52.1 2024-05-31 09:36:17 -03:00
gotjosh 37b408c6cd
Feature: Allow configuration of a rule evaluation delay (#14061) 
* [PATCH] Allow having evaluation delay for rule groups

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* [PATCH] Fix lint

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* [PATCH] Move the option to ManagerOptions

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* [PATCH] Include evaluation_delay in the group config

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Fix comments

Signed-off-by: gotjosh <josue.abreu@gmail.com>

* Add a server configuration option.

Signed-off-by: gotjosh <josue.abreu@gmail.com>

* Appease the linter #1

Signed-off-by: gotjosh <josue.abreu@gmail.com>

* Add the new server flag documentation

Signed-off-by: gotjosh <josue.abreu@gmail.com>

* Improve documentation of the new flag and configuration

Signed-off-by: gotjosh <josue.abreu@gmail.com>

* Use named parameters for clarity on the `Rule` interface

Signed-off-by: gotjosh <josue.abreu@gmail.com>

* Add `initial` to the flag help

Signed-off-by: gotjosh <josue.abreu@gmail.com>

* Change the CHANGELOG area from `ruler` to `rules`

Signed-off-by: gotjosh <josue.abreu@gmail.com>

* Rename evaluation_delay to `rule_query_offset`/`query_offset` and make it a global configuration option.

Signed-off-by: gotjosh <josue.abreu@gmail.com>

E Your branch is up to date with 'origin/gotjosh/evaluation-delay'.

* more docs

Signed-off-by: gotjosh <josue.abreu@gmail.com>

* Improve wording on CHANGELOG

Signed-off-by: gotjosh <josue.abreu@gmail.com>

* Add `RuleQueryOffset` to the default config in tests in case it changes

Signed-off-by: gotjosh <josue.abreu@gmail.com>

* Update docs/configuration/recording_rules.md

Co-authored-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: gotjosh <josue.abreu@gmail.com>

* Rename `RuleQueryOffset` to `QueryOffset` when in the group context.

Signed-off-by: gotjosh <josue.abreu@gmail.com>

* Improve docstring and documentation on the `rule_query_offset`

Signed-off-by: gotjosh <josue.abreu@gmail.com>

---------

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
Signed-off-by: gotjosh <josue.abreu@gmail.com>
Co-authored-by: Ganesh Vernekar <ganeshvern@gmail.com>
Co-authored-by: Julius Volz <julius.volz@gmail.com>
 2024-05-30 11:49:50 +01:00
Arthur Silva Sens 3c1aadd942
Prepare v2.52.1 release 
Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com>
 2024-05-29 10:41:52 -03:00
Arve Knudsen f094dd50e0 Merge remote-tracking branch 'prometheus/main' into arve/wlog-histograms 2024-05-09 11:58:37 +02:00
Arve Knudsen 5c4310aa37
[ENHANCEMENT] TSDB: Optimize querying with regexp matchers 
Add method `PostingsForLabelMatching` to `tsdb.IndexReader`, to obtain postings for labels with a certain name and values accepted by a provided callback, and use it from `tsdb.PostingsForMatchers`.
The intention is to optimize regexp matcher paths, especially not having to load all label values before matching on them.

Plus tests, and refactor some `tsdb/index.Reader` methods.

Benchmarking shows memory reduction up to ~100%, and speedup of up to ~50%.

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com>
 2024-05-09 10:55:30 +01:00
Arthur Silva Sens df05132f19 Prepare v2.52.0 release 
Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com>
 2024-05-08 07:37:25 -03:00
Arve Knudsen fb6a45f06b tsdb/wlog: Only treat unknown record types as failure 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2024-05-06 11:58:02 +02:00
Arthur Silva Sens 2e323af50f
Merge branch 'main' into resolve-conflicts-2.52 
Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>
 2024-05-03 14:36:38 -03:00
Arthur Silva Sens 48e6e16943
Prepare v2.52.0-rc.1 release (#14050) 
Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>
 2024-05-03 17:31:50 +00:00
Arthur Silva Sens 650f4d7a72
Merge remote-tracking branch 'origin/main' into resolve-conflicts-2.52 2024-05-02 10:47:45 -03:00
Arve Knudsen 12e317786b
Add missing OTLP fixes to changelog (#14014) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2024-04-30 18:44:27 +02:00
gotjosh 1dd0bff4f1
Merge pull request #13980 from prometheus/gotjosh/restore-only-with-rule-query 
Rule Manager: Only query once per alert rule when restoring alert state
 2024-04-30 15:29:21 +01:00
Arve Knudsen 99f3051f45 OTLP: Use PrometheusConverter directly 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2024-04-30 13:10:27 +02:00
Arthur Silva Sens 9195d51469
Prepare v2.52 release 
Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>
 2024-04-24 17:19:43 -03:00
gotjosh 6cfc584308
- Add a changelog entry 
- Improve variable name of the map produced by the series set

Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2024-04-24 19:02:47 +01:00
gotjosh d672eda979
Add a changelog entry 
Signed-off-by: gotjosh <josue.abreu@gmail.com>
 2024-04-24 14:31:18 +01:00
Bryan Boreham e1dd8e72df
Merge branch 'main' into merge-2.51.2-into-main 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-04-10 15:05:52 +01:00
Bryan Boreham b4c0ab52c3 Cut release 2.51.2 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-04-10 11:08:16 +01:00
Bryan Boreham e1a5886c88
Merge branch 'main' into merge-2.51-into-main 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-03-28 10:00:25 +00:00
Bryan Boreham 855b5ac4b8
Cut release 2.51.1 (#13853) 
* Cut release 2.51.1

Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com>
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-03-28 09:23:45 +00:00
Bryan Boreham 0630e49c0d
Merge branch 'main' into merge-2.51.0 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-03-19 11:56:14 +01:00
Bryan Boreham c05c15512a
Cut v2.51.0 (#13787) 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-03-19 10:49:40 +00:00
Darshan Chaudhary b7047f7fcb
Fix retention boundary so 2h retention deletes blocks right at the 2h boundary (#9633) 
Signed-off-by: darshanime <deathbullet@gmail.com>
 2024-03-15 19:35:16 +01:00
Bryan Boreham 8d53e7ba90
Cut v2.51.0-rc.0 (#13729) 
* Cherry-pick [BUGFIX] Azure SD: Fix 'error: parameter virtualMachineScaleSetName cannot be empty' (#13702)

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-03-11 13:35:44 +00:00
Bryan Boreham e537d6d1c1 Cut 2.50.1 with metadata api bugfix 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2024-02-26 10:00:21 +00:00
Augustin Husson 814b920e8a
Cut v2.50.0 (#13612) 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2024-02-22 10:21:59 +01:00
Augustin Husson 93591ec5cc
Cut v2.50.0-rc.1 (#13602) 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2024-02-19 14:15:03 +01:00
Augustin Husson 452f4c96b7
Cut v2.50.0-rc.0 (#13465) 
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
 2024-02-13 10:21:23 +01:00
bwplotka 65a101cdc2 Cut 2.49.1 with scrape q= bugfix. 
Signed-off-by: bwplotka <bwplotka@gmail.com>
 2024-01-15 16:18:18 +00:00
bwplotka cf50f85faa Cut 2.49.0 
Signed-off-by: bwplotka <bwplotka@gmail.com>
 2024-01-15 09:55:35 +00:00
bwplotka abbcdc61f5 Cut 2.49.0-rc.2 
Signed-off-by: bwplotka <bwplotka@gmail.com>
 2024-01-08 09:49:30 +00:00
bwplotka 20b4ef5d58 Cut v2.49.0-rc.1 
Signed-off-by: bwplotka <bwplotka@gmail.com>
 2023-12-19 19:23:43 +00:00
Bartlomiej Plotka c4c8d59c14
Cut 2.49.0-rc.0 (#13270) 
* Cut 2.49.0-rc.0

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

* Removed the duplicate.

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

---------

Signed-off-by: bwplotka <bwplotka@gmail.com>
 2023-12-12 10:12:08 +00:00
Julien Levesy e4ec263bcc
fix(wlog/watcher): read segment synchronously when not tailing (#13224) 
Signed-off-by: Julien Levesy <jlevesy@gmail.com>
Signed-off-by: Callum Styan <callumstyan@gmail.com>
Co-authored-by: Callum Styan <callumstyan@gmail.com>
 2023-12-01 14:26:38 -08:00
Julien Levesy 501f514389
feat(tsdb/agent): notify remote storage when commit happens (#13223) 
Signed-off-by: Julien Levesy <jlevesy@gmail.com>
Signed-off-by: Callum Styan <callumstyan@gmail.com>
Co-authored-by: Callum Styan <callumstyan@gmail.com>
 2023-12-01 14:00:26 -08:00
Levi Harrison 41c7253333 Release 2.48.0 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2023-11-15 15:15:57 -05: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
Levi Harrison 7bdabb01d2
Release 2.48.0-rc.1 (#13028) 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2023-10-25 12:33:03 +01:00
zenador 80e977aae6
Remove NewPossibleNonCounterInfo and minimise creating empty annotations (#13012) 
* Remove NewPossibleNonCounterInfo until it can be made more efficient, and avoid creating empty annotations as much as possible

Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
 2023-10-24 17:36:07 +01:00
Levi Harrison d1620abde9 Add last warning pr 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2023-10-17 09:37:50 -04:00
Levi Harrison 700f9bd7c6 nits 
Signed-off-by: Levi Harrison <git@leviharrison.dev>
 2023-10-16 22:26:45 -04: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
SuperQ 64130d7909
Release 2.47.1 
* [BUGFIX] Fix duplicate sample detection at chunk size limit #12874

Signed-off-by: SuperQ <superq@gmail.com>
 2023-10-04 09:46:57 +02:00
Bryan Boreham 966dc0bf67 Release 2.47.0 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2023-09-06 08:16:07 +00:00
Bryan Boreham a9a5de825c CHANGELOG: add note encouraging use of keep_dropped_targets 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2023-08-29 17:24:48 +00: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
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 034babbf9e Address feedback on CHANGELOG 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-07-20 22:18:17 +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 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 be0b82cf2f
Fix PR typo in 2.45.0-rc.1 CHANGELOG (#12479) 
Signed-off-by: Jesus Vazquez <jesusvzpg@gmail.com>
 2023-06-20 20:20:01 +00: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 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
Julien Pivotto 1991bfb552 Merge remote-tracking branch 'origin/release-2.43' 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-05-16 22:29:52 +02: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 e278195e39
Cherry-pick bugfix #12322 and create v2.43.1 (#12324) 
* labels: respect Set after Del in Builder (#12322)

The implementations are not symmetric between `Set()` and `Del()`, so
we must be careful. Add tests for this, both in labels and in relabel
where the issue was reported.

Also make the slice implementation consistent re `slices.Contains`.

* Create v2.43.1 with bugfix

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Co-authored-by: Julius Volz <julius.volz@gmail.com>
 2023-05-04 20:09:31 +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 6b25e9a923 build: turn on stringlabels by default 
This setting uses less memory, and was optional in previous release 2.43.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2023-04-25 10:11:32 +00:00
Bryan Boreham 8bfd162198 Review feedback - mostly capitalization 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2023-04-25 10:06:23 +00: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
Julien Pivotto b73040cff6 Fix changelog 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-03-23 00:01:34 +01:00
Julien Pivotto 67f48f47c7 Address review comments 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-03-21 13:50:48 +01:00
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
Julien Pivotto 031fc2dfb5 Address feedback 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-03-09 15:05:18 +01:00
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
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 aee2ea4713
Update changelog for 2.42 (#11909) 
* Update changelog

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

* Reorder entries

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

---------

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
 2023-01-31 13:57:16 +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
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
Julien Pivotto 3910b09969
Merge pull request #11596 from prometheus/release-2.40 
Merge back release-2.40 branch
 2022-11-20 23:35:21 +01:00
Ganesh Vernekar ef886ac4b3
Cut v2.40.2 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2022-11-16 13:54:46 +01:00
Ganesh Vernekar 717f82eef2
Merge remote-tracking branch 'upstream/main' into merge239 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2022-11-09 14:34:48 +01:00