Merge branch 'master' of github.com:MicroOps-cn/alertmanager

Author: MicroOps-cn

.circleci/config.yml

@@ -8,7 +8,8 @@ jobs:
     # We need to use a machine executor because the front-end validation runs
     # containers with mounted volumes which isn't supported with the docker
     # executor (even with setup_remote_docker).
-    machine: true
+    machine:
+      image: ubuntu-2204:current
     steps:
       - checkout
       - run: sudo service docker restart
@@ -17,7 +18,7 @@ jobs:
           command: sudo rm -rf /usr/local/go
       # Whenever the Go version is updated here, .promu.yml should also be updated.
       - go/install:
-          version: "1.17"
+          version: "1.18"
       - run:
           name: Remove generated code
           command: make clean
@@ -36,18 +37,25 @@ jobs:
       - run: git diff --exit-code
       - store_test_results:
           path: ~/test-results
+      - run:
+          name: Save assets
+          command: make assets-tarball
+      - persist_to_workspace:
+          root: .
+          paths:
+            - .tarballs
   test:
     docker:
       # Whenever the Go version is updated here, .promu.yml should also be updated.
-      - image: quay.io/prometheus/golang-builder:1.17-base
+      - image: quay.io/prometheus/golang-builder:1.18-base
       # maildev containers are for running the email tests against a "real" SMTP server.
       # See notify/email_test.go for details.
-      - image: djfarrelly/maildev:1.1.0
+      - image: maildev/maildev:1.1.0
         name: maildev-noauth
         entrypoint: bin/maildev
         command:
           - -v
-      - image: djfarrelly/maildev:1.1.0
+      - image: maildev/maildev:1.1.0
         name: maildev-auth
         entrypoint: bin/maildev
         command:
@@ -96,13 +104,13 @@ jobs:
   mixin:
     docker:
       # Whenever the Go version is updated here, .promu.yml should also be updated.
-      - image: quay.io/prometheus/golang-builder:1.17-base
+      - image: quay.io/prometheus/golang-builder:1.18-base
     steps:
       - checkout
-      - run: cd doc/alertmanager-mixin; go install github.com/monitoring-mixins/mixtool/cmd/mixtool@latest
-      - run: cd doc/alertmanager-mixin; go install github.com/google/go-jsonnet/cmd/jsonnetfmt@latest
-      - run: cd doc/alertmanager-mixin; go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb@latest
-      - run: cd doc/alertmanager-mixin; make lint
+      - run: go install github.com/monitoring-mixins/mixtool/cmd/mixtool@latest
+      - run: go install github.com/google/go-jsonnet/cmd/jsonnetfmt@latest
+      - run: go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb@latest
+      - run: make -C doc/alertmanager-mixin lint
 workflows:
   version: 2
   alertmanager:
@@ -117,10 +125,21 @@ workflows:
               only: /.*/
       - prometheus/build:
           name: build
-          parallelism: 8
+          parallelism: 3
+          promu_opts: "-p linux/amd64 -p windows/amd64 -p linux/arm64 -p darwin/amd64 -p darwin/arm64 -p linux/386"
           filters:
             tags:
-              only: /.*/
+              ignore: /^v2(\.[0-9]+){2}(-.+|[^-.]*)$/
+            branches:
+              ignore: /^(main|release-.*|.*build-all.*)$/
+      - prometheus/build:
+          name: build_all
+          parallelism: 12
+          filters:
+            branches:
+              only: /^(main|release-.*|.*build-all.*)$/
+            tags:
+              only: /^v2(\.[0-9]+){2}(-.+|[^-.]*)$/
       - mixin:
           filters:
             tags:
@@ -130,7 +149,7 @@ workflows:
           requires:
             - test_frontend
             - test
-            - build
+            - build_all
           filters:
             branches:
               only: main
@@ -139,7 +158,7 @@ workflows:
           requires:
             - test_frontend
             - test
-            - build
+            - build_all
           filters:
             tags:
               only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "monthly"

.promu.yml

@@ -1,7 +1,7 @@
 go:
     # Whenever the Go version is updated here, .travis.yml and
     # .circle/config.yml should also be updated.
-    version: 1.17
+    version: 1.18
 repository:
     path: github.com/prometheus/alertmanager
 build:

.yamllint

@@ -14,6 +14,7 @@ rules:
   document-start: disable
   indentation:
     spaces: consistent
+    indent-sequences: consistent
   key-duplicates:
     ignore: |
       config/testdata/section_key_dup.bad.yml

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 0.24.0-rc.0 / 2022-03-10
+## 0.24.0 / 2022-03-24
 
 * [CHANGE] Add the `/api/v2` prefix to all endpoints in the OpenAPI specification and generated client code. #2696
 * [CHANGE] Remove the `github.com/prometheus/alertmanager/client` Go package. #2763

CODE_OF_CONDUCT.md

@@ -1,3 +1,3 @@
-## Prometheus Community Code of Conduct
+# Prometheus Community Code of Conduct
 
-Prometheus follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
+Prometheus follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/main/code-of-conduct.md).

Makefile

@@ -29,6 +29,10 @@ build-all: assets apiv2 build
 .PHONY: assets
 assets: asset/assets_vfsdata.go
 
+.PHONY: assets-tarball
+assets-tarball: ui/app/script.js ui/app/index.html
+	scripts/package_assets.sh
+
 asset/assets_vfsdata.go: ui/app/script.js ui/app/index.html ui/app/lib template/default.tmpl template/email.tmpl
 	GO111MODULE=$(GO111MODULE) $(GO) generate $(GOOPTS) ./asset
 	@$(GOFMT) -w ./asset

Makefile.common

@@ -83,7 +83,7 @@ PROMU_URL     := https://github.com/prometheus/promu/releases/download/v$(PROMU_
 
 GOLANGCI_LINT :=
 GOLANGCI_LINT_OPTS ?=
-GOLANGCI_LINT_VERSION ?= v1.44.2
+GOLANGCI_LINT_VERSION ?= v1.45.2
 # golangci-lint only supports linux, darwin and windows platforms on i386/amd64.
 # windows isn't included here because of the path separator being different.
 ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))

README.md

@@ -210,7 +210,7 @@ _API v2 is still under heavy development and thereby subject to change._
 
 Alternatively you can install with:
 ```
-go get github.com/prometheus/alertmanager/cmd/amtool
+$ go install github.com/prometheus/alertmanager/cmd/amtool@latest
 ```
 
 ### Examples

SECURITY.md

@@ -3,4 +3,4 @@
 The Prometheus security policy, including how to report vulnerabilities, can be
 found here:
 
-https://prometheus.io/docs/operating/security/
+<https://prometheus.io/docs/operating/security/>