Merge pull request #1256 from arajkumar/alertmanager-loglevel

Allow configuration of the log level for Alertmanager in the CMO configmap
openshift · Jun 30, 2021 · fb0e576 · fb0e576
2 parents f2a0824 + 37e1071
commit fb0e576
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/pkg/manifests/config.go b/pkg/manifests/config.go
@@ -128,6 +128,7 @@ type TLSConfig struct {
 }
 
 type AlertmanagerMainConfig struct {
+	LogLevel            string                               `json:"logLevel"`
 	NodeSelector        map[string]string                    `json:"nodeSelector"`
 	Tolerations         []v1.Toleration                      `json:"tolerations"`
 	Resources           *v1.ResourceRequirements             `json:"resources"`

diff --git a/pkg/manifests/manifests.go b/pkg/manifests/manifests.go
@@ -412,6 +412,10 @@ func (f *Factory) AlertmanagerMain(host string, trustedCABundleCM *v1.ConfigMap)
 
 	a.Spec.ExternalURL = f.AlertmanagerExternalURL(host).String()
 
+	if f.config.ClusterMonitoringConfiguration.AlertmanagerMainConfig.LogLevel != "" {
+		a.Spec.LogLevel = f.config.ClusterMonitoringConfiguration.AlertmanagerMainConfig.LogLevel
+	}
+
 	if f.config.ClusterMonitoringConfiguration.AlertmanagerMainConfig.Resources != nil {
 		a.Spec.Resources = *f.config.ClusterMonitoringConfiguration.AlertmanagerMainConfig.Resources
 	}

diff --git a/pkg/manifests/manifests_test.go b/pkg/manifests/manifests_test.go
@@ -1210,6 +1210,7 @@ k8sPrometheusAdapter:
 
 func TestAlertmanagerMainConfiguration(t *testing.T) {
 	c, err := NewConfigFromString(`alertmanagerMain:
+  logLevel: debug
   baseImage: quay.io/test/alertmanager
   nodeSelector:
     type: worker
@@ -1247,6 +1248,10 @@ ingress:
 		t.Fatal(err)
 	}
 
+	if a.Spec.LogLevel != "debug" {
+		t.Fatalf("Alertmanager logLevel is not configured correctly, want: 'debug', got: '%s'", a.Spec.LogLevel)
+	}
+
 	if *a.Spec.Image != "docker.io/openshift/origin-prometheus-alertmanager:latest" {
 		t.Fatal("Alertmanager image is not configured correctly")
 	}