Merge pull request #10985 from prometheus/release-2.37

Merge back release 2.37

CHANGELOG.md

@@ -1,12 +1,32 @@
 # Changelog
 
+## 2.37.0-rc.0 / 2022-07-05
+
+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
+found. #8799
+
+* [FEATURE] Nomad SD: New service discovery for Nomad built-in service discovery. #10915
+* [ENHANCEMENT] Kubernetes SD: Allow attaching node labels for endpoint role. #10759
+* [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
+* [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
+* [BUGFIX] Scrape: Keep relabeled scrape interval and timeout on reloads. #10916
+* [BUGFIX] TSDB: Don't increment `prometheus_tsdb_compactions_failed_total` when context is canceled. #10772
+* [BUGFIX] TSDB: Fix panic if series is not found when deleting series. #10907
+* [BUGFIX] TSDB: Increase `prometheus_tsdb_mmap_chunk_corruptions_total` on out of sequence errors. #10406
+* [BUGFIX] Uyuni SD: Make authentication files relative to Prometheus configuration file and fix default configuration values. #10813
+
 ## 2.36.2 / 2022-06-20
 
 * [BUGFIX] Fix serving of static assets like fonts and favicon. #10888
 
 ## 2.36.1 / 2022-06-09
 
-* [BUGFIX] promtool: Add --lint-fatal option #10840
+* [BUGFIX] promtool: Add --lint-fatal option. #10840
 
 ## 2.36.0 / 2022-05-30
 

VERSION

@@ -1 +1 @@
-2.36.2
+2.37.0-rc.0

notifier/notifier_test.go

@@ -590,8 +590,13 @@ func TestHangingNotifier(t *testing.T) {
 				close(done)
 			}()
 
+			var calledOnce bool
 			// Setting up a bad server. This server hangs for 2 seconds.
 			badServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				if calledOnce {
+					t.Fatal("hanging server called multiple times")
+				}
+				calledOnce = true
 				select {
 				case <-done:
 				case <-time.After(2 * time.Second):
@@ -672,8 +677,8 @@ func TestHangingNotifier(t *testing.T) {
 			}()
 
 			select {
-			case <-time.After(300 * time.Millisecond):
+			case <-time.After(1 * time.Second):
-				t.Fatalf("Timeout after 300 milliseconds, targets not synced in time.")
+				t.Fatalf("Timeout after 1 second, targets not synced in time.")
 			case <-changed:
 				// The good server has been hit in less than 3 seconds, therefore
 				// targets have been updated before a second call could be made to the

scripts/ui_release.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 ## /!\ This file must be used at the root of the prometheus project
 ## This script provides utils method to help to release and verify the readiness of each libs under the folder ui/
@@ -79,7 +79,7 @@ function bumpVersion() {
   npm version "${version}" --workspaces
   # upgrade the @prometheus-io/* dependencies on all packages
   for workspace in ${workspaces}; do
-    sed -E -i "" "s|(\"@prometheus-io/.+\": )\".+\"|\1\"\^${version}\"|" "${workspace}"/package.json
+    sed -E -i "s|(\"@prometheus-io/.+\": )\".+\"|\1\"\^${version}\"|" "${workspace}"/package.json
   done
 }
 

web/ui/module/codemirror-promql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prometheus-io/codemirror-promql",
-  "version": "0.19.0",
+  "version": "0.37.0-rc.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.23.0",
+    "@prometheus-io/lezer-promql": "^0.37.0-rc.0",
     "lru-cache": "^6.0.0"
   },
   "devDependencies": {

web/ui/module/lezer-promql/package.json

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

web/ui/package-lock.json

@@ -28,10 +28,10 @@
     },
     "module/codemirror-promql": {
       "name": "@prometheus-io/codemirror-promql",
-      "version": "0.19.0",
+      "version": "0.37.0-rc.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@prometheus-io/lezer-promql": "0.23.0",
+        "@prometheus-io/lezer-promql": "^0.37.0-rc.0",
         "lru-cache": "^6.0.0"
       },
       "devDependencies": {
@@ -61,7 +61,7 @@
     },
     "module/lezer-promql": {
       "name": "@prometheus-io/lezer-promql",
-      "version": "0.23.0",
+      "version": "0.37.0-rc.0",
       "license": "Apache-2.0",
       "devDependencies": {
         "@lezer/generator": "^1.0.0",
@@ -17518,7 +17518,7 @@
     },
     "react-app": {
       "name": "@prometheus-io/app",
-      "version": "0.1.0",
+      "version": "0.37.0-rc.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.19.0",
+        "@prometheus-io/codemirror-promql": "^0.37.0-rc.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.19.0",
+        "@prometheus-io/codemirror-promql": "^0.37.0-rc.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.23.0",
+        "@prometheus-io/lezer-promql": "^0.37.0-rc.0",
         "@types/lru-cache": "^5.1.1",
         "isomorphic-fetch": "^3.0.0",
         "lru-cache": "^6.0.0",

web/ui/react-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prometheus-io/app",
-  "version": "0.1.0",
+  "version": "0.37.0-rc.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.19.0",
+    "@prometheus-io/codemirror-promql": "^0.37.0-rc.0",
     "bootstrap": "^4.6.1",
     "css.escape": "^1.5.1",
     "downshift": "^6.1.7",