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
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
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
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
d541b3bbeb
prepare release 3.0.0
...
Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
2024-11-13 15:41:05 +01:00
60489308a1
Prepare v3.0.0-rc.1
...
Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
2024-11-11 22:32:26 +00:00
1ac3ca9528
Release 3.0.0-rc.0
...
Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
2024-11-04 14:19:32 +01:00
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
5408184452
react-app: bump version in lock file
...
Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
2024-10-28 17:10:34 +01:00
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
bb27c6b896
Create release 2.55.0
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-10-22 09:31:02 +01:00
70e2d23027
Merge pull request #11474 from clwluvw/group-label
...
[FEATURE] rules: add labels at group level
2024-10-21 14:47:12 +01:00
8ea2c6adce
Prepare release 2.55.0-rc.1
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-10-16 13:56:24 +01:00
3f9b869fb5
Fix react-app (old UI) package-lock.json
...
cd web/ui/react-app
npm install
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2024-09-23 16:34:37 +01:00
ca673eb749
Merge remote-tracking branch 'origin/release-2.55' into merge-2.55-into-main
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-09-22 17:49:34 +01:00
81b9407f15
Prepare release 2.55.0-rc.0
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-09-19 12:38:12 +01:00
50cd453c8f
chore: Fix typos ( #14868 )
...
* Fix typos
---------
Signed-off-by: Nathan Baulch <nathan.baulch@gmail.com>
2024-09-10 22:32:03 +02:00
fa318711f4
Merge branch 'main' into 3.0-main-sync-24-09-09
...
Conflicts:
cmd/prometheus/main.go
docs/command-line/prometheus.md
docs/feature_flags.md
web/ui/build_ui.sh
web/web.go
Resolved by dropping the UTF-8 feature flag and adding the
`auto-reload-config` feature flag.
For the new web ui pick all changes from `main`.
2024-09-09 15:44:22 +02:00
d9fdb50a61
Remove file that was erroneously added to old UI
...
Signed-off-by: Julius Volz <julius.volz@gmail.com>
2024-09-07 18:00:35 +02:00
490eef6509
Merge branch 'main' into mantine-ui
...
Signed-off-by: Julius Volz <julius.volz@gmail.com>
2024-09-04 20:58:19 +02:00
00315ce15e
Merge branch 'main' into 3.0-main-sync-24-08-30
...
using -Xours
Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
2024-09-02 11:27:18 +02:00
4202be5e79
Merge branch 'release-2.54' into merge-2.54.1-into-main
2024-08-27 12:04:48 +01:00
da28f88910
Cut release 2.54.1
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-08-27 10:14:16 +01:00
5138922b0d
Merge branch 'main' into 3.0-main-sync-24-08-21
2024-08-21 09:09:36 +02:00
7711cd5ab5
Remove deprecated storage.tsdb.retention flag
...
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
Signed-off-by: Julien <roidelapluie@o11y.eu>
2024-08-16 13:53:09 +02:00
8978f3ef71
Cut release 2.54.0
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-08-09 12:07:28 +01:00
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
0f951774b8
Merge branch 'main' into mantine-ui
...
Signed-off-by: Julius Volz <julius.volz@gmail.com>
2024-07-31 21:02:21 +02:00
f253d36361
rule: allow merging labels from group level
...
Support merging labels from groups to rule labels
Signed-off-by: Seena Fallah <seenafallah@gmail.com>
2024-07-26 20:18:05 +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
edf31da311
Merge branch 'main' into mantine-ui
...
Signed-off-by: Julius Volz <julius.volz@gmail.com>
2024-07-15 14:11:48 +02: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
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
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
8849b7dcad
chore: remove console logs ( #14430 )
...
Signed-off-by: Manik Rana <manikrana54@gmail.com>
2024-07-07 12:27:13 +02: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
c9bc1c2be0
Update histogram math ( #13680 )
...
ui: Fix many edge cases of rendering a histogram
---------
Signed-off-by: Manik Rana <manikrana54@gmail.com>
2024-07-04 14:01:09 +02:00
f090ab1baf
build(deps): bump sass from 1.77.4 to 1.77.6 in /web/ui
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.77.4 to 1.77.6.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.77.4...1.77.6 )
---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-07-01 23:02:26 +00:00
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
51e303d450
Merge pull request #14244 from prometheus/dependabot/npm_and_yarn/web/ui/http-proxy-middleware-3.0.0
...
build(deps): bump http-proxy-middleware from 2.0.6 to 3.0.0 in /web/ui
2024-06-06 19:15:58 +02:00
be0d51278c
Merge pull request #14270 from prometheus/dependabot/npm_and_yarn/web/ui/types/sinon-17.0.3
...
build(deps-dev): bump @types/sinon from 10.0.20 to 17.0.3 in /web/ui
2024-06-06 19:12:15 +02:00
f58f539c53
build(deps): bump @codemirror/commands from 6.3.2 to 6.6.0 in /web/ui
...
Bumps [@codemirror/commands](https://github.com/codemirror/commands ) from 6.3.2 to 6.6.0.
- [Changelog](https://github.com/codemirror/commands/blob/main/CHANGELOG.md )
- [Commits](https://github.com/codemirror/commands/compare/6.3.2...6.6.0 )
---
updated-dependencies:
- dependency-name: "@codemirror/commands"
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-06-06 16:37:28 +00:00
dependabot[bot]