Merge branch 'main' into jira_disable_update_per_config

Signed-off-by: Holger Waschke <[email protected]>

Author: holger-waschke

.circleci/config.yml

@@ -18,3 +18,12 @@ updates:
     directory: "/"
     schedule:
       interval: "monthly"
+  - package-ecosystem: "npm"
+    directory: "/ui/mantine-ui"
+    open-pull-requests-limit: 20
+    schedule:
+      interval: "monthly"
+    groups:
+      mantine:
+        patterns:
+          - "@mantine/*"

.github/dependabot.yml

@@ -37,7 +37,19 @@ jobs:
     # Whenever the Go version is updated here, .promu.yml
     # should also be updated.
     container:
+
       image: quay.io/prometheus/golang-builder:1.25-base
+    services:
+      maildev-noauth:
+        image: maildev/maildev:2.2.1
+      maildev-auth:
+        image: maildev/maildev:2.2.1
+        env:
+          MAILDEV_INCOMING_USER: user
+          MAILDEV_INCOMING_PASS: pass
+    env:
+      EMAIL_NO_AUTH_CONFIG: testdata/noauth.yml
+      EMAIL_AUTH_CONFIG: testdata/auth.yml
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - uses: prometheus/promci@443c7fc2397e946bc9f5029e313a9c3441b9b86d # v0.4.7

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Install Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version: 1.25.x
       - name: Install snmp_exporter/generator dependencies

.github/workflows/golangci-lint.yml

@@ -0,0 +1,33 @@
+name: UI CI
+
+on:
+  pull_request:
+    branches:
+      - '**'
+    paths:
+      - 'ui/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.number || github.sha }}
+  cancel-in-progress: true
+
+jobs:
+  test_mantine_ui:
+    name: Test mantine-ui
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./ui/mantine-ui
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
+        with:
+          node-version-file: './ui/mantine-ui/.nvmrc'
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
+      - name: Install dependencies
+        run: npm install
+      - name: Run build
+        run: npm run build
+      - name: Run tests
+        run: npm test

.github/workflows/ui-ci.yml

@@ -5,7 +5,7 @@
 * [ENHANCEMENT] ...
 * [BUGFIX] ...
 
-## 0.29.0-rc.0 / 2025-10-09
+## 0.29.0 / 2025-11-01
 
 * [FEATURE] Add incident.io notifier. #4372
 * [FEATURE] Add monospace message formatting. #4362
@@ -18,6 +18,7 @@
 * [BUGFIX] Fix error handling in template rendering for Telegram. #4353
 * [BUGFIX] Fix duplicate `other` in error messages for config. #4366
 * [BUGFIX] Fix logic that considers an alert reopened in Jira. #4478
+* [BUGFIX] Fix Jira issue count #4615
 
 ## 0.28.1 / 2025-03-07
 

CHANGELOG.md

@@ -69,11 +69,3 @@ clean:
                   template/email.tmpl \
                   api/v2/models api/v2/restapi api/v2/client
 	- @cd $(FRONTEND_DIR) && $(MAKE) clean
-
-# In github actions we skip the email test for now. Service containers in github
-# actions currently have a bug, see https://github.com/prometheus/alertmanager/pull/3299
-# So define a test target, that skips the email test for now.
-.PHONY: test
-test: $(GOTEST_DIR)
-	@echo ">> running all tests, except notify/email"
-	$(GOTEST) $(test-flags) $(GOOPTS) `go list ./... | grep -v notify/email`

Makefile

@@ -61,7 +61,7 @@ PROMU_URL     := https://github.com/prometheus/promu/releases/download/v$(PROMU_
 SKIP_GOLANGCI_LINT :=
 GOLANGCI_LINT :=
 GOLANGCI_LINT_OPTS ?=
-GOLANGCI_LINT_VERSION ?= v2.4.0
+GOLANGCI_LINT_VERSION ?= v2.6.0
 GOLANGCI_FMT_OPTS ?=
 # golangci-lint only supports linux, darwin and windows platforms on i386/amd64/arm64.
 # windows isn't included here because of the path separator being different.

Makefile.common

@@ -30,10 +30,10 @@ Alertmanager will now be reachable at http://localhost:9093/.
 
 ### Compiling the binary
 
-You can either `go get` it:
+You can either `go install` it:
 
 ```
-$ GO15VENDOREXPERIMENT=1 go get github.com/prometheus/alertmanager/cmd/...
+$ go install github.com/prometheus/alertmanager/cmd/...@latest
 # cd $GOPATH/src/github.com/prometheus/alertmanager
 $ alertmanager --config.file=<your_file>
 ```
@@ -358,6 +358,7 @@ be configured to communicate with each other. This is configured using the
 - `--cluster.advertise-address` string: cluster advertise address
 - `--cluster.peer` value: initial peers (repeat flag for each additional peer)
 - `--cluster.peer-timeout` value: peer timeout period (default "15s")
+- `--cluster.peers-resolve-timeout` value: peers resolve timeout period (default "15s")
 - `--cluster.gossip-interval` value: cluster message propagation speed
   (default "200ms")
 - `--cluster.pushpull-interval` value: lower values will increase

README.md

@@ -10,6 +10,8 @@ Release cadence of first pre-releases being cut is 12 weeks.
 | v0.26          | 2023-08-23            | Josh Abreu (Github: @gotjosh) |
 | v0.27          | 2024-02-28            | Josh Abreu (Github: @gotjosh) |
 | v0.28          | 2024-05-28            | Josh Abreu (Github: @gotjosh) |
+| v0.29          | 2025-11-01            | Joe Adams (Github: @sysadmind) |
+| v0.30          | 2025-12-12            | Solomon Jacobs (Github: @SoloJacobs) |
 
 If you are interested in volunteering please create a pull request against the [prometheus/alertmanager](https://github.com/prometheus/alertmanager) repository and propose yourself for the release of your choice.