RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11590 from codesome/cut2402 

Cut v2.40.2
This commit is contained in:
Ganesh Vernekar 2022-11-17 14:34:16 +01:00 committed by GitHub
parent 965274259f ef886ac4b3
commit a07a94a5ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,5 +1,9 @@
# Changelog
## 2.40.2 / 2022-11-16
* [BUGFIX] UI: Fix black-on-black metric name color in dark mode. #11572
## 2.40.1 / 2022-11-09
* [BUGFIX] TSDB: Fix alignment for atomic int64 for 32 bit architecture. #11547

2
VERSION
View File

@ -1 +1 @@
2.40.1
2.40.2

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

@ -1,6 +1,6 @@
{
"name": "@prometheus-io/codemirror-promql",
"version": "0.40.1",
"version": "0.40.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.40.1",
"@prometheus-io/lezer-promql": "^0.40.2",
"lru-cache": "^6.0.0"
},
"devDependencies": {

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

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

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

@ -28,10 +28,10 @@
},
"module/codemirror-promql": {
"name": "@prometheus-io/codemirror-promql",
"version": "0.40.1",
"version": "0.40.2",
"license": "Apache-2.0",
"dependencies": {
"@prometheus-io/lezer-promql": "^0.40.1",
"@prometheus-io/lezer-promql": "^0.40.2",
"lru-cache": "^6.0.0"
},
"devDependencies": {
@ -61,7 +61,7 @@
},
"module/lezer-promql": {
"name": "@prometheus-io/lezer-promql",
"version": "0.40.1",
"version": "0.40.2",
"license": "Apache-2.0",
"devDependencies": {
"@lezer/generator": "^1.1.1",
@ -17625,7 +17625,7 @@
},
"react-app": {
"name": "@prometheus-io/app",
"version": "0.40.1",
"version": "0.40.2",
"dependencies": {
"@codemirror/autocomplete": "^6.2.0",
"@codemirror/commands": "^6.1.0",
@ -17643,7 +17643,7 @@
"@lezer/lr": "^1.2.3",
"@nexucis/fuzzy": "^0.4.1",
"@nexucis/kvsearch": "^0.8.1",
"@prometheus-io/codemirror-promql": "^0.40.1",
"@prometheus-io/codemirror-promql": "^0.40.2",
"bootstrap": "^4.6.2",
"css.escape": "^1.5.1",
"downshift": "^6.1.11",
@ -19883,7 +19883,7 @@
"@lezer/lr": "^1.2.3",
"@nexucis/fuzzy": "^0.4.1",
"@nexucis/kvsearch": "^0.8.1",
"@prometheus-io/codemirror-promql": "^0.40.1",
"@prometheus-io/codemirror-promql": "^0.40.2",
"@testing-library/react-hooks": "^7.0.2",
"@types/enzyme": "^3.10.12",
"@types/flot": "0.0.32",
@ -19935,7 +19935,7 @@
"@lezer/common": "^1.0.1",
"@lezer/highlight": "^1.1.0",
"@lezer/lr": "^1.2.3",
"@prometheus-io/lezer-promql": "^0.40.1",
"@prometheus-io/lezer-promql": "^0.40.2",
"@types/lru-cache": "^5.1.1",
"isomorphic-fetch": "^3.0.0",
"lru-cache": "^6.0.0",

4
web/ui/react-app/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@prometheus-io/app",
"version": "0.40.1",
"version": "0.40.2",
"private": true,
"dependencies": {
"@codemirror/autocomplete": "^6.2.0",
@ -19,7 +19,7 @@
"@lezer/common": "^1.0.1",
"@nexucis/fuzzy": "^0.4.1",
"@nexucis/kvsearch": "^0.8.1",
"@prometheus-io/codemirror-promql": "^0.40.1",
"@prometheus-io/codemirror-promql": "^0.40.2",
"bootstrap": "^4.6.2",
"css.escape": "^1.5.1",
"downshift": "^6.1.11",

4
web/ui/react-app/src/pages/graph/CMTheme.tsx
View File

@ -1,5 +1,5 @@
import { EditorView } from '@codemirror/view';
import { HighlightStyle } from '@codemirror/language';
import { EditorView } from '@codemirror/view';
import { tags } from '@lezer/highlight';
export const baseTheme = EditorView.theme({
@ -263,7 +263,6 @@ export const darkTheme = EditorView.theme(
);
export const promqlHighlighter = HighlightStyle.define([
{ tag: tags.name, color: '#000' },
{ tag: tags.number, color: '#09885a' },
{ tag: tags.string, color: '#a31515' },
{ tag: tags.keyword, color: '#008080' },
@ -279,7 +278,6 @@ export const promqlHighlighter = HighlightStyle.define([
]);
export const darkPromqlHighlighter = HighlightStyle.define([
{ tag: tags.name, color: '#000' },
{ tag: tags.number, color: '#22c55e' },
{ tag: tags.string, color: '#fca5a5' },
{ tag: tags.keyword, color: '#14bfad' },