Merge branch 'main' into rorymalcolm/incidentio-notifier

Author: rorymalcolm

.github/workflows/golangci-lint.yml

@@ -26,14 +26,14 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Install Go
-        uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
+        uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
         with:
           go-version: 1.24.x
       - name: Install snmp_exporter/generator dependencies
         run: sudo apt-get update && sudo apt-get -y install libsnmp-dev
         if: github.repository == 'prometheus/snmp_exporter'
       - name: Lint
-        uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2
+        uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7.0.0
         with:
           args: --verbose
-          version: v1.64.6
+          version: v2.3.0

.golangci.yml

@@ -1,99 +1,96 @@
-output:
-  sort-results: true
-
+version: "2"
 linters:
   enable:
     - depguard
     - errorlint
     - godot
-    - gofumpt
-    - goimports
     - misspell
     - revive
-    - testifylint
     - sloglint
-
+    - testifylint
+  settings:
+    depguard:
+      rules:
+        main:
+          deny:
+            - pkg: sync/atomic
+              desc: "Use go.uber.org/atomic instead of sync/atomic"
+            - pkg: github.com/stretchr/testify/assert
+              desc: "Use github.com/stretchr/testify/require instead of github.com/stretchr/testify/assert"
+            - pkg: github.com/go-kit/kit/log
+              desc: "Use github.com/go-kit/log instead of github.com/go-kit/kit/log"
+            - pkg: github.com/pkg/errors
+              desc: "Use errors or fmt instead of github.com/pkg/errors"
+    errcheck:
+      exclude-functions:
+        # Don't flag lines such as "io.Copy(io.Discard, resp.Body)".
+        - io.Copy
+        # The next two are used in HTTP handlers, any error is handled by the server itself.
+        - io.WriteString
+        - (net/http.ResponseWriter).Write
+        # No need to check for errors on server's shutdown.
+        - (*net/http.Server).Shutdown
+        # Never check for rollback errors as Rollback() is called when a previous error was detected.
+        - (github.com/prometheus/prometheus/storage.Appender).Rollback
+    godot:
+      scope: toplevel
+      exclude:
+        - "^ ?This file is safe to edit"
+        - "^ ?scheme value"
+      period: true
+      capital: true
+    revive:
+      rules:
+        - name: blank-imports
+        - name: context-as-argument
+        - name: error-naming
+        - name: error-return
+        - name: error-strings
+        - name: errorf
+        - name: exported
+          arguments:
+            - disableStutteringCheck
+        - name: if-return
+        - name: increment-decrement
+        - name: indent-error-flow
+        - name: package-comments
+        - name: range
+        - name: receiver-naming
+        - name: time-naming
+        - name: unexported-return
+        - name: var-declaration
+        - name: var-naming
+    testifylint:
+      disable:
+        - float-compare
+        - go-require
+      enable-all: true
+  exclusions:
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      # Skip autogenerated files.
+      - ^.*\.(pb|y)\.go$
+    rules:
+      - linters:
+          - errcheck
+        path: _test.go
+    warn-unused: true
 issues:
   max-issues-per-linter: 0
   max-same-issues: 0
-  exclude-rules:
-    - path: _test.go
-      linters:
-        - errcheck
-  exclude-files:
-    # Skip autogenerated files.
-    - ^.*\.(pb|y)\.go$
-
 run:
   timeout: 5m
-
-linters-settings:
-  depguard:
-    rules:
-      main:
-        deny:
-          - pkg: sync/atomic
-            desc: "Use go.uber.org/atomic instead of sync/atomic"
-          - pkg: github.com/stretchr/testify/assert
-            desc: "Use github.com/stretchr/testify/require instead of github.com/stretchr/testify/assert"
-          - pkg: github.com/go-kit/kit/log
-            desc: "Use github.com/go-kit/log instead of github.com/go-kit/kit/log"
-          - pkg: github.com/pkg/errors
-            desc: "Use errors or fmt instead of github.com/pkg/errors"
-  errcheck:
-    exclude-functions:
-      # Don't flag lines such as "io.Copy(io.Discard, resp.Body)".
-      - io.Copy
-      # The next two are used in HTTP handlers, any error is handled by the server itself.
-      - io.WriteString
-      - (net/http.ResponseWriter).Write
-      # No need to check for errors on server's shutdown.
-      - (*net/http.Server).Shutdown
-      # Never check for rollback errors as Rollback() is called when a previous error was detected.
-      - (github.com/prometheus/prometheus/storage.Appender).Rollback
-  godot:
-    scope: toplevel
-    exclude:
-      - "^ ?This file is safe to edit"
-      - "^ ?scheme value"
-    period: true
-    capital: true
-  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: 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
-  testifylint:
-    disable:
-      - float-compare
-      - go-require
-    enable:
-      - bool-compare
-      - compares
-      - empty
-      - error-is-as
-      - error-nil
-      - expected-actual
-      - len
-      - require-error
-      - suite-dont-use-pkg
-      - suite-extra-assert-call
+formatters:
+  enable:
+    - gofumpt
+    - goimports
+  settings:
+    gofumpt:
+      extra-rules: true
+    goimports:
+      local-prefixes:
+        - github.com/prometheus/alertmanager

Dockerfile

