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
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
9bfc47f1f7
build(deps-dev): bump @types/sinon from 10.0.20 to 17.0.3 in /web/ui
...
Bumps [@types/sinon](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/sinon ) from 10.0.20 to 17.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases )
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/sinon )
---
updated-dependencies:
- dependency-name: "@types/sinon"
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-06-06 16:37:10 +00:00
0661b9076f
build(deps): bump http-proxy-middleware from 2.0.6 to 3.0.0 in /web/ui
...
Bumps [http-proxy-middleware](https://github.com/chimurai/http-proxy-middleware ) from 2.0.6 to 3.0.0.
- [Release notes](https://github.com/chimurai/http-proxy-middleware/releases )
- [Changelog](https://github.com/chimurai/http-proxy-middleware/blob/master/CHANGELOG.md )
- [Commits](https://github.com/chimurai/http-proxy-middleware/compare/v2.0.6...v3.0.0 )
---
updated-dependencies:
- dependency-name: http-proxy-middleware
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-06-06 13:58:59 +00:00
ee0527e0c6
Merge pull request #14260 from prometheus/dependabot/npm_and_yarn/web/ui/types/jquery-3.5.30
...
build(deps-dev): bump @types/jquery from 3.5.29 to 3.5.30 in /web/ui
2024-06-06 15:57:29 +02:00
89ab04b3ef
Merge pull request #14265 from prometheus/dependabot/npm_and_yarn/web/ui/downshift-9.0.6
...
build(deps): bump downshift from 7.6.2 to 9.0.6 in /web/ui
2024-06-06 15:56:52 +02:00
5f12cf5bbd
Merge pull request #14257 from prometheus/dependabot/npm_and_yarn/web/ui/moment-timezone-0.5.45
...
build(deps): bump moment-timezone from 0.5.43 to 0.5.45 in /web/ui
2024-06-06 15:56:08 +02:00
fed911e8e0
Merge pull request #14233 from prometheus/dependabot/npm_and_yarn/web/ui/fortawesome/free-solid-svg-icons-6.5.2
...
build(deps): bump @fortawesome/free-solid-svg-icons from 6.5.1 to 6.5.2 in /web/ui
2024-06-06 15:55:10 +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
5c498b7202
build(deps): bump moment-timezone from 0.5.43 to 0.5.45 in /web/ui
...
Bumps [moment-timezone](https://github.com/moment/moment-timezone ) from 0.5.43 to 0.5.45.
- [Release notes](https://github.com/moment/moment-timezone/releases )
- [Changelog](https://github.com/moment/moment-timezone/blob/develop/changelog.md )
- [Commits](https://github.com/moment/moment-timezone/compare/0.5.43...0.5.45 )
---
updated-dependencies:
- dependency-name: moment-timezone
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-06-06 12:14:12 +00:00
22bad5ab20
Merge pull request #14259 from prometheus/dependabot/npm_and_yarn/web/ui/codemirror/lint-6.8.0
...
build(deps): bump @codemirror/lint from 6.4.2 to 6.8.0 in /web/ui
2024-06-06 14:13:47 +02:00
35704bee02
build(deps): bump downshift from 7.6.2 to 9.0.6 in /web/ui
...
Bumps [downshift](https://github.com/downshift-js/downshift ) from 7.6.2 to 9.0.6.
- [Release notes](https://github.com/downshift-js/downshift/releases )
- [Changelog](https://github.com/downshift-js/downshift/blob/master/CHANGELOG.md )
- [Commits](https://github.com/downshift-js/downshift/compare/v7.6.2...v9.0.6 )
---
updated-dependencies:
- dependency-name: downshift
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-06-06 11:28:25 +00:00
da6bfe62d1
build(deps): bump moment from 2.29.4 to 2.30.1 in /web/ui
...
Bumps [moment](https://github.com/moment/moment ) from 2.29.4 to 2.30.1.
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/moment/moment/compare/2.29.4...2.30.1 )
---
updated-dependencies:
- dependency-name: moment
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-06-06 11:26:15 +00:00
aec8355b80
build(deps-dev): bump @types/jquery from 3.5.29 to 3.5.30 in /web/ui
...
Bumps [@types/jquery](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jquery ) from 3.5.29 to 3.5.30.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases )
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jquery )
---
updated-dependencies:
- dependency-name: "@types/jquery"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-06-06 11:25:45 +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
f6fcca5800
build(deps): bump @fortawesome/free-solid-svg-icons in /web/ui
...
Bumps [@fortawesome/free-solid-svg-icons](https://github.com/FortAwesome/Font-Awesome ) from 6.5.1 to 6.5.2.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases )
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md )
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/6.5.1...6.5.2 )
---
updated-dependencies:
- dependency-name: "@fortawesome/free-solid-svg-icons"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-06-06 11:23:14 +00:00
Arve Knudsen