Merge upstream Prometheus v3.13.0 into invoca-2.55.1-base

.dockerignore

@@ -3,7 +3,8 @@ data/
 .tarballs/
 
 !.build/linux-amd64/
-!.build/linux-armv7/
 !.build/linux-arm64/
+!.build/linux-armv7/
 !.build/linux-ppc64le/
+!.build/linux-riscv64/
 !.build/linux-s390x/

.gitattributes

@@ -0,0 +1 @@
+web/api/v1/testdata/openapi_golden.yaml linguist-generated

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
-blank_issues_enabled: false
+blank_issues_enabled: true
 contact_links:
  - name: Prometheus Community Support
  url: https://prometheus.io/community/

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +1,5 @@
 <!--
- Please give your PR a title in the form "area: short description". For example "tsdb: reduce disk usage by 95%"
-
- If your PR is to fix an issue, put "Fixes #issue-number" in the description.
-
- Don't forget!
+ - Please give your PR a title in the form "area: short description". For example "tsdb: reduce disk usage by 95%"
 
  - Please sign CNCF's Developer Certificate of Origin and sign-off your commits by adding the -s / --signoff flag to `git commit`. See https://github.com/apps/dco for more information.
 
@@ -17,3 +13,29 @@
 
  - All comments should start with a capital letter and end with a full stop.
  -->
+
+#### Which issue(s) does the PR fix:
+<!--
+If it applies.
+Automatically closes linked issue when PR is merged.
+Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
+More at https://docs.github.com/en/issues/tracking-your-work-with-issues/using-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword
+-->
+
+#### Release notes for end users (**ALL** commits must be considered).
+*Reviewers should verify clarity and quality.*
+
+<!--
+Write NONE only if there is no user-facing change.
+
+Otherwise use one of: [FEATURE] [ENHANCEMENT] [PERF] [BUGFIX] [SECURITY] [CHANGE]
+Following the pattern `[TYPE] Component: description.`
+
+Example: [FEATURE] API: Add `/api/v1/features` endpoint.
+
+Refer to the existing CHANGELOG for inspiration: https://github.com/prometheus/
+prometheus/blob/main/CHANGELOG.md
+-->
+```release-notes
+
+```

.github/workflows/automerge-dependabot.yml

@@ -0,0 +1,30 @@
+---
+name: Dependabot auto-merge
+on: pull_request
+
+concurrency:
+ group: ${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
+ cancel-in-progress: true
+
+permissions:
+ contents: read
+
+jobs:
+ dependabot:
+ permissions:
+ contents: write
+ pull-requests: write
+ runs-on: ubuntu-latest
+ if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' && github.repository_owner == 'prometheus' }}
+ steps:
+ - name: Dependabot metadata
+ id: metadata
+ uses: dependabot/fetch-metadata@21025c705c08248db411dc16f3619e6b5f9ea21a # v2.5.0
+ with:
+ github-token: "${{ secrets.GITHUB_TOKEN }}"
+ - name: Enable auto-merge for Dependabot PRs
+ if: ${{steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
+ run: gh pr merge --auto --merge "$PR_URL"
+ env:
+ PR_URL: ${{github.event.pull_request.html_url}}
+ GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/buf-lint.yml

@@ -12,8 +12,10 @@ jobs:
  name: lint
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- - uses: bufbuild/buf-setup-action@54abbed4fe8d8d45173eca4798b0c39a53a7b658 # v1.39.0
+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+ with:
+ persist-credentials: false
+ - uses: bufbuild/buf-setup-action@a47c93e0b1648d5651a065437926377d060baa99 # v1.50.0
  with:
  github_token: ${{ secrets.GITHUB_TOKEN }}
  - uses: bufbuild/buf-lint-action@06f9dd823d873146471cfaaf108a993fe00e5325 # v1.1.1

.github/workflows/buf.yml

@@ -12,8 +12,10 @@ jobs:
  runs-on: ubuntu-latest
  if: github.repository_owner == 'prometheus'
  steps:
- - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- - uses: bufbuild/buf-setup-action@54abbed4fe8d8d45173eca4798b0c39a53a7b658 # v1.39.0
+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+ with:
+ persist-credentials: false
+ - uses: bufbuild/buf-setup-action@a47c93e0b1648d5651a065437926377d060baa99 # v1.50.0
  with:
  github_token: ${{ secrets.GITHUB_TOKEN }}
  - uses: bufbuild/buf-lint-action@06f9dd823d873146471cfaaf108a993fe00e5325 # v1.1.1
@@ -23,7 +25,7 @@ jobs:
  with:
  input: 'prompb'
  against: 'https://github.com/prometheus/prometheus.git#branch=main,ref=HEAD~1,subdir=prompb'
- - uses: bufbuild/buf-push-action@a654ff18effe4641ebea4a4ce242c49800728459 # v1.1.1
+ - uses: bufbuild/buf-push-action@a654ff18effe4641ebea4a4ce242c49800728459 # v1.2.0
  with:
  input: 'prompb'
  buf_token: ${{ secrets.BUF_TOKEN }}

.github/workflows/check_release_notes.yml

@@ -0,0 +1,28 @@
+name: 'Check release notes'
+on:
+ pull_request:
+ branches: [main, 'release-*']
+ types:
+ - opened
+ - reopened
+ - edited
+ - synchronize
+permissions:
+ contents: read
+ pull-requests: read
+
+jobs:
+ check_release_notes:
+ name: check
+ runs-on: ubuntu-latest
+ # Don't run this workflow on forks.
+ # Don't run it on dependabot PRs either as humans would take control in case a bump introduces a breaking change.
+ if: (github.repository_owner == 'prometheus' || github.repository_owner == 'prometheus-community') && github.event.pull_request.user.login != 'dependabot[bot]'
+ steps:
+ - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+ with:
+ persist-credentials: false
+ - env:
+ PR_DESCRIPTION: ${{ github.event.pull_request.body }}
+ run: |
+ echo "$PR_DESCRIPTION" | ./scripts/check_release_notes.sh