Merge pull request #11398 from prometheus/release-2.39

Merge back release 2.39

.github/actions/publish_release/action.yml

@@ -20,6 +20,9 @@ inputs:
   quay_io_password:
     type: string
     description: Quay.io password
+  github_token:
+    type: string
+    description: Github Token
 runs:
   using: composite
   steps:
@@ -27,12 +30,14 @@ runs:
       with:
         enable_docker_multibuild: true
     - uses: ./.github/actions/restore_artifacts
-    - run: promu crossbuild tarballs
+    - run: ~/go/bin/promu crossbuild tarballs
       shell: bash
-    - run: promu checksum .tarballs
+    - run: ~/go/bin/promu checksum .tarballs
       shell: bash
-    - run: promu release .tarballs
+    - run: ~/go/bin/promu release .tarballs
       shell: bash
+      env:
+        GITHUB_TOKEN: ${{ inputs.github_token }}
     - uses: ./.github/actions/publish_release_images
       if: inputs.docker_hub_organization != '' && inputs.docker_hub_login != ''
       with:

.github/actions/publish_release_images/action.yml

@@ -46,8 +46,8 @@ runs:
         make docker-publish DOCKER_IMAGE_TAG="$current_tag" DOCKER_REPO=${{ inputs.registry }}/${{ inputs.organization }}
         make docker-manifest DOCKER_IMAGE_TAG="$current_tag" DOCKER_REPO=${{ inputs.registry }}/${{ inputs.organization }}
         if [[ "$current_tag" =~ ^v[0-9]+(\.[0-9]+){2}$ ]]; then
-          make docker-tag-latest DOCKER_IMAGE_TAG="$current_tag" DOCKER_REPO=${{ input.registry }}/${{ input.organization }}
+          make docker-tag-latest DOCKER_IMAGE_TAG="$current_tag" DOCKER_REPO=${{ inputs.registry }}/${{ inputs.organization }}
-          make docker-publish DOCKER_IMAGE_TAG="latest" DOCKER_REPO=${{ input.registry }}/${{ input.organization }}
+          make docker-publish DOCKER_IMAGE_TAG="latest" DOCKER_REPO=${{ inputs.registry }}/${{ inputs.organization }}
-          make docker-manifest DOCKER_IMAGE_TAG="latest" DOCKER_REPO=${{ input.registry }}/${{ input.organization }}
+          make docker-manifest DOCKER_IMAGE_TAG="latest" DOCKER_REPO=${{ inputs.registry }}/${{ inputs.organization }}
         fi
       shell: bash

.github/actions/restore_artifacts/action.yml

@@ -17,6 +17,3 @@ runs:
         done
         rm -v .artifacts/*.tar
       shell: bash
-    - uses: actions/upload-artifact@v3
-      with:
-        path: artifact-*.tar

.github/workflows/ci.yml

@@ -175,6 +175,7 @@ jobs:
           docker_hub_password: ${{ secrets.docker_hub_password }}
           quay_io_login: ${{ secrets.quay_io_login }}
           quay_io_password: ${{ secrets.quay_io_password }}
+          github_token: ${{ secrets.PROMBOT_GITHUB_TOKEN }}
   publish_ui_release:
     name: Publish UI on npm Registry
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 2.39.0-rc.0 / 2022-09-27
+
+* [FEATURE] **experimental** TSDB: Add support for ingesting out-of-order samples. This is configured via `out_of_order_time_window` field in the config file; check config file docs for more info. #11075
+* [ENHANCEMENT] API: `/-/healthy` and `/-/ready` API calls now also respond to a `HEAD` request on top of existing `GET` support. #11160
+* [ENHANCEMENT] PuppetDB SD: Add `__meta_puppetdb_query` label. #11238
+* [ENHANCEMENT] AWS EC2 SD: Add `__meta_ec2_region` label. #11326
+* [ENHANCEMENT] AWS Lightsail SD: Add `__meta_lightsail_region` label. #11326
+* [ENHANCEMENT] Scrape: Optimise relabeling by re-using memory. #11147
+* [ENHANCEMENT] TSDB: Improve WAL replay timings. #10973 #11307 #11319
+* [ENHANCEMENT] TSDB: Optimise memory by not storing unnecessary data in the memory. #11280 #11288 #11296
+* [ENHANCEMENT] TSDB: Allow overlapping blocks by default. `--storage.tsdb.allow-overlapping-blocks` now has no effect. #11331
+* [ENHANCEMENT] UI: Click to copy label-value pair from query result to clipboard. #11229
+* [BUGFIX] TSDB: Turn off isolation for Head compaction to fix a memory leak. #11317
+* [BUGFIX] TSDB: Fix 'invalid magic number 0' error on Prometheus startup. #11338
+* [BUGFIX] PromQL: Properly close file descriptor when logging unfinished queries. #11148
+* [BUGFIX] Agent: Fix validation of flag options and prevent WAL from growing more than desired. #9876
+
 ## 2.38.0 / 2022-08-16
 
 * [FEATURE]: Web: Add a `/api/v1/format_query` HTTP API endpoint that allows pretty-formatting PromQL expressions. #11036 #10544 #11005

VERSION

@@ -1 +1 @@
-2.38.0
+2.39.0-rc.0

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

@@ -1,6 +1,6 @@
 {
   "name": "@prometheus-io/codemirror-promql",
-  "version": "0.38.0",
+  "version": "0.39.0-rc.0",
   "description": "a CodeMirror mode for the PromQL language",
   "types": "dist/esm/index.d.ts",
   "module": "dist/esm/index.js",

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

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

web/ui/package-lock.json

@@ -28,7 +28,7 @@
     },
     "module/codemirror-promql": {
       "name": "@prometheus-io/codemirror-promql",
-      "version": "0.38.0",
+      "version": "0.39.0-rc.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@prometheus-io/lezer-promql": "^0.38.0",
@@ -59,9 +59,18 @@
         "@lezer/common": "^1.0.1"
       }
     },
+    "module/codemirror-promql/node_modules/@prometheus-io/lezer-promql": {
+      "version": "0.38.0",
+      "resolved": "https://registry.npmjs.org/@prometheus-io/lezer-promql/-/lezer-promql-0.38.0.tgz",
+      "integrity": "sha512-4TNQChpbYctsztar4jvWmxZlXD1CIBneN5Kin2j07Hild4kIMYoDv0nQGUr8a851w37x9emZuJEVVv0/RphIyg==",
+      "peerDependencies": {
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.0.0"
+      }
+    },
     "module/lezer-promql": {
       "name": "@prometheus-io/lezer-promql",
-      "version": "0.38.0",
+      "version": "0.39.0-rc.0",
       "license": "Apache-2.0",
       "devDependencies": {
         "@lezer/generator": "^1.1.1",
@@ -17485,7 +17494,7 @@
     },
     "react-app": {
       "name": "@prometheus-io/app",
-      "version": "0.38.0",
+      "version": "0.39.0-rc.0",
       "dependencies": {
         "@codemirror/autocomplete": "^6.2.0",
         "@codemirror/commands": "^6.1.0",
@@ -17592,6 +17601,35 @@
         "@fortawesome/fontawesome-svg-core": "~1 || >=1.3.0-beta1",
         "react": ">=16.x"
       }
+    },
+    "react-app/node_modules/@prometheus-io/codemirror-promql": {
+      "version": "0.38.0",
+      "resolved": "https://registry.npmjs.org/@prometheus-io/codemirror-promql/-/codemirror-promql-0.38.0.tgz",
+      "integrity": "sha512-QTnM2FJmHSDHT/LMrN6XoCgWK6IExw6eehylh9ucnZoeJSpE2PUvoDcIcg6nXHGLScH99kxz1QB/bKuiBa7K2g==",
+      "dependencies": {
+        "@prometheus-io/lezer-promql": "^0.38.0",
+        "lru-cache": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@codemirror/autocomplete": "^6.0.0",
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/lint": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "@lezer/common": "^1.0.0"
+      }
+    },
+    "react-app/node_modules/@prometheus-io/lezer-promql": {
+      "version": "0.38.0",
+      "resolved": "https://registry.npmjs.org/@prometheus-io/lezer-promql/-/lezer-promql-0.38.0.tgz",
+      "integrity": "sha512-4TNQChpbYctsztar4jvWmxZlXD1CIBneN5Kin2j07Hild4kIMYoDv0nQGUr8a851w37x9emZuJEVVv0/RphIyg==",
+      "peerDependencies": {
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.0.0"
+      }
     }
   },
   "dependencies": {
@@ -19835,6 +19873,21 @@
           "requires": {
             "prop-types": "^15.8.1"
           }
+        },
+        "@prometheus-io/codemirror-promql": {
+          "version": "0.38.0",
+          "resolved": "https://registry.npmjs.org/@prometheus-io/codemirror-promql/-/codemirror-promql-0.38.0.tgz",
+          "integrity": "sha512-QTnM2FJmHSDHT/LMrN6XoCgWK6IExw6eehylh9ucnZoeJSpE2PUvoDcIcg6nXHGLScH99kxz1QB/bKuiBa7K2g==",
+          "requires": {
+            "@prometheus-io/lezer-promql": "^0.38.0",
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "@prometheus-io/lezer-promql": {
+          "version": "0.38.0",
+          "resolved": "https://registry.npmjs.org/@prometheus-io/lezer-promql/-/lezer-promql-0.38.0.tgz",
+          "integrity": "sha512-4TNQChpbYctsztar4jvWmxZlXD1CIBneN5Kin2j07Hild4kIMYoDv0nQGUr8a851w37x9emZuJEVVv0/RphIyg==",
+          "requires": {}
         }
       }
     },
@@ -19854,6 +19907,14 @@
         "isomorphic-fetch": "^3.0.0",
         "lru-cache": "^6.0.0",
         "nock": "^13.2.9"
+      },
+      "dependencies": {
+        "@prometheus-io/lezer-promql": {
+          "version": "0.38.0",
+          "resolved": "https://registry.npmjs.org/@prometheus-io/lezer-promql/-/lezer-promql-0.38.0.tgz",
+          "integrity": "sha512-4TNQChpbYctsztar4jvWmxZlXD1CIBneN5Kin2j07Hild4kIMYoDv0nQGUr8a851w37x9emZuJEVVv0/RphIyg==",
+          "requires": {}
+        }
       }
     },
     "@prometheus-io/lezer-promql": {

web/ui/react-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prometheus-io/app",
-  "version": "0.38.0",
+  "version": "0.39.0-rc.0",
   "private": true,
   "dependencies": {
     "@codemirror/autocomplete": "^6.2.0",