Merge branch 'refs/heads/main' into jira

Signed-off-by: Jan-Otto Kröpke <[email protected]> # Conflicts: # config/config.go
prometheus · Jun 25, 2024 · dbda07a · dbda07a
2 parents ca08adb + 4c1a187
commit dbda07a
Show file tree

Hide file tree

Showing 42 changed files with 601 additions and 359 deletions.
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -24,15 +24,16 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout repository
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
- - name: install Go
+ uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+ - name: Install Go
  uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
  with:
  go-version: 1.22.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@9d1e0624a798bb64f6c3cea93db47765312263dc # v5.1.0
+ uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1
  with:
- version: v1.56.2
+ args: --verbose
+ version: v1.59.0
diff --git a/Makefile.common b/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.56.2
+GOLANGCI_LINT_VERSION ?= v1.59.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))

diff --git a/api/v2/api.go b/api/v2/api.go
@@ -45,7 +45,7 @@ import (
  "github.com/prometheus/alertmanager/cluster"
  "github.com/prometheus/alertmanager/config"
  "github.com/prometheus/alertmanager/dispatch"
- "github.com/prometheus/alertmanager/matchers/compat"
+ "github.com/prometheus/alertmanager/matcher/compat"
  "github.com/prometheus/alertmanager/pkg/labels"
  "github.com/prometheus/alertmanager/provider"
  "github.com/prometheus/alertmanager/silence"
@@ -660,8 +660,7 @@ func (api *API) postSilencesHandler(params silence_ops.PostSilencesParams) middl
  return silence_ops.NewPostSilencesBadRequest().WithPayload(msg)
  }
 
