From ff080b26e29efb3e839f601950553a7f57c9a4db Mon Sep 17 00:00:00 2001
From: Jordan CARRIER <carrierjordan@gmail.com>
Date: Fri, 24 Jan 2025 09:22:41 +0100
Subject: [PATCH] fix: update dependencies and configuration for Armonik chart,
 including seq version and control-plane deployment adjustments

---
 charts/armonik/Chart.lock                     |   8 +-
 charts/armonik/Chart.yaml                     |   8 +-
 .../templates/control-plane-deployment.yaml   |   5 -
 .../fluent-bit-configmap-armonik.yaml         | 170 ++++++++++++++++++
 .../templates/job-configmap.yaml              |   5 +-
 .../charts/control-plane/templates/jobs.yaml  |  16 +-
 .../armonik/charts/control-plane/values.yaml  |  21 +--
 charts/armonik/values-aws.yaml                |  19 +-
 charts/armonik/values.yaml                    |  23 ++-
 9 files changed, 217 insertions(+), 58 deletions(-)
 create mode 100644 charts/armonik/charts/control-plane/templates/fluent-bit-configmap-armonik.yaml

diff --git a/charts/armonik/Chart.lock b/charts/armonik/Chart.lock
index 7437b0e0a..217ef006d 100644
--- a/charts/armonik/Chart.lock
+++ b/charts/armonik/Chart.lock
@@ -51,10 +51,10 @@ dependencies:
   repository: https://charts.bitnami.com/bitnami
   version: 2.4.3
 - name: seq
-  repository: https://cloudnativeapp.github.io/charts/curated/
-  version: 1.0.0
+  repository: https://helm.datalust.co
+  version: 2024.3.1
 - name: cert-manager
   repository: https://charts.jetstack.io
   version: v1.16.3
-digest: sha256:a1a459fd97c7f4d0f9dec52108a23dacd0bef1936f0da907c9a8f0b7d6aaddf1
-generated: "2025-01-17T14:11:41.634626+01:00"
+digest: sha256:e16cfaabc030b04a56a49327aaa22498eddb70fcf06f3d995d95d720766d4e8a
+generated: "2025-01-23T16:39:46.358106+01:00"
diff --git a/charts/armonik/Chart.yaml b/charts/armonik/Chart.yaml
index eac81626d..3b72071c8 100644
--- a/charts/armonik/Chart.yaml
+++ b/charts/armonik/Chart.yaml
@@ -89,14 +89,10 @@ dependencies:
     repository: https://charts.bitnami.com/bitnami
     condition: fluent-bit.enabled
   - name: seq
-    version: 1.0.0
-    repository: https://cloudnativeapp.github.io/charts/curated/
+    version: 2024.3.1
+    repository: https://helm.datalust.co
     condition: seq.enabled
   - name: cert-manager
     version: 1.16.3
     repository: https://charts.jetstack.io
     condition: cert-manager.enabled
-
-    
-
-
diff --git a/charts/armonik/charts/control-plane/templates/control-plane-deployment.yaml b/charts/armonik/charts/control-plane/templates/control-plane-deployment.yaml
index 87aa91eb2..158ef50e8 100644
--- a/charts/armonik/charts/control-plane/templates/control-plane-deployment.yaml
+++ b/charts/armonik/charts/control-plane/templates/control-plane-deployment.yaml
@@ -12,11 +12,6 @@ spec:
   selector:
     matchLabels:
       {{- include "control-plane.selectorLabels" . | nindent 6 }}
-  strategy:
-    rollingUpdate:
-      maxSurge: 25%
-      maxUnavailable: 25%
-    type: RollingUpdate
   template:
     metadata:
       labels:
