mirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-08-05 21:57:09 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Jan-Otto Kröpke 2025-06-26 22:54:24 +02:00
commit 5a1deb84cc
No known key found for this signature in database
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -4,7 +4,7 @@
* [FEATURE] OTLP receiver: Support promoting OTel scope name/version/schema URL/attributes as metric labels, enable via configuration parameter `otlp.promote_scope_metadata`. #16730 #16760
## 3.4.2 / 2025-06-04
## 3.4.2 / 2025-06-26
* [BUGFIX] OTLP receiver: Fix default configuration not being respected if the `otlp:` block is unset in the config file. #16693

2
VERSION
View File

@ -1 +1 @@
3.4.1
3.4.2

4
web/ui/mantine-ui/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@prometheus-io/mantine-ui",
"private": true,
"version": "0.304.1",
"version": "0.304.2",
"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.1",
"@prometheus-io/codemirror-promql": "0.304.2",
"@reduxjs/toolkit": "^2.7.0",
"@tabler/icons-react": "^3.31.0",
"@tanstack/react-query": "^5.74.7",

4
web/ui/module/codemirror-promql/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@prometheus-io/codemirror-promql",
"version": "0.304.1",
"version": "0.304.2",
"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.1",
"@prometheus-io/lezer-promql": "0.304.2",
"lru-cache": "^11.1.0"
},
"devDependencies": {

2
web/ui/module/lezer-promql/package.json
View File

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

14
web/ui/package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "prometheus-io",
"version": "0.304.1",
"version": "0.304.2",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "prometheus-io",
"version": "0.304.1",
"version": "0.304.2",
"workspaces": [
"mantine-ui",
"module/*"
@ -24,7 +24,7 @@
},
"mantine-ui": {
"name": "@prometheus-io/mantine-ui",
"version": "0.304.1",
"version": "0.304.2",
"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.1",
"@prometheus-io/codemirror-promql": "0.304.2",
"@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.1",
"version": "0.304.2",
"license": "Apache-2.0",
"dependencies": {
"@prometheus-io/lezer-promql": "0.304.1",
"@prometheus-io/lezer-promql": "0.304.2",
"lru-cache": "^11.1.0"
},
"devDependencies": {
@ -222,7 +222,7 @@
},
"module/lezer-promql": {
"name": "@prometheus-io/lezer-promql",
"version": "0.304.1",
"version": "0.304.2",
"license": "Apache-2.0",
"devDependencies": {
"@lezer/generator": "^1.7.3",

2
web/ui/package.json
View File

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