TJ Hoplock
aa8e067f13
Merge release-3.0 into main
2024-11-27 17:51:51 -05:00
Owen Williams
12577e3851
Add support for values unescaping on `/v1/label/:name/values` endpoint
...
Signed-off-by: Owen Williams <owen.williams@grafana.com>
2024-11-27 14:03:03 -05:00
Julius Volz
975d5d7357
Merge pull request #15459 from prometheus/dependabot/npm_and_yarn/web/ui/rollup-4.27.4
...
chore(deps-dev): bump rollup from 4.21.2 to 4.27.4 in /web/ui
2024-11-26 14:07:57 +01:00
dependabot[bot]
c08edd3ff3
chore(deps-dev): bump rollup from 2.79.1 to 2.79.2 in /web/ui/react-app ( #15461 )
...
Bumps [rollup](https://github.com/rollup/rollup ) from 2.79.1 to 2.79.2.
- [Release notes](https://github.com/rollup/rollup/releases )
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rollup/rollup/compare/v2.79.1...v2.79.2 )
---
updated-dependencies:
- dependency-name: rollup
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-11-26 08:00:25 +01:00
dependabot[bot]
8e7e7a0406
chore(deps): bump micromatch from 4.0.5 to 4.0.8 in /web/ui/react-app ( #15462 )
...
Bumps [micromatch](https://github.com/micromatch/micromatch ) from 4.0.5 to 4.0.8.
- [Release notes](https://github.com/micromatch/micromatch/releases )
- [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md )
- [Commits](https://github.com/micromatch/micromatch/compare/4.0.5...4.0.8 )
---
updated-dependencies:
- dependency-name: micromatch
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-11-26 06:37:30 +00:00
dependabot[bot]
1bd16db101
chore(deps): bump body-parser and express in /web/ui/react-app ( #15460 )
...
Bumps [body-parser](https://github.com/expressjs/body-parser ) and [express](https://github.com/expressjs/express ). These dependencies needed to be updated together.
Updates `body-parser` from 1.20.2 to 1.20.3
- [Release notes](https://github.com/expressjs/body-parser/releases )
- [Changelog](https://github.com/expressjs/body-parser/blob/master/HISTORY.md )
- [Commits](https://github.com/expressjs/body-parser/compare/1.20.2...1.20.3 )
Updates `express` from 4.19.2 to 4.21.1
- [Release notes](https://github.com/expressjs/express/releases )
- [Changelog](https://github.com/expressjs/express/blob/4.21.1/History.md )
- [Commits](https://github.com/expressjs/express/compare/4.19.2...4.21.1 )
---
updated-dependencies:
- dependency-name: body-parser
dependency-type: indirect
- dependency-name: express
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-11-26 07:26:06 +01:00
dependabot[bot]
1939123b5b
chore(deps): bump braces from 3.0.2 to 3.0.3 in /web/ui/react-app ( #15457 )
...
Bumps [braces](https://github.com/micromatch/braces ) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md )
- [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3 )
---
updated-dependencies:
- dependency-name: braces
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-11-26 07:25:28 +01:00
dependabot[bot]
a778a58bdf
chore(deps-dev): bump rollup from 4.21.2 to 4.27.4 in /web/ui
...
Bumps [rollup](https://github.com/rollup/rollup ) from 4.21.2 to 4.27.4.
- [Release notes](https://github.com/rollup/rollup/releases )
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rollup/rollup/compare/v4.21.2...v4.27.4 )
---
updated-dependencies:
- dependency-name: rollup
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-11-26 05:20:09 +00:00
newtonne
88675710f9
Add support for utf8 names on `/v1/label/:name/values` endpoint
...
Previously, the api was evaluating this regex to determine if the label
name was valid or not:
14bac55a99/model/labels.go (L94)
However, I believe that the `IsValid()` function is what ought to be
used in the brave new utf8 era.
**Before**
```
$ curl localhost:9090/api/v1/label/host.name/values
{"status":"error","errorType":"bad_data","error":"invalid label name: \"host.name\""}
```
**After**
```
$ curl localhost:9090/api/v1/label/host.name/values
{"status":"success","data":["localhost"]}
```
It's very likely that I'm missing something here or you were already
planning to do this at some point but I just encountered this issue and
figured I'd give it a go.
Signed-off-by: Owen Williams <owen.williams@grafana.com>
2024-11-25 11:48:45 -05:00
Raphael Philipe Mendes da Silva
e664c16b31
api: fix typo in list rules API response ( #15400 )
...
* Fix typo in list rules API response
---------
Signed-off-by: Raphael Silva <rapphil@gmail.com>
2024-11-24 17:28:21 +01:00
Arve Knudsen
89bbb885e5
Upgrade to golangci-lint v1.62.0 ( #15424 )
...
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2024-11-20 17:22:20 +01:00
Björn Rabenstein
e8003cb347
Merge pull request #15417 from huochexizhan/main
...
chore: fix some function names in comment
2024-11-20 14:36:47 +01:00
Bryan Boreham
b02805e40e
Merge pull request #15415 from prometheus/merge-release-into-main
...
Merge release branches 2.53, 2.55 and 3.0 into main
2024-11-19 18:33:33 +00:00
huochexizhan
4f48e76086
chore: fix some function names in comment
...
Signed-off-by: huochexizhan <huochexizhan@outlook.com>
2024-11-19 12:02:10 +08:00
Bryan Boreham
26886d6d95
Merge branch 'release-3.0' into merge-release-into-main
2024-11-18 14:43:56 +00:00
Jan Fajerski
d541b3bbeb
prepare release 3.0.0
...
Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
2024-11-13 15:41:05 +01:00
Jan Fajerski
60489308a1
Prepare v3.0.0-rc.1
...
Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
2024-11-11 22:32:26 +00:00
🌲 Harry 🌊 John 🏔
f9bc50b247
storage: Implement limit in mergeGenericQuerier
...
Signed-off-by: 🌲 Harry 🌊 John 🏔 <johrry@amazon.com>
2024-11-07 09:08:23 -08:00
Matthieu MOREL
af1a19fc78
enable errorf rule from perfsprint linter
...
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
2024-11-06 16:50:36 +01:00
Julius Volz
d19e749dc6
Fix selector / series formatting for empty metric names
...
Fixes https://github.com/prometheus/prometheus/issues/15335
Signed-off-by: Julius Volz <julius.volz@gmail.com>
2024-11-05 16:29:40 +01:00
Julius Volz
c1f8036228
Fix selector / series formatting for empty metric names
...
Fixes https://github.com/prometheus/prometheus/issues/15335
Signed-off-by: Julius Volz <julius.volz@gmail.com>
2024-11-05 16:12:05 +01:00
Jan Fajerski
1ac3ca9528
Release 3.0.0-rc.0
...
Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
2024-11-04 14:19:32 +01:00
Julius Volz
51866b9fee
Merge pull request #15244 from prometheus/utf8-web-ui-support
...
Support UTF-8 metric names and labels in web UI
2024-11-04 12:13:41 +01:00
Bryan Boreham
adcc873d51
[BUILD] React-app: replace 0.55.0-rc.0 with 0.55.0
...
Try to stop build errors.
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-11-02 11:55:52 +00:00
Jan Fajerski
284135a905
Merge pull request #15223 from jan--f/release-3.0.0-rc.0
...
Prepare release 3.0.0 rc.0
2024-10-31 20:33:37 +01:00
Julius Volz
76ca7d08d9
Fixup: re-add erroneously removed lines
...
Signed-off-by: Julius Volz <julius.volz@gmail.com>
2024-10-30 16:43:10 +01:00
Julius Volz
c861b31b72
Support UTF-8 metric names and labels in web UI
...
Fixes most of https://github.com/prometheus/prometheus/issues/15202
This should address all areas of the UI except for the autocompletion in the
codemirror-promql text editor. The strategy here is that any time we print or
internally serialize (like for the PromLens tree view) either a metric name or
a label name as part of a selector or in other relevant parts of PromQL, we
check whether it contains characters beyond what was previously supported, and
if so, quote and escape it. In the case of metric names, we also have to move
them from the beginning of the selector into the curly braces.
Signed-off-by: Julius Volz <julius.volz@gmail.com>
2024-10-29 20:22:52 +01:00
Jan Fajerski
5408184452
react-app: bump version in lock file
...
Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
2024-10-28 17:10:34 +01:00
Jack Westbrook
7cda23ba32
fix(lezer-promql): fix missing types export in package.json ( #15161 )
...
Signed-off-by: Jack Westbrook <jack.westbrook@gmail.com>
2024-10-28 17:05:10 +01:00
Jan Fajerski
38fd48e6b5
v2.55.0
...
-----BEGIN SSH SIGNATURE-----
U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgX42TrpDUXJbbi9yZ3hs6cDg+kz
G6d3nAlAb2XQInrEgAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5
AAAAQGoSEKIFT/BfavtG2qW9n7NYonNQk/9r6gCLvxln9elt1hiY0ZGcwRhm1QNx6FotxJ
Y3LB9dt4s5akB3fOPkYwc=
-----END SSH SIGNATURE-----
Merge tag 'v2.55.0' into release-3.0.0-rc.0
v2.55.0
2024-10-25 14:16:22 +02:00
Bryan Boreham
bb27c6b896
Create release 2.55.0
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-10-22 09:31:02 +01:00
Yijie Qin
d2802c6fac
api: Add rule group pagination to list rules api ( #14017 )
...
* Add paginated feature to list rules api
Signed-off-by: Yijie Qin <qinyijie@amazon.com>
* Refactor to simplify code:
* Reduce number of variables
* Reduce type convesion
Signed-off-by: Raphael Silva <rapphil@gmail.com>
* Simplify paginated implementation
* Remove maxAlerts parameter.
* Reuse existing API responses by using omitempty in some fields
Signed-off-by: Raphael Silva <rapphil@gmail.com>
* Simplify pagination implementation
* Eliminate the need to sort the rule groups.
Signed-off-by: Raphael Silva <rapphil@gmail.com>
* Fix linting error
Signed-off-by: Raphael Silva <rapphil@gmail.com>
* Add more unit tests
Signed-off-by: Raphael Silva <rapphil@gmail.com>
* Update pagination parameters to be consistent with existing parameters
Signed-off-by: Raphael Silva <rapphil@gmail.com>
* Rename max_rule_groups to max_groups
Signed-off-by: Raphael Silva <rapphil@gmail.com>
* Refactor to simplify code
Signed-off-by: Raphael Silva <rapphil@gmail.com>
* Refactor to simplify the calculation of next token
Signed-off-by: Raphael Silva <rapphil@gmail.com>
* Handle corner case in pagination request
Signed-off-by: Raphael Silva <rapphil@gmail.com>
* Handle corner cases for pagination of list rules
Signed-off-by: Raphael Silva <rapphil@gmail.com>
* Update documentation for list rules parameters
Signed-off-by: Raphael Silva <rapphil@gmail.com>
* Refactor comments
Signed-off-by: Raphael Silva <rapphil@gmail.com>
* Simplify pagination implementation
* Eliminate need for extra structs to store pagination parameters
Signed-off-by: Raphael Silva <rapphil@gmail.com>
* Update docs/querying/api.md
Co-authored-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: Raphael Philipe Mendes da Silva <rapphil@gmail.com>
* Update web/api/v1/api.go
Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com>
Signed-off-by: Raphael Philipe Mendes da Silva <rapphil@gmail.com>
* Update comment describing the need for next token
Signed-off-by: Raphael Silva <rapphil@gmail.com>
---------
Signed-off-by: Yijie Qin <qinyijie@amazon.com>
Signed-off-by: Raphael Silva <rapphil@gmail.com>
Signed-off-by: Raphael Philipe Mendes da Silva <rapphil@gmail.com>
Co-authored-by: Raphael Silva <rapphil@gmail.com>
Co-authored-by: Julius Volz <julius.volz@gmail.com>
Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com>
2024-10-22 00:04:40 +01:00
Bryan Boreham
70e2d23027
Merge pull request #11474 from clwluvw/group-label
...
[FEATURE] rules: add labels at group level
2024-10-21 14:47:12 +01:00
Bryan Boreham
8ea2c6adce
Prepare release 2.55.0-rc.1
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-10-16 13:56:24 +01:00
Arve Knudsen
de16f5e387
[FEATURE] PromQL: Add experimental info function MVP ( #14495 )
...
The `info` function is an experiment to improve UX
around including labels from info metrics.
`info` has to be enabled via the feature flag `--enable-feature=promql-experimental-functions`.
This MVP of info simplifies the implementation by assuming:
* Only support for the target_info metric
* That target_info's identifying labels are job and instance
Also:
* Encode info samples' original timestamp as sample value
* Deduce info series select hints from top-most VectorSelector
---------
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Ying WANG <ying.wang@grafana.com>
Co-authored-by: Augustin Husson <augustin.husson@amadeus.com>
Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com>
Co-authored-by: Björn Rabenstein <github@rabenste.in>
Co-authored-by: Bryan Boreham <bjboreham@gmail.com>
2024-10-16 13:52:11 +01:00
Bryan Boreham
9623681543
Prepare 3.0.0-beta.1
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-10-08 17:27:10 +01:00
Julien
8406aa9c9c
Add a note for pre-built assets
...
Signed-off-by: Julien <roidelapluie@o11y.eu>
2024-10-08 11:23:01 +02:00
TJ Hoplock
6ebfbd2d54
chore!: adopt log/slog, remove go-kit/log
...
For: #14355
This commit updates Prometheus to adopt stdlib's log/slog package in
favor of go-kit/log. As part of converting to use slog, several other
related changes are required to get prometheus working, including:
- removed unused logging util func `RateLimit()`
- forward ported the util/logging/Deduper logging by implementing a small custom slog.Handler that does the deduping before chaining log calls to the underlying real slog.Logger
- move some of the json file logging functionality to use prom/common package functionality
- refactored some of the new json file logging for scraping
- changes to promql.QueryLogger interface to swap out logging methods for relevant slog sugar wrappers
- updated lots of tests that used/replicated custom logging functionality, attempting to keep the logical goal of the tests consistent after the transition
- added a healthy amount of `if logger == nil { $makeLogger }` type conditional checks amongst various functions where none were provided -- old code that used the go-kit/log.Logger interface had several places where there were nil references when trying to use functions like `With()` to add keyvals on the new *slog.Logger type
Signed-off-by: TJ Hoplock <t.hoplock@gmail.com>
2024-10-07 15:58:50 -04:00
Matthieu MOREL
ab64966e9d
fix: use "ErrorContains" or "EqualError" instead of "Contains(t, err.Error()" and "Equal(t, err.Error()" ( #15094 )
...
* fix: use "ErrorContains" or "EqualError" instead of "Contains(t, err.Error()" and "Equal(t, err.Error()"
---------
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
2024-10-06 16:35:29 +00:00
Julius Volz
3d2194f561
Style cleanups, mostly for web notifications and startup alert
...
Some of the changes are a bit unreadable because the previous files were not
saved with the project's linter / auto-formatter settings applied. But it's
basically:
* For icons that are not Mantine-native components, use the rem() function
for computing their size, so they scale correctly with the root font size.
See https://mantine.dev/styles/rem/ .
* Try a different icon for the notifications tray, since the bell icon was
already used for Prometheus alerts. Other candidates from
https://tabler.io/icons would be IconExclamationCircle or
IconDeviceDesktopExclamation or IconMessageCircleExclamation.
* The server startup alert looked a bit cramped, introduced a Stack to add
spacing between the text and the progress bar.
* Added a bit of spacing between notification text and date. Things looked
cramped. To make things look ok with that, I also top-aligned the
notification text and icon.
Signed-off-by: Julius Volz <julius.volz@gmail.com>
2024-10-04 14:14:45 +02:00
Julien
21e0f83b68
Move notifications in utils
...
Signed-off-by: Julien <roidelapluie@o11y.eu>
2024-10-04 10:11:56 +02:00
Julien
b6158e8956
Notify web UI when starting up and shutting down
...
Signed-off-by: Julien <roidelapluie@o11y.eu>
2024-10-03 10:27:04 +02:00
Julius Volz
bcd9ce1d43
Merge pull request #15061 from prometheus/dependabot/npm_and_yarn/web/ui/postcss-8.4.47
...
Bump postcss from 8.4.44 to 8.4.47 in /web/ui
2024-10-02 08:24:41 +02:00
Julius Volz
4edbe3f70a
Merge pull request #15055 from prometheus/dependabot/npm_and_yarn/web/ui/globals-15.10.0
...
Bump globals from 15.9.0 to 15.10.0 in /web/ui
2024-10-02 08:24:24 +02:00
Julius Volz
d3b0ab453c
Fix tabler icon props import after version bump
...
Signed-off-by: Julius Volz <julius.volz@gmail.com>
2024-10-02 08:05:20 +02:00
dependabot[bot]
4f448d4c4c
Bump @tabler/icons-react from 2.47.0 to 3.19.0 in /web/ui
...
Bumps [@tabler/icons-react](https://github.com/tabler/tabler-icons/tree/HEAD/packages/icons-react ) from 2.47.0 to 3.19.0.
- [Release notes](https://github.com/tabler/tabler-icons/releases )
- [Commits](https://github.com/tabler/tabler-icons/commits/v3.19.0/packages/icons-react )
---
updated-dependencies:
- dependency-name: "@tabler/icons-react"
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-10-02 05:56:23 +00:00
dependabot[bot]
c0a0520b54
Bump globals from 15.9.0 to 15.10.0 in /web/ui
...
Bumps [globals](https://github.com/sindresorhus/globals ) from 15.9.0 to 15.10.0.
- [Release notes](https://github.com/sindresorhus/globals/releases )
- [Commits](https://github.com/sindresorhus/globals/compare/v15.9.0...v15.10.0 )
---
updated-dependencies:
- dependency-name: globals
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-10-02 05:55:37 +00:00
Julius Volz
e32dbeb384
Merge pull request #15056 from prometheus/dependabot/npm_and_yarn/web/ui/eslint-9.11.1
...
Bump eslint from 9.9.1 to 9.11.1 in /web/ui
2024-10-02 07:54:54 +02:00
Julius Volz
9c0fe8e452
Merge pull request #15057 from prometheus/dependabot/npm_and_yarn/web/ui/codemirror/autocomplete-6.18.1
...
Bump @codemirror/autocomplete from 6.18.0 to 6.18.1 in /web/ui
2024-10-02 07:54:37 +02:00
dependabot[bot]
98cf5942ae
Bump postcss from 8.4.44 to 8.4.47 in /web/ui
...
Bumps [postcss](https://github.com/postcss/postcss ) from 8.4.44 to 8.4.47.
- [Release notes](https://github.com/postcss/postcss/releases )
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md )
- [Commits](https://github.com/postcss/postcss/compare/8.4.44...8.4.47 )
---
updated-dependencies:
- dependency-name: postcss
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-10-02 05:07:46 +00:00