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

12359 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arve Knudsen ef70a6e6cf Allocate tracing attributes up front 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2023-11-09 16:57:56 +01:00
Arve Knudsen 46bf26e841 Create Tracer once per PostingsForMatchersCache 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2023-11-09 15:31:31 +01:00
Arve Knudsen 403abaee79 Set span status on error 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2023-11-09 15:31:31 +01:00
Arve Knudsen 7c313be3b5 Remove unnecessary event attributes 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2023-11-09 15:31:31 +01:00
Arve Knudsen 2aabf7cc2c Improve tracing 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2023-11-09 15:31:31 +01:00
Arve Knudsen 25e2c05a47 Implement review feedback 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2023-11-09 15:31:31 +01:00
Arve Knudsen 6c0910a289 Update tsdb/postings_for_matchers_cache.go 
Co-authored-by: Charles Korn <charleskorn@users.noreply.github.com>
 2023-11-09 15:31:31 +01:00
Arve Knudsen ca4cdeb1af Apply suggestions from code review 
Co-authored-by: Charles Korn <charleskorn@users.noreply.github.com>
 2023-11-09 15:31:31 +01:00
Arve Knudsen 8ece24ddb0 PostingsForMatchersCache: Add tracing 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2023-11-09 15:31:31 +01:00
George Krajcsovits 237a77b483
Merge pull request #562 from grafana/krajo/revert549 
Revert "Fix issue where `concatenatingChunkIterator` can obscure erro…
 2023-11-06 17:09:16 +01:00
György Krajcsovits 7bb4f04a1c Revert "Fix issue where concatenatingChunkIterator can obscure errors." 
This reverts commit 4a1fb3b18c.
 2023-11-06 16:43:47 +01:00
George Krajcsovits 790cede0a1
Merge pull request #561 from grafana/krajo/merge-upstream 
Sync with upstream main at 79f4e45d64
 2023-11-03 07:18:20 +01:00
György Krajcsovits 1149f7e9e1 Fix lint errors: dot at comment end 
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
 2023-11-02 21:09:38 +01:00
György Krajcsovits d42e296516 Merge remote-tracking branch 'upstream/main' into krajo/merge-upstream 2023-11-02 20:45:05 +01:00
Björn Rabenstein 79f4e45d64
Merge pull request #13089 from prometheus/beorn7/release 
Merge release-2.48 back into main
 2023-11-02 20:43:18 +01:00
beorn7 5dca994f64 Merge branch 'release-2.48' into beorn7/release 2023-11-02 19:58:33 +01:00
Bryan Boreham 6e2586b1c7
Merge pull request #13083 from LeviHarrison/release-2.48.0-rc.2 
Release 2.48.0-rc.2
 2023-11-02 18:21:02 +00:00
Julien Pivotto 8c560c9632
Merge pull request #13069 from prometheus/dependabot/go_modules/documentation/examples/remote_storage/github.com/prometheus/common-0.45.0 
build(deps): bump github.com/prometheus/common from 0.44.0 to 0.45.0 in /documentation/examples/remote_storage
 2023-11-02 14:10:06 -04:00
Julien Pivotto 540a6729c0
Merge pull request #13077 from prometheus/dependabot/go_modules/go-opentelemetry-io-a16b2b5997 
build(deps): bump the go-opentelemetry-io group with 2 updates
 2023-11-02 14:03:52 -04:00
Julien Pivotto caec414964
Merge pull request #13085 from dimitarvdimitrov/dimitar/expose-findQueryMinMaxTime 
Export `promql.FindMinMaxTime`
 2023-11-02 14:02:17 -04:00
Bryan Boreham ae5dd1ffcb
Merge pull request #13062 from zenador/min-time-hist-chunks 
Add min time to histogram chunks
 2023-11-02 14:13:51 +00:00
Jeanette Tan 52eb303031 Refactor assigning MinTime in histogram chunks 
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
 2023-11-02 21:23:05 +08:00
Dimitar Dimitrov 9e3df532d8
Export promql.Engine.FindMinMaxTime 
This function is useful to analyze promQL queries. We want to use this in Mimir to record the time range which the query touches.

I also chose to remove the `Engine` receiver because it was unnecessary, and it makes it easier to use, but happy to refactor that if you disagree.

The function is untested on its own. If you prefer to have unit tests now that its exported, I can look into adding some.

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
 2023-11-02 13:17:35 +01:00
Jeanette Tan 3ccaaa40ba Fix according to code review 
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
 2023-11-02 13:37:07 +08:00
György Krajcsovits 4296ecbd14 tsdb/compact_test.go: test mixed typed series with PopulateBlock 
Add testcase and update test so that it can test native histograms as well.

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
 2023-11-02 13:33:42 +08:00
Jeanette Tan 27abf09e7f Fix missing MinTime in histogram chunks 
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
 2023-11-02 13:33:39 +08:00
Jeanette Tan 2f7060bd5a Expand TestPopulateWithTombSeriesIterators to test earlier deletion intervals for histogram chunks as well as time-overlapping chunks 
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
 2023-11-02 13:33:35 +08:00
Jeanette Tan 7a4a1127b7 Expand TestPopulateWithTombSeriesIterators to test min max times of chunks, including mixed chunks 
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
 2023-11-02 13:33:33 +08:00
Jeanette Tan 04aabdd7cc Refactor TestPopulateWithDelSeriesIterator unit tests to reuse more code 
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
 2023-11-02 13:33:30 +08:00
Jeanette Tan 46be85f2dc Make TestPopulateWithDelSeriesIterator tests cover histogram types and check MinTime 
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
 2023-11-02 13:33:26 +08: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 287511d92f
Merge pull request #13066 from prometheus/superq/pick_timestamp 
scrape: Added trackTimestampsStaleness configuration option
 2023-11-01 21:00:43 -04:00
dependabot[bot] 1103569841
build(deps): bump the go-opentelemetry-io group with 2 updates 
Bumps the go-opentelemetry-io group with 2 updates: [go.opentelemetry.io/collector/pdata](https://github.com/open-telemetry/opentelemetry-collector) and [go.opentelemetry.io/collector/semconv](https://github.com/open-telemetry/opentelemetry-collector).


Updates `go.opentelemetry.io/collector/pdata` from 1.0.0-rcv0016 to 1.0.0-rcv0017
- [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/pdata/v1.0.0-rcv0016...pdata/v1.0.0-rcv0017)

Updates `go.opentelemetry.io/collector/semconv` from 0.87.0 to 0.88.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.87.0...v0.88.0)

---
updated-dependencies:
- dependency-name: go.opentelemetry.io/collector/pdata
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: go-opentelemetry-io
- dependency-name: go.opentelemetry.io/collector/semconv
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-opentelemetry-io
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-01 23:44:15 +00:00
dependabot[bot] f9d060c65f
build(deps): bump github.com/prometheus/common 
Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.44.0 to 0.45.0.
- [Release notes](https://github.com/prometheus/common/releases)
- [Commits](https://github.com/prometheus/common/compare/v0.44.0...v0.45.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/common
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-01 23:30:13 +00:00
Matthieu MOREL 7eaefcf379
ci(lint): enable errorlint on scrape (#12923) 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
Signed-off-by: Jesus Vazquez <jesusvazquez@users.noreply.github.com>
Co-authored-by: Jesus Vazquez <jesusvazquez@users.noreply.github.com>
 2023-11-01 20:06:46 +01:00
George Krajcsovits e399395b01
Native histograms vs labels (#13005) 
* Document le and quantile label transition due to native histograms

Fixes: #12984

For full explanation see the related issue. The le and quantile labels
are formatted as float with trailing .0 for whole number values when
native histograms is enabled, e.g. 10.0. This changes the resulting series
in Prometheus if previously we scraped the whole number itself, e.g. 10
over the text format.

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>

---------

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Signed-off-by: George Krajcsovits <krajorama@users.noreply.github.com>
 2023-11-01 18:30:34 +01:00
Björn Rabenstein a43669e611
Merge pull request #12928 from alexandear/ci-enable-godot 
ci(lint): enable godot; append dot at the end of comments
 2023-11-01 17:15:41 +01:00
Julien Pivotto fed6f81377
scrape: Added trackTimestampsStaleness configuration option 
Add the ability to track staleness when an explicit timestamp is set.
Useful for cAdvisor.

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-11-01 15:34:19 +01:00
Dimitar Dimitrov 5f9db04c2d
Sync with upstream/main to 6518d6fde 
Sync with upstream/main to `6518d6fde`
 2023-11-01 15:02:07 +01:00
Dimitar Dimitrov 1cb47cd3f7
Attempt to remove unused revive linter directive 2023-11-01 14:25:51 +01:00
Dimitar Dimitrov 601a2f91ed
Attempt to remove unused unused linter directives 2023-11-01 14:19:50 +01:00
Dimitar Dimitrov dba5006d7a
Merge branch 'upstream/main' into dimitar/sync-with-upstream-main 2023-11-01 14:06:11 +01:00
Matthias Loibl 6518d6fdec
Merge pull request #13036 from prometheus/codeowners-mixins 
Assign new code owners for prometheus-mixin
 2023-11-01 11:47:58 +01:00
Julien Pivotto 79bbfe601f
Merge pull request #13060 from roidelapluie/trackTimestampsStaleness 
scrape: Added trackTimestampsStaleness configuration option
 2023-10-31 19:34:31 -04:00
Charles Korn 5184368db6
Fix issue where chainSampleIterator can obscure errors (#13006) 
* Fix issue where `chainSampleIterator` can obscure errors

Signed-off-by: Charles Korn <charles.korn@grafana.com>

* Address PR feedback.

Signed-off-by: Charles Korn <charles.korn@grafana.com>

---------

Signed-off-by: Charles Korn <charles.korn@grafana.com>
 2023-10-31 22:35:17 +00:00
Julien Pivotto 84aadfc45b scrape: Added trackTimestampsStaleness configuration option 
Add the ability to track staleness when an explicit timestamp is set.
Useful for cAdvisor.

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-10-31 16:58:42 -04:00
Julien Pivotto 12dd0cb53b
Merge pull request #13034 from charleskorn/rule-evaluation-logs 
Include trace ID in log lines emitted during rule evaluation
 2023-10-31 15:53:17 -04: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
Oleksandr Redko fa90ca46e5 ci(lint): enable godot; append dot at the end of comments 
Signed-off-by: Oleksandr Redko <Oleksandr_Redko@epam.com>
 2023-10-31 19:53:38 +02:00
Björn Rabenstein 96179fe06a
Merge pull request #13055 from prometheus/beorn7/storage 
storage: Fix mixed samples handling in sampleRing
 2023-10-31 17:10:24 +01:00