Commit Graph

13210 Commits

Author SHA1 Message Date
B1F030
3648386345 fix fmt
Signed-off-by: B1F030 <b1fzhang@gmail.com>
2024-07-15 11:59:58 +08:00
B1F030
15ac95ddd0 change documentcli
Signed-off-by: B1F030 <b1fzhang@gmail.com>
2024-07-15 11:33:58 +08:00
B1F030
5c2590c358 revert main.go
Signed-off-by: B1F030 <b1fzhang@gmail.com>
2024-07-15 10:54:54 +08:00
Odysseus Zhang
4c74d359eb
Merge branch 'prometheus:main' into patch-1 2024-07-15 10:51:51 +08:00
Arve Knudsen
52a73ec871
Merge pull request #14374 from prometheus/dependabot/npm_and_yarn/web/ui/sass-1.77.6
build(deps): bump sass from 1.77.4 to 1.77.6 in /web/ui
2024-07-14 19:32:10 +02:00
Arve Knudsen
9f9f9298fa
Merge pull request #14375 from prometheus/dependabot/npm_and_yarn/web/ui/types/node-20.14.9
build(deps-dev): bump @types/node from 20.14.2 to 20.14.9 in /web/ui
2024-07-14 19:31:30 +02:00
Arve Knudsen
5daf584afc
Merge pull request #14385 from prometheus/dependabot/github_actions/github/codeql-action-3.25.11
build(deps): bump github/codeql-action from 3.25.8 to 3.25.11
2024-07-14 19:30:15 +02:00
Arve Knudsen
a41a0538c7
Merge pull request #14384 from prometheus/dependabot/go_modules/go-opentelemetry-io-deefcab708
build(deps): bump the go-opentelemetry-io group across 1 directory with 2 updates
2024-07-14 19:23:36 +02:00
dependabot[bot]
18a40e31d4 build(deps): bump the go-opentelemetry-io group across 1 directory with 2 updates
Bumps the go-opentelemetry-io group with 2 updates in the / directory: [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.8.0 to 1.11.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/pdata/v1.8.0...pdata/v1.11.0)

Updates `go.opentelemetry.io/collector/semconv` from 0.101.0 to 0.104.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.101.0...v0.104.0)

