From 6af2f9ff5ee88f3483b6b21ddf117158c0df2754 Mon Sep 17 00:00:00 2001 From: Augustin Husson Date: Tue, 5 Jul 2022 16:38:16 +0200 Subject: [PATCH 1/8] add missing npm registry url (#10987) Signed-off-by: Augustin Husson --- .github/workflows/ui_build_and_release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ui_build_and_release.yml b/.github/workflows/ui_build_and_release.yml index f3ca67418..630ce992c 100644 --- a/.github/workflows/ui_build_and_release.yml +++ b/.github/workflows/ui_build_and_release.yml @@ -17,6 +17,7 @@ jobs: uses: actions/setup-node@v3 with: node-version-file: "web/ui/.nvmrc" + registry-url: "https://registry.npmjs.org" - uses: actions/cache@v3.0.4 with: path: ~/.npm From 7a2d24b76af486dc8719faf2da5d138a10093f4f Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Wed, 6 Jul 2022 10:33:14 +0200 Subject: [PATCH 2/8] Fix flakiness in windows tests (#10983) Our windows CI is too slow, process takes lots of time to start. Signed-off-by: Julien Pivotto --- cmd/prometheus/main_test.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/cmd/prometheus/main_test.go b/cmd/prometheus/main_test.go index 9a6dc6671..2e1795c0b 100644 --- a/cmd/prometheus/main_test.go +++ b/cmd/prometheus/main_test.go @@ -38,6 +38,8 @@ import ( "github.com/prometheus/prometheus/rules" ) +const startupTime = 10 * time.Second + var ( promPath = os.Args[0] promConfig = filepath.Join("..", "..", "documentation", "examples", "prometheus.yml") @@ -226,7 +228,7 @@ func TestWALSegmentSizeBounds(t *testing.T) { select { case err := <-done: t.Errorf("prometheus should be still running: %v", err) - case <-time.After(5 * time.Second): + case <-time.After(startupTime): prom.Process.Kill() <-done } @@ -272,7 +274,7 @@ func TestMaxBlockChunkSegmentSizeBounds(t *testing.T) { select { case err := <-done: t.Errorf("prometheus should be still running: %v", err) - case <-time.After(5 * time.Second): + case <-time.After(startupTime): prom.Process.Kill() <-done } @@ -366,7 +368,7 @@ func TestAgentSuccessfulStartup(t *testing.T) { case err := <-done: t.Logf("prometheus agent should be still running: %v", err) actualExitStatus = prom.ProcessState.ExitCode() - case <-time.After(5 * time.Second): + case <-time.After(startupTime): prom.Process.Kill() } require.Equal(t, 0, actualExitStatus) @@ -387,7 +389,7 @@ func TestAgentFailedStartupWithServerFlag(t *testing.T) { case err := <-done: t.Logf("prometheus agent should not be running: %v", err) actualExitStatus = prom.ProcessState.ExitCode() - case <-time.After(5 * time.Second): + case <-time.After(startupTime): prom.Process.Kill() } @@ -411,7 +413,7 @@ func TestAgentFailedStartupWithInvalidConfig(t *testing.T) { case err := <-done: t.Logf("prometheus agent should not be running: %v", err) actualExitStatus = prom.ProcessState.ExitCode() - case <-time.After(5 * time.Second): + case <-time.After(startupTime): prom.Process.Kill() } require.Equal(t, 2, actualExitStatus) @@ -462,7 +464,7 @@ func TestModeSpecificFlags(t *testing.T) { select { case err := <-done: t.Errorf("prometheus should be still running: %v", err) - case <-time.After(5 * time.Second): + case <-time.After(startupTime): prom.Process.Kill() <-done } From 3599213e7934957c0c943d5b8c22c960b91e2fbc Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Mon, 11 Jul 2022 10:04:30 +0200 Subject: [PATCH 3/8] Release 2.37.0-rc.1 (#10999) Signed-off-by: Julien Pivotto --- CHANGELOG.md | 5 +++++ VERSION | 2 +- web/ui/module/codemirror-promql/package.json | 4 ++-- web/ui/module/lezer-promql/package.json | 2 +- web/ui/package-lock.json | 14 +++++++------- web/ui/react-app/package.json | 4 ++-- 6 files changed, 18 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d9dd46e6..5ab2f11ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 2.37.0-rc.1 / 2022-07-11 + +This release candidate addresses an issue with the publishing of the Prometheus +UI libraries to NPM registry. + ## 2.37.0-rc.0 / 2022-07-05 Following data loss by users due to lack of unified buffer cache in OpenBSD, we diff --git a/VERSION b/VERSION index 1dadcdca6..34965099a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.37.0-rc.0 +2.37.0-rc.1 diff --git a/web/ui/module/codemirror-promql/package.json b/web/ui/module/codemirror-promql/package.json index e94c7f16d..4f5c3b41b 100644 --- a/web/ui/module/codemirror-promql/package.json +++ b/web/ui/module/codemirror-promql/package.json @@ -1,6 +1,6 @@ { "name": "@prometheus-io/codemirror-promql", - "version": "0.37.0-rc.0", + "version": "0.37.0-rc.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.37.0-rc.0", + "@prometheus-io/lezer-promql": "^0.37.0-rc.1", "lru-cache": "^6.0.0" }, "devDependencies": { diff --git a/web/ui/module/lezer-promql/package.json b/web/ui/module/lezer-promql/package.json index dd924f88c..a5a1efd28 100644 --- a/web/ui/module/lezer-promql/package.json +++ b/web/ui/module/lezer-promql/package.json @@ -1,6 +1,6 @@ { "name": "@prometheus-io/lezer-promql", - "version": "0.37.0-rc.0", + "version": "0.37.0-rc.1", "description": "lezer-based PromQL grammar", "main": "index.cjs", "type": "module", diff --git a/web/ui/package-lock.json b/web/ui/package-lock.json index d247dad13..ac90c0e15 100644 --- a/web/ui/package-lock.json +++ b/web/ui/package-lock.json @@ -28,10 +28,10 @@ }, "module/codemirror-promql": { "name": "@prometheus-io/codemirror-promql", - "version": "0.37.0-rc.0", + "version": "0.37.0-rc.1", "license": "Apache-2.0", "dependencies": { - "@prometheus-io/lezer-promql": "^0.37.0-rc.0", + "@prometheus-io/lezer-promql": "^0.37.0-rc.1", "lru-cache": "^6.0.0" }, "devDependencies": { @@ -61,7 +61,7 @@ }, "module/lezer-promql": { "name": "@prometheus-io/lezer-promql", - "version": "0.37.0-rc.0", + "version": "0.37.0-rc.1", "license": "Apache-2.0", "devDependencies": { "@lezer/generator": "^1.0.0", @@ -17518,7 +17518,7 @@ }, "react-app": { "name": "@prometheus-io/app", - "version": "0.37.0-rc.0", + "version": "0.37.0-rc.1", "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/commands": "^6.0.0", @@ -17536,7 +17536,7 @@ "@lezer/lr": "^1.0.0", "@nexucis/fuzzy": "^0.4.0", "@nexucis/kvsearch": "^0.7.0", - "@prometheus-io/codemirror-promql": "^0.37.0-rc.0", + "@prometheus-io/codemirror-promql": "^0.37.0-rc.1", "bootstrap": "^4.6.1", "css.escape": "^1.5.1", "downshift": "^6.1.7", @@ -19783,7 +19783,7 @@ "@lezer/lr": "^1.0.0", "@nexucis/fuzzy": "^0.4.0", "@nexucis/kvsearch": "^0.7.0", - "@prometheus-io/codemirror-promql": "^0.37.0-rc.0", + "@prometheus-io/codemirror-promql": "^0.37.0-rc.1", "@testing-library/react-hooks": "^7.0.1", "@types/enzyme": "^3.10.10", "@types/flot": "0.0.32", @@ -19835,7 +19835,7 @@ "@lezer/common": "^1.0.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0", - "@prometheus-io/lezer-promql": "^0.37.0-rc.0", + "@prometheus-io/lezer-promql": "^0.37.0-rc.1", "@types/lru-cache": "^5.1.1", "isomorphic-fetch": "^3.0.0", "lru-cache": "^6.0.0", diff --git a/web/ui/react-app/package.json b/web/ui/react-app/package.json index d3911d900..70f1333ed 100644 --- a/web/ui/react-app/package.json +++ b/web/ui/react-app/package.json @@ -1,6 +1,6 @@ { "name": "@prometheus-io/app", - "version": "0.37.0-rc.0", + "version": "0.37.0-rc.1", "private": true, "dependencies": { "@codemirror/autocomplete": "^6.0.0", @@ -19,7 +19,7 @@ "@lezer/common": "^1.0.0", "@nexucis/fuzzy": "^0.4.0", "@nexucis/kvsearch": "^0.7.0", - "@prometheus-io/codemirror-promql": "^0.37.0-rc.0", + "@prometheus-io/codemirror-promql": "^0.37.0-rc.1", "bootstrap": "^4.6.1", "css.escape": "^1.5.1", "downshift": "^6.1.7", From 8228eb4b7330cbec63ca45b18ded3abba8440ce5 Mon Sep 17 00:00:00 2001 From: Augustin Husson Date: Thu, 14 Jul 2022 15:22:44 +0200 Subject: [PATCH 4/8] codemirror-promql: fix the way to verify if it's a prometheusClient (#11019) Signed-off-by: Augustin Husson --- .../src/complete/index.test.ts | 27 +++++++++++++++++++ .../codemirror-promql/src/complete/index.ts | 18 ++++++------- 2 files changed, 35 insertions(+), 10 deletions(-) create mode 100644 web/ui/module/codemirror-promql/src/complete/index.test.ts diff --git a/web/ui/module/codemirror-promql/src/complete/index.test.ts b/web/ui/module/codemirror-promql/src/complete/index.test.ts new file mode 100644 index 000000000..b2b9e32f9 --- /dev/null +++ b/web/ui/module/codemirror-promql/src/complete/index.test.ts @@ -0,0 +1,27 @@ +// Copyright 2022 The Prometheus Authors +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import { isPrometheusClient } from './index'; +import { HTTPPrometheusClient } from '../client/prometheus'; + +describe('type of remoteConfig', () => { + it('should be a prometheusClient', () => { + const client = new HTTPPrometheusClient({}); + expect(isPrometheusClient(client)).toBe(true); + }); + + it('should be a remote config', () => { + const remote = { url: 'https://prometheus.io' }; + expect(isPrometheusClient(remote)).toBe(false); + }); +}); diff --git a/web/ui/module/codemirror-promql/src/complete/index.ts b/web/ui/module/codemirror-promql/src/complete/index.ts index a28b7583d..b3902c3b6 100644 --- a/web/ui/module/codemirror-promql/src/complete/index.ts +++ b/web/ui/module/codemirror-promql/src/complete/index.ts @@ -31,16 +31,14 @@ export interface CompleteConfiguration { completeStrategy?: CompleteStrategy; } -function isPrometheusConfig(remoteConfig: PrometheusConfig | PrometheusClient): remoteConfig is PrometheusConfig { - const cfg = remoteConfig as PrometheusConfig; +export function isPrometheusClient(remoteConfig: PrometheusConfig | PrometheusClient): remoteConfig is PrometheusClient { + const client = remoteConfig as PrometheusClient; return ( - cfg.url !== undefined || - cfg.lookbackInterval !== undefined || - cfg.httpErrorHandler !== undefined || - cfg.fetchFn !== undefined || - cfg.cache !== undefined || - cfg.httpMethod !== undefined || - cfg.apiPrefix !== undefined + typeof client.labelNames === 'function' && + typeof client.labelValues === 'function' && + typeof client.metricMetadata === 'function' && + typeof client.series === 'function' && + typeof client.metricNames === 'function' ); } @@ -49,7 +47,7 @@ export function newCompleteStrategy(conf?: CompleteConfiguration): CompleteStrat return conf.completeStrategy; } if (conf?.remote) { - if (!isPrometheusConfig(conf.remote)) { + if (isPrometheusClient(conf.remote)) { return new HybridComplete(conf.remote, conf.maxMetricsMetadata); } return new HybridComplete(new CachedPrometheusClient(new HTTPPrometheusClient(conf.remote), conf.remote.cache), conf.maxMetricsMetadata); From bfbb061a8fd9a1ff1c5335e72ddeaa2f517f1f27 Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Thu, 14 Jul 2022 13:49:30 +0200 Subject: [PATCH 5/8] docs: Change relabelling -> relabeling (#11006) Signed-off-by: Julien Pivotto --- docs/configuration/configuration.md | 10 +++++----- docs/querying/api.md | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/configuration/configuration.md b/docs/configuration/configuration.md index c525109fd..a2875da9c 100644 --- a/docs/configuration/configuration.md +++ b/docs/configuration/configuration.md @@ -623,7 +623,7 @@ metadata and a single tag). DigitalOcean SD configurations allow retrieving scrape targets from [DigitalOcean's](https://www.digitalocean.com/) Droplets API. This service discovery uses the public IPv4 address by default, by that can be -changed with relabelling, as demonstrated in [the Prometheus digitalocean-sd +changed with relabeling, as demonstrated in [the Prometheus digitalocean-sd configuration file](/documentation/examples/prometheus-digitalocean.yml). The following meta labels are available on targets during [relabeling](#relabel_config): @@ -1992,7 +1992,7 @@ See below for the configuration options for Lightsail discovery: Linode SD configurations allow retrieving scrape targets from [Linode's](https://www.linode.com/) Linode APIv4. This service discovery uses the public IPv4 address by default, by that can be -changed with relabelling, as demonstrated in [the Prometheus linode-sd +changed with relabeling, as demonstrated in [the Prometheus linode-sd configuration file](/documentation/examples/prometheus-linode.yml). The following meta labels are available on targets during [relabeling](#relabel_config): @@ -2461,7 +2461,7 @@ The following meta labels are available on targets during [relabeling](#relabel_ * `__meta_scaleway_instance_zone`: the zone of the server (ex: `fr-par-1`, complete list [here](https://developers.scaleway.com/en/products/instance/api/#introduction)) This role uses the private IPv4 address by default. This can be -changed with relabelling, as demonstrated in [the Prometheus scaleway-sd +changed with relabeling, as demonstrated in [the Prometheus scaleway-sd configuration file](/documentation/examples/prometheus-scaleway.yml). #### Baremetal role @@ -2479,7 +2479,7 @@ configuration file](/documentation/examples/prometheus-scaleway.yml). * `__meta_scaleway_baremetal_zone`: the zone of the server (ex: `fr-par-1`, complete list [here](https://developers.scaleway.com/en/products/instance/api/#introduction)) This role uses the public IPv4 address by default. This can be -changed with relabelling, as demonstrated in [the Prometheus scaleway-sd +changed with relabeling, as demonstrated in [the Prometheus scaleway-sd configuration file](/documentation/examples/prometheus-scaleway.yml). See below for the configuration options for Scaleway discovery: @@ -2616,7 +2616,7 @@ for a practical example on how to set up Uyuni Prometheus configuration. Vultr SD configurations allow retrieving scrape targets from [Vultr](https://www.vultr.com/). This service discovery uses the main IPv4 address by default, which that be -changed with relabelling, as demonstrated in [the Prometheus vultr-sd +changed with relabeling, as demonstrated in [the Prometheus vultr-sd configuration file](/documentation/examples/prometheus-vultr.yml). The following meta labels are available on targets during [relabeling](#relabel_config): diff --git a/docs/querying/api.md b/docs/querying/api.md index 11c0ae9a2..8428fc332 100644 --- a/docs/querying/api.md +++ b/docs/querying/api.md @@ -476,8 +476,8 @@ GET /api/v1/targets ``` Both the active and dropped targets are part of the response by default. -`labels` represents the label set after relabelling has occurred. -`discoveredLabels` represent the unmodified labels retrieved during service discovery before relabelling has occurred. +`labels` represents the label set after relabeling has occurred. +`discoveredLabels` represent the unmodified labels retrieved during service discovery before relabeling has occurred. ```json $ curl http://localhost:9090/api/v1/targets From 90540c53d89c14f10cd9d43ae5e4ed0ddf848200 Mon Sep 17 00:00:00 2001 From: Wen Long Date: Thu, 14 Jul 2022 06:50:02 +0800 Subject: [PATCH 6/8] docs: correct the accepted value for X-XSS-Protection header (#11015) Signed-off-by: heylongdacoder --- docs/configuration/https.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuration/https.md b/docs/configuration/https.md index ad142e4a5..0513612f5 100644 --- a/docs/configuration/https.md +++ b/docs/configuration/https.md @@ -90,7 +90,7 @@ http_server_config: # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Content-Type-Options [ X-Content-Type-Options: ] # Set the X-XSS-Protection header to all responses. - # Unset if blank. Accepted value is nosniff. + # Unset if blank. # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-XSS-Protection [ X-XSS-Protection: ] # Set the Strict-Transport-Security header to HTTP responses. From 371b253972b5830d5e3f3a1e05f6c6c3d544a5e4 Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Thu, 14 Jul 2022 13:55:50 +0200 Subject: [PATCH 7/8] Update prometheus/common for oauth2 improvements Signed-off-by: Julien Pivotto --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 16f8bc50f..274a9ae39 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,7 @@ require ( github.com/prometheus/alertmanager v0.24.0 github.com/prometheus/client_golang v1.12.2 github.com/prometheus/client_model v0.2.0 - github.com/prometheus/common v0.35.0 + github.com/prometheus/common v0.37.0 github.com/prometheus/common/assets v0.2.0 github.com/prometheus/common/sigv4 v0.1.0 github.com/prometheus/exporter-toolkit v0.7.1 diff --git a/go.sum b/go.sum index 8ddb762c5..3dc007f54 100644 --- a/go.sum +++ b/go.sum @@ -761,8 +761,8 @@ github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB8 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.35.0 h1:Eyr+Pw2VymWejHqCugNaQXkAi6KayVNxaHeu6khmFBE= -github.com/prometheus/common v0.35.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= +github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= +github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/common/assets v0.2.0 h1:0P5OrzoHrYBOSM1OigWL3mY8ZvV2N4zIE/5AahrSrfM= github.com/prometheus/common/assets v0.2.0/go.mod h1:D17UVUE12bHbim7HzwUvtqm6gwBEaDQ0F+hIGbFbccI= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= From d0a3d44a45df44a893ae9a9d57609f4acbbcfaf1 Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Thu, 14 Jul 2022 13:56:24 +0200 Subject: [PATCH 8/8] Release 2.37.0 Signed-off-by: Julien Pivotto --- CHANGELOG.md | 11 ++++++----- VERSION | 2 +- web/ui/module/codemirror-promql/package.json | 4 ++-- web/ui/module/lezer-promql/package.json | 2 +- web/ui/package-lock.json | 14 +++++++------- web/ui/react-app/package.json | 4 ++-- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ab2f11ad..d93cef4d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,11 @@ # Changelog -## 2.37.0-rc.1 / 2022-07-11 +## 2.37.0 / 2022-07-14 -This release candidate addresses an issue with the publishing of the Prometheus -UI libraries to NPM registry. - -## 2.37.0-rc.0 / 2022-07-05 +This release is a LTS (Long-Term Support) release of Prometheus and will +receive security, documentation and bugfix patches for at least 6 months. +Please read more about our LTS release cycle at +. Following data loss by users due to lack of unified buffer cache in OpenBSD, we will no longer release Prometheus upstream for OpenBSD until a proper solution is @@ -16,6 +16,7 @@ found. #8799 * [ENHANCEMENT] PromQL: Optimise creation of signature with/without labels. #10667 * [ENHANCEMENT] TSDB: Memory optimizations. #10873 #10874 * [ENHANCEMENT] TSDB: Reduce sleep time when reading WAL. #10859 #10878 +* [ENHANCEMENT] OAuth2: Add appropriate timeouts and User-Agent header. #11020 * [BUGFIX] Alerting: Fix Alertmanager targets not being updated when alerts were queued. #10948 * [BUGFIX] Hetzner SD: Make authentication files relative to Prometheus config file. #10813 * [BUGFIX] Promtool: Fix `promtool check config` not erroring properly on failures. #10952 diff --git a/VERSION b/VERSION index 34965099a..c94fd315f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.37.0-rc.1 +2.37.0 diff --git a/web/ui/module/codemirror-promql/package.json b/web/ui/module/codemirror-promql/package.json index 4f5c3b41b..b986b4465 100644 --- a/web/ui/module/codemirror-promql/package.json +++ b/web/ui/module/codemirror-promql/package.json @@ -1,6 +1,6 @@ { "name": "@prometheus-io/codemirror-promql", - "version": "0.37.0-rc.1", + "version": "0.37.0", "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.37.0-rc.1", + "@prometheus-io/lezer-promql": "^0.37.0", "lru-cache": "^6.0.0" }, "devDependencies": { diff --git a/web/ui/module/lezer-promql/package.json b/web/ui/module/lezer-promql/package.json index a5a1efd28..c9f82756f 100644 --- a/web/ui/module/lezer-promql/package.json +++ b/web/ui/module/lezer-promql/package.json @@ -1,6 +1,6 @@ { "name": "@prometheus-io/lezer-promql", - "version": "0.37.0-rc.1", + "version": "0.37.0", "description": "lezer-based PromQL grammar", "main": "index.cjs", "type": "module", diff --git a/web/ui/package-lock.json b/web/ui/package-lock.json index ac90c0e15..0d12356a9 100644 --- a/web/ui/package-lock.json +++ b/web/ui/package-lock.json @@ -28,10 +28,10 @@ }, "module/codemirror-promql": { "name": "@prometheus-io/codemirror-promql", - "version": "0.37.0-rc.1", + "version": "0.37.0", "license": "Apache-2.0", "dependencies": { - "@prometheus-io/lezer-promql": "^0.37.0-rc.1", + "@prometheus-io/lezer-promql": "^0.37.0", "lru-cache": "^6.0.0" }, "devDependencies": { @@ -61,7 +61,7 @@ }, "module/lezer-promql": { "name": "@prometheus-io/lezer-promql", - "version": "0.37.0-rc.1", + "version": "0.37.0", "license": "Apache-2.0", "devDependencies": { "@lezer/generator": "^1.0.0", @@ -17518,7 +17518,7 @@ }, "react-app": { "name": "@prometheus-io/app", - "version": "0.37.0-rc.1", + "version": "0.37.0", "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/commands": "^6.0.0", @@ -17536,7 +17536,7 @@ "@lezer/lr": "^1.0.0", "@nexucis/fuzzy": "^0.4.0", "@nexucis/kvsearch": "^0.7.0", - "@prometheus-io/codemirror-promql": "^0.37.0-rc.1", + "@prometheus-io/codemirror-promql": "^0.37.0", "bootstrap": "^4.6.1", "css.escape": "^1.5.1", "downshift": "^6.1.7", @@ -19783,7 +19783,7 @@ "@lezer/lr": "^1.0.0", "@nexucis/fuzzy": "^0.4.0", "@nexucis/kvsearch": "^0.7.0", - "@prometheus-io/codemirror-promql": "^0.37.0-rc.1", + "@prometheus-io/codemirror-promql": "^0.37.0", "@testing-library/react-hooks": "^7.0.1", "@types/enzyme": "^3.10.10", "@types/flot": "0.0.32", @@ -19835,7 +19835,7 @@ "@lezer/common": "^1.0.0", "@lezer/highlight": "^1.0.0", "@lezer/lr": "^1.0.0", - "@prometheus-io/lezer-promql": "^0.37.0-rc.1", + "@prometheus-io/lezer-promql": "^0.37.0", "@types/lru-cache": "^5.1.1", "isomorphic-fetch": "^3.0.0", "lru-cache": "^6.0.0", diff --git a/web/ui/react-app/package.json b/web/ui/react-app/package.json index 70f1333ed..25a9d1b0f 100644 --- a/web/ui/react-app/package.json +++ b/web/ui/react-app/package.json @@ -1,6 +1,6 @@ { "name": "@prometheus-io/app", - "version": "0.37.0-rc.1", + "version": "0.37.0", "private": true, "dependencies": { "@codemirror/autocomplete": "^6.0.0", @@ -19,7 +19,7 @@ "@lezer/common": "^1.0.0", "@nexucis/fuzzy": "^0.4.0", "@nexucis/kvsearch": "^0.7.0", - "@prometheus-io/codemirror-promql": "^0.37.0-rc.1", + "@prometheus-io/codemirror-promql": "^0.37.0", "bootstrap": "^4.6.1", "css.escape": "^1.5.1", "downshift": "^6.1.7",