diff --git a/charts/armonik/charts/control-plane/templates/fluent-bit-configmap-armonik.yaml b/charts/armonik/charts/control-plane/templates/fluent-bit-configmap-armonik.yaml
new file mode 100644
index 000000000..79d470763
--- /dev/null
+++ b/charts/armonik/charts/control-plane/templates/fluent-bit-configmap-armonik.yaml
@@ -0,0 +1,170 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    app: armonik
+    service: fluent-bit
+    type: logs
+  name: fluent-bit-config
+  namespace: {{ .Values.namespace }}
+data:
+  filter-kubernetes.conf: |
+    [FILTER]
+        Name                kubernetes
+        Match               *
+        Kube_URL            https://kubernetes.default.svc:443
+        Kube_CA_File        /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+        Kube_Token_File     /var/run/secrets/kubernetes.io/serviceaccount/token
+        Kube_Tag_Prefix     kube.var.log.containers.
+        Merge_Log           On
+        Merge_Log_Key       log
+        Merge_Log_Trim      On
+        Merge_Parser        json
+        Keep_Log            Off
+        Annotations         On
+        Labels              On
+        K8S-Logging.Parser  On
+        K8S-Logging.Exclude Off
+        Use_Kubelet         On
+        Kubelet_Port        10250
+        Buffer_Size         0
+
+    [FILTER]
+        Name                    nest
+        Match                   *
+        Operation               lift
+        Nested_under            kubernetes
+        Add_prefix              kubernetes_
+
+    [FILTER]
+        Name                    nest
+        Match                   *
+        Operation               lift
+        Nested_under            log
+
+    [FILTER]
+        Name                    modify
+        Match                   *
+        Condition               Key_exists log
+        Rename                  log @m
+        Add                     sourcetype renamelog
+  fluent-bit.conf: |
+    [SERVICE]
+        Flush         1
+        Log_Level     error
+        Daemon        off
+        Parsers_File  parsers.conf
+        HTTP_Server   ${HTTP_SERVER}
+        HTTP_Listen   0.0.0.0
+        HTTP_Port     ${HTTP_PORT}
+    @INCLUDE input-kubernetes.conf
+    @INCLUDE filter-kubernetes.conf
+    @INCLUDE output-cloudwatch.conf
+    @INCLUDE output-http-seq.conf
+    @INCLUDE output-s3.conf
+    @INCLUDE output-stdout.conf
+  input-kubernetes.conf: |
+    [INPUT]
+        Name               tail
+        Tag                kube.*
+        Path               /var/log/containers/control-plane*.log, /var/log/containers/compute-plane*.log
+        Parser             ${PARSER}
+        Docker_Mode        On
+        Buffer_Chunk_Size  512KB
+        Buffer_Max_Size    5M
+        Rotate_Wait        30
+        Mem_Buf_Limit      30MB
+        Skip_Long_Lines    Off
+        Refresh_Interval   10
+        READ_FROM_HEAD     ${READ_FROM_HEAD}
+
+    [INPUT]
+        Name               tail
+        Tag                application.*
+        Path               /var/log/containers/control-plane*.log, /var/log/containers/compute-plane*.log, /var/log/containers/ingress*.log, /var/log/containers/mongodb*.log, /var/log/containers/keda*.log
+        Parser             ${PARSER}
+        Docker_Mode        On
+        Buffer_Chunk_Size  512KB
+        Buffer_Max_Size    5M
+        Rotate_Wait        30
+        Mem_Buf_Limit      30MB
+        Skip_Long_Lines    Off
+        Refresh_Interval   10
+        READ_FROM_HEAD     ${READ_FROM_HEAD}
+
+    [INPUT]
+        Name               tail
+        Tag                s3-application.*
+        Path               /var/log/containers/control-plane*.log, /var/log/containers/compute-plane*.log, /var/log/containers/ingress*.log, /var/log/containers/mongodb*.log, /var/log/containers/keda*.log
+        Parser             ${PARSER}
+        Docker_Mode        On
+        Buffer_Chunk_Size  512KB
+        Buffer_Max_Size    5M
+        Rotate_Wait        30
+        Mem_Buf_Limit      30MB
+        Skip_Long_Lines    Off
+        Refresh_Interval   10
+        READ_FROM_HEAD     ${READ_FROM_HEAD}
+  output-cloudwatch.conf: ""
+  output-http-seq.conf: |
+    [OUTPUT]
+        Name                    http
+        Match                   kube.*
+        Host                    seq
+        Port                    5341
+        URI                     /api/events/raw?clef
+        Header                  ContentType application/vnd.serilog.clef
+        Format                  json_lines
+        json_date_key           @t
+        json_date_format        iso8601
+  output-s3.conf: ""
+  output-stdout.conf: ""
+  parsers.conf: |
+    [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]
+        Name cri
+        Format regex
+        Regex ^(?:(?<time>[^\s]+)\s+(?<stream>\w+)\s+(?<logtag>\w+)\s+)?(?<log>\{.*\})$
+        Time_Key time
+        Time_Format %Y-%m-%dT%H:%M:%S.%L
+        Time_Keep On
+        Decode_Field_As json log
+    [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
+
diff --git a/charts/armonik/charts/control-plane/templates/job-configmap.yaml b/charts/armonik/charts/control-plane/templates/job-configmap.yaml
index 28a659183..98c1f7650 100644
--- a/charts/armonik/charts/control-plane/templates/job-configmap.yaml
+++ b/charts/armonik/charts/control-plane/templates/job-configmap.yaml
@@ -1,12 +1,9 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Values.config.job.name }}
+  name: jobs-configmap
   namespace: {{ .Values.namespace }}
 data:
   {{- range $key, $value := .Values.config.core.data }}
   {{ $key }}: {{ $value | quote }}
   {{- end }}
-  {{- range $key, $value := .Values.config.job.data }}
-  {{ $key }}: {{ $value | quote }}
-  {{- end }}
diff --git a/charts/armonik/charts/control-plane/templates/jobs.yaml b/charts/armonik/charts/control-plane/templates/jobs.yaml
index 898561275..f633b1f9e 100644
--- a/charts/armonik/charts/control-plane/templates/jobs.yaml
+++ b/charts/armonik/charts/control-plane/templates/jobs.yaml
@@ -27,17 +27,13 @@ spec:
       automountServiceAccountToken: true
       containers:
       - name: job-partitions-in-database
-        image: rtsp/mongosh:2.2.15
+        image: rtsp/mongosh:2.3.8
         imagePullPolicy: IfNotPresent
-        command:
-          - /bin/bash
-          - -c
+        command: ["mongosh"]
+        args:
           - |
-            #!/bin/bash
-            # Drop
-            mongosh --username $MongoDB__User --password $MongoDB__Password mongodb://$MongoDB__Host:$MongoDB__Port/database?authSource=$MongoDB__AuthSource --eval 'db.PartitionData.drop()'
-            # Insert
-            mongosh --username $MongoDB__User --password $MongoDB__Password mongodb://$MongoDB__Host:$MongoDB__Port/database?authSource=$MongoDB__AuthSource --eval 'db.PartitionData.insertMany([{"ParentPartitionIds":[],"PodConfiguration":null,"PodMax":100,"PodReserved":1,"PreemptionPercentage":50,"Priority":1,"_id":"bench"},{"ParentPartitionIds":[],"PodConfiguration":null,"PodMax":100,"PodReserved":1,"PreemptionPercentage":50,"Priority":1,"_id":"default"},{"ParentPartitionIds":[],"PodConfiguration":null,"PodMax":100,"PodReserved":1,"PreemptionPercentage":50,"Priority":1,"_id":"htcmock"},{"ParentPartitionIds":[],"PodConfiguration":null,"PodMax":100,"PodReserved":1,"PreemptionPercentage":50,"Priority":1,"_id":"stream"}])'
+            -u $MongoDB__User -p $MongoDB__Password mongodb://$MongoDB__Host:$MongoDB__Port/database?authSource=$MongoDB__AuthSource --eval "db.PartitionData.drop()"
+            -u $MongoDB__User -p $MongoDB__Password mongodb://$MongoDB__Host:$MongoDB__Port/database?authSource=$MongoDB__AuthSource --eval "db.PartitionData.insertMany([{'ParentPartitionIds':[],'PodConfiguration':null,'PodMax':100,'PodReserved':1,'PreemptionPercentage':50,'Priority':1,'_id':'bench'},{'ParentPartitionIds':[],'PodConfiguration':null,'PodMax':100,'PodReserved':1,'PreemptionPercentage':50,'Priority':1,'_id':'default'},{'ParentPartitionIds':[],'PodConfiguration':null,'PodMax':100,'PodReserved':1,'PreemptionPercentage':50,'Priority':1,'_id':'htcmock'},{'ParentPartitionIds':[],'PodConfiguration':null,'PodMax':100,'PodReserved':1,'PreemptionPercentage':50,'Priority':1,'_id':'stream'}])"
         env:
         - name: MongoDB__Password
           valueFrom:
