CLOUDP-321073: Handle logLevel in MongoDBSearch (mongodb#453)

# Summary This PR exposes logging configuration of mongot pods to MongoDBSearch CRD. ## Proof of Work ## Checklist - [ ] Have you linked a jira ticket and/or is the ticket in the title? - [ ] Have you checked whether your jira ticket required DOCSP changes? - [ ] Have you added changelog file? - use `skip-changelog` label if not needed - refer to [Changelog files and Release Notes](https://github.com/mongodb/mongodb-kubernetes/blob/master/CONTRIBUTING.md#changelog-files-and-release-notes) section in CONTRIBUTING.md for more details

Author: lsierant

api/v1/mdb/mongodb_types.go

@@ -46,6 +46,7 @@ const (
 Warn LogLevel = "WARN"
 Error LogLevel = "ERROR"
 Fatal LogLevel = "FATAL"
+Trace LogLevel = "TRACE"
 
 Standalone ResourceType = "Standalone"
 ReplicaSet ResourceType = "ReplicaSet"

api/v1/search/mongodbsearch_types.go

@@ -10,6 +10,7 @@ import (
 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 v1 "github.com/mongodb/mongodb-kubernetes/api/v1"
+"github.com/mongodb/mongodb-kubernetes/api/v1/mdb"
 "github.com/mongodb/mongodb-kubernetes/api/v1/status"
 userv1 "github.com/mongodb/mongodb-kubernetes/api/v1/user"
 "github.com/mongodb/mongodb-kubernetes/mongodb-community-operator/api/v1/common"
@@ -46,6 +47,10 @@ type MongoDBSearchSpec struct {
 // Configure security settings of the MongoDB Search server that MongoDB database is connecting to when performing search queries.
 // +optional
 Security Security `json:"security"`
+// Configure verbosity of mongot logs. Defaults to INFO if not set.
+// +kubebuilder:validation:Enum=TRACE;DEBUG;INFO;WARN;ERROR
+// +optional
+LogLevel mdb.LogLevel `json:"logLevel,omitempty"`
 }
 
 type MongoDBSource struct {
@@ -228,3 +233,11 @@ func (s *MongoDBSearch) GetMongotHealthCheckPort() int32 {
 func (s *MongoDBSearch) IsExternalMongoDBSource() bool {
 return s.Spec.Source != nil && s.Spec.Source.ExternalMongoDBSource != nil
 }
+
+func (s *MongoDBSearch) GetLogLevel() mdb.LogLevel {
+if s.Spec.LogLevel == "" {
+return "INFO"
+}
+
+return s.Spec.LogLevel
+}

config/crd/bases/mongodb.com_mongodbsearch.yaml

@@ -48,6 +48,16 @@ spec:
  type: object
  spec:
  properties:
+ logLevel:
+ description: Configure verbosity of mongot logs. Defaults to INFO
+ if not set.
+ enum:
+ - TRACE
+ - DEBUG
+ - INFO
+ - WARN
+ - ERROR
+ type: string
  persistence:
  description: Configure MongoDB Search's persistent volume. If not
  defined, the operator will request 10GB of storage.
@@ -180,7 +190,7 @@ spec:
  type: object
  x-kubernetes-map-type: atomic
  required:
-  - certificateKeySecretRef
+ - certificateKeySecretRef
  type: object
  type: object
  source:
@@ -224,7 +234,7 @@ spec:
  type: object
  x-kubernetes-map-type: atomic
  required:
-  - ca
+ - ca
  type: object
  type: object
  mongodbResourceRef:

controllers/operator/mongodbsearch_controller_test.go

@@ -95,6 +95,11 @@ func buildExpectedMongotConfig(search *searchv1.MongoDBSearch, mdbc *mdbcv1.Mong
 for i := range mdbc.Spec.Members {
 hostAndPorts = append(hostAndPorts, fmt.Sprintf("%s-%d.%s.%s.svc.cluster.local:%d", mdbc.Name, i, mdbc.Name+"-svc", search.Namespace, 27017))
 }
+
+logLevel := "INFO"
+if search.Spec.LogLevel != "" {
+logLevel = string(search.Spec.LogLevel)
+}
 return mongot.Config{
 SyncSource: mongot.ConfigSyncSource{
 ReplicaSet: mongot.ConfigReplicaSet{
@@ -127,7 +132,7 @@ func buildExpectedMongotConfig(search *searchv1.MongoDBSearch, mdbc *mdbcv1.Mong
 Address: fmt.Sprintf("0.0.0.0:%d", search.GetMongotHealthCheckPort()),
 },
 Logging: mongot.ConfigLogging{
-Verbosity: "TRACE",
+Verbosity: logLevel,
 LogPath: nil,
 },
 }
@@ -164,6 +169,8 @@ func TestMongoDBSearchReconcile_MissingSource(t *testing.T) {
 func TestMongoDBSearchReconcile_Success(t *testing.T) {
 ctx := context.Background()
 search := newMongoDBSearch("search", mock.TestNamespace, "mdb")
+search.Spec.LogLevel = "WARN"
+
 mdbc := newMongoDBCommunity("mdb", mock.TestNamespace)
 reconciler, c := newSearchReconciler(mdbc, search)
 

controllers/searchcontroller/mongodbsearch_reconcile_helper.go

@@ -382,7 +382,7 @@ func createMongotConfig(search *searchv1.MongoDBSearch, db SearchSourceDBResourc
 Address: fmt.Sprintf("0.0.0.0:%d", search.GetMongotHealthCheckPort()),
 }
 config.Logging = mongot.ConfigLogging{
-Verbosity: "TRACE",
+Verbosity: string(search.GetLogLevel()),
 LogPath: nil,
 }
 }

docker/mongodb-kubernetes-tests/tests/search/fixtures/search-minimal.yaml

@@ -2,4 +2,6 @@ apiVersion: mongodb.com/v1
 kind: MongoDBSearch
 metadata:
  name: mdbc-rs
-spec: {}
+spec:
+ logLevel: DEBUG
+

helm_chart/crds/mongodb.com_mongodbsearch.yaml

@@ -48,6 +48,16 @@ spec:
  type: object
  spec:
  properties:
+ logLevel:
+ description: Configure verbosity of mongot logs. Defaults to INFO
+ if not set.
+ enum:
+ - TRACE
+ - DEBUG
+ - INFO
+ - WARN
+ - ERROR
+ type: string
  persistence:
  description: Configure MongoDB Search's persistent volume. If not
  defined, the operator will request 10GB of storage.
@@ -180,7 +190,7 @@ spec:
  type: object
  x-kubernetes-map-type: atomic
  required:
-  - certificateKeySecretRef
+ - certificateKeySecretRef
  type: object
  type: object
  source:
@@ -224,7 +234,7 @@ spec:
  type: object
  x-kubernetes-map-type: atomic
  required:
-  - ca
+ - ca
  type: object
  type: object
  mongodbResourceRef:

public/crds.yaml

@@ -4070,6 +4070,16 @@ spec:
  type: object
  spec:
  properties:
+ logLevel:
+ description: Configure verbosity of mongot logs. Defaults to INFO
+ if not set.
+ enum:
+ - TRACE
+ - DEBUG
+ - INFO
+ - WARN
+ - ERROR
+ type: string
  persistence:
  description: Configure MongoDB Search's persistent volume. If not
  defined, the operator will request 10GB of storage.
@@ -4202,7 +4212,7 @@ spec:
  type: object
  x-kubernetes-map-type: atomic
  required:
-  - certificateKeySecretRef
+ - certificateKeySecretRef
  type: object
  type: object
  source:
@@ -4246,7 +4256,7 @@ spec:
  type: object
  x-kubernetes-map-type: atomic
  required:
-  - ca
+ - ca
  type: object
  type: object
  mongodbResourceRef: