diff --git a/bundle/manifests/monitoring.rhobs_monitoringstacks.yaml b/bundle/manifests/monitoring.rhobs_monitoringstacks.yaml index d308979b8..384bc3e6e 100644 --- a/bundle/manifests/monitoring.rhobs_monitoringstacks.yaml +++ b/bundle/manifests/monitoring.rhobs_monitoringstacks.yaml @@ -51,7 +51,8 @@ spec: enum: - debug - info - - warning + - warn + - error type: string namespaceSelector: description: Namespace selector for Monitoring Stack Resources. If diff --git a/deploy/crds/common/monitoring.rhobs_monitoringstacks.yaml b/deploy/crds/common/monitoring.rhobs_monitoringstacks.yaml index 153063814..bd50c0cc8 100644 --- a/deploy/crds/common/monitoring.rhobs_monitoringstacks.yaml +++ b/deploy/crds/common/monitoring.rhobs_monitoringstacks.yaml @@ -52,7 +52,8 @@ spec: enum: - debug - info - - warning + - warn + - error type: string namespaceSelector: description: Namespace selector for Monitoring Stack Resources. If diff --git a/docs/api.md b/docs/api.md index 994df8028..1f915295d 100644 --- a/docs/api.md +++ b/docs/api.md @@ -100,7 +100,7 @@ MonitoringStackSpec is the specification for desired Monitoring Stack Loglevel set log levels of configured components

- Enum: debug, info, warning
+ Enum: debug, info, warn, error
Default: info
false diff --git a/pkg/apis/monitoring/v1alpha1/types.go b/pkg/apis/monitoring/v1alpha1/types.go index 3a85e48db..d327274d4 100644 --- a/pkg/apis/monitoring/v1alpha1/types.go +++ b/pkg/apis/monitoring/v1alpha1/types.go @@ -34,7 +34,7 @@ type MonitoringStackList struct { } // Loglevel set log levels of configured components -// +kubebuilder:validation:Enum=debug;info;warning +// +kubebuilder:validation:Enum=debug;info;warn;error type LogLevel string const ( @@ -44,8 +44,11 @@ const ( // Info Log level Info LogLevel = "info" - // Warning Log level - Warning LogLevel = "warning" + // Warn Log level + Warn LogLevel = "warn" + + // Error Log level + Error LogLevel = "error" ) // MonitoringStackSpec is the specification for desired Monitoring Stack diff --git a/test/e2e/monitoring_stack_controller_test.go b/test/e2e/monitoring_stack_controller_test.go index 4ccbb222c..49ea85dec 100644 --- a/test/e2e/monitoring_stack_controller_test.go +++ b/test/e2e/monitoring_stack_controller_test.go @@ -276,6 +276,7 @@ func validateStackLogLevel(t *testing.T) { "xyz", "Info", "Debug", + "Warning", } ms := newMonitoringStack(t, "invalid-loglevel-stack") for _, v := range invalidLogLevels {