code review fixes and bugs

Author: gkech

build/logcollector/entrypoint.sh

@@ -17,5 +17,5 @@ else
 		fluentbit_opt+='-c /opt/percona/logcollector/fluentbit/fluentbit.conf'
 	fi
 
-	exec "$@" "$fluentbit_opt"
+	exec "$@" $fluentbit_opt
 fi

build/logcollector/fluentbit/fluentbit_mongo.conf

@@ -1,22 +1,14 @@
-[PARSER]
-    Name        json
-    Format      json
-    Time_Key    t.$date
-    Time_Format %Y-%m-%dT%H:%M:%S.%L%z
-
 [SERVICE]
     Flush        1
-    Log_Level    debug
+    Log_Level    error
     Daemon       off
-    Parser json
 
 [INPUT]
     Name             tail
     Path             ${LOG_DATA_DIR}/mongod.log
     Tag              ${POD_NAMESPACE}.${POD_NAME}.mongod.log
     Refresh_Interval 5
     DB               /tmp/flb_kube.db
-    Parser           json
     read_from_head   true
     Path_Key         file
 

build/logcollector/fluentbit/parsers_multiline.conf

@@ -0,0 +1,17 @@
+[MULTILINE_PARSER]
+    name          multiline-regex-test
+    type          regex
+    flush_timeout 1000
+    #
+    # Regex rules for multiline parsing
+    # ---------------------------------
+    #
+    # configuration hints:
+    #
+    #  - first state always has the name: start_state
+    #  - every field in the rule must be inside double quotes
+    #
+    # rules |   state name  | regex pattern                  | next state
+    # ------|---------------|--------------------------------------------
+    rule      "start_state"   "/\d{2,4}\-\d{2,4}\-\d{2,4}T\d{2,4}\:\d{2,4}\:\d{2,4}\.\d{1,6}Z(.*)|\d{2,6} \d{2,4}\:\d{2,4}\:\d{2,4}(.*)/" "cont"
+    rule      "cont"          "/^\D/"                                                     "cont"

build/ps-entry.sh

@@ -480,7 +480,7 @@ if [[ $originalArgOne == mongo* ]]; then
 		_mongod_hack_rename_arg_save_val --sslDisabledProtocols --tlsDisabledProtocols "${mongodHackedArgs[@]}"
 	fi
 
-	if [[ $originalArgOne == "mongod" ]]; then
+	if [[ $originalArgOne == "mongod" && "${LOGCOLLECTOR_ENABLED:-}" == "true" ]]; then
 		_mongod_hack_ensure_arg_val --logpath "/data/logs/mongod.log" "${mongodHackedArgs[@]}"
 		_mongod_hack_ensure_arg --logappend "${mongodHackedArgs[@]}"
 	fi

pkg/apis/psmdb/v1/psmdb_types.go

@@ -1368,3 +1368,7 @@ type LogCollectorSpec struct {
 	ContainerSecurityContext *corev1.SecurityContext     `json:"containerSecurityContext,omitempty"`
 	ImagePullPolicy          corev1.PullPolicy           `json:"imagePullPolicy,omitempty"`
 }
+
+func (cr *PerconaServerMongoDB) IsLogCollectorEnabled() bool {
+	return cr.Spec.LogCollector != nil && cr.Spec.LogCollector.Enabled
+}

pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-arbiter.yaml

@@ -79,6 +79,8 @@ spec:
           value: "27017"
         - name: MONGODB_REPLSET
           value: cfg
+        - name: LOGCOLLECTOR_ENABLED
+          value: "true"
         envFrom:
         - secretRef:
             name: internal-reconcile-statefulset-cr-users

pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-mongod.yaml

@@ -79,6 +79,8 @@ spec:
           value: "27017"
         - name: MONGODB_REPLSET
           value: cfg
+        - name: LOGCOLLECTOR_ENABLED
+          value: "true"
         envFrom:
         - secretRef:
             name: internal-reconcile-statefulset-cr-users

pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/cfg-nv.yaml

@@ -79,6 +79,8 @@ spec:
           value: "27017"
         - name: MONGODB_REPLSET
           value: cfg
+        - name: LOGCOLLECTOR_ENABLED
+          value: "true"
         envFrom:
         - secretRef:
             name: internal-reconcile-statefulset-cr-users

pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-arbiter.yaml

@@ -79,6 +79,8 @@ spec:
           value: "27017"
         - name: MONGODB_REPLSET
           value: rs0
+        - name: LOGCOLLECTOR_ENABLED
+          value: "true"
         envFrom:
         - secretRef:
             name: internal-reconcile-statefulset-cr-users

pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-mongod.yaml

@@ -79,6 +79,8 @@ spec:
           value: "27017"
         - name: MONGODB_REPLSET
           value: rs0
+        - name: LOGCOLLECTOR_ENABLED
+          value: "true"
         envFrom:
         - secretRef:
             name: internal-reconcile-statefulset-cr-users

pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/rs0-nv.yaml

@@ -79,6 +79,8 @@ spec:
           value: "27017"
         - name: MONGODB_REPLSET
           value: rs0
+        - name: LOGCOLLECTOR_ENABLED
+          value: "true"
         envFrom:
         - secretRef:
             name: internal-reconcile-statefulset-cr-users

pkg/psmdb/container.go

@@ -175,6 +175,15 @@ func container(ctx context.Context, cr *api.PerconaServerMongoDB, replset *api.R
 		container.Command = []string{config.BinMountPath + "/ps-entry.sh"}
 	}
 
+	if cr.CompareVersion("1.20.0") >= 0 {
+		if cr.IsLogCollectorEnabled() {
+			container.Env = append(container.Env, corev1.EnvVar{
+				Name:  "LOGCOLLECTOR_ENABLED",
+				Value: "true",
+			})
+		}
+	}
+
 	return container, nil
 }