From 220f0431f23431ad6a82910c19cf04467cfb7d1f Mon Sep 17 00:00:00 2001
From: vzaytsev <vzaytsev@nubes.ru>
Date: Wed, 29 Jan 2025 18:10:13 +0300
Subject: [PATCH 1/2] Remove sidecar

---
 build/helm/templates/configmap.yaml  | 144 ---------------------------
 build/helm/templates/deployment.yaml |  23 -----
 build/helm/values.yaml               |  35 -------
 3 files changed, 202 deletions(-)
 delete mode 100644 build/helm/templates/configmap.yaml

diff --git a/build/helm/templates/configmap.yaml b/build/helm/templates/configmap.yaml
deleted file mode 100644
index 250b698..0000000
--- a/build/helm/templates/configmap.yaml
+++ /dev/null
@@ -1,144 +0,0 @@
-{{- if .Values.sidecars.logger.enabled  }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: "fluentbit-{{ .Chart.Name }}"
-data:
-  fluent-bit.conf: |
-    [SERVICE]
-        Parsers_File    /fluent-bit/etc/parsers.conf
-
-    [INPUT]
-        Name                tail
-        Tag                 lk
-        Path                /usr/lib/serverHome/logs/access.txt*
-        Mem_Buf_Limit       100MB
-        Skip_Long_Lines     On
-        Refresh_Interval    5
-
-    [INPUT]
-        Name                tail
-        Tag                 error_logs
-        Path                /usr/lib/serverHome/WEB-INF/lucee-server/context/logs/application.log
-        Refresh_Interval    5
-        Mem_Buf_Limit       100MB
-        Skip_Long_Lines     Off
-        Read_from_Head      On
-        multiline.parser    multiline-regex-lucee 
-
-    [FILTER]
-        Name parser
-        Match error_logs
-        Key_name log
-        Parser lucee_errorlog_parser
-
-    [FILTER]
-        Name record_modifier
-        Match *
-        Whitelist_key log
-
-    [FILTER]
-        Name rewrite_tag
-        Match {{ .Chart.Name }}
-        Rule $log kube-probe {{ .Chart.Name }}-healtcheck false
-
-    [FILTER]
-        Name rewrite_tag
-        Match {{ .Chart.Name }}
-        Rule $log {{ .Chart.Name }} {{ .Chart.Name }}.access false
-
-    [FILTER]
-        Name parser
-        Match {{ .Chart.Name }}.access
-        Key_name log
-        Parser lucee_parser
-
-    [OUTPUT]
-        Name        loki
-        Match       *
-        Host        10.96.52.75
-        labels      job={{ .Chart.Name }}-fluentbit-{{ .Values.stand }}
-        port        3100
-
-    [OUTPUT]
-        Name stdout
-        Match *
-
-  parsers.conf: |-
-    [PARSER]
-      Name lucee_parser
-      Format regex
-      Regex ^(?<remote_address>[^ ]*) [^ ]* (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")?$
-      Types status:integer
-
-    [PARSER]
-        Name   apache
-        Format regex
-        Regex  ^(?<host>[^ ]*) [^ ]* (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")?$
-        Time_Key time
-        Time_Format %d/%b/%Y:%H:%M:%S %z
-
-    [PARSER]
-        Name   apache2
-        Format regex
-        Regex  ^(?<host>[^ ]*) [^ ]* (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^ ]*) +\S*)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")?$
-        Time_Key time
-        Time_Format %d/%b/%Y:%H:%M:%S %z
-
-    [PARSER]
-        Name   apache_error
-        Format regex
-        Regex  ^\[[^ ]* (?<time>[^\]]*)\] \[(?<level>[^\]]*)\](?: \[pid (?<pid>[^\]]*)\])?( \[client (?<client>[^\]]*)\])? (?<message>.*)$
-
-    [PARSER]
-        Name   nginx
-        Format regex
-        Regex ^(?<remote>[^ ]*) (?<host>[^ ]*) (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")?$
-        Time_Key time
-        Time_Format %d/%b/%Y:%H:%M:%S %z
-
-    [PARSER]
-        Name   json
-        Format json
-        Time_Key time
-        Time_Format %d/%b/%Y:%H:%M:%S %z
-
-    [PARSER]
-        Name        docker
-        Format      json
-        Time_Key    time
-        Time_Format %Y-%m-%dT%H:%M:%S.%L
-        Time_Keep   On
-
-    [PARSER]
-        # http://rubular.com/r/tjUt3Awgg4
-        Name cri
-        Format regex
-        Regex ^(?<time>[^ ]+) (?<stream>stdout|stderr) (?<logtag>[^ ]*) (?<message>.*)$
-        Time_Key    time
-        Time_Format %Y-%m-%dT%H:%M:%S.%L%z
-
-    [PARSER]
-        Name        syslog
-        Format      regex
-        Regex       ^\<(?<pri>[0-9]+)\>(?<time>[^ ]* {1,2}[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[a-zA-Z0-9_\/\.\-]*)(?:\[(?<pid>[0-9]+)\])?(?:[^\:]*\:)? *(?<message>.*)$
-        Time_Key    time
-        Time_Format %b %d %H:%M:%S
-
-    [PARSER]
-        Name   lucee_errorlog_parser
-        Format regex
-        Regex  ^"(?<severity>ERROR)","(?<thread_id>[^"]*)","(?<date>[^"]*),(?<time>[^"]*)","(?<application>[^"]*)","(?<message>[^"]*)"
-        Time_Key date
-        Time_Format %d/%m/%Y
-
-    [MULTILINE_PARSER]
-        name          multiline-regex-lucee
-        type          regex
-        flush_timeout 1000
-
-        rule          "start_state"   "/^\"ERROR\".*$/"            "cont"
-        rule          "cont"          "/^\s+.*$/"                  "cont"    
-
-{{- end }}
\ No newline at end of file
diff --git a/build/helm/templates/deployment.yaml b/build/helm/templates/deployment.yaml
index 63891a9..3aa5c28 100644
--- a/build/helm/templates/deployment.yaml
+++ b/build/helm/templates/deployment.yaml
@@ -49,26 +49,3 @@ spec:
             - secretRef:
                 name: "{{ .Values.vault.target.name }}"
           {{- end }}
-          volumeMounts:
-            {{- toYaml .Values.mainContainer.volumeMounts | nindent 12 }}
-          
-        # Sidecar-контейнеры
-        {{- if .Values.sidecars.logger.enabled }}
-        - name: logger
-          image: "{{ .Values.sidecars.logger.image.repository }}:{{ .Values.sidecars.logger.image.tag }}"
-          imagePullPolicy: IfNotPresent
-          resources:
-            {{- toYaml .Values.sidecars.logger.resources | nindent 12 }}
-          volumeMounts:
-            - name: fluentbit-config
-              mountPath: /fluent-bit/etc/
-            {{- toYaml .Values.sidecars.logger.volumeMounts | nindent 12 }}
-        {{- end }}
-      
-      volumes:
-        {{- if .Values.sidecars.logger.enabled }}
-        - name: fluentbit-config
-          configMap:
-            name: fluentbit-{{ .Chart.Name }}
-        {{- end }}
-        {{- toYaml .Values.mainContainer.volumes | nindent 8 }}
diff --git a/build/helm/values.yaml b/build/helm/values.yaml
index c8326a4..a0df745 100644
--- a/build/helm/values.yaml
+++ b/build/helm/values.yaml
@@ -28,42 +28,7 @@ mainContainer:
   livenessProbe:
     tcpSocket:
       port: {{ appPort }}
-  ###### Подключение Volumes
-  volumeMounts:
-    - name: ingress-logs
-      mountPath: /usr/lib/serverHome/logs/
-    - name: application-logs
-      mountPath: /usr/lib/serverHome/WEB-INF/lucee-server/context/logs/
-  # Общий блок volumes для всех контейнеров
-  volumes:
-  - name: ingress-logs
-    emptyDir: {}
-  - name: application-logs
-    emptyDir: {}
   
-
-sidecars:
-  ###### Репозиторий
-  logger:
-    enabled: true
-    image: 
-      repository: drn.tst.nubes.ru/fluent-bit
-      tag: 2.2.1
-  ###### Ресурсы
-    resources:
-      requests:
-        cpu: 100m
-        memory: 256Mi
-      limits:
-        cpu: 100m
-        memory: 256Mi
-  ###### Подключение Volumes
-    volumeMounts:
-      - name: ingress-logs
-        mountPath: /usr/lib/serverHome/logs/
-      - name: application-logs
-        mountPath: /usr/lib/serverHome/WEB-INF/lucee-server/context/logs/
-
 # Для Vault есть условие
 # Предварительно в Namespace должен быть создан SecretStore
 # 

From 693751766c5a1febe289e596fa2db99f92c3a44e Mon Sep 17 00:00:00 2001
From: vzaytsev <vzaytsev@nubes.ru>
Date: Thu, 30 Jan 2025 10:33:42 +0300
Subject: [PATCH 2/2] Correct logging

---
 build/Dockerfile       |  3 ++-
 build/helm/values.yaml | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build/Dockerfile b/build/Dockerfile
index 8c4b117..3eb64f7 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -32,6 +32,7 @@ RUN sed -i 's~"debug"~"debugBDF952SPR"~' /app/index.cfm && \
     wget https://ext.lucee.org/org.postgresql.jdbc-42.6.0.lex -P /usr/lib/serverHome/WEB-INF/lucee-server/deploy && \
     ln -sf /dev/stdout /usr/lib/serverHome/logs/access.txt && \
     ln -sf /dev/stdout /usr/lib/serverHome/logs/server.out.txt && \
-    ln -sf /dev/stdout /usr/lib/serverHome/WEB-INF/lucee-server/context/logs/application.log
+    ln -sf /dev/stdout /usr/lib/serverHome/WEB-INF/lucee-server/context/logs/application.log && \
+    ln -sf /dev/stdout /usr/lib/serverHome/WEB-INF/lucee-web/logs/exception.log
 
 EXPOSE 8080
\ No newline at end of file
diff --git a/build/helm/values.yaml b/build/helm/values.yaml
index a0df745..8ae3234 100644
--- a/build/helm/values.yaml
+++ b/build/helm/values.yaml
@@ -21,13 +21,13 @@ mainContainer:
       memory: "1024Mi" 
   ###### Пробы контейнера
   readinessProbe:
-    httpGet:
-      path: /
-      port: {{ appPort }}
-      scheme: HTTP
-  livenessProbe:
     tcpSocket:
       port: {{ appPort }}
+  livenessProbe:
+    httpGet:
+      path: /api/v1
+      port: {{ appPort }}
+      scheme: HTTP
   
 # Для Vault есть условие
 # Предварительно в Namespace должен быть создан SecretStore