Update alertmanager

.circleci/config.yml

@@ -1,155 +1,166 @@
 ---
 version: 2.1
-
 orbs:
-  prometheus: prometheus/prometheus@0.11.0
-  go: circleci/go@0.2.0
-
+  prometheus: prometheus/prometheus@0.16.0
+  go: circleci/go@1.7.0
 jobs:
   test_frontend:
     # 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
-    - run:
-        name: Remove existing Go installation
-        command: sudo rm -rf /usr/local/go
-    # Whenever the Go version is updated here, .promu.yml should also be updated.
-    - go/install:
-        version: "1.16"
-    - run:
-        name: Remove generated code
-        command: make clean
-    - run:
-        name: Generate front-end code
-        command: make all
-        working_directory: ~/project/ui/app
-        environment:
-          JUNIT_DIR: ~/test-results
-    - run:
-        name: Generate assets
-        command: make assets
-    - run:
-        name: Generate API v2 code
-        command: make apiv2
-    - run: git diff --exit-code
-    - store_test_results:
-        path: ~/test-results
-
+      - checkout
+      - run: sudo service docker restart
+      - run:
+          name: Remove existing Go installation
+          command: sudo rm -rf /usr/local/go
+      # Whenever the Go version is updated here, .promu.yml should also be updated.
+      - go/install:
+          version: "1.18"
+      - run:
+          name: Remove generated code
+          command: make clean
+      - run:
+          name: Generate front-end code
+          command: make all
+          working_directory: ~/project/ui/app
+          environment:
+            JUNIT_DIR: ~/test-results
+      - run:
+          name: Generate assets
+          command: make assets
+      - run:
+          name: Generate API v2 code
+          command: make apiv2
+      - 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: circleci/golang:1.16
-    # 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
-      name: maildev-noauth
-      entrypoint: bin/maildev
-      command:
-      - -v
-    - image: djfarrelly/maildev:1.1.0
-      name: maildev-auth
-      entrypoint: bin/maildev
-      command:
-      - -v
-      - --incoming-user
-      - user
-      - --incoming-pass
-      - pass
-
+      # Whenever the Go version is updated here, .promu.yml should also be updated.
+      - 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: maildev/maildev:1.1.0
+        name: maildev-noauth
+        entrypoint: bin/maildev
+        command:
+          - -v
+      - image: maildev/maildev:1.1.0
+        name: maildev-auth
+        entrypoint: bin/maildev
+        command:
+          - -v
+          - --incoming-user
+          - user
+          - --incoming-pass
+          - pass
     environment:
       EMAIL_NO_AUTH_CONFIG: /tmp/smtp_no_auth.yml
       EMAIL_AUTH_CONFIG: /tmp/smtp_auth.yml
-
     steps:
-    - prometheus/setup_environment
-    - go/load-cache:
-        key: v1-go-mod
-    - run:
-        command: |
-          cat \<<EOF > $EMAIL_NO_AUTH_CONFIG
-          smarthost: maildev-noauth:1025
-          server: http://maildev-noauth:1080/
-          EOF
-          cat \<<EOF > $EMAIL_AUTH_CONFIG
-          smarthost: maildev-auth:1025
-          server: http://maildev-auth:1080/
-          username: user
-          password: pass
-          EOF
-    - run:
-        command: make
-        environment:
-          # By default Go uses GOMAXPROCS but a Circle CI executor has many
-          # cores (> 30) while the CPU and RAM resources are throttled. If we
-          # don't limit this to the number of allocated cores, the job is
-          # likely to get OOMed and killed.
-          GOOPTS: "-p 2"
-    - prometheus/check_proto:
-        version: "3.15.8"
-    - prometheus/store_artifact:
-        file: alertmanager
-    - prometheus/store_artifact:
-        file: amtool
-    - go/save-cache:
-        key: v1-go-mod
-    - store_test_results:
-        path: test-results
-
+      - prometheus/setup_environment
+      - go/load-cache:
+          key: v1-go-mod
+      - run:
+          command: |
+            cat \<<EOF > $EMAIL_NO_AUTH_CONFIG
+            smarthost: maildev-noauth:1025
+            server: http://maildev-noauth:1080/
+            EOF
+            cat \<<EOF > $EMAIL_AUTH_CONFIG
+            smarthost: maildev-auth:1025
+            server: http://maildev-auth:1080/
+            username: user
+            password: pass
+            EOF
+      - run:
+          command: make
+          environment:
+            # By default Go uses GOMAXPROCS but a Circle CI executor has many
+            # cores (> 30) while the CPU and RAM resources are throttled. If we
+            # don't limit this to the number of allocated cores, the job is
+            # likely to get OOMed and killed.
+            GOOPTS: "-p 2"
+      - prometheus/check_proto:
+          version: "3.15.8"
+      - prometheus/store_artifact:
+          file: alertmanager
+      - prometheus/store_artifact:
+          file: amtool
+      - go/save-cache:
+          key: v1-go-mod
+      - store_test_results:
+          path: test-results
   mixin:
     docker:
