mirror of
https://github.com/prometheus/prometheus.git
synced 2024-12-24 05:04:05 -08:00
Merge pull request #11022 from prometheus/release-2.37
Merge back release 2.37
This commit is contained in:
Julien Pivotto
GitHub
commit
97d7e09e0b
1
.github/workflows/ui_build_and_release.yml
vendored
1
.github/workflows/ui_build_and_release.yml
vendored
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
<https://prometheus.io/docs/introduction/release-cycle/>.
|
||||
|
||||
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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
2
go.mod
2
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
|
||||
|
|
|
|||
4
go.sum
4
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=
|
||||
|
|
|
|||
|
|
@ -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": {
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
14
web/ui/package-lock.json
generated
14
web/ui/package-lock.json
generated
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
Loading…
Reference in a new issue