Merge upstream Prometheus v2.55.1 into invoca-2.53.1-base

.github/workflows/buf-lint.yml

@@ -13,7 +13,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- - uses: bufbuild/buf-setup-action@dde0b9351db90fbf78e345f41a57de8514bf1091 # v1.32.2
+ - uses: bufbuild/buf-setup-action@54abbed4fe8d8d45173eca4798b0c39a53a7b658 # v1.39.0
  with:
  github_token: ${{ secrets.GITHUB_TOKEN }}
  - uses: bufbuild/buf-lint-action@06f9dd823d873146471cfaaf108a993fe00e5325 # v1.1.1

.github/workflows/buf.yml

@@ -13,7 +13,7 @@ jobs:
  if: github.repository_owner == 'prometheus'
  steps:
  - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- - uses: bufbuild/buf-setup-action@dde0b9351db90fbf78e345f41a57de8514bf1091 # v1.32.2
+ - uses: bufbuild/buf-setup-action@54abbed4fe8d8d45173eca4798b0c39a53a7b658 # v1.39.0
  with:
  github_token: ${{ secrets.GITHUB_TOKEN }}
  - uses: bufbuild/buf-lint-action@06f9dd823d873146471cfaaf108a993fe00e5325 # v1.1.1

.github/workflows/ci.yml

@@ -11,10 +11,10 @@ jobs:
  container:
  # Whenever the Go version is updated here, .promu.yml
  # should also be updated.
- image: quay.io/prometheus/golang-builder:1.22-base
+ image: quay.io/prometheus/golang-builder:1.23-base
  steps:
  - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- - uses: prometheus/promci@3cb0c3871f223bd5ce1226995bd52ffb314798b6 # v0.1.0
+ - uses: prometheus/promci@45166329da36d74895901808f1c8c97efafc7f84 # v0.3.0
  - uses: ./.github/promci/actions/setup_environment
  - run: make GOOPTS=--tags=stringlabels GO_ONLY=1 SKIP_GOLANGCI_LINT=1
  - run: go test --tags=stringlabels ./tsdb/ -test.tsdb-isolation=false
@@ -25,10 +25,10 @@ jobs:
  name: More Go tests
  runs-on: ubuntu-latest
  container:
- image: quay.io/prometheus/golang-builder:1.22-base
+ image: quay.io/prometheus/golang-builder:1.23-base
  steps:
  - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- - uses: prometheus/promci@3cb0c3871f223bd5ce1226995bd52ffb314798b6 # v0.1.0
+ - uses: prometheus/promci@45166329da36d74895901808f1c8c97efafc7f84 # v0.3.0
  - uses: ./.github/promci/actions/setup_environment
  - run: go test --tags=dedupelabels ./...
  - run: GOARCH=386 go test ./cmd/prometheus
@@ -39,9 +39,12 @@ jobs:
  test_go_oldest:
  name: Go tests with previous Go version
  runs-on: ubuntu-latest
+ env:
+ # Enforce the Go version.
+ GOTOOLCHAIN: local
  container:
  # The go version in this image should be N-1 wrt test_go.
- image: quay.io/prometheus/golang-builder:1.21-base
+ image: quay.io/prometheus/golang-builder:1.22-base
  steps:
  - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
  - run: make build
@@ -54,11 +57,11 @@ jobs:
  # Whenever the Go version is updated here, .promu.yml
  # should also be updated.
  container:
- image: quay.io/prometheus/golang-builder:1.22-base
+ image: quay.io/prometheus/golang-builder:1.23-base
 
  steps:
  - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- - uses: prometheus/promci@3cb0c3871f223bd5ce1226995bd52ffb314798b6 # v0.1.0
+ - uses: prometheus/promci@45166329da36d74895901808f1c8c97efafc7f84 # v0.3.0
  - uses: ./.github/promci/actions/setup_environment
  with:
  enable_go: false
@@ -75,9 +78,9 @@ jobs:
  runs-on: windows-latest
  steps:
  - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+ - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
  with:
- go-version: 1.22.x
+ go-version: 1.23.x
  - run: |
  $TestTargets = go list ./... | Where-Object { $_ -NotMatch "(github.com/prometheus/prometheus/discovery.*|github.com/prometheus/prometheus/config|github.com/prometheus/prometheus/web)"}
  go test $TestTargets -vet=off -v
@@ -89,7 +92,7 @@ jobs:
  # Whenever the Go version is updated here, .promu.yml
  # should also be updated.
  container:
- image: quay.io/prometheus/golang-builder:1.22-base
+ image: quay.io/prometheus/golang-builder:1.23-base
  steps:
  - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
  - run: go install ./cmd/promtool/.
@@ -115,7 +118,7 @@ jobs:
  thread: [ 0, 1, 2 ]
  steps:
  - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- - uses: prometheus/promci@3cb0c3871f223bd5ce1226995bd52ffb314798b6 # v0.1.0
+ - uses: prometheus/promci@45166329da36d74895901808f1c8c97efafc7f84 # v0.3.0
  - uses: ./.github/promci/actions/build
  with:
  promu_opts: "-p linux/amd64 -p windows/amd64 -p linux/arm64 -p darwin/amd64 -p darwin/arm64 -p linux/386"
@@ -138,22 +141,34 @@ jobs:
  # should also be updated.
  steps:
  - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- - uses: prometheus/promci@3cb0c3871f223bd5ce1226995bd52ffb314798b6 # v0.1.0
+ - uses: prometheus/promci@45166329da36d74895901808f1c8c97efafc7f84 # v0.3.0
  - uses: ./.github/promci/actions/build
  with:
  parallelism: 12
  thread: ${{ matrix.thread }}
+ build_all_status:
+ name: Report status of build Prometheus for all architectures
+ runs-on: ubuntu-latest
+ needs: [build_all]
+ if: github.event_name == 'pull_request' && startsWith(github.event.pull_request.base.ref, 'release-')
+ steps:
+ - name: Successful build
+ if: ${{ !(contains(needs.*.result, 'failure')) && !(contains(needs.*.result, 'cancelled')) }}
+ run: exit 0
+ - name: Failing or cancelled build
+ if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
+ run: exit 1
  check_generated_parser:
  name: Check generated parser
  runs-on: ubuntu-latest
  steps:
  - name: Checkout repository
  uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
  - name: Install Go
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+ uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
  with:
  cache: false
- go-version: 1.22.x
+ go-version: 1.23.x
  - name: Run goyacc and check for diff
  run: make install-goyacc check-generated-parser
  golangci:
@@ -163,18 +178,18 @@ jobs:
  - name: Checkout repository
  uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
  - name: Install Go
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+ uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
  with:
- go-version: 1.22.x
+ go-version: 1.23.x
  - name: Install snmp_exporter/generator dependencies
  run: sudo apt-get update && sudo apt-get -y install libsnmp-dev
  if: github.repository == 'prometheus/snmp_exporter'
  - name: Lint
- uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1
+ uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0
  with:
  args: --verbose
  # Make sure to sync this with Makefile.common and scripts/golangci-lint.yml.
- version: v1.59.1
+ version: v1.60.2
  fuzzing:
  uses: ./.github/workflows/fuzzing.yml
  if: github.event_name == 'pull_request'
@@ -188,7 +203,7 @@ jobs:
  if: github.event_name == 'push' && github.event.ref == 'refs/heads/main'
  steps:
  - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- - uses: prometheus/promci@3cb0c3871f223bd5ce1226995bd52ffb314798b6 # v0.1.0
+ - uses: prometheus/promci@45166329da36d74895901808f1c8c97efafc7f84 # v0.3.0
  - uses: ./.github/promci/actions/publish_main
  with:
  docker_hub_login: ${{ secrets.docker_hub_login }}
@@ -202,7 +217,7 @@ jobs:
  if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v2.')
  steps:
  - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- - uses: prometheus/promci@3cb0c3871f223bd5ce1226995bd52ffb314798b6 # v0.1.0
+ - uses: prometheus/promci@45166329da36d74895901808f1c8c97efafc7f84 # v0.3.0
  - uses: ./.github/promci/actions/publish_release
  with:
  docker_hub_login: ${{ secrets.docker_hub_login }}
@@ -217,9 +232,9 @@ jobs:
  steps:
  - name: Checkout
  uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- - uses: prometheus/promci@3cb0c3871f223bd5ce1226995bd52ffb314798b6 # v0.1.0
+ - uses: prometheus/promci@45166329da36d74895901808f1c8c97efafc7f84 # v0.3.0
  - name: Install nodejs
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+ uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
  with:
  node-version-file: "web/ui/.nvmrc"
  registry-url: "https://registry.npmjs.org"

.github/workflows/codeql-analysis.yml

@@ -27,12 +27,12 @@ jobs:
  uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
 
  - name: Initialize CodeQL
- uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
+ uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
  with:
  languages: ${{ matrix.language }}
 
  - name: Autobuild
- uses: github/codeql-action/autobuild@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
+ uses: github/codeql-action/autobuild@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
 
  - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
+ uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6

.github/workflows/fuzzing.yml

@@ -21,7 +21,7 @@ jobs:
  fuzz-seconds: 600
  dry-run: false
  - name: Upload Crash
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+ uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
  if: failure() && steps.build.outcome == 'success'
  with:
  name: artifacts

.github/workflows/scorecards.yml

@@ -26,7 +26,7 @@ jobs:
  persist-credentials: false
 
  - name: "Run analysis"
- uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # tag=v2.3.3
+ uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # tag=v2.4.0
  with:
  results_file: results.sarif
  results_format: sarif
@@ -37,14 +37,14 @@ jobs:
  # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
  # format to the repository Actions tab.
  - name: "Upload artifact"
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # tag=v4.3.3
+ uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # tag=v4.3.4
  with:
  name: SARIF file
  path: results.sarif
  retention-days: 5
 
  # Upload the results to GitHub's code scanning dashboard.
  - name: "Upload to code-scanning"
- uses: github/codeql-action/upload-sarif@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # tag=v3.25.8
+ uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # tag=v3.26.6
  with:
  sarif_file: results.sarif

.github/workflows/stale.yml

@@ -0,0 +1,31 @@
+name: Stale Check
+on:
+ workflow_dispatch: {}
+ schedule:
+ - cron: '16 22 * * *'
+permissions:
+ issues: write
+ pull-requests: write
+jobs:
+ stale:
+ if: github.repository_owner == 'prometheus' || github.repository_owner == 'prometheus-community' # Don't run this workflow on forks.
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
+ with:
+ repo-token: ${{ secrets.GITHUB_TOKEN }}
+ # opt out of defaults to avoid marking issues as stale and closing them
+ # https://github.com/actions/stale#days-before-close
+ # https://github.com/actions/stale#days-before-stale
+ days-before-stale: -1
+ days-before-close: -1
+ # Setting it to empty string to skip comments.
+ # https://github.com/actions/stale#stale-pr-message
+ # https://github.com/actions/stale#stale-issue-message
+ stale-pr-message: ''
+ stale-issue-message: ''
+ operations-per-run: 30
+ # override days-before-stale, for only marking the pull requests as stale
+ days-before-pr-stale: 60
+ stale-pr-label: stale
+ exempt-pr-labels: keepalive