K8SPSMDB-1396: Fix conflicts

Author: eleo007

.github/CODEOWNERS

@@ -1,4 +1,4 @@
 * @hors @egegunes @pooknull @nmarukovich @gkech
-/e2e-tests/ @ptankov @jvpasinatto @eleo007
-Jenkinsfile @ptankov @jvpasinatto @eleo007
+/e2e-tests/ @jvpasinatto @eleo007 @valmiranogueira
+Jenkinsfile @jvpasinatto @eleo007 @valmiranogueira
 

.github/workflows/reviewdog.yml

@@ -7,7 +7,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4.1.1
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v7
+        uses: golangci/golangci-lint-action@v8
         with:
           version: latest
           only-new-issues: true

Makefile

@@ -14,6 +14,7 @@ help: ## Display this help.
 	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
 
 generate: controller-gen  ## Generate CRDs and RBAC files
+	go generate ./...
 	$(CONTROLLER_GEN) crd:maxDescLen=0,allowDangerousTypes=true rbac:roleName=$(NAME) webhook paths="./..." output:crd:artifacts:config=config/crd/bases  ## Generate WebhookConfiguration, Role and CustomResourceDefinition objects.
 	$(CONTROLLER_GEN) object paths="./..." ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
 

build/Dockerfile

@@ -53,5 +53,6 @@ COPY build/init-entrypoint.sh /init-entrypoint.sh
 COPY build/ps-entry.sh /ps-entry.sh
 COPY build/physical-restore-ps-entry.sh /physical-restore-ps-entry.sh
 COPY build/pbm-entry.sh /pbm-entry.sh
+COPY build/logcollector /logcollector
 
 USER 2

build/init-entrypoint.sh

@@ -6,4 +6,7 @@ set -o xtrace
 install -o "$(id -u)" -g "$(id -g)" -m 0755 -D /ps-entry.sh /opt/percona/ps-entry.sh
 install -o "$(id -u)" -g "$(id -g)" -m 0755 -D /physical-restore-ps-entry.sh /opt/percona/physical-restore-ps-entry.sh
 install -o "$(id -u)" -g "$(id -g)" -m 0755 -D /mongodb-healthcheck /opt/percona/mongodb-healthcheck
-install -o "$(id -u)" -g "$(id -g)" -m 0755 -D /pbm-entry.sh /opt/percona/pbm-entry.sh
+install -o "$(id -u)" -g "$(id -g)" -m 0755 -D /pbm-entry.sh /opt/percona/pbm-entry.sh
+cp -a /logcollector /opt/percona/
+chown -R "$(id -u)":"$(id -g)" /opt/percona/logcollector
+chmod -R 0755 /opt/percona/logcollector

build/logcollector/entrypoint.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+set -e
+set -o xtrace
+
+export PATH="$PATH":/opt/fluent-bit/bin
+
+if [ "$1" = 'logrotate' ]; then
+	if [[ $EUID != 1001 ]]; then
+		# logrotate requires UID in /etc/passwd
+		sed -e "s^x:1001:^x:$EUID:^" /etc/passwd >/tmp/passwd
+		cat /tmp/passwd >/etc/passwd
+		rm -rf /tmp/passwd
+	fi
+	exec go-cron "0 0 * * *" sh -c "logrotate -s /data/db/logs/logrotate.status /opt/percona/logcollector/logrotate/logrotate.conf;"
+else
+	if [ "$1" = 'fluent-bit' ]; then
+		fluentbit_opt+='-c /opt/percona/logcollector/fluentbit/fluentbit.conf'
+	fi
+
+	exec "$@" $fluentbit_opt
+fi

build/logcollector/fluentbit/custom/default.conf

@@ -0,0 +1,2 @@
+@INCLUDE fluentbit_*.conf
+@INCLUDE custom/*.conf

build/logcollector/fluentbit/fluentbit.conf

@@ -0,0 +1,25 @@
+[SERVICE]
+    Flush        1
+    Log_Level    error
+    Daemon       off
+
+[INPUT]
+    Name             tail
+    Path             ${LOG_DATA_DIR}/mongod.log
+    Tag              ${POD_NAMESPACE}.${POD_NAME}.mongod.log
+    Refresh_Interval 5
+    DB               /tmp/flb_kube.db
+    read_from_head   true
+    Path_Key         file
+
+[OUTPUT]
+    Name             stdout
+    Match            *
+    Format           json_lines
+    json_date_key    false
+
+[OUTPUT]
+    Name file
+    Match ${POD_NAMESPACE}.${POD_NAME}.mongod.log
+    File mongod.full.log
+    Path ${LOG_DATA_DIR}/

build/logcollector/fluentbit/fluentbit_mongo.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"