Merge pull request #2 from lalithkota/develop

Logging Flow with Fluentd added

.github/workflows/push_trigger.yml

@@ -87,10 +87,9 @@ jobs:
 
     - name: Update index.yaml
       run: |
-        git status
         helm repo index --url https://openg2p.github.io/openg2p-helm/ .
         for chartname in $RANCHER_CHARTS; do
-          cp "${chartname}*.tgz" rancher/
+          cp ${chartname}*.tgz rancher/
         done
         helm repo index --url https://openg2p.github.io/openg2p-helm/ --merge rancher/index.yaml rancher
       if: env.SKIP != 'TRUE'

charts/openg2p-social-registry/templates/logging/flow.yaml

@@ -0,0 +1,27 @@
+{{- if .Values.loggingFlow.enabled }}
+{{- if .Values.odoo.enabled }}
+apiVersion: logging.banzaicloud.io/v1beta1
+kind: Flow
+metadata:
+  name: {{ include "socialRegistry.fullname" . }}-odoo
+spec:
+  filters:
+  - parser:
+      {{- include "common.tplvalues.render" (dict "value" .Values.loggingFlow.parser "context" $) | nindent 4 }}
+  {{- if .Values.loggingFlow.extraFilters }}
+  {{- include "common.tplvalues.render" (dict "value" .Values.loggingFlow.extraFilters "context" $) | nindent 2 }}
+  {{- end }}
+  localOutputRefs:
+  - {{ .Values.loggingFlow.outputRef }}
+  {{- if .Values.loggingFlow.extraLocalOutputRefs }}
+  {{- include "common.tplvalues.render" (dict "value" .Values.loggingFlow.extraLocalOutputRefs "context" $) | nindent 2 }}
+  {{- end }}
+  {{- if .Values.loggingFlow.globalOutputRefs }}
+  globalOutputRefs: {{- include "common.tplvalues.render" (dict "value" .Values.loggingFlow.globalOutputRefs "context" $) | nindent 2 }}
+  {{- end }}
+  match:
+  - select:
+      labels:
+        {{- include "common.labels.matchLabels" (dict "customLabels" .Values.odoo.podLabels "context" $.Subcharts.odoo) | nindent 8 }}
+{{- end }}
+{{- end }}

charts/openg2p-social-registry/values.yaml

@@ -5,27 +5,8 @@ global:
   mailname: openg2p.sandbox.net
   sysAdminEmail: [email protected]
 
-istio:
-  enabled: true
-  virtualservice:
-    enabled: true
-    host: ""
-    gateway: "internal"
-    destination: '{{ .Release.Name }}-odoo'
-    destinationPort: '{{ .Values.odoo.service.port }}'
-  gateway:
-    enabled: false
-    host: ""
-    ingressController:
-      istio: ingressgateway
-    httpTlsRedirect: true
-    httpEnabled: true
-    httpsEnabled: false
-    tls:
-      mode: SIMPLE
-      credentialName: ""
-
 odoo:
+  enabled: true
   image:
     repository: openg2p/openg2p-social-registry-odoo-package
     tag: "17.0-develop-social-registry"
@@ -126,6 +107,41 @@ minio:
         mode: SIMPLE
         credentialName: ""
 
+istio:
+  enabled: true
+  virtualservice:
+    enabled: true
+    host: ""
+    gateway: "internal"
+    destination: '{{ .Release.Name }}-odoo'
+    destinationPort: '{{ .Values.odoo.service.port }}'
+  gateway:
+    enabled: false
+    host: ""
+    ingressController:
+      istio: ingressgateway
+    httpTlsRedirect: true
+    httpEnabled: true
+    httpsEnabled: false
+    tls:
+      mode: SIMPLE
+      credentialName: ""
+
+loggingFlow:
+  enabled: true
+  outputRef: opensearch
+  extraLocalOutputRefs: []
+  globalOutputRefs: []
+  parser:
+    key_name: message
+    parse:
+      type: regexp
+      expression: /^(?<asctime>(\S+)(\s)(\S+))\s+(?<pid>\S+)\s+(?<levelname>\S+)\s+(?<dbname>\S+)\s+(?<name>\S+)\s+(?<message>.*)$/
+    remove_key_name_field: true
+    replace_invalid_sequence: true
+    reserve_data: true
+  extraFilters: []
+
 postgresIngress:
   enabled: false
   type: istio