@@ -11,7 +11,8 @@ COPY .build/${OS}-${ARCH}/alertmanager /bin/alertmanager
 COPY examples/ha/alertmanager.yml      /etc/alertmanager/alertmanager.yml
 
 RUN mkdir -p /alertmanager && \
-    chown -R nobody:nobody /etc/alertmanager /alertmanager
+    chown -R nobody:nobody /etc/alertmanager /alertmanager && \
+    chmod -R g+w /alertmanager
 
 USER       nobody
 EXPOSE     9093

Makefile.common

@@ -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 ?= v1.64.6
+GOLANGCI_LINT_VERSION ?= v2.3.0
 # 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.
 ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))

api/v2/api.go

@@ -565,16 +565,16 @@ func SortSilences(sils open_api_models.GettableSilences) {
 		}
 		switch state1 {
 		case types.SilenceStateActive:
-			endsAt1 := time.Time(*sils[i].Silence.EndsAt)
-			endsAt2 := time.Time(*sils[j].Silence.EndsAt)
+			endsAt1 := time.Time(*sils[i].EndsAt)
+			endsAt2 := time.Time(*sils[j].EndsAt)
 			return endsAt1.Before(endsAt2)
 		case types.SilenceStatePending:
-			startsAt1 := time.Time(*sils[i].Silence.StartsAt)
-			startsAt2 := time.Time(*sils[j].Silence.StartsAt)
+			startsAt1 := time.Time(*sils[i].StartsAt)
+			startsAt2 := time.Time(*sils[j].StartsAt)
 			return startsAt1.Before(startsAt2)
 		case types.SilenceStateExpired:
-			endsAt1 := time.Time(*sils[i].Silence.EndsAt)
-			endsAt2 := time.Time(*sils[j].Silence.EndsAt)
+			endsAt1 := time.Time(*sils[i].EndsAt)
+			endsAt2 := time.Time(*sils[j].EndsAt)
 			return endsAt1.After(endsAt2)
 		}
 		return false

cli/format/format_extended.go

@@ -48,8 +48,8 @@ func (formatter *ExtendedFormatter) FormatSilences(silences []models.GettableSil
 			"%s\t%s\t%s\t%s\t%s\t%s\t%s\t\n",
 			*silence.ID,
 			extendedFormatMatchers(silence.Matchers),
-			FormatDate(*silence.Silence.StartsAt),
-			FormatDate(*silence.Silence.EndsAt),
+			FormatDate(*silence.StartsAt),
+			FormatDate(*silence.EndsAt),
 			FormatDate(*silence.UpdatedAt),
 			*silence.CreatedBy,
 			*silence.Comment,

cli/format/sort.go

@@ -27,7 +27,7 @@ type ByEndAt []models.GettableSilence
 func (s ByEndAt) Len() int      { return len(s) }
 func (s ByEndAt) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
 func (s ByEndAt) Less(i, j int) bool {
-	return time.Time(*s[i].Silence.EndsAt).Before(time.Time(*s[j].Silence.EndsAt))
+	return time.Time(*s[i].Silence.EndsAt).Before(time.Time(*s[j].EndsAt))
 }
 
 type ByStartsAt []*models.GettableAlert

cli/root.go

@@ -52,7 +52,7 @@ var (
 func initMatchersCompat(_ *kingpin.ParseContext) error {
 	promslogConfig := &promslog.Config{Writer: os.Stdout}
 	if verbose {
-		promslogConfig.Level = &promslog.AllowedLevel{}
+		promslogConfig.Level = promslog.NewLevel()
 		_ = promslogConfig.Level.Set("debug")
 	}
 	logger := promslog.New(promslogConfig)

cluster/cluster.go

@@ -610,11 +610,11 @@ func (p *Peer) Status() string {
 
 // Info returns a JSON-serializable dump of cluster state.
 // Useful for debug.
-func (p *Peer) Info() map[string]interface{} {
+func (p *Peer) Info() map[string]any {
 	p.mtx.RLock()
 	defer p.mtx.RUnlock()
 
-	return map[string]interface{}{
+	return map[string]any{
 		"self":    p.mlist.LocalNode(),
 		"members": p.mlist.Members(),
 	}

cluster/cluster_test.go

@@ -105,7 +105,7 @@ func testJoinLeave(t *testing.T) {
 	p2.Leave(0 * time.Second)
 	require.Equal(t, 1, p.ClusterSize())
 	require.Len(t, p.failedPeers, 1)
-	require.Equal(t, p2.Self().Address(), p.peers[p2.Self().Address()].Node.Address())
+	require.Equal(t, p2.Self().Address(), p.peers[p2.Self().Address()].Address())
 	require.Equal(t, p2.Name(), p.failedPeers[0].Name)
 }
 
@@ -341,6 +341,6 @@ func testTLSConnection(t *testing.T) {
 	p2.Leave(0 * time.Second)
 	require.Equal(t, 1, p1.ClusterSize())
 	require.Len(t, p1.failedPeers, 1)
-	require.Equal(t, p2.Self().Address(), p1.peers[p2.Self().Address()].Node.Address())
+	require.Equal(t, p2.Self().Address(), p1.peers[p2.Self().Address()].Address())
 	require.Equal(t, p2.Name(), p1.failedPeers[0].Name)
 }