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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d9dd46e6..d93cef4d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Changelog -## 2.37.0-rc.0 / 2022-07-05 +## 2.37.0 / 2022-07-14 + +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 @@ -11,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 1dadcdca6..c94fd315f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.37.0-rc.0 +2.37.0 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 } diff --git a/go.mod b/go.mod index a323dc407..e51a01d63 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 f9d1d02d7..c38afd512 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= diff --git a/web/ui/module/codemirror-promql/package.json b/web/ui/module/codemirror-promql/package.json index e94c7f16d..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.0", + "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.0", + "@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 dd924f88c..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.0", + "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 d247dad13..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.0", + "version": "0.37.0", "license": "Apache-2.0", "dependencies": { - "@prometheus-io/lezer-promql": "^0.37.0-rc.0", + "@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.0", + "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.0", + "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.0", + "@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.0", + "@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.0", + "@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 d3911d900..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.0", + "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.0", + "@prometheus-io/codemirror-promql": "^0.37.0", "bootstrap": "^4.6.1", "css.escape": "^1.5.1", "downshift": "^6.1.7",