Augustin Husson
94c81bba41
Merge pull request #14039 from prometheus/resolve-conflicts-2.52
...
Merge `release-2.52` back to main
2024-05-02 16:47:39 +02:00
Ben Kochie
73f42fea3a
Merge pull request #14023 from prometheus/superq/promu
...
Update promu
2024-05-02 07:32:12 -07:00
Arthur Silva Sens
650f4d7a72
Merge remote-tracking branch 'origin/main' into resolve-conflicts-2.52
2024-05-02 10:47:45 -03:00
Julien
85e3c438ba
Merge pull request #14029 from prometheus/dependabot/github_actions/actions/upload-artifact-4.3.3
...
build(deps): bump actions/upload-artifact from 4.3.1 to 4.3.3
2024-05-02 11:15:24 +02:00
Julien
3257ab4285
Merge pull request #14035 from prometheus/dependabot/go_modules/github.com/linode/linodego-1.33.0
...
build(deps): bump github.com/linode/linodego from 1.32.0 to 1.33.0
2024-05-02 11:14:54 +02:00
Julien
90f45778f8
Merge pull request #14024 from prometheus/dependabot/github_actions/scripts/golangci/golangci-lint-action-5.1.0
...
build(deps): bump golangci/golangci-lint-action from 4.0.0 to 5.1.0 in /scripts
2024-05-02 11:14:18 +02:00
Julien
2d41a35284
Merge pull request #14027 from prometheus/dependabot/github_actions/actions/checkout-4.1.4
...
build(deps): bump actions/checkout from 4.1.2 to 4.1.4
2024-05-02 11:13:04 +02:00
Julien
ce8789f230
Merge pull request #14031 from prometheus/dependabot/go_modules/documentation/examples/remote_storage/github.com/prometheus/prometheus-0.51.2
...
build(deps): bump github.com/prometheus/prometheus from 0.51.1 to 0.51.2 in /documentation/examples/remote_storage
2024-05-02 11:12:22 +02:00
Julien
cf02e5d7eb
Merge pull request #14037 from prometheus/dependabot/go_modules/google.golang.org/api-0.177.0
...
build(deps): bump google.golang.org/api from 0.174.0 to 0.177.0
2024-05-02 11:12:02 +02:00
dependabot[bot]
bb513b2722
build(deps): bump google.golang.org/api from 0.174.0 to 0.177.0
...
Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client ) from 0.174.0 to 0.177.0.
- [Release notes](https://github.com/googleapis/google-api-go-client/releases )
- [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md )
- [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.174.0...v0.177.0 )
---
updated-dependencies:
- dependency-name: google.golang.org/api
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-05-01 23:31:24 +00:00
dependabot[bot]
753fdd513a
build(deps): bump github.com/linode/linodego from 1.32.0 to 1.33.0
...
Bumps [github.com/linode/linodego](https://github.com/linode/linodego ) from 1.32.0 to 1.33.0.
- [Release notes](https://github.com/linode/linodego/releases )
- [Commits](https://github.com/linode/linodego/compare/v1.32.0...v1.33.0 )
---
updated-dependencies:
- dependency-name: github.com/linode/linodego
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-05-01 23:31:06 +00:00
dependabot[bot]
b90e1dfe6a
build(deps): bump github.com/prometheus/prometheus
...
Bumps [github.com/prometheus/prometheus](https://github.com/prometheus/prometheus ) from 0.51.1 to 0.51.2.
- [Release notes](https://github.com/prometheus/prometheus/releases )
- [Changelog](https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md )
- [Commits](https://github.com/prometheus/prometheus/compare/v0.51.1...v0.51.2 )
---
updated-dependencies:
- dependency-name: github.com/prometheus/prometheus
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-05-01 23:21:27 +00:00
dependabot[bot]
781815f064
build(deps): bump actions/upload-artifact from 4.3.1 to 4.3.3
...
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact ) from 4.3.1 to 4.3.3.
- [Release notes](https://github.com/actions/upload-artifact/releases )
- [Commits](5d5d22a312...65462800fd
2024-05-01 23:05:58 +00:00
dependabot[bot]
1821803720
build(deps): bump actions/checkout from 4.1.2 to 4.1.4
...
Bumps [actions/checkout](https://github.com/actions/checkout ) from 4.1.2 to 4.1.4.
- [Release notes](https://github.com/actions/checkout/releases )
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md )
- [Commits](9bb56186c3...0ad4b8fada
2024-05-01 23:05:44 +00:00
dependabot[bot]
ff1bcdb7b9
build(deps): bump golangci/golangci-lint-action in /scripts
...
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action ) from 4.0.0 to 5.1.0.
- [Release notes](https://github.com/golangci/golangci-lint-action/releases )
- [Commits](3cfe3a4abb...9d1e0624a7
2024-05-01 23:03:44 +00:00
SuperQ
f09cf2d9fb
Update promu
...
Update promu to the latest release.
Signed-off-by: SuperQ <superq@gmail.com>
2024-05-02 00:10:02 +02:00
George Krajcsovits
29b558396a
Merge pull request #14012 from krajorama/ci-check-promql-parser
...
ci: check generated parser code before running unit tests
2024-05-01 16:35:22 +02: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
György Krajcsovits
965f507db5
ci: check generated parser code before running unit tests
...
Check that the generated parser code is consistent with the input definition.
Remove the file before re-generating to make sure that missing goyacc is
not effecting the check.
Fixes : #7488
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2024-04-30 17:58:15 +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
Arthur Silva Sens
f170a014f3
Merge pull request #13969 from prometheus/prepare-v2.52
...
Prepare v2.52.0-rc.0 release
2024-04-30 09:18:30 -03:00
gotjosh
379dec9d36
querier.Select cannot return a nil series set.
...
Signed-off-by: gotjosh <josue.abreu@gmail.com>
2024-04-30 13:09:30 +01:00
gotjosh
05ca082b07
Rename alerts to expectedAlerts in the test case input
...
Signed-off-by: gotjosh <josue.abreu@gmail.com>
2024-04-30 12:43:09 +01:00
gotjosh
f63dbc3db2
Remove duplicated sorted and assignment of expected alerts.
...
Signed-off-by: gotjosh <josue.abreu@gmail.com>
2024-04-30 12:39:07 +01:00
Arve Knudsen
e491deba97
Merge pull request #14006 from aknuds1/arve/otlp-translator-direct
...
OTLP: Use PrometheusConverter directly
2024-04-30 13:30:45 +02:00
gotjosh
63b09944b8
Use labels.Len() instead of manually counting the labels
...
Signed-off-by: gotjosh <josue.abreu@gmail.com>
2024-04-30 12:25:48 +01:00
gotjosh
ccfafae36d
Rename QueryforStateSeries to QueryForStateSeries
...
Signed-off-by: gotjosh <josue.abreu@gmail.com>
2024-04-30 12:19:18 +01:00
gotjosh
151f6e0ed6
Add an assertion on the count of alerts before adding an active alert
...
Signed-off-by: gotjosh <josue.abreu@gmail.com>
2024-04-30 12:17:56 +01:00
Arve Knudsen
9189507569
prometheusremotewrite: Add PrometheusConverter.FromMetrics benchmark
...
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2024-04-30 13:13:37 +02: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
Arve Knudsen
7f81065b01
Merge pull request #13966 from komisan19/refactor/add_max_func_to_maxTimestamp
...
refactor: replace maxTimestamp with standard max function
2024-04-30 11:50:52 +02:00
Arve Knudsen
759ca8b207
Merge branch 'main' into refactor/add_max_func_to_maxTimestamp
...
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2024-04-30 11:50:37 +02:00
Jesus Vazquez
7554384dac
otlp: Prometheus to own its own copy of the otlptranslator package ( #13991 )
...
After a lot of productive discussion between the Prometheus and
OpenTelemetry community we decided that it made sense for Prometheus to
own its own copy of the code in charge for handling OTLP ingestion
traffic.
This commit is removing the README and update-copy.sh files that had the
previous steps to update the code.
Also it is updating the licensing of all the files to make sure the
OpenTelemetry provenance is explicit and to state the new ownership.
Signed-off-by: Jesus Vazquez <jesusvzpg@gmail.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
2024-04-30 11:29:52 +02:00
guangwu
9fda9443d4
fix(promql/query_logger): close file in error handling ( #13948 )
...
Signed-off-by: guoguangwu <guoguangwug@gmail.com>
2024-04-30 10:47:10 +02:00
komisan19
b974a99279
fix
...
Signed-off-by: komisan19 <18901496+komisan19@users.noreply.github.com>
2024-04-30 10:45:50 +09:00
Arthur Silva Sens
34ee8c6078
Merge pull request #13982 from tesla59/tesla/storage-doc
...
docs: storage.md: clarify storage.tsdb.retention.time description
2024-04-29 15:33:27 -03:00
Arthur Silva Sens
3d42466894
Merge pull request #13997 from bboreham/api-marshalling
...
bugfix: API: encode empty Vector/Matrix as [] not null
2024-04-29 15:26:01 -03:00
Bryan Boreham
5c8ffaa77c
bugfix: API: encode empty Vector/Matrix as []
...
If the underlying data is `nil` the default encoding
will render `"null"` which is not accepted by
(some) Prometheus client libraries.
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-04-29 19:08:10 +01:00
Bryan Boreham
00247b5d87
test: API: check empty responses
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-04-29 19:08:10 +01:00
Bryan Boreham
e0a00f45db
refactor: API: separate typed and unsafe marshalling
...
The typed versions are used when we call from one marshaller to another.
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-04-29 19:08:10 +01:00
Bryan Boreham
66a1c3daad
refactor: API: be explicit that we marshal empty objects
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-04-29 19:08:10 +01:00
Bryan Boreham
c8aed6b0ec
tests: API: Let nil expected response mean skip check
...
When we want to check just the json encoding.
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-04-29 19:08:10 +01:00
Bryan Boreham
5a339ba359
tests: API: Use jsoniter when encoding
...
So that tests use the same encoding as the api.
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-04-29 19:08:10 +01:00
Bryan Boreham
2c4a36376d
tests: API: simplify check of error response
...
Since we already use require.JSONEq in similar cases.
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-04-29 19:08:10 +01:00
Julien
ed4e50e792
Merge pull request #13992 from heckler1/heckler1/discovery-client-go
...
discovery(k8s): Only register client-go metrics adapters when needed
2024-04-29 11:18:49 +02:00
Neeraj Gartia
99f9d32499
UTF-8: updates UI parser to support UTF-8 characters ( #13590 )
...
Signed-off-by: Neeraj Gartia <neerajgartia211002@gmail.com>
2024-04-29 11:14:01 +02:00
Heyoxe
f7e923c3bb
fix(scaleway-sd): use public IPs if no private IP present ( #13941 )
...
* fix(scaleway-sd): use public IPs if no private IP present
* tests(scaleway-sd): add instance with routed public ip and no private ip
---------
Signed-off-by: Heyoxe <32708033+Heyoxe@users.noreply.github.com>
2024-04-27 15:01:30 +01:00
Nishant Singh
c8b23980c9
Update docs/storage.md
...
Co-authored-by: Ayoub Mrini <ayoubmrini424@gmail.com>
Signed-off-by: Nishant Singh <nishant@heim.id>
2024-04-27 13:50:50 +05:30
Nishant Singh
801314901c
Update docs/storage.md
...
Co-authored-by: Ayoub Mrini <ayoubmrini424@gmail.com>
Signed-off-by: Nishant Singh <nishant@heim.id>
2024-04-27 13:50:41 +05:30
Stephen Heckler
31a4217784
discovery(k8s): Only register client-go metrics adapters when needed
...
Previously the metrics adapters for client-go were registered in an init function.
This resulted in clobbering default metrics providers when these packages are imported
into an application that leverages the default client-go metrics registry.
Instead, let's only register these adapters when requested.
Signed-off-by: Stephen Heckler <sheckler@cloudflare.com>
2024-04-25 12:33:29 -05:00
