Skip to content

[REQUIRES MERGE COMMIT] merge release/v1.12 into main #5070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jharvey10 wants to merge 20 commits into
base: main
Choose a base branch
from
+5 −6
Open

[REQUIRES MERGE COMMIT] merge release/v1.12 into main #5070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
9343499
ci: increase runner size for pr tests (#4851)
jharvey10 Nov 14, 2025
89a3f79
chore(release): update changelog (#4847)
jharvey10 Nov 14, 2025
afba243
sync main to 1.12 release branch (#4857)
jharvey10 Nov 14, 2025
c7380e1
ci: fix publish-alloy-release workflow (#4865)
jharvey10 Nov 17, 2025
9d8a1aa
v1.12 rc.1 content (#4877)
jharvey10 Nov 19, 2025
7c2947c
1.12 rc.2 content (#4888)
jharvey10 Nov 24, 2025
3ef3a73
V1.12.0 rc3 (#4933)
kalleep Nov 25, 2025
a464233
move to final 1.12.0 release (#4959)
jharvey10 Dec 1, 2025
433508b
Refactor the Alloy Get Started topics (#4591) (#4962)
grafana-alloybot[bot] Dec 1, 2025
f360c7b
chore(doc): admonition for API saturation risk (#4955) (#4964)
clayton-cornell Dec 1, 2025
30dc5fa
Fix broken link definitions (#4965) (#4966)
grafana-alloybot[bot] Dec 1, 2025
3cdb452
Fix broken links in admonition (#4971) (#4974)
grafana-alloybot[bot] Dec 1, 2025
c9c49bd
docs: adjust remove_empty_groups in prometheus.exporter.process (#497…
grafana-alloybot[bot] Dec 2, 2025
147e38e
Fix aliases in Get started documentation (#4990) (#4996)
grafana-alloybot[bot] Dec 3, 2025
a6316b3
Fix broken link in admonition (#4988) (#4999)
grafana-alloybot[bot] Dec 3, 2025
7598bb4
Add two more missing aliases (#5000) (#5007)
grafana-alloybot[bot] Dec 4, 2025
8d7cc5a
Update the Debug topic to add detailed information about logs (#4245)…
grafana-alloybot[bot] Dec 4, 2025
07430fb
Add missing information to the prometheus.exporter.oracledb component…
grafana-alloybot[bot] Dec 8, 2025
824d2d9
Fix missing release note for v1.12 (#5043) (#5044)
grafana-alloybot[bot] Dec 9, 2025
cf078c7
Merge branch 'release/v1.12' into jdh/mainsync
jharvey10 Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/test_pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ jobs:
cache: false

- run: make GO_TAGS="nodocker" test

8 changes: 4 additions & 4 deletions internal/cmd/integration-tests-k8s/tests/mimir-alerts-kubernetes/testdata/kubernetes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ data:
sync_interval = "5s"
global_config = remote.kubernetes.configmap.default.data["glbl"]
template_files = {
`default_template` =
`default_template` =
`{{ define "__alertmanager" }}AlertManager{{ end }}
{{ define "__alertmanagerURL" }}{{ .ExternalURL }}/#/alerts?receiver={{ .Receiver | urlquery }}{{ end }}`,
}
Expand Down Expand Up @@ -206,9 +206,9 @@ kind: AlertmanagerConfig
metadata:
name: alertmgr-config3
namespace: testing
# This config should not have the label required for
# mimir.alerts.kubernetes to pick up the CRD.
#
# This config should not have the label required for
# mimir.alerts.kubernetes to pick up the CRD.
#
# labels:
# alloy: "yes"
spec:
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/integration-tests-k8s/tests/mimir-alerts-kubernetes/testdata/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -x #echo on

# Install the Prometheus Operator
LATEST=$(curl -s https://api.github.com/repos/prometheus-operator/prometheus-operator/releases/latest | jq -cr .tag_name)
curl -sL https://github.com/prometheus-operator/prometheus-operator/releases/download/${LATEST}/bundle.yaml | kubectl create -f -
curl -sL https://github.com/prometheus-operator/prometheus-operator/releases/download/"${LATEST}"/bundle.yaml | kubectl create -f -

# Install Mimir
kubectl create namespace mimir-test
Expand Down
Loading