Fork Sync: Update from parent repository #1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ma-validation fix(nativehistograms): validation should fail on unsupported schemas
…ma-reduce Native histograms: reduce resolution as needed when reading from chunk or remote read
Reduce the resolution of histograms as needed and ignore invalid schemas while emitting a warning log. Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Co-authored-by: Björn Rabenstein <beorn@grafana.com> Signed-off-by: George Krajcsovits <krajorama@users.noreply.github.com>
…ma-wal Native histograms: ignore invalid schemas from WAL and log
follow-up of 985. Without this change mimir can't inject its own factory
Signed-off-by: Nikos Angelopoulos <nikolaos.angelopoulos@grafana.com>
* Remove head stats calculation * Fix linter * Remove config options * Generate docs
Signed-off-by: Naman-B-Parlecha <namanparlecha@gmail.com>
…etrics Signed-off-by: Nikos Angelopoulos <nikolaos.angelopoulos@grafana.com>
* Add anchored and smoothed to vector selectors. This adds "anchored" and "smoothed" keywords that can be used following a matrix selector. "Anchored" selects the last point before the range (or the first one after the range) and adds it at the boundary of the matrix selector. "Smoothed" applies linear interpolation at the edges using the points around the edges. In the absence of a point before or after the edge, the first or the last point is added to the edge, without interpolation. *Exemple usage* * `increase(caddy_http_requests_total[5m] anchored)` (equivalent of *caddy_http_requests_total - caddy_http_requests_total offset 5m* but takes counter reset into consideration) * `rate(caddy_http_requests_total[step()] smoothed)` Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com> * Update docs/feature_flags.md Co-authored-by: Charles Korn <charleskorn@users.noreply.github.com> Signed-off-by: Julien <291750+roidelapluie@users.noreply.github.com> * Smoothed/Anchored rate: Add more tests Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com> * Anchored/Smoothed modifier: error out with histograms Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com> --------- Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com> Signed-off-by: Julien <291750+roidelapluie@users.noreply.github.com> Co-authored-by: Charles Korn <charleskorn@users.noreply.github.com>
Signed-off-by: Naman-B-Parlecha <namanparlecha@gmail.com>
… tests Signed-off-by: Naman-B-Parlecha <namanparlecha@gmail.com>
Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com>
This simply fills the classic buckets of the histogram protobuf with the content of the custom buckets. Signed-off-by: beorn7 <beorn@grafana.com>
federation: Add NHCB support
Update to k8s.io v0.33.5
And why we only have one implementation in this code base. Fixes: prometheus/prometheus#15869 Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
Implements expand/collapse functionality for displaying final scrape configuration (interval + timeout) in the targets page timing column. - Add ScrapeDetails component with expand/collapse chevron - Keep existing "Last Scrape" and "Scrape Duration" badges always visible - Display "Scrape interval: every \<interval\>" and "Scrape timeout: after \<timeout\>" when expanded - Use IconRepeat for interval and IconPlugConnectedX for timeout - Follow TargetLabels.tsx pattern for consistency - Implement performance optimization with conditional DOM rendering - Maintain existing hover tooltip functionality Signed-off-by: ADITYATIWARI342005 <142050150+ADITYATIWARI342005@users.noreply.github.com>
…-4gw3-53p4 / CVE-2025-54388); bump go-viper/mapstructure/v2 to v2.4.0 (GHSA-2464-8j7c-4cjm) Signed-off-by: Reema Alzaid <reema-alzaid@outlook.com>
…/merge-upstream-main-202509290232
Signed-off-by: Mara Sophie Grosch <littlefox@lf-net.org>
Rename component for clarity (timing-only focus) Chevron title: “Show/Hide additional timing info” Duration pill tooltip: “Duration of last target scrape” Update imports/usages; keep DOM-conditional expanded content Signed-off-by: ADITYATIWARI342005 <142050150+ADITYATIWARI342005@users.noreply.github.com>
…509290232 [main] Merge upstream prometheus/main to c9e0e36
…tion
[FEATURE] : Add {scrape interval + timeout} to targets page
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
chore: allow seamless use of testing/synctest for >=go1.24
…3-mapstructure-2.4.0 deps: docker/docker→v28.3.3+incompatible; mapstructure/v2→v2.4.0
…410) Reduce tsdb.TestHeadSeriesChunkRace number of iterations from 1000 to 100, to stop this test from timing out under CI. Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Correctly generate rulesLintConfig when --lint=none is set (#17399) If I run promtool check config --lint=none I get: ``` Checking rules.yml FAILED: rules.yml: unset nameValidationScheme ``` This is because passing --lint=none stops newConfigLintConfig from generating rulesLintConfig which is needed for validation. It means that defaults are used then, one of which is unset value for metric name validation, causing this error. Fix this by handling --lint=none case correctly and still generating rulesLintConfig. --------- Signed-off-by: Lukasz Mierzwa <l.mierzwa@gmail.com> Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> Co-authored-by: Łukasz Mierzwa <l.mierzwa@gmail.com>
…17400) Add logic to the target_info metric generation in the OTLP endpoint, so that any samples with the same timestamp for the same (target_info) series are de-duplicated. It comes out of a user's bug report about duplicated target_info samples in Grafana Mimir (which uses the Prometheus target_info generation logic). If I'm not mistaken, duplicate target_info samples should stem from multiple resources in the same OTLP request being translated to the same target_info label set. It shouldn't be caused by a Prometheus bug.
Fixes #16622. Signed-off-by: beorn7 <beorn@grafana.com>
…/merge-upstream-main-202510281415
Signed-off-by: Naman-B-Parlecha <namanparlecha@gmail.com>
…2510281415 [main] Merge upstream prometheus/main to c36e966
Update prometheus/common dependency to v0.67.2
* Reduce samples for TestRuntimeRetentionConfigChange --------- Signed-off-by: Fiona Liao <fiona.liao@grafana.com>
…2510281723 [main] Merge upstream prometheus/main to b004db4
Signed-off-by: geogrego <geogrego@outlook.com>
…lease-3.7-pre3-to-main Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
…3-to-main merge release 3.7 branch before 3.7.3 to main
…ng logic (#17412)
* Revert "chore: deprecate prometheus_remote_storage_{samples,exemplars,histograms}_in_total and prometheus_remote_storage_highest_timestamp_in_seconds"
This reverts commit ba14bc4.
Signed-off-by: machine424 <ayoubmrini424@gmail.com>
* Revert "storage/remote: compute highestTimestamp and dataIn at QueueManager level"
This reverts commit 184c7eb.
Signed-off-by: machine424 <ayoubmrini424@gmail.com>
* fix(remote-write): bring back the per queue metrics
Signed-off-by: machine424 <ayoubmrini424@gmail.com>
* test(remote): add TestRemoteWrite_ReshardingWithoutDeadlock to reproduce the sharding scale up deadlock
Signed-off-by: machine424 <ayoubmrini424@gmail.com>
---------
Signed-off-by: machine424 <ayoubmrini424@gmail.com>
various bug fixes Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Unroll NHCBs to Classic Histograms func for RW
`histogram.Error` becomes the generic wrapper type for all histogram errors. This makes it easier and less error prone when adding new errors to check if an error is an histogram error as well as making it less error prone to convert the errors. This change the type of those specific sentinel errors from error to `histogram.Error`, but it should almost never matter. e.g., `errors.Is(err, ErrHistogram...)` would still work out of the box. Signed-off-by: Laurent Dufresne <laurent.dufresne@grafana.com>
Signed-off-by: Laurent Dufresne <laurent.dufresne@grafana.com>
…error-type histogram: Add `Error` type for all histogram errors
…7.3-to-main # Conflicts: # CHANGELOG.md # storage/remote/queue_manager_test.go
merge 3.7.3 to main
docs: Fix typos
…2510310816 [main] Merge upstream prometheus/main to 84d2007
…r to prioritize type-and-unit-labels feature (#17387) * fix Signed-off-by: pipiland2612 <nguyen.t.dang.minh@gmail.com> * fix nits & update docs Signed-off-by: pipiland2612 <nguyen.t.dang.minh@gmail.com> * fix docs Signed-off-by: pipiland2612 <nguyen.t.dang.minh@gmail.com> --------- Signed-off-by: pipiland2612 <nguyen.t.dang.minh@gmail.com>
* add feature flag for remote write v2 Signed-off-by: pipiland2612 <nguyen.t.dang.minh@gmail.com> * change from number to protobuf_message Signed-off-by: pipiland2612 <nguyen.t.dang.minh@gmail.com> * fix test Signed-off-by: pipiland2612 <nguyen.t.dang.minh@gmail.com> * fix name Signed-off-by: pipiland2612 <nguyen.t.dang.minh@gmail.com> * run make cli-documentation Signed-off-by: pipiland2612 <nguyen.t.dang.minh@gmail.com> * fix help Signed-off-by: pipiland2612 <nguyen.t.dang.minh@gmail.com> * run make cli-documentation Signed-off-by: pipiland2612 <nguyen.t.dang.minh@gmail.com> --------- Signed-off-by: pipiland2612 <nguyen.t.dang.minh@gmail.com>
ui: Allow viewing detailed relabeling steps for each discovered target
…2511030236 [main] Merge upstream prometheus/main to 0093e21
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
36 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.