-    # Whenever the Go version is updated here, .promu.yml should also be updated.
-    - image: circleci/golang:1.16
-
+      # Whenever the Go version is updated here, .promu.yml should also be updated.
+      - 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
-
+      - checkout
+      - 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:
     jobs:
-    - test_frontend:
-        filters:
-          tags:
-            only: /.*/
-    - test:
-        filters:
-          tags:
-            only: /.*/
-    - prometheus/build:
-        name: build
-        parallelism: 8
-        filters:
-          tags:
-            only: /.*/
-    - mixin:
-        filters:
-          tags:
-            only: /.*/
-    - prometheus/publish_main:
-        context: org-context
-        requires:
-        - test_frontend
-        - test
-        - build
-        filters:
-          branches:
-            only: main
-    - prometheus/publish_release:
-        context: org-context
-        requires:
-        - test_frontend
-        - test
-        - build
-        filters:
-          tags:
-            only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
-          branches:
-            ignore: /.*/
+      - test_frontend:
+          filters:
+            tags:
+              only: /.*/
+      - test:
+          filters:
+            tags:
+              only: /.*/
+      - prometheus/build:
+          name: build
+          parallelism: 3
+          promu_opts: "-p linux/amd64 -p windows/amd64 -p linux/arm64 -p darwin/amd64 -p darwin/arm64 -p linux/386"
+          filters:
+            tags:
+              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:
+              only: /.*/
+      - prometheus/publish_main:
+          context: org-context
+          requires:
+            - test_frontend
+            - test
+            - build_all
+          filters:
+            branches:
+              only: main
+      - prometheus/publish_release:
+          context: org-context
+          requires:
+            - test_frontend
+            - test
+            - build_all
+          filters:
+            tags:
+              only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
+            branches:
+              ignore: /.*/

.github/dependabot.yml

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

.golangci.yml

@@ -1,13 +1,58 @@
----
 run:
   deadline: 5m
+  skip-files:
+    # Skip autogenerated files.
+    - ^.*\.(pb|y)\.go$
+
+output:
+  sort-results: true
+
+linters:
+  enable:
+    - depguard
+    - gofumpt
+    - goimports
+    - revive
+    - misspell
 
 issues:
   exclude-rules:
-  - path: _test.go
-    linters:
-    - errcheck
+    - path: _test.go
+      linters:
+        - errcheck
 
 linters-settings:
+  depguard:
+    list-type: blacklist
+    include-go-root: true
+    packages-with-error-message:
+      - sync/atomic: "Use go.uber.org/atomic instead of sync/atomic"
+      - github.com/stretchr/testify/assert: "Use github.com/stretchr/testify/require instead of github.com/stretchr/testify/assert"
+      - github.com/go-kit/kit/log: "Use github.com/go-kit/log instead of github.com/go-kit/kit/log"
   errcheck:
     exclude: scripts/errcheck_excludes.txt
+  goimports:
+    local-prefixes: github.com/prometheus/alertmanager
+  gofumpt:
+    extra-rules: true
+  revive:
+    rules:
+      - name: exported
+        arguments: ["disableStutteringCheck"]
+      - name: blank-imports
+      - name: context-as-argument
+      - name: dot-imports
+      - name: error-return
+      - name: error-strings
+      - name: error-naming
+      - name: if-return
+      - name: increment-decrement
+      - name: var-naming
+      - name: var-declaration
+      - name: package-comments
+      - name: range
+      - name: receiver-naming
+      - name: time-naming
+      - name: unexported-return
+      - name: indent-error-flow
+      - name: errorf

.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.16
+    version: 1.18
 repository:
     path: github.com/prometheus/alertmanager
 build: