Merge branch 'main' into main#release#patch

giantswarm · Dec 17, 2024 · 65d17e1 · 65d17e1
2 parents a4b05d0 + ae3a611
commit 65d17e1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/onsi/gomega v1.36.1
 	github.com/opsgenie/opsgenie-go-sdk-v2 v1.2.23
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.79.0
+	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.79.1
 	github.com/prometheus/alertmanager v0.27.0
 	github.com/prometheus/client_golang v1.20.5
 	github.com/prometheus/common v0.61.0

diff --git a/go.sum b/go.sum
@@ -324,8 +324,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.79.0 h1:IiCqr23V8SexkXkPmK+6tS/Ped/oCVhXSSmLacEATy4=
-github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.79.0/go.mod h1:AVMP4QEW8xuGWnxaWSpI3kKjP9fDA31nO68zsyREJZA=
+github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.79.1 h1:Dwk9xYZOd8gq+nhlZREvHbQ6enj3yjC5HPFOdcReqGw=
+github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.79.1/go.mod h1:AVMP4QEW8xuGWnxaWSpI3kKjP9fDA31nO68zsyREJZA=
 github.com/prometheus/alertmanager v0.27.0 h1:V6nTa2J5V4s8TG4C4HtrBP/WNSebCCTYGGv4qecA/+I=
 github.com/prometheus/alertmanager v0.27.0/go.mod h1:8Ia/R3urPmbzJ8OsdvmZvIprDwvwmYCmUbwBL+jlPOE=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=

diff --git a/internal/controller/alertmanager_controller.go b/internal/controller/alertmanager_controller.go
@@ -46,6 +46,7 @@ func SetupAlertmanagerReconciler(mgr ctrl.Manager, conf config.Config) error {
 
 	// Setup the controller
 	return ctrl.NewControllerManagedBy(mgr).
+		Named("alertmanager").
 		For(&v1.Secret{}, builder.WithPredicates(secretPredicate)).
 		Watches(&v1.Pod{}, p, builder.WithPredicates(podPredicate)).
 		Complete(r)

diff --git a/pkg/alertmanager/alertmanager.go b/pkg/alertmanager/alertmanager.go
@@ -5,10 +5,8 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"maps"
 	"net/http"
 	"path"
-	"slices"
 	"strings"
 
 	"github.com/pkg/errors"
@@ -89,40 +87,39 @@ func (s Service) Configure(ctx context.Context, secret *v1.Secret) error {
 }
 
 // configure sends the configuration and templates to Mimir Alertmanager's API
+// It is the caller responsibility to make sure templates names are valid (do not contain any path), and that templates are referenced in the configuration.
 // https://grafana.com/docs/mimir/latest/references/http-api/#set-alertmanager-configuration
 func (s Service) configure(ctx context.Context, alertmanagerConfigContent []byte, templates map[string]string, tenantID string) error {
 	logger := log.FromContext(ctx)
 
-	// Load alertmanager configuration
-	alertmanagerConfig, err := config.Load(string(alertmanagerConfigContent))
+	// Validate Alertmanager configuration
+	// The returned config is not used, as transforming it via String() would produce an invalid configuration with all secrets replaced with <redacted>.
+	_, err := config.Load(string(alertmanagerConfigContent))
 	if err != nil {
 		return errors.WithStack(fmt.Errorf("alertmanager: failed to load configuration: %w", err))
 	}
 
-	// Set template names
-	// Values set here must match the keys set in requestData.TemplateFiles
-	alertmanagerConfig.Templates = slices.Collect(maps.Keys(templates))
-	alertmanagerConfigString := alertmanagerConfig.String()
-
 	// Prepare request for Alertmanager API
 	requestData := configRequest{
-		AlertmanagerConfig: alertmanagerConfigString,
+		AlertmanagerConfig: string(alertmanagerConfigContent),
 		TemplateFiles:      templates,
 	}
 	data, err := yaml.Marshal(requestData)
 	if err != nil {
 		return errors.WithStack(fmt.Errorf("alertmanager: failed to marshal yaml: %w", err))
 	}
+	dataLen := len(data)
 
 	url := s.alertmanagerURL + alertmanagerAPIPath
-	logger.WithValues("url", url, "data_size", len(data), "config_size", len(alertmanagerConfigString), "templates_count", len(templates)).Info("Alertmanager: sending configuration")
+	logger.WithValues("url", url, "data_size", dataLen, "config_size", len(alertmanagerConfigContent), "templates_count", len(templates)).Info("Alertmanager: sending configuration")
 
 	// Send request to Alertmanager's API
 	req, err := http.NewRequest(http.MethodPost, url, bytes.NewBuffer(data))
 	if err != nil {
 		return errors.WithStack(fmt.Errorf("alertmanager: failed to create request: %w", err))
 	}
 	req.Header.Set(common.OrgIDHeader, tenantID)
+	req.ContentLength = int64(dataLen)
 
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {