80adc5baf4
Merge remote-tracking branch 'origin/main' into merge-2.54-to-main
2024-08-06 09:19:55 +01:00
6d7ed08850
Prepare release 2.54.0-rc.1 ( #14593 )
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-08-06 06:58:58 +01:00
5681ec50e1
build(deps): bump @lezer/lr from 1.4.1 to 1.4.2 in /web/ui ( #14560 )
...
Bumps [@lezer/lr](https://github.com/lezer-parser/lr ) from 1.4.1 to 1.4.2.
- [Changelog](https://github.com/lezer-parser/lr/blob/main/CHANGELOG.md )
- [Commits](https://github.com/lezer-parser/lr/compare/1.4.1...1.4.2 )
---
updated-dependencies:
- dependency-name: "@lezer/lr"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-02 11:47:04 +02:00
a5666dded5
build(deps): bump @codemirror/view from 6.28.3 to 6.29.1 in /web/ui ( #14564 )
...
Bumps [@codemirror/view](https://github.com/codemirror/view ) from 6.28.3 to 6.29.1.
- [Changelog](https://github.com/codemirror/view/blob/main/CHANGELOG.md )
- [Commits](https://github.com/codemirror/view/compare/6.28.3...6.29.1 )
---
updated-dependencies:
- dependency-name: "@codemirror/view"
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-02 10:06:52 +02:00
29b62762db
adapt the lezer grammar and codemirror autocompletion with duration and number that are equivalent ( #14417 )
...
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
2024-07-31 15:31:42 +02:00
6cef8698c2
build(deps-dev): bump @lezer/generator from 1.7.0 to 1.7.1 in /web/ui ( #14382 )
...
Bumps [@lezer/generator](https://github.com/lezer-parser/generator ) from 1.7.0 to 1.7.1.
- [Changelog](https://github.com/lezer-parser/generator/blob/main/CHANGELOG.md )
- [Commits](https://github.com/lezer-parser/generator/compare/1.7.0...1.7.1 )
---
updated-dependencies:
- dependency-name: "@lezer/generator"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-30 13:30:49 +02:00
7b5897a46d
Prepare release 2.54.0-rc.0 ( #14498 )
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-07-25 17:51:29 +01:00
c6c240d4ce
build(deps): bump @codemirror/lint from 6.8.0 to 6.8.1 in /web/ui ( #14383 )
...
Bumps [@codemirror/lint](https://github.com/codemirror/lint ) from 6.8.0 to 6.8.1.
- [Changelog](https://github.com/codemirror/lint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/codemirror/lint/compare/6.8.0...6.8.1 )
---
updated-dependencies:
- dependency-name: "@codemirror/lint"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-15 11:42:41 +02:00
c0f1b452bc
build(deps): bump @codemirror/view from 6.27.0 to 6.28.3 in /web/ui ( #14379 )
...
Bumps [@codemirror/view](https://github.com/codemirror/view ) from 6.27.0 to 6.28.3.
- [Changelog](https://github.com/codemirror/view/blob/main/CHANGELOG.md )
- [Commits](https://github.com/codemirror/view/compare/6.27.0...6.28.3 )
---
updated-dependencies:
- dependency-name: "@codemirror/view"
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-15 09:52:55 +02:00
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
646e1e847d
Merge branch 'release-2.53' into merge-2.53.1
2024-07-10 11:17:53 +01:00
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
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
c94c5b64c3
feat: add limitk() and limit_ratio() operators ( #12503 )
...
* rebase 2024-07-01, picks previous renaming to `limitk()` and `limit_ratio()`
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* gofumpt -d -extra
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* more lint fixes
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* more lint fixes+
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* put limitk() and limit_ratio() behind --enable-feature=promql-experimental-functions
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* EnableExperimentalFunctions for TestConcurrentRangeQueries() also
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* use testutil.RequireEqual to fix tests, WIP equivalent thingie for require.Contains
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* lint fix
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* moar linting
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* rebase 2024-06-19
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* re-add limit(2, metric) testing for N=2 common series subset
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* move `ratio = param` to default switch case, for better readability
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* gofumpt -d -extra util/testutil/cmp.go
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* early break when reaching k elems in limitk(), should have always been so (!)
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* small typo fix
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* no-change small break-loop rearrange for readability
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* remove IsNan(ratio) condition in switch-case, already handled as input validation
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* no-change adding some comments
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* no-change simplify fullMatrix() helper functions used for tests
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* add `limitk(-1, metric)` testcase, which is handled as any k < 1 case
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* engine_test.go: no-change create `requireCommonSeries() helper func (moving code into it) for readability
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* rebase 2024-06-21
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* engine_test.go: HAPPY NOW about its code -> reorg, create and use simpleRangeQuery() function, less lines and more readable ftW \o/
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* move limitk(), limit_ratio() testing to promql/promqltest/testdata/limit.test
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* remove stale leftover after moving tests from engine_test.go to testdata/
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* fix flaky `limit_ratio(0.5, ...)` test case
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* Update promql/engine.go
Co-authored-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* Update promql/engine.go
Co-authored-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* Update promql/engine.go
Co-authored-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* fix AddRatioSample() implementation to use a single conditional (instead of switch/case + fallback return)
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* docs/querying/operators.md: document r < 0
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* add negative limit_ratio() example to docs/querying/examples.md
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* move more extensive docu examples to docs/querying/operators.md
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* typo
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* small docu fix for poor-mans-normality-check, add it to limit.test ;)
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* limit.test: expand "Poor man's normality check" to whole eval range
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* restore mistakenly removed existing small comment
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* expand poors-man-normality-check case(s)
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* Revert "expand poors-man-normality-check case(s)"
This reverts commit f69e1603b2ebe69c0a100197cfbcf6f81644b564, indeed too
flaky 0:)
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* remove humor from docs/querying/operators.md
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* fix signoff
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* add web/ui missing changes
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* expand limit_ratio test cases, cross-fingering they'll not be flaky
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* remove flaky test
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* add missing warnings.Merge(ws) in instant-query return shortcut
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* add missing LimitK||LimitRatio case to codemirror-promql/src/parser/parser.ts
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* fix ui-lint
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
* actually fix returned warnings :]
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
---------
Signed-off-by: JuanJo Ciarlante <juanjosec@gmail.com>
Co-authored-by: Julius Volz <julius.volz@gmail.com>
2024-07-03 22:18:57 +02:00
19da579799
Merge pull request #12821 from rexagod/12769
...
parser: support underscores
2024-06-27 17:04:18 +02:00
3c9e3ee552
parser: support underscores
...
Support underscores in numbers, namely, decimals, hexadecimals, and
exponentials.
Fixes #12769
Signed-off-by: Pranshu Srivastava <rexagod@gmail.com>
Signed-off-by: Pranshu Srivastava <rexagod@gmail.com>
2024-06-27 19:20:52 +05:30
fcabffb999
Merge branch 'release-2.53' into merge-2.53-to-main
2024-06-19 10:06:57 +02:00
e121d07388
Prepare release 2.53.0
...
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2024-06-16 10:24:09 +02:00
dd8676218b
Prepare 2.53.0-rc.1 release
...
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2024-06-11 12:56:32 +02:00
afd26e5019
Merge pull request #14264 from prometheus/dependabot/npm_and_yarn/web/ui/lezer/generator-1.7.0
...
build(deps-dev): bump @lezer/generator from 1.5.1 to 1.7.0 in /web/ui
2024-06-06 15:55:51 +02:00
d433d200f6
Merge pull request #14263 from prometheus/dependabot/npm_and_yarn/web/ui/codemirror/language-6.10.2
...
build(deps): bump @codemirror/language from 6.9.3 to 6.10.2 in /web/ui
2024-06-06 15:54:45 +02:00
50e3712651
Merge pull request #14266 from prometheus/dependabot/npm_and_yarn/web/ui/nock-13.5.4
...
build(deps-dev): bump nock from 13.4.0 to 13.5.4 in /web/ui
2024-06-06 15:54:07 +02:00
6205b54e7d
build(deps): bump @codemirror/language from 6.9.3 to 6.10.2 in /web/ui
...
Bumps [@codemirror/language](https://github.com/codemirror/language ) from 6.9.3 to 6.10.2.
- [Changelog](https://github.com/codemirror/language/blob/main/CHANGELOG.md )
- [Commits](https://github.com/codemirror/language/compare/6.9.3...6.10.2 )
---
updated-dependencies:
- dependency-name: "@codemirror/language"
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-06-06 12:14:52 +00:00
638a11b797
build(deps-dev): bump nock from 13.4.0 to 13.5.4 in /web/ui
...
Bumps [nock](https://github.com/nock/nock ) from 13.4.0 to 13.5.4.
- [Release notes](https://github.com/nock/nock/releases )
- [Changelog](https://github.com/nock/nock/blob/main/CHANGELOG.md )
- [Commits](https://github.com/nock/nock/compare/v13.4.0...v13.5.4 )
---
updated-dependencies:
- dependency-name: nock
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-06-06 11:29:05 +00:00
9ebc630d10
build(deps-dev): bump @lezer/generator from 1.5.1 to 1.7.0 in /web/ui
...
Bumps [@lezer/generator](https://github.com/lezer-parser/generator ) from 1.5.1 to 1.7.0.
- [Changelog](https://github.com/lezer-parser/generator/blob/main/CHANGELOG.md )
- [Commits](https://github.com/lezer-parser/generator/compare/1.5.1...1.7.0 )
---
updated-dependencies:
- dependency-name: "@lezer/generator"
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-06-06 11:27:49 +00:00
38d459968c
build(deps): bump @codemirror/lint from 6.4.2 to 6.8.0 in /web/ui
...
Bumps [@codemirror/lint](https://github.com/codemirror/lint ) from 6.4.2 to 6.8.0.
- [Changelog](https://github.com/codemirror/lint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/codemirror/lint/compare/6.4.2...6.8.0 )
---
updated-dependencies:
- dependency-name: "@codemirror/lint"
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-06-06 11:24:57 +00:00
2544066169
Merge pull request #14239 from prometheus/dependabot/npm_and_yarn/web/ui/lezer/lr-1.4.1
...
build(deps): bump @lezer/lr from 1.3.14 to 1.4.1 in /web/ui
2024-06-06 10:24:02 +02:00
583e3842e5
Merge pull request #14237 from prometheus/dependabot/npm_and_yarn/web/ui/codemirror/autocomplete-6.16.2
...
build(deps): bump @codemirror/autocomplete from 6.11.1 to 6.16.2 in /web/ui
2024-06-06 10:11:42 +02:00
a16573dbad
build(deps): bump @lezer/lr from 1.3.14 to 1.4.1 in /web/ui
...
Bumps [@lezer/lr](https://github.com/lezer-parser/lr ) from 1.3.14 to 1.4.1.
- [Changelog](https://github.com/lezer-parser/lr/blob/main/CHANGELOG.md )
- [Commits](https://github.com/lezer-parser/lr/compare/1.3.14...1.4.1 )
---
updated-dependencies:
- dependency-name: "@lezer/lr"
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-06-06 07:56:56 +00:00
8397c7bc48
Version bump to v2.53.0-rc.0
...
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2024-06-06 09:56:36 +02:00
a4bcd6a7d1
build(deps): bump @lezer/common from 1.1.1 to 1.2.1 in /web/ui
...
Bumps [@lezer/common](https://github.com/lezer-parser/common ) from 1.1.1 to 1.2.1.
- [Changelog](https://github.com/lezer-parser/common/blob/main/CHANGELOG.md )
- [Commits](https://github.com/lezer-parser/common/compare/1.1.1...1.2.1 )
---
updated-dependencies:
- dependency-name: "@lezer/common"
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-06-05 15:18:31 +00:00
35b228b50f
build(deps): bump @codemirror/autocomplete in /web/ui
...
Bumps [@codemirror/autocomplete](https://github.com/codemirror/autocomplete ) from 6.11.1 to 6.16.2.
- [Changelog](https://github.com/codemirror/autocomplete/blob/main/CHANGELOG.md )
- [Commits](https://github.com/codemirror/autocomplete/compare/6.11.1...6.16.2 )
---
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-06-05 15:14:52 +00:00
d73537ccc0
Merge branch 'main' into resolveconflicts-2.52.1
2024-05-31 09:36:17 -03:00
3c1aadd942
Prepare v2.52.1 release
...
Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com>
2024-05-29 10:41:52 -03:00
df05132f19
Prepare v2.52.0 release
...
Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com>
2024-05-08 07:37:25 -03:00
2e323af50f
Merge branch 'main' into resolve-conflicts-2.52
...
Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>
2024-05-03 14:36:38 -03:00
48e6e16943
Prepare v2.52.0-rc.1 release ( #14050 )
...
Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>
2024-05-03 17:31:50 +00:00
650f4d7a72
Merge remote-tracking branch 'origin/main' into resolve-conflicts-2.52
2024-05-02 10:47:45 -03:00
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
9195d51469
Prepare v2.52 release
...
Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>
2024-04-24 17:19:43 -03:00
b4c0ab52c3
Cut release 2.51.2
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-04-10 11:08:16 +01:00
855b5ac4b8
Cut release 2.51.1 ( #13853 )
...
* Cut release 2.51.1
Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com>
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-03-28 09:23:45 +00:00
c05c15512a
Cut v2.51.0 ( #13787 )
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-03-19 10:49:40 +00:00
8d53e7ba90
Cut v2.51.0-rc.0 ( #13729 )
...
* Cherry-pick [BUGFIX] Azure SD: Fix 'error: parameter virtualMachineScaleSetName cannot be empty' (#13702 )
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-03-11 13:35:44 +00:00
518ab179fb
Merge branch 'release-2.50' into merge-2.50.1
2024-02-26 11:50:06 +00:00
e537d6d1c1
Cut 2.50.1 with metadata api bugfix
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-02-26 10:00:21 +00:00
9738e48a7d
Merge pull request #13629 from prometheus/release-2.50
...
merge back release 2.50
2024-02-22 11:07:52 +01:00
814b920e8a
Cut v2.50.0 ( #13612 )
...
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
2024-02-22 10:21:59 +01:00
93591ec5cc
Cut v2.50.0-rc.1 ( #13602 )
...
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
2024-02-19 14:15:03 +01:00
452f4c96b7
Cut v2.50.0-rc.0 ( #13465 )
...
Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
2024-02-13 10:21:23 +01:00
Bryan Boreham