@@ -69,7 +65,7 @@ spec:
       nodeSelector:
         {{- toYaml .Values.nodeSelector | nindent 8 }}
       {{- end }}
-{{- if .Values.tolerations }} 
+  {{- if .Values.tolerations }} 
       tolerations:
         {{- toYaml .Values.tolerations | nindent 8 }}
       {{- end }}
diff --git a/charts/armonik/charts/control-plane/values.yaml b/charts/armonik/charts/control-plane/values.yaml
index fb2e7beae..9e20a319b 100644
--- a/charts/armonik/charts/control-plane/values.yaml
+++ b/charts/armonik/charts/control-plane/values.yaml
@@ -126,12 +126,12 @@ config:
       Components__TableStorage: ArmoniK.Adapters.MongoDB.TableStorage
       MongoDB__User: root
       MongoDB__AllowInsecureTls: "true"
-      MongoDB__AuthSource: admin
-      MongoDB__CAFile: /mongodb/certs/tls-combined.pem
+      #MongoDB__AuthSource: admin
+      #MongoDB__CAFile: /mongodb/certs/tls-combined.pem
       MongoDB__DataRetention: 1.00:00:00
       MongoDB__DatabaseName: database
       MongoDB__DirectConnection: "true"
-      MongoDB__Host: mongodb
+      MongoDB__Host: mongodb-headless
       MongoDB__Port: "27017"
       MongoDB__ReplicaSet: rs0
       #MongoDB__Sharding: "true"
@@ -142,7 +142,7 @@ config:
       Redis__User: ""
       #Redis__CaPath: /redis/ca.crt
       Redis__ClientName: ArmoniK.Core
-      Redis__EndpointUrl: redis-master:6379
+      Redis__EndpointUrl: redis-headless:6379
       Redis__InstanceName: ArmoniKRedis
       #Redis__Ssl: "false"
       #Redis__SslHost: 127.0.0.1
@@ -152,7 +152,7 @@ config:
   log:
     name: log-configmap
     data: 
-      minimumLevel: Information
+      minimumLevel: Debug
       overrides:
         ArmoniK.Core.Common.Auth.Authentication.Authenticator: Warning
         Grpc.AspNetCore.Server.ServerCallHandler: Warning
@@ -164,17 +164,6 @@ config:
         Microsoft.Extensions.Diagnostics.HealthChecks: Warning
         Microsoft.Extensions.Http.DefaultHttpClientFactory: Warning
         Serilog.AspNetCore.RequestLoggingMiddleware: Warning
-  job:
-    name: jobs-configmap
-    data:
-      MongoDB__DirectConnection: "false"
-      MongoDB__Tls: "false"
-      Redis__CaPath: /redis/chain.pem
-      Redis__ClientName: ArmoniK.Core
-      Redis__EndpointUrl: redis-master:6379
-      Redis__InstanceName: ArmoniKRedis
-      Redis__Ssl: "false"
-      Redis__SslHost: 127.0.0.1
 
   controlPlane:
     name: control-plane-configmap