- sid, err := api.silences.Set(sil)
- if err != nil {
+ if err = api.silences.Set(sil); err != nil {
  level.Error(logger).Log("msg", "Failed to create silence", "err", err)
  if errors.Is(err, silence.ErrNotFound) {
  return silence_ops.NewPostSilencesNotFound().WithPayload(err.Error())
@@ -670,7 +669,7 @@ func (api *API) postSilencesHandler(params silence_ops.PostSilencesParams) middl
  }
 
  return silence_ops.NewPostSilencesOK().WithPayload(&silence_ops.PostSilencesOKBody{
- SilenceID: sid,
+ SilenceID: sil.Id,
  })
 }
 

diff --git a/api/v2/api_test.go b/api/v2/api_test.go
@@ -15,6 +15,7 @@ package v2
 
 import (
  "bytes"
+ "encoding/json"
  "fmt"
  "io"
  "net/http"
@@ -24,6 +25,7 @@ import (
  "time"
 
  "github.com/go-openapi/runtime"
+ "github.com/go-openapi/runtime/middleware"
  "github.com/go-openapi/strfmt"
  "github.com/prometheus/common/model"
  "github.com/stretchr/testify/require"
@@ -159,18 +161,16 @@ func TestDeleteSilenceHandler(t *testing.T) {
  EndsAt: now.Add(time.Hour),
  UpdatedAt: now,
  }
- unexpiredSid, err := silences.Set(unexpiredSil)
- require.NoError(t, err)
+ require.NoError(t, silences.Set(unexpiredSil))
 
  expiredSil := &silencepb.Silence{
  Matchers: []*silencepb.Matcher{m},
  StartsAt: now.Add(-time.Hour),
  EndsAt: now.Add(time.Hour),
  UpdatedAt: now,
  }
- expiredSid, err := silences.Set(expiredSil)
- require.NoError(t, err)
- require.NoError(t, silences.Expire(expiredSid))
+ require.NoError(t, silences.Set(expiredSil))
+ require.NoError(t, silences.Expire(expiredSil.Id))
 
  for i, tc := range []struct {
  sid string
@@ -181,11 +181,11 @@ func TestDeleteSilenceHandler(t *testing.T) {
  404,
  },
  {
- unexpiredSid,
+ unexpiredSil.Id,
  200,
  },
  {
- expiredSid,
+ expiredSil.Id,
  200,
  },
  } {
@@ -223,18 +223,16 @@ func TestPostSilencesHandler(t *testing.T) {
  EndsAt: now.Add(time.Hour),
  UpdatedAt: now,
  }
- unexpiredSid, err := silences.Set(unexpiredSil)
- require.NoError(t, err)
+ require.NoError(t, silences.Set(unexpiredSil))
 
  expiredSil := &silencepb.Silence{
  Matchers: []*silencepb.Matcher{m},
  StartsAt: now.Add(-time.Hour),
  EndsAt: now.Add(time.Hour),
  UpdatedAt: now,
  }
- expiredSid, err := silences.Set(expiredSil)
- require.NoError(t, err)
- require.NoError(t, silences.Expire(expiredSid))
+ require.NoError(t, silences.Set(expiredSil))
+ require.NoError(t, silences.Expire(expiredSil.Id))
 
  t.Run("Silences CRUD", func(t *testing.T) {
  for i, tc := range []struct {
@@ -259,46 +257,122 @@ func TestPostSilencesHandler(t *testing.T) {
  },
  {
  "with an active silence ID - it extends the silence",
- unexpiredSid,
+ unexpiredSil.Id,
  now.Add(time.Hour),
  now.Add(time.Hour * 2),
  200,
  },
  {
  "with an expired silence ID - it re-creates the silence",
- expiredSid,
+ expiredSil.Id,
  now.Add(time.Hour),
  now.Add(time.Hour * 2),
  200,
  },
  } {
  t.Run(tc.name, func(t *testing.T) {
- silence, silenceBytes := createSilence(t, tc.sid, "silenceCreator", tc.start, tc.end)
-
  api := API{
  uptime: time.Now(),
  silences: silences,
  logger: log.NewNopLogger(),
  }
 
- r, err := http.NewRequest("POST", "/api/v2/silence/${tc.sid}", bytes.NewReader(silenceBytes))
- require.NoError(t, err)
-
+ sil := createSilence(t, tc.sid, "silenceCreator", tc.start, tc.end)
  w := httptest.NewRecorder()
- p := runtime.TextProducer()
- responder := api.postSilencesHandler(silence_ops.PostSilencesParams{
- HTTPRequest: r,
- Silence: &silence,
- })
- responder.WriteResponse(w, p)
+ postSilences(t, w, api.postSilencesHandler, sil)
  body, _ := io.ReadAll(w.Result().Body)
-
  require.Equal(t, tc.expectedCode, w.Code, fmt.Sprintf("test case: %d, response: %s", i, string(body)))
  })
  }
  })
 }
 
+func TestPostSilencesHandlerMissingIdCreatesSilence(t *testing.T) {
+ now := time.Now()
+ silences := newSilences(t)
+ api := API{
+ uptime: time.Now(),
+ silences: silences,
+ logger: log.NewNopLogger(),
+ }
+
+ // Create a new silence. It should be assigned a random UUID.
+ sil := createSilence(t, "", "silenceCreator", now.Add(time.Hour), now.Add(time.Hour*2))
+ w := httptest.NewRecorder()
+ postSilences(t, w, api.postSilencesHandler, sil)
+ require.Equal(t, http.StatusOK, w.Code)
+
+ // Get the silences from the API.
+ w = httptest.NewRecorder()
+ getSilences(t, w, api.getSilencesHandler)
+ require.Equal(t, http.StatusOK, w.Code)
+ var resp []open_api_models.GettableSilence
+ require.NoError(t, json.NewDecoder(w.Body).Decode(&resp))
+ require.Len(t, resp, 1)
+
+ // Change the ID. It should return 404 Not Found.
+ sil = open_api_models.PostableSilence{
+ ID: "unknownID",
+ Silence: resp[0].Silence,
+ }
+ w = httptest.NewRecorder()
+ postSilences(t, w, api.postSilencesHandler, sil)
+ require.Equal(t, http.StatusNotFound, w.Code)
+
+ // Remove the ID. It should duplicate the silence with a different UUID.
+ sil = open_api_models.PostableSilence{
+ ID: "",
+ Silence: resp[0].Silence,
+ }
+ w = httptest.NewRecorder()
+ postSilences(t, w, api.postSilencesHandler, sil)
+ require.Equal(t, http.StatusOK, w.Code)
+
+ // Get the silences from the API. There should now be 2 silences.
+ w = httptest.NewRecorder()
+ getSilences(t, w, api.getSilencesHandler)
+ require.Equal(t, http.StatusOK, w.Code)
+ require.NoError(t, json.NewDecoder(w.Body).Decode(&resp))
+ require.Len(t, resp, 2)
+ require.NotEqual(t, resp[0].ID, resp[1].ID)
+}
+
+func getSilences(
+ t *testing.T,
+ w *httptest.ResponseRecorder,
+ handlerFunc func(params silence_ops.GetSilencesParams) middleware.Responder,
+) {
+ r, err := http.NewRequest("GET", "/api/v2/silences", nil)
+ require.NoError(t, err)
+
+ p := runtime.TextProducer()
+ responder := handlerFunc(silence_ops.GetSilencesParams{
+ HTTPRequest: r,
+ Filter: nil,
+ })
+ responder.WriteResponse(w, p)
+}
+
+func postSilences(
+ t *testing.T,
+ w *httptest.ResponseRecorder,
+ handlerFunc func(params silence_ops.PostSilencesParams) middleware.Responder,
+ sil open_api_models.PostableSilence,
+) {
+ b, err := json.Marshal(sil)
+ require.NoError(t, err)
+
+ r, err := http.NewRequest("POST", "/api/v2/silences", bytes.NewReader(b))
+ require.NoError(t, err)
+
+ p := runtime.TextProducer()
+ responder := handlerFunc(silence_ops.PostSilencesParams{
+ HTTPRequest: r,
+ Silence: &sil,
+ })
+ responder.WriteResponse(w, p)
+}
+
 func TestCheckSilenceMatchesFilterLabels(t *testing.T) {
  type test struct {
  silenceMatchers []*silencepb.Matcher

diff --git a/api/v2/testing.go b/api/v2/testing.go
@@ -14,19 +14,17 @@
 package v2
 
 import (
- "encoding/json"
  "testing"
  "time"
 
  "github.com/go-openapi/strfmt"
- "github.com/stretchr/testify/require"
 
  open_api_models "github.com/prometheus/alertmanager/api/v2/models"
  "github.com/prometheus/alertmanager/pkg/labels"
  "github.com/prometheus/alertmanager/silence/silencepb"
 )
 
-func createSilence(t *testing.T, ID, creator string, start, ends time.Time) (open_api_models.PostableSilence, []byte) {
+func createSilence(t *testing.T, ID, creator string, start, ends time.Time) open_api_models.PostableSilence {
  t.Helper()
 
  comment := "test"
@@ -46,10 +44,7 @@ func createSilence(t *testing.T, ID, creator string, start, ends time.Time) (ope
  Comment: &comment,
  },
  }
- b, err := json.Marshal(&sil)
- require.NoError(t, err)
-
- return sil, b
+ return sil
 }
 
 func createSilenceMatcher(t *testing.T, name, pattern string, matcherType silencepb.Matcher_Type) *silencepb.Matcher {

diff --git a/cli/alert_add.go b/cli/alert_add.go
@@ -25,7 +25,7 @@ import (
 
  "github.com/prometheus/alertmanager/api/v2/client/alert"
  "github.com/prometheus/alertmanager/api/v2/models"
- "github.com/prometheus/alertmanager/matchers/compat"
+ "github.com/prometheus/alertmanager/matcher/compat"
  "github.com/prometheus/alertmanager/pkg/labels"
 )
 

diff --git a/cli/alert_query.go b/cli/alert_query.go
@@ -23,7 +23,7 @@ import (
 
  "github.com/prometheus/alertmanager/api/v2/client/alert"
  "github.com/prometheus/alertmanager/cli/format"
- "github.com/prometheus/alertmanager/matchers/compat"
+ "github.com/prometheus/alertmanager/matcher/compat"
 )
 
 type alertQueryCmd struct {

diff --git a/cli/root.go b/cli/root.go
@@ -34,7 +34,7 @@ import (
  "github.com/prometheus/alertmanager/cli/config"
  "github.com/prometheus/alertmanager/cli/format"
  "github.com/prometheus/alertmanager/featurecontrol"
- "github.com/prometheus/alertmanager/matchers/compat"
+ "github.com/prometheus/alertmanager/matcher/compat"
 )
 
 var (

diff --git a/cli/silence_add.go b/cli/silence_add.go
@@ -27,7 +27,7 @@ import (
 
  "github.com/prometheus/alertmanager/api/v2/client/silence"
  "github.com/prometheus/alertmanager/api/v2/models"
- "github.com/prometheus/alertmanager/matchers/compat"
+ "github.com/prometheus/alertmanager/matcher/compat"
  "github.com/prometheus/alertmanager/pkg/labels"
 )
 

diff --git a/cli/silence_query.go b/cli/silence_query.go
@@ -25,7 +25,7 @@ import (
  "github.com/prometheus/alertmanager/api/v2/client/silence"
  "github.com/prometheus/alertmanager/api/v2/models"
  "github.com/prometheus/alertmanager/cli/format"
- "github.com/prometheus/alertmanager/matchers/compat"
+ "github.com/prometheus/alertmanager/matcher/compat"
 )
 
 type silenceQueryCmd struct {

diff --git a/cli/test_routing.go b/cli/test_routing.go
@@ -24,7 +24,7 @@ import (
 
  "github.com/prometheus/alertmanager/api/v2/models"
  "github.com/prometheus/alertmanager/dispatch"
- "github.com/prometheus/alertmanager/matchers/compat"
+ "github.com/prometheus/alertmanager/matcher/compat"
  "github.com/prometheus/alertmanager/pkg/labels"
 )
 

diff --git a/cluster/tls_transport_test.go b/cluster/tls_transport_test.go
@@ -217,7 +217,7 @@ func TestDialTimeout(t *testing.T) {
  sent := []byte(("test stream"))
  m, err := from.Write(sent)
  require.NoError(t, err)
- require.Greater(t, m, 0)
+ require.Positive(t, m)
 
  wg.Wait()