Skip to content

Commit d1ef156

Browse files
authored
Merge branch 'main' into feat-otelcol-receiver-github
2 parents 6965c55 + e7ea34a commit d1ef156

155 files changed

Lines changed: 4118 additions & 2349 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE/blank.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ body:
8282
- mimir.rules.kubernetes
8383
- otelcol.auth.basic
8484
- otelcol.auth.bearer
85+
- otelcol.auth.google
8586
- otelcol.auth.headers
8687
- otelcol.auth.oauth2
8788
- otelcol.auth.sigv4

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ body:
8282
- mimir.rules.kubernetes
8383
- otelcol.auth.basic
8484
- otelcol.auth.bearer
85+
- otelcol.auth.google
8586
- otelcol.auth.headers
8687
- otelcol.auth.oauth2
8788
- otelcol.auth.sigv4

.github/ISSUE_TEMPLATE/docs.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ body:
8585
- mimir.rules.kubernetes
8686
- otelcol.auth.basic
8787
- otelcol.auth.bearer
88+
- otelcol.auth.google
8889
- otelcol.auth.headers
8990
- otelcol.auth.oauth2
9091
- otelcol.auth.sigv4

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ body:
8282
- mimir.rules.kubernetes
8383
- otelcol.auth.basic
8484
- otelcol.auth.bearer
85+
- otelcol.auth.google
8586
- otelcol.auth.headers
8687
- otelcol.auth.oauth2
8788
- otelcol.auth.sigv4

.github/ISSUE_TEMPLATE/proposal.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ body:
8282
- mimir.rules.kubernetes
8383
- otelcol.auth.basic
8484
- otelcol.auth.bearer
85+
- otelcol.auth.google
8586
- otelcol.auth.headers
8687
- otelcol.auth.oauth2
8788
- otelcol.auth.sigv4

.github/renovate.json5

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@
8181
"github.com/mackerelio/go-osstat",
8282
"github.com/ncabatoff/process-exporter",
8383
"github.com/nerdswords/yet-another-cloudwatch-exporter",
84+
"github.com/percona/mongodb_exporter", // v0.48+ pulls in percona-backup-mongodb with platform-incompatible syscall usage
85+
"github.com/prometheus-community/yet-another-cloudwatch-exporter", // Introduces breaking changes in minor versions
86+
"github.com/prometheus/alertmanager", // v0.31+ requires sigv4 v0.4+ which is held
8487
"github.com/opencontainers/runc",
8588
"github.com/prometheus-operator/**",
8689
"github.com/prometheus/consul_exporter",

.github/workflows/fuzz-go.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
# a different module.
108108
cd "${{ matrix.package }}"
109109
# Note: -parallel=1 is required to avoid race conditions in the fuzzer until https://github.com/golang/go/issues/56238 is fixed.
110-
go test -parallel=1 -fuzz="${{ matrix.function }}\$" -run="${{ matrix.function }}\$" -fuzztime="${FUZZ_TIME}" .
110+
go test -tags=gore2regex -parallel=1 -fuzz="${{ matrix.function }}\$" -run="${{ matrix.function }}\$" -fuzztime="${FUZZ_TIME}" .
111111
env:
112112
FUZZ_TIME: ${{ inputs.fuzz-time }}
113113

.github/workflows/publish-technical-documentation-release.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,32 @@ jobs:
2020
contents: read
2121
id-token: write
2222
runs-on: ubuntu-latest
23+
2324
steps:
25+
- name: Wait for release branch ⏳
26+
if: github.ref_type == 'tag'
27+
env:
28+
GH_TOKEN: ${{ github.token }}
29+
run: |
30+
TAG="${GITHUB_REF_NAME}"
31+
BRANCH="release/v$(echo "${TAG}" | sed -E 's/^v([0-9]+\.[0-9]+)\..*/\1/')"
32+
echo "Waiting for branch ${BRANCH}..."
33+
for i in $(seq 1 60); do
34+
if gh api "repos/${{ github.repository }}/branches/${BRANCH}" > /dev/null 2>&1; then
35+
echo "Branch ${BRANCH} found."
36+
exit 0
37+
fi
38+
echo "Attempt ${i}/60: branch not found, retrying in 10s..."
39+
sleep 10
40+
done
41+
echo "::error::Branch ${BRANCH} did not appear within 10 minutes."
42+
exit 1
43+
2444
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2545
with:
2646
fetch-depth: 0
2747
persist-credentials: false
48+
2849
- uses: grafana/writers-toolkit/publish-technical-documentation-release@8cc658b604c6e05c275af30163a1c7728dfe19b2 # publish-technical-documentation-release/v2
2950
# This internal action's version is left as a tag instead of a pinned hash because renovate
3051
# does not support this type of tag/version format without custom configuration.

.github/workflows/release-code-freeze-guard.yml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
REPO_OWNER: ${{ github.repository_owner }}
3333
REPO_NAME: ${{ github.event.repository.name }}
3434
BASE_BRANCH: ${{ github.base_ref }}
35+
PR_TITLE: ${{ github.event.pull_request.title }}
3536
run: |
3637
# Always allow release-please bot PRs
3738
if [ "$PR_AUTHOR" = "grafana-alloybot[bot]" ]; then
@@ -45,6 +46,18 @@ jobs:
4546
exit 0
4647
fi
4748
49+
# Auto-exempt PR types.
50+
# The PR title is validated as conventional commit format by
51+
# release-lint-pr-title.yml, so we can reliably extract the type.
52+
#
53+
EXEMPT_TYPES="docs test ci style proposal"
54+
#
55+
CC_TYPE=$(echo "$PR_TITLE" | grep -oE '^[a-z]+' || true)
56+
if echo "$EXEMPT_TYPES" | grep -qw "$CC_TYPE"; then
57+
echo "✅ PR type '$CC_TYPE' is exempt from code freeze."
58+
exit 0
59+
fi
60+
4861
# Determine which tags to consider based on the target branch.
4962
# On main: only minor-release tags (vX.Y.0 / vX.Y.0-rc.N).
5063
# On release/vX.Y: all tags in that series (vX.Y.Z / vX.Y.Z-rc.N).
@@ -81,7 +94,12 @@ jobs:
8194
echo ""
8295
echo "An RC has been published and $BASE_BRANCH is frozen until the final release."
8396
echo "Only critical fixes approved by the release manager may be merged."
84-
echo "Add the 'freeze-exempt' label to this PR to bypass the freeze."
97+
echo ""
98+
echo "PRs with type [$EXEMPT_TYPES] are automatically exempt."
99+
echo "If this PR qualifies, update the title to use the appropriate conventional"
100+
echo "commit type."
101+
echo ""
102+
echo "Otherwise, add the 'freeze-exempt' label to bypass the freeze."
85103
exit 1
86104
fi
87105

.github/workflows/release-lint-pr-title.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ jobs:
3030
refactor
3131
perf
3232
test
33-
build
3433
ci
3534
chore
3635
revert

0 commit comments

Comments
 (0)