---
updated-dependencies:
- dependency-name: go.opentelemetry.io/collector/pdata
  dependency-type: direct:production
  update-type: version-update:semver-minor
  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>
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2024-07-14 18:51:09 +02:00
Arve Knudsen
f23792f9e8
Merge pull request #14468 from prometheus/dependabot/npm_and_yarn/web/ui/ts-jest-29.2.2
build(deps-dev): bump ts-jest from 29.2.1 to 29.2.2 in /web/ui
2024-07-14 18:39:03 +02:00
Arve Knudsen
3eda19ac04
Merge pull request #14386 from prometheus/dependabot/github_actions/bufbuild/buf-setup-action-1.34.0
build(deps): bump bufbuild/buf-setup-action from 1.32.2 to 1.34.0
2024-07-14 18:16:19 +02:00
Arve Knudsen
64bfd2f49a
Merge pull request #14390 from prometheus/dependabot/github_actions/scripts/actions/checkout-4.1.7
build(deps): bump actions/checkout from 4.1.6 to 4.1.7 in /scripts
2024-07-14 18:15:51 +02:00
dependabot[bot]
c458cb73a4
build(deps-dev): bump ts-jest from 29.2.1 to 29.2.2 in /web/ui
Bumps [ts-jest](https://github.com/kulshekhar/ts-jest) from 29.2.1 to 29.2.2.
- [Release notes](https://github.com/kulshekhar/ts-jest/releases)
- [Changelog](https://github.com/kulshekhar/ts-jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/kulshekhar/ts-jest/compare/v29.2.1...v29.2.2)

---
updated-dependencies:
- dependency-name: ts-jest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-14 16:12:25 +00:00
Arve Knudsen
42293c008a
Merge pull request #14458 from prometheus/dependabot/npm_and_yarn/web/ui/codemirror/autocomplete-6.17.0
build(deps): bump @codemirror/autocomplete from 6.16.2 to 6.17.0 in /web/ui
2024-07-14 18:12:14 +02:00
Arve Knudsen
f6e37c5cdb
Merge pull request #14459 from prometheus/dependabot/npm_and_yarn/web/ui/ts-jest-29.2.1
build(deps-dev): bump ts-jest from 29.1.4 to 29.2.1 in /web/ui
2024-07-14 18:11:16 +02:00
Bryan Boreham
d116bf7b9f
Merge pull request #14109 from harry671003/pass_limit_to_querier
storage: pass limit param as hint in querier
2024-07-12 10:27:52 +01:00
Bartlomiej Plotka
0c87643abd
[PRW 2.0] write_handler: Support for rc.2 spec & improved error handling for v2. (#14427)
* [PRW 2.0] write_handler: Support for rc.2 spec & improved error handling for v2.

Fixes: https://github.com/prometheus/prometheus/issues/14359

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

* Addressed Callum comments.

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

* Added missing lock on flush.

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

* Fixed lint.

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

* Added tests.

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

* Addressed Callum's comments & updated re spec.

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

* Update storage/remote/write_handler_test.go

Co-authored-by: Callum Styan <callumstyan@gmail.com>
Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>

---------

Signed-off-by: bwplotka <bwplotka@gmail.com>
Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
Co-authored-by: Callum Styan <callumstyan@gmail.com>
2024-07-12 08:11:38 +01:00
咸鱼暄
bab098a4c1 change all lists to bullets
Signed-off-by: 咸鱼暄 <30610597+smd1121@users.noreply.github.com>
2024-07-11 17:05:23 +02:00
咸鱼暄
ad03ede602 fix markdown list
Signed-off-by: 咸鱼暄 <30610597+smd1121@users.noreply.github.com>
2024-07-11 17:05:23 +02:00
machine424
caa71fb3c7 chore(storage/remote): collect maxTimestamp when value is 0 as well.
This change enables the PrometheusRemoteWriteBehind alert’s expression to be evaluated
even when the remote endpoint has never been reached. As a result, PrometheusRemoteWriteBehind
will fire to easily detect configuration mistakes (such as incorrect endpoint URLs) or
unrecoverable connectivity issues.

See https://github.com/prometheus/prometheus/issues/14350 for details.

Signed-off-by: machine424 <ayoubmrini424@gmail.com>
2024-07-11 16:43:58 +02:00
Björn Rabenstein
58963f7b2e
Merge pull request #9138 from darshanime/duration_number_duality
Making durations and number literals the same
2024-07-10 18:06:06 +02:00
dependabot[bot]
dca82e0805
build(deps-dev): bump ts-jest from 29.1.4 to 29.2.1 in /web/ui
Bumps [ts-jest](https://github.com/kulshekhar/ts-jest) from 29.1.4 to 29.2.1.
- [Release notes](https://github.com/kulshekhar/ts-jest/releases)
- [Changelog](https://github.com/kulshekhar/ts-jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/kulshekhar/ts-jest/compare/v29.1.4...v29.2.1)

---
updated-dependencies:
- dependency-name: ts-jest
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-10 15:35:15 +00:00
dependabot[bot]
dd48eab981
build(deps): bump @codemirror/autocomplete in /web/ui
Bumps [@codemirror/autocomplete](https://github.com/codemirror/autocomplete) from 6.16.2 to 6.17.0.
- [Changelog](https://github.com/codemirror/autocomplete/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codemirror/autocomplete/compare/6.16.2...6.17.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>
2024-07-10 15:35:14 +00:00
Bryan Boreham
9d744deea3
Merge pull request #14455 from bboreham/merge-2.53.1
Merge 2.53.1 into main
2024-07-10 16:34:01 +01:00
beorn7
706e19912b adjust version number in documentation
Signed-off-by: beorn7 <beorn@grafana.com>
2024-07-10 16:59:33 +02:00
darshanime
1a1b09fc3d Add a note about the new syntax
Signed-off-by: darshanime <deathbullet@gmail.com>
2024-07-10 15:50:23 +02:00
darshanime
bd4ea118e9 Allow durations for number rule
Signed-off-by: darshanime <deathbullet@gmail.com>
2024-07-10 15:50:22 +02:00
darshanime
cfad8ff3b2 Deprecate duration token
Signed-off-by: darshanime <deathbullet@gmail.com>
2024-07-10 15:49:58 +02:00
darshanime
8c8860d2d6 Allow number literals as duration
Signed-off-by: darshanime <deathbullet@gmail.com>
2024-07-10 15:49:30 +02:00
Saswata Mukherjee
398f42de5f
Add label-matcher support to Rules API (#10194)
* Add label-matcher support to Rules API

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
Signed-off-by: Yijie Qin <qinyijie@amazon.com>

* Implement suggestions

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
Signed-off-by: Yijie Qin <qinyijie@amazon.com>

* Match any matcherSet instead of all

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
Signed-off-by: Yijie Qin <qinyijie@amazon.com>

* Don't treat labels.Labels as slice

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
Signed-off-by: Yijie Qin <qinyijie@amazon.com>

* Remove non-templated check and fix tests

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
Signed-off-by: Yijie Qin <qinyijie@amazon.com>

* Update docs

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
Signed-off-by: Yijie Qin <qinyijie@amazon.com>

* fix comments

Signed-off-by: Yijie Qin <qinyijie@amazon.com>

* fix comment

Signed-off-by: Yijie Qin <qinyijie@amazon.com>

* Add comment for matching logic, fix tests after rebase

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>

---------

Signed-off-by: Saswata Mukherjee <saswataminsta@yahoo.com>
Signed-off-by: Yijie Qin <qinyijie@amazon.com>
Co-authored-by: Yijie Qin <qinyijie@amazon.com>
2024-07-10 13:18:29 +01:00
Björn Rabenstein
b1c106a9ce
Merge pull request #14454 from fpetkovski/fix-binop-hist-stats
Fix decoding buckets for native histograms in binops
2024-07-10 13:07:45 +02:00
Bryan Boreham
646e1e847d Merge branch 'release-2.53' into merge-2.53.1 2024-07-10 11:17:53 +01:00
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
Filip Petkovski
acb6c1ae4b
Fix decoding buckets for native histograms in binops
The optimizer which detects cases where histogram buckets can be skipped
does not take into account binary expressions. This can lead to buckets
not being decoded if a metric is used with both histogram_fraction/quantile and
histogram_sum/count in the same expression.

Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>
2024-07-10 11:55:29 +02:00
Bryan Boreham
7b595d67b4
2.54: Propose Bryan Boreham as release shepherd (#14453)
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-07-10 10:42:26 +01:00
Bryan Boreham
7083ae8267
[release 2.53] Revert 13583 to stop dropping samples in remote-write catch-up (#14446)
* Revert "fix bug that would cause us to endlessly fall behind (#13583)"
This reverts commit 0c71230784.
(leaving the new test in place)

* TSDB: enhance TestRun_AvoidNotifyWhenBehind
With code suggested by @cstyan in #14439.

* WAL watcher: add back log line showing current segment

---------

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-07-10 10:00:31 +01:00
Björn Rabenstein
d002fad00c
Merge pull request #14424 from aknuds1/arve/fix-comments
Fix a couple of comments
2024-07-10 00:56:32 +02:00
Bartlomiej Plotka
5646c315bd
Merge pull request #14416 from prometheus/prw2.0-nhcb
writev2: Add basic support for nhcb.
2024-07-09 08:54:49 +02:00
B1F030
e5c69685b5 Fix web.cors.origin in command-line/prometheus.md
Signed-off-by: B1F030 <b1fzhang@gmail.com>
2024-07-08 11:30:36 +08:00
Manik Rana
8849b7dcad
chore: remove console logs (#14430)
Signed-off-by: Manik Rana <manikrana54@gmail.com>
2024-07-07 12:27:13 +02:00
Björn Rabenstein
06f0f2ef3b
Merge pull request #14429 from prometheus/document-info-annotations
Document info-level annotations in query response
2024-07-07 00:24:34 +02:00
Julius Volz
0f0b3d82e1 Document info-level annotations in query response
Fixes https://github.com/prometheus/prometheus/issues/14135

Signed-off-by: Julius Volz <julius.volz@gmail.com>
2024-07-06 23:51:00 +02:00
zenador
480fefd089
Split warnings and info annotations in API response (#14327)
* split warnings and info annotations in API response

Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>

* update according to code review

Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>

* minimal UI change: show infos in different colour

Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>

* Update web/ui/react-app/src/pages/graph/Panel.tsx

Co-authored-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: zenador <zenador@users.noreply.github.com>

---------

Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
Signed-off-by: zenador <zenador@users.noreply.github.com>
Co-authored-by: Julius Volz <julius.volz@gmail.com>
2024-07-06 11:05:00 +02:00
Arve Knudsen
e410a215fb Fix a couple of comments
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2024-07-05 15:25:42 +02:00
Bryan Boreham
89608c69a7
Merge pull request #14328 from bboreham/more-dedupelabels
TSDB and scraping: improvements to dedupelabels
2024-07-05 11:46:31 +01:00
Bryan Boreham
4d7532f60b tsdb: reset symbol table for exemplars periodically
To avoid keeping the memory alive forever.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-07-05 10:19:07 +01:00
Bryan Boreham
5281a6bc1b TSDB: rebuild labels symbol-table on each compaction
Log begin/end for timing, plus some stats.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-07-05 10:19:07 +01:00
Bryan Boreham
e6356e64bd Scraping: drop series cache when resizing symbol table
Clear caches by restarting scraping loops: each loop assumes it has
exclusive ownership of its cache, so we can't come in from another
goroutine and change it.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-07-05 10:16:22 +01:00
Bryan Boreham
74b1f3daa6 Refactor: scraping: extract method restartLoops
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-07-05 10:16:22 +01:00
Bryan Boreham
b42b5fbd74 Scraping: check symbol-table on sync
Previously they were only checked on a change of config.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-07-05 10:16:22 +01:00