Merge branch 'release-3.4' into release-3.4-main

# Conflicts:
#	.github/workflows/ci.yml
#	CHANGELOG.md
#	RELEASE.md
#	VERSION
#	cmd/prometheus/main_test.go
#	docs/configuration/configuration.md
#	web/ui/mantine-ui/package.json
#	web/ui/module/codemirror-promql/package.json
#	web/ui/module/lezer-promql/package.json
#	web/ui/package-lock.json
#	web/ui/package.json
pull/16653/head
Jan-Otto Kröpke 4 weeks ago
commit 638dc8dbdc
No known key found for this signature in database
  1. 4
      CHANGELOG.md
  2. 2
      VERSION
  3. 2
      docs/configuration/configuration.md
  4. 4
      web/ui/mantine-ui/package.json
  5. 4
      web/ui/module/codemirror-promql/package.json
  6. 2
      web/ui/module/lezer-promql/package.json
  7. 14
      web/ui/package-lock.json
  8. 2
      web/ui/package.json

@ -1,5 +1,9 @@
# Changelog
## 3.4.1 / 2025-05-31
* [BUGFIX] Parser: Add reproducer for a dangling-reference issue in parsers. #16633
## 3.4.0 / 2025-05-17
* [CHANGE] Config: Make setting out-of-order native histograms feature (`--enable-feature=ooo-native-histograms`) a no-op. Out-of-order native histograms are now always enabled when `out_of_order_time_window` is greater than zero and `--enable-feature=native-histograms` is set. #16207

@ -1 +1 @@
3.4.0
3.4.1

@ -511,7 +511,7 @@ metric_relabel_configs:
# If this value is left blank, Prometheus will default to `allow-utf-8` if the
# validation scheme for the current scrape config is set to utf8, or
# `underscores` if the validation scheme is set to `legacy`.
[ metric_name_escaping_scheme: <string> | default "utf8" ]
[ metric_name_escaping_scheme: <string> | default "allow-utf-8" ]
# Limit on total number of positive and negative buckets allowed in a single
# native histogram. The resolution of a histogram with more buckets will be

@ -1,7 +1,7 @@
{
"name": "@prometheus-io/mantine-ui",
"private": true,
"version": "0.304.0",
"version": "0.304.1",
"type": "module",
"scripts": {
"start": "vite",
@ -28,7 +28,7 @@
"@microsoft/fetch-event-source": "^2.0.1",
"@nexucis/fuzzy": "^0.5.1",
"@nexucis/kvsearch": "^0.9.1",
"@prometheus-io/codemirror-promql": "0.304.0",
"@prometheus-io/codemirror-promql": "0.304.1",
"@reduxjs/toolkit": "^2.7.0",
"@tabler/icons-react": "^3.31.0",
"@tanstack/react-query": "^5.74.7",

@ -1,6 +1,6 @@
{
"name": "@prometheus-io/codemirror-promql",
"version": "0.304.0",
"version": "0.304.1",
"description": "a CodeMirror mode for the PromQL language",
"types": "dist/esm/index.d.ts",
"module": "dist/esm/index.js",
@ -29,7 +29,7 @@
},
"homepage": "https://github.com/prometheus/prometheus/blob/main/web/ui/module/codemirror-promql/README.md",
"dependencies": {
"@prometheus-io/lezer-promql": "0.304.0",
"@prometheus-io/lezer-promql": "0.304.1",
"lru-cache": "^11.1.0"
},
"devDependencies": {

@ -1,6 +1,6 @@
{
"name": "@prometheus-io/lezer-promql",
"version": "0.304.0",
"version": "0.304.1",
"description": "lezer-based PromQL grammar",
"main": "dist/index.cjs",
"type": "module",

@ -1,12 +1,12 @@
{
"name": "prometheus-io",
"version": "0.303.0",
"version": "0.304.1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "prometheus-io",
"version": "0.303.0",
"version": "0.304.1",
"workspaces": [
"mantine-ui",
"module/*"
@ -24,7 +24,7 @@
},
"mantine-ui": {
"name": "@prometheus-io/mantine-ui",
"version": "0.304.0",
"version": "0.304.1",
"dependencies": {
"@codemirror/autocomplete": "^6.18.6",
"@codemirror/language": "^6.11.0",
@ -42,7 +42,7 @@
"@microsoft/fetch-event-source": "^2.0.1",
"@nexucis/fuzzy": "^0.5.1",
"@nexucis/kvsearch": "^0.9.1",
"@prometheus-io/codemirror-promql": "0.304.0",
"@prometheus-io/codemirror-promql": "0.304.1",
"@reduxjs/toolkit": "^2.7.0",
"@tabler/icons-react": "^3.31.0",
"@tanstack/react-query": "^5.74.7",
@ -189,10 +189,10 @@
},
"module/codemirror-promql": {
"name": "@prometheus-io/codemirror-promql",
"version": "0.304.0",
"version": "0.304.1",
"license": "Apache-2.0",
"dependencies": {
"@prometheus-io/lezer-promql": "0.304.0",
"@prometheus-io/lezer-promql": "0.304.1",
"lru-cache": "^11.1.0"
},
"devDependencies": {
@ -222,7 +222,7 @@
},
"module/lezer-promql": {
"name": "@prometheus-io/lezer-promql",
"version": "0.304.0",
"version": "0.304.1",
"license": "Apache-2.0",
"devDependencies": {
"@lezer/generator": "^1.7.3",

@ -1,7 +1,7 @@
{
"name": "prometheus-io",
"description": "Monorepo for the Prometheus UI",
"version": "0.304.0",
"version": "0.304.1",
"private": true,
"scripts": {
"build": "bash build_ui.sh --all",

Loading…
Cancel
Save