diff --git a/charts/armonik/values-aws.yaml b/charts/armonik/values-aws.yaml
index 3979f0f52..89f1419e4 100644
--- a/charts/armonik/values-aws.yaml
+++ b/charts/armonik/values-aws.yaml
@@ -214,7 +214,18 @@ grafana:
 fluent-bit:
   enabled: true
   fullnameOverride: "fluent-bit"
-  metrics.enabled: true
+  metrics:
+    enabled: true
+    serviceMonitor:
+      enabled: false
+  aggregator:
+    enabled: true
+    configMap: "fluent-bit-configmap-armonik"
+    extraEnvVars:
+      - name: FLUENT_HTTP_SEQ_HOST
+        value: "seq"
+      - name: FLUENT_HTTP_SEQ_PORT
+        value: "5341"
   ingress:
     enabled: true
     selfSigned: true
@@ -226,8 +237,6 @@ seq:
   fullnameOverride: "seq"
   persistence:
     enabled: false
-  image:
-    tag: "2024.3"
   nodeSelector:
     service: monitoring
   tolerations:
@@ -250,7 +259,6 @@ ingress:
 ################## PROMETHEUS ##################
 prometheus:
   enabled: true
-  clusterDomain: cluster.local
   nodeSelector:
     service: metrics
   tolerations:
@@ -267,7 +275,7 @@ prometheus:
         type: prometheus
         access: proxy
         orgId: 1
-        url: https://server.prometheus.local/ 
+        url: http://prometheus-server.{{ .Release.Namespace }}.svc.cluster.local
         isDefault: true
         jsonData:
           tlsSkipVerify: true
@@ -279,6 +287,7 @@ prometheus:
   nodeExporter:
     enabled: true
   server:
+    resourcesPreset: medium
     ingress:
       enabled: true
       tls: true
diff --git a/charts/armonik/values.yaml b/charts/armonik/values.yaml
index 2af727f05..982cd500e 100644
--- a/charts/armonik/values.yaml
+++ b/charts/armonik/values.yaml
@@ -35,6 +35,8 @@ redis:
   useStatefulSet: true
   replica:
     replicaCount: 1
+    persistence:
+      enabled: false
   fullnameOverride: "redis"
   tls:
     enabled: false
@@ -52,9 +54,6 @@ redis:
       enabled: false
     containerPorts:
       redis: 6379
-  replica:
-    persistence:
-      enabled: false
 
 ################## ACTIVEMQ ##################
 activemq:
@@ -189,7 +188,17 @@ grafana:
 fluent-bit:
   enabled: true
   fullnameOverride: "fluent-bit"
-  metrics.enabled: true
+  metrics:
+    enabled: true
+    serviceMonitor:
+      enabled: false
+  aggregator:
+    configMap: "fluent-bit-configmap-armonik"
+    extraEnvVars:
+      - name: FLUENT_HTTP_SEQ_HOST
+        value: "seq"
+      - name: FLUENT_HTTP_SEQ_PORT
+        value: "5341"
   ingress:
     enabled: true
     selfSigned: true
@@ -201,8 +210,6 @@ seq:
   fullnameOverride: "seq"
   persistence:
     enabled: false
-  image:
-    tag: "2024.3"
   #nodeSelector: {"monitoring"}
 
 ################## INGRESS ##################
@@ -213,7 +220,6 @@ ingress:
 ################## PROMETHEUS ##################
 prometheus:
   enabled: true
-  clusterDomain: cluster.local
   #nodeSelector: {"metrics"}
   fullnameOverride: "prometheus"
   datasources:
@@ -224,7 +230,7 @@ prometheus:
         type: prometheus
         access: proxy
         orgId: 1
-        url: https://server.prometheus.local/ 
+        url: http://prometheus-server.{{ .Release.Namespace }}.svc.cluster.local
         isDefault: true
         jsonData:
           tlsSkipVerify: true
@@ -236,6 +242,7 @@ prometheus:
   nodeExporter:
     enabled: true
   server:
+    resourcesPreset: medium
     ingress:
       enabled: true